fix: Support header-, query- and path params (#8)

Author: thced

acceptance/k6/script.js

@@ -44,7 +44,7 @@ const listBody = JSON.stringify(exampleListRequest);
 export default function () {
   group('get request', () => {
     const url = 'http://localhost:8080/api/v1/data';
-    const res = http.get(url);
+    const res = http.get(url, { headers: { 'X-Name': "Alotta" }});
 
     check(res, {
       'is status 200': (r) => r.status === 200,
@@ -80,4 +80,43 @@ export default function () {
       'is status 200': (r) => r.status === 200,
     });
   });
+
+  group('get query params', () => {
+    const url = 'http://localhost:8080/api/v1/params/query?q1=data&q2=data';
+    const res = http.get(url, listBody, {
+      headers: {
+        'Content-Type':'application/json',
+      }
+    });
+
+    check(res, {
+      'is status 200': (r) => r.status === 200,
+    });
+  });
+
+  group('get path params', () => {
+    const url = 'http://localhost:8080/api/v1/params/path/1234567890';
+    const res = http.get(url, listBody, {
+      headers: {
+        'Content-Type':'application/json',
+      }
+    });
+
+    check(res, {
+      'is status 200': (r) => r.status === 200,
+    });
+  });
+
+  group('get with many path params', () => {
+    const url = 'http://localhost:8080/api/v1/params/path/1234567890/Justin/Case';
+    const res = http.get(url, listBody, {
+      headers: {
+        'Content-Type':'application/json',
+      }
+    });
+
+    check(res, {
+      'is status 200': (r) => r.status === 200,
+    });
+  });
 }

pom.xml

@@ -138,22 +138,49 @@
           <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>3.5.2</version>
+        <configuration>
+          <!-- Remove Mockito agent warning -->
+          <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
         <version>0.8.12</version>
         <executions>
           <execution>
+            <id>jacoco-surefire</id>
             <goals>
               <goal>prepare-agent</goal>
             </goals>
+            <phase>initialize</phase>
+            <configuration>
+              <destFile>${project.build.directory}/jacoco.exec</destFile>
+              <append>true</append>
+            </configuration>
           </execution>
           <execution>
-            <id>generate-code-coverage-report</id>
+            <id>jacoco-report</id>
             <goals>
               <goal>report</goal>
             </goals>
-            <phase>test</phase>
+            <phase>verify</phase>
+            <configuration>
+              <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+              <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
+            </configuration>
           </execution>
         </executions>
       </plugin>

src/main/java/com/retailsvc/http/Handlers.java

@@ -33,7 +33,6 @@ public static ExceptionHandler internalServerErrorHandler() {
   }
 
   public static ExceptionHandler defaultExceptionHandler() {
-    LOG.warn("No exception handler set, using default.");
     return (exchange, e) -> internalServerErrorHandler().handleException(exchange, e);
   }
 

src/main/java/com/retailsvc/http/OpenApiServer.java

@@ -2,8 +2,8 @@
 
 import static com.retailsvc.http.Handlers.notFoundHandler;
 import static java.lang.Thread.ofVirtual;
+import static java.util.Objects.isNull;
 import static java.util.Objects.requireNonNull;
-import static java.util.Objects.requireNonNullElseGet;
 import static java.util.concurrent.Executors.newThreadPerTaskExecutor;
 
 import com.retailsvc.http.openapi.OpenApiValidationFilter;
@@ -70,11 +70,19 @@ public OpenApiServer(
     requireNonNull(specification, "OpenAPI specification must not be null");
     requireNonNull(jsonMapper, "Request body mapper must not be null");
     requireNonNull(requestHandlers, "Request handlers must not be null");
-    ExceptionHandler errorHandler =
-        requireNonNullElseGet(exceptionHandler, Handlers::defaultExceptionHandler);
+
+    if (isNull(exceptionHandler)) {
+      LOG.warn("No exception handler set, using default.");
+      exceptionHandler = Handlers.defaultExceptionHandler();
+    }
 
     httpServer =
-        initializeServer(httpPort, specification, jsonMapper, requestHandlers, errorHandler, t0);
+        initializeServer(
+            httpPort, specification, jsonMapper, requestHandlers, exceptionHandler, t0);
+  }
+
+  public int listenPort() {
+    return httpServer.getAddress().getPort();
   }
 
   private HttpServer initializeServer(
@@ -94,7 +102,7 @@ private HttpServer initializeServer(
     filters.add(new BodyHandler());
     filters.add(new OpenApiValidationFilter(specification, jsonMapper));
 
-    context.setHandler(new RequestDispatchingHandler(specification, requestHandlers));
+    context.setHandler(new RequestDispatchingHandler(requestHandlers));
 
     server.createContext("/", notFoundHandler());
     server.start();