feat(*): step 5

feat(*): Add step 5


feat: small enhancements


feat: solution for step 5


refactor(*): Update Postman collection

Author: aoudiamoncef

README.md

@@ -63,7 +63,7 @@ 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 `log.info("Hello {}", greeting)` using [SLFJ](https://www.slf4j.org/).
+  - 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/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-service/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.26.1</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>
@@ -42,10 +42,13 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-health</artifactId>
     </dependency>
+    <!-- Step 5 dependencies -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jdbc-postgresql</artifactId>
     </dependency>
+    <!--/ Step 5 dependencies -->
+    <!-- Step 6 dependencies -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-metrics</artifactId>
@@ -74,6 +77,15 @@
       <artifactId>quarkus-junit5</artifactId>
       <scope>test</scope>
     </dependency>
+    <!--/ Step 6 dependencies -->
+
+
+    <!-- test dependencies-->
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>

bookmark-service/src/main/java/fr/loicmathieu/bookmarkit/AppHealthCheck.java

@@ -0,0 +1,14 @@
+package fr.loicmathieu.bookmarkit;
+
+import org.eclipse.microprofile.health.HealthCheck;
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.eclipse.microprofile.health.Readiness;
+
+@Readiness
+public class AppHealthCheck implements HealthCheck {
+
+    @Override
+    public HealthCheckResponse call() {
+        return HealthCheckResponse.builder().name("bookmark").withData("is", "always").up().build();
+    }
+}

bookmark-service/src/main/java/fr/loicmathieu/bookmarkit/BookmarkResource.java

@@ -1,16 +1,17 @@
 package fr.loicmathieu.bookmarkit;
 
+import io.smallrye.reactive.messaging.annotations.Channel;
 import io.smallrye.reactive.messaging.annotations.Emitter;
-import io.smallrye.reactive.messaging.annotations.Stream;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.metrics.annotation.Counted;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 import org.eclipse.microprofile.openapi.annotations.Operation;
-import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import org.jboss.logging.Logger;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import javax.annotation.PreDestroy;
 import javax.transaction.Transactional;
+import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -19,73 +20,92 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 import java.net.URI;
 import java.util.List;
 
 @Path("/bookmarks")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public class BookmarkResource {
-    @ConfigProperty(name="greeting") String greeting;
 
-    @Inject @Stream("bookmarks") Emitter<Bookmark> emitter;
+    private static final Logger LOGGER = Logger.getLogger(BookmarkResource.class);
+
+    @ConfigProperty(name = "greeting")
+    private String greeting;
+
+    @Channel("bookmarks")
+    private Emitter<Bookmark> emitter;
 
     @PostConstruct
-    void init(){
-        System.out.println("Hello " + greeting);
+    void init() {
+        LOGGER.infof("Hello %s", greeting);
+    }
+
+    @PreDestroy
+    void shutdown() {
+        if (!emitter.isCancelled()) {
+            emitter.complete();
+        }
     }
 
     @GET
     @Operation(summary = "List all bookmarks")
-    @Counted(name = "listAll.count")
-    @Timed(name="listAll.time")
-    public List<Bookmark> listAll(){
+    @Counted(name = "listBookmarks.count")
+    @Timed(name = "listBookmarks.time")
+    public List<Bookmark> listBookmarks() {
         return Bookmark.listAll();
     }
 
     @GET
-    @Path("/{id}")
+    @Path("{id}")
     @Operation(summary = "Get a bookmark")
-    @Counted(name = "get.count")
-    @Timed(name="get.time")
-    public Bookmark get(@PathParam("id") Long id) {
+    @Counted(name = "getBookmark.count")
+    @Timed(name = "getBookmark.time")
+    public Bookmark getBookmark(@PathParam("id") Long id) {
         return Bookmark.findById(id);
     }
 
     @POST
     @Transactional
     @Operation(summary = "Create a bookmark")
-    @Counted(name = "create.count")
-    @Timed(name="create.time")
-    public Response create(Bookmark bookmark){
+    @Counted(name = "createBookmark.count")
+    @Timed(name = "createBookmark.time")
+    public Response createBookmark(@Valid Bookmark bookmark) {
         bookmark.persist();
-        emitter.send(bookmark);
-        return Response.created(URI.create("/bookmarks/" + bookmark.id)).build();
+        this.emitter.send(bookmark);
+        return Response.status(Response.Status.CREATED).entity(bookmark).build();
     }
 
     @PUT
-    @Path("/{id}")
+    @Path("{id}")
     @Transactional
     @Operation(summary = "Update a bookmark")
-    @Counted(name = "update.count")
-    @Timed(name="update.time")
-    public void update(Bookmark bookmark){
-        Bookmark existing = Bookmark.findById(bookmark.id);
-        existing.url = bookmark.url;
-        existing.description = bookmark.description;
-        existing.title = bookmark.title;
+    @Counted(name = "updateBookmark.count")
+    @Timed(name = "updateBookmark.time")
+    public Response updateBookmark(@Valid Bookmark bookmark, @PathParam("id") Long id, @Context UriInfo uriInfo) {
+        Bookmark entity = Bookmark.findById(id);
+        entity.description = bookmark.description;
+        entity.location = bookmark.location;
+        entity.title = bookmark.title;
+        entity.url = bookmark.url;
+        return Response.created(URI.create(uriInfo.getPath())).build();
     }
 
     @DELETE
-    @Path("/{id}")
+    @Path("{id}")
     @Transactional
     @Operation(summary = "Delete a bookmark")
-    @Counted(name = "delete.count")
-    @Timed(name="delete.time")
-    public void delete(@PathParam("id")Long id){
-        Bookmark existing = Bookmark.findById(id);
-        existing.delete();
+    @Counted(name = "deleteBookmark.count")
+    @Timed(name = "deleteBookmark.time")
+    public Response deleteBookmark(@PathParam("id") Long id) {
+        Bookmark bookmark = Bookmark.findById(id);
+        if (bookmark.isPersistent()) {
+            bookmark.delete();
+        }
+        return Response.noContent().build();
     }
 }

bookmark-service/src/main/java/fr/loicmathieu/bookmarkit/MyHealCheck.java

@@ -1,18 +1,17 @@
-# Datasource configuration
-quarkus.datasource.url=jdbc:postgresql://localhost:5432/bookmarkit
-quarkus.datasource.driver=org.postgresql.Driver
-quarkus.datasource.username=quarkus
-quarkus.datasource.password=quarkus
-# drop and create the database at startup (use `update` to only update the schema)
-quarkus.hibernate-orm.database.generation=drop-and-create
-
-greeting=World
+greeting=world
 %dev.greeting=Dev
-
 # Configures the AMQP broker credentials.
 amqp-username=quarkus
 amqp-password=quarkus
 # Configure the AMQP connector to write to the `bookmark` address
 mp.messaging.outgoing.bookmarks.connector=smallrye-amqp
 mp.messaging.outgoing.bookmarks.address=bookmarks
-mp.messaging.outgoing.bookmarks.durable=true
+mp.messaging.outgoing.bookmarks.durable=true
+# Datasource configuration
+quarkus.datasource.url=jdbc:postgresql://localhost:5432/bookmarkit
+quarkus.datasource.driver=org.postgresql.Driver
+quarkus.datasource.username=quarkus
+quarkus.datasource.password=quarkus
+# drop and create the database at startup (use `update` to only update the schema)
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.sql-load-script=import.sql

bookmark-service/src/main/resources/application.properties

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