Merge pull request #75 from EMResearch/drivers-suts-for-wm

Drivers for WM SUTs

Author: arcuri82

.gitignore

@@ -27,6 +27,7 @@ hs_err_pid*
 *.iml
 
 
+js_npm/evomaster-client-js
 
 /temp/
 /dist.zip
@@ -260,6 +261,21 @@ dotnet_3/em/embedded/rest/ScsDriver/generated-tests/
 /jdk_17_gradle/cs/rest/bibliothek/build/
 /jdk_17_gradle/em/external/rest/bibliothek/build
 /jdk_17_maven/cs/grpc/signal-registration/target/
+jdk_11_maven/cs/rest/pay-publicapi/target/
+jdk_11_maven/em/embedded/rest/pay-publicapi/target/
+jdk_11_maven/em/external/rest/ind1/target/
+jdk_17_maven/cs/rest/signal-server/event-logger/target/
+jdk_17_maven/cs/rest/signal-server/websocket-resources/target/
+jdk_17_maven/cs/rest/signal-server/integration-tests/target/
+jdk_17_maven/cs/rest/signal-server/service/target/
+jdk_17_maven/cs/rest/signal-server/api-doc/target/
+jdk_17_maven/em/embedded/rest/signal-server/target/
+jdk_17_maven/cs/rest/familie-tilbake/target/
+jdk_17_maven/em/embedded/rest/familie-tilbake/target/
+jdk_17_maven/cs/rest/familie-ba-sak/target/
+jdk_17_maven/cs/rest/tiltaksgjennomforing-api/target/
+jdk_17_maven/em/embedded/rest/familie-ba-sak/target/
+
 /jdk_8_maven/em/embedded/grpc/ncs/target/
 /jdk_8_maven/em/embedded/grpc/scs/target/
 /jdk_8_maven/em/external/grpc/ncs/target/

jdk_11_maven/cs/rest/pay-publicapi/pom.xml

@@ -351,6 +351,14 @@
             <version>2.3.1</version>
             <scope>compile</scope>
         </dependency>
+
+        <!-- Added to server swagger JSON as static file -->
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-assets</artifactId>
+            <version>2.0.25</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

jdk_11_maven/cs/rest/pay-publicapi/src/main/java/uk/gov/pay/api/app/PublicApi.java

@@ -3,6 +3,7 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import io.dropwizard.Application;
+import io.dropwizard.assets.AssetsBundle;
 import io.dropwizard.auth.AuthDynamicFeature;
 import io.dropwizard.auth.AuthValueFactoryProvider;
 import io.dropwizard.auth.CachingAuthenticator;
@@ -15,6 +16,8 @@
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.dropwizard.DropwizardExports;
 import io.prometheus.client.exporter.MetricsServlet;
+import org.eclipse.jetty.server.AbstractNetworkConnector;
+import org.eclipse.jetty.server.Server;
 import org.glassfish.jersey.CommonProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,11 +81,28 @@
 public class PublicApi extends Application<PublicApiConfig> {
 
     private static final Logger logger = LoggerFactory.getLogger(PublicApi.class);
-    
+
     private static final String SERVICE_METRICS_NODE = "publicapi";
 
+    /**
+     * Added to check the status of the SUT, since there is no API
+     * available to access this information.
+     */
+    private Server jettyServer;
+
+    public int getJettyPort() {
+        return ((AbstractNetworkConnector)jettyServer.getConnectors()[0]).getLocalPort();
+    }
+
+    public Server getJettyServer() {
+        return jettyServer;
+    }
+
     @Override
     public void initialize(Bootstrap<PublicApiConfig> bootstrap) {
+        // Added to server Swagger JSON as static file
+        bootstrap.addBundle(new AssetsBundle("/assets/", "/assets/"));
+
         bootstrap.setConfigurationSourceProvider(
                 new SubstitutingSourceProvider(
                         bootstrap.getConfigurationSourceProvider(),
@@ -129,7 +149,7 @@ public void run(PublicApiConfig configuration, Environment environment) {
 
         /*
            Turn off 'FilteringJacksonJaxbJsonProvider' which overrides dropwizard JacksonMessageBodyProvider.
-           Fails on Integration tests if not disabled. 
+           Fails on Integration tests if not disabled.
                - https://github.com/dropwizard/dropwizard/issues/1341
         */
         environment.jersey().property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, Boolean.TRUE);
@@ -153,6 +173,8 @@ public void run(PublicApiConfig configuration, Environment environment) {
         environment.admin().addServlet("prometheusMetrics", new MetricsServlet(collectorRegistry)).addMapping("/metrics");
 
         environment.lifecycle().manage(injector.getInstance(RedisClientManager.class));
+
+        environment.lifecycle().addServerLifecycleListener(server -> jettyServer = server);
     }
 
     /**