feat(*): step 6

feat: small enhancements


feat: solution for step 3


feat: solution for step 5


feat: solution for step 6


refactor(*): Update Postman collection

Author: aoudiamoncef

.gitignore

@@ -1,29 +1,35 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# NetBeans
+nb-configuration.xml
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
+# Visual Studio Code
+.vscode
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# OSX
+.DS_Store
 
-.idea/
+# Vim
+*.swp
+*.swo
 
-*.iml
+# patch
+*.orig
+*.rej
 
-bookmark-service/target
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties

Bookmarkit.postman_collection.json

@@ -10,10 +10,6 @@
 			"request": {
 				"method": "GET",
 				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
 				"url": {
 					"raw": "localhost:8080/bookmarks",
 					"host": [
@@ -60,10 +56,6 @@
 			"request": {
 				"method": "GET",
 				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
 				"url": {
 					"raw": "localhost:8080/bookmarks/1",
 					"host": [
@@ -141,10 +133,6 @@
 						"type": "text"
 					}
 				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
 				"url": {
 					"raw": "localhost:8080/openapi",
 					"host": [
@@ -169,10 +157,6 @@
 						"type": "text"
 					}
 				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
 				"url": {
 					"raw": "http://localhost:8080/metrics/application",
 					"protocol": "http",
@@ -193,10 +177,6 @@
 			"request": {
 				"method": "GET",
 				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
 				"url": {
 					"raw": "localhost:8080/health",
 					"host": [
@@ -209,6 +189,45 @@
 				}
 			},
 			"response": []
+		},
+		{
+			"name": "GET /geoip",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://localhost:8093/geoip",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8093",
+					"path": [
+						"geoip"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "GET /geoip/{ip}",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "http://localhost:8093/geoip/8.8.8.8",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8093",
+					"path": [
+						"geoip",
+						"8.8.8.8"
+					]
+				}
+			},
+			"response": []
 		}
 	]
 }

GENERATE.md

@@ -1,13 +1,14 @@
-mvn io.quarkus:quarkus-maven-plugin:0.22.0:create \
+mvn io.quarkus:quarkus-maven-plugin:0.26.1:create \
     -DprojectGroupId=fr.loicmathieu.bookmarkit \
     -DprojectArtifactId=bookmark-service \
     -DclassName="fr.loicmathieu.bookmarkit.BookmarkResource" \
     -Dpath="/bookmarks" \
     -Dextensions="resteasy-jsonb,openapi,metrics,health,rest-client,hibernate-orm-panache,jdbc-postgresql,fault-tolerance,amqp"
 
-mvn io.quarkus:quarkus-maven-plugin:0.22.0:create \
+mvn io.quarkus:quarkus-maven-plugin:0.26.1:create \
     -DprojectGroupId=fr.loicmathieu.bookmarkit \
     -DprojectArtifactId=bookmark-message-consumer \
     -DclassName="fr.loicmathieu.bookmarkit.BookmarkConsumer" \
     -Dpath="/bookmarks" \
     -Dextensions="metrics,health,amqp"
+    

README.md

@@ -13,7 +13,7 @@ There is a Postman collection that can help to test your application during you
 
 ## Step 1 - Quarkus basics
 
-Goal: implements a bookmark service that pass the test from `fr.loicmathieu.bookmarkit.BookmarkStep1Test`.
+Goal: implements a bookmark service that pass the test from `fr.loicmathieu.bookmarkit.BookmarkResourceTest`.
 
 Steps:
 
@@ -22,7 +22,7 @@ Steps:
   You must implement the service as a JAX-RS resource ([WRITING JSON REST SERVICES](https://quarkus.io/guides/rest-json-guide)).
   You must use Hibernate ORM with Panache to access the database ([SIMPLIFIED HIBERNATE ORM WITH PANACHE](https://quarkus.io/guides/hibernate-orm-panache-guide)).
 - Run the service with `mvn compile quarkus:dev` it has livereload !
-- Test that everything works with `mvn test -Dtest=BookmarkStep1Test `.
+- Test that everything works with `mvn test -Dtest=BookmarkResourceTest`.
 
 NOTE: Hibernate is configured to drop and recreate the schema each time you restart your application. You can change this behaviour inside your `application.properties`.
 
@@ -41,15 +41,15 @@ be careful that the name of the metric must be unique. You can access your metri
 - Create a custom check
 ```
 @Readiness
-public class MyHealCheck implements HealthCheck {
+public class AppHealthCheck implements HealthCheck {
 
     @Override
     public HealthCheckResponse call() {
-        return HealthCheckResponse.builder().name("custom").withData("key", "value").up().build();
+        return HealthCheckResponse.builder().name("bookmark").withData("is", "always").up().build();
     }
 }
 ```
-- Test that everything works with `mvn test -Dtest=BookmarkStep2Test `.
+- Test that everything works with `mvn test -Dtest=BookmarkObservabilityTest`.
 
 NOTE: OpenAPI and OpenMetrics works as soon as you integrate the extension inside your application as it provides default documentation and metrics. Health provides basic liveness and readyness checks, you can add your own if needed.
 
@@ -62,9 +62,9 @@ Steps:
 
 - Add a configuration property inside you `application.properties` file: `greeting=World` 
 - Modify `BookmarkResource` to read this configuration property and log it at startup:
-  - Use `@@ConfigProperty` to inject the property inside a `greeting` variable.
-  - Create a `@PostConstruct` method that log it via `System.out.println("Hello " + greeting)`.
-- Test using `mvn quarkus:dev` you should see `Hello World` in the console when you hit the endpoint.
+  - Use `@ConfigProperty` to inject the property inside a `greeting` variable.
+  - Create a `@PostConstruct` method that log it via `LOGGER.infof("Hello %s", greeting)` using [Jboss logging](https://docs.jboss.org/jbosslogging/latest/org/jboss/logging/Logger.html).
+- Test using `mvn quarkus:dev` you should see `Hello World` in the console.
 - Add a new line to `application.properties` file: `%dev.greeting=Dev` this is an override of the same property for the dev profile.
 - Test using `mvn quarkus:dev` you should see `Hello Dev` in the console.
 

bookmark-message-consumer/.gitignore

@@ -0,0 +1,37 @@
+/ObjectStore/
+
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties

bookmark-message-consumer/pom.xml

@@ -9,7 +9,7 @@
     <surefire-plugin.version>2.22.0</surefire-plugin.version>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <quarkus.version>0.22.0</quarkus.version>
+    <quarkus.version>0.28.1</quarkus.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>

bookmark-message-consumer/src/main/java/fr/loicmathieu/bookmarkit/BookmarkConsumer.java

@@ -1,14 +1,18 @@
 package fr.loicmathieu.bookmarkit;
 
 import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class BookmarkConsumer {
 
+    private final Logger log = LoggerFactory.getLogger(BookmarkConsumer.class);
+
     @Incoming("bookmarks")
     public void process(String bookmark) {
-        System.out.println("Indexing a bookmark: " +bookmark );
+        log.info("Indexing a bookmark: {}", bookmark);
     }
-}
+}

bookmark-message-consumer/src/test/java/fr/loicmathieu/bookmarkit/BookmarkConsumerTest.java

@@ -18,4 +18,4 @@ public void testHelloEndpoint() {
              .body(is("hello"));
     }
 
-}
+}

bookmark-message-consumer/src/test/java/fr/loicmathieu/bookmarkit/NativeBookmarkConsumerIT.java

@@ -6,4 +6,4 @@
 public class NativeBookmarkConsumerIT extends BookmarkConsumerTest {
 
     // Execute the same tests but in native mode.
-}
+}

bookmark-message-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +1 @@
-/data/git/bookmarkit/bookmark-message-consumer/src/main/java/fr/loicmathieu/bookmarkit/BookmarkConsumer.java
+/home/sparow199/Workspace/bookmarkit/bookmark-message-consumer/src/main/java/fr/loicmathieu/bookmarkit/BookmarkConsumer.java