Merge pull request #9 from entur/bugfix/SIK-1501

SIK-1501: Fix TenantAnnotationTokenFactory don't handle PortReservation correct

Author: vevik

CHANGELOG.md

@@ -1,4 +1,7 @@
 # [Release notes](https://github.com/entur/oidc-auth-client)
 
+## oidc-auth-resource-server v1.0.1
+* Fix TenantAnnotationTokenFactory don't handle PortReservation correct
+
 ## oidc-auth-resource-server v1.0.0
  * oidc-auth-resource-server are split out as separate project from oidc-auth

gradle.properties

@@ -1,4 +1,4 @@
 group=org.entur.auth.resource-server
-version=1.1.0-SNAPSHOT
+version=1.0.1-SNAPSHOT
 
 org.gradle.jvmargs=-Xms128m -Xmx2048m

oidc-rs-junit-tenant/src/main/java/org/entur/auth/junit/tenant/TenantAnnotationTokenFactory.java

@@ -32,7 +32,7 @@
  * </ul>
  */
 @Slf4j
-public class TenantAnnotationTokenFactory {
+public class TenantAnnotationTokenFactory implements AutoCloseable {
     private final Provider provider;
     private final PortReservation portReservation;
     private JwtTokenFactory jwtTokenFactory;
@@ -61,9 +61,7 @@ public void setServer(@NonNull WireMockAuthenticationServer server) {
             return;
         }
 
-        if (this.server != null) {
-            this.server.close();
-        }
+        close();
 
         log.info("Setup mock server on port {}", portReservation.getPort());
         this.jwtTokenFactory = new JwtTokenFactory(provider);
@@ -75,19 +73,23 @@ public void setServer(@NonNull WireMock wireMock, int port) {
             return;
         }
 
-        if (this.server != null) {
-            this.server.close();
-        }
+        close();
 
-        log.info("Setup mock server on port {}", portReservation.getPort());
+        log.info("Setup mock server on port {}", port);
         this.jwtTokenFactory = new JwtTokenFactory(provider);
         this.server = new WireMockAuthenticationServer(wireMock, port);
     }
 
-    public void shutdown() {
+    public void close() {
+        if (this.server == null) {
+            return;
+        }
+
         this.server.close();
+        if (this.server.getPort() == this.portReservation.getPort()) {
+            this.portReservation.start();
+        }
         this.server = null;
-        this.portReservation.start();
     }
 
     /**

oidc-rs-junit-tenant/src/test/java/org/entur/auth/junit/tenant/WireMockTestAnnotationTest.java

@@ -28,6 +28,6 @@ void testTokenExists(@PartnerTenant(clientId = "abc", username = "testUser") Str
 
     @AfterAll
     static void aferAllTests(TenantAnnotationTokenFactory annotationTokenFactory) {
-        annotationTokenFactory.shutdown();
+        annotationTokenFactory.close();
     }
 }

oidc-rs-spring-boot-web-test/src/test/java/org/entur/auth/spring/test/server/WireMockTestAnnotationTest.java

@@ -65,6 +65,6 @@ void testProtectedWithPartner(
 
     @AfterAll
     static void aferAllTests(TenantAnnotationTokenFactory annotationTokenFactory) {
-        annotationTokenFactory.shutdown();
+        annotationTokenFactory.close();
     }
 }

oidc-rs-spring-boot-web-test/src/test/resources/config/application-annotation.yaml

@@ -10,4 +10,4 @@ entur:
             - /unprotected
     tenants:
       environment: dev
-      include: partner
+      include: []

oidc-rs-spring-boot-webflux-test/src/test/java/org/entur/auth/spring/test/server/ReactiveWireMockTestAnnotationTest.java

@@ -67,6 +67,6 @@ void testProtectedWithPartner(
 
     @AfterAll
     static void aferAllTests(TenantAnnotationTokenFactory annotationTokenFactory) {
-        annotationTokenFactory.shutdown();
+        annotationTokenFactory.close();
     }
 }