fix for DW issues

Author: arcuri82

jdk_11_maven/em/embedded/graphql/timbuctoo/src/main/java/em/embedded/nl/knaw/huygens/EmbeddedEvoMasterController.java

@@ -1,6 +1,9 @@
 package em.embedded.nl.knaw.huygens;
 
 
+import io.dropwizard.configuration.ResourceConfigurationSourceProvider;
+import io.dropwizard.setup.Bootstrap;
+import nl.knaw.huygens.timbuctoo.server.TimbuctooConfiguration;
 import nl.knaw.huygens.timbuctoo.server.TimbuctooV4;
 import org.evomaster.client.java.controller.AuthUtils;
 import org.evomaster.client.java.controller.EmbeddedSutController;
@@ -16,10 +19,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.sql.Connection;
-import java.util.Collections;
 import java.util.List;
 
+
 /**
  * Class used to start/stop the SUT. This will be controller by the EvoMaster process
  */
@@ -63,7 +65,8 @@ public String startSut() {
 
         elasticsearch.start();
 
-        application = new TimbuctooV4();
+        //application = new TimbuctooV4();
+        application = new TimbuctooResource();
 
         tmpFolder = "tmpFolder";
 
@@ -74,7 +77,8 @@ public String startSut() {
         System.setProperty("dw.securityConfiguration.localAuthentication.permissionConfig",tmpFolder +"/permissionConfig.json");
         System.setProperty("dw.securityConfiguration.localAuthentication.loginsFilePath", tmpFolder+"/logins.json");
         System.setProperty("dw.securityConfiguration.localAuthentication.usersFilePath", tmpFolder + "/users.json");
-        System.setProperty("dw.server.adminConnectors[0].port","8081");
+//        System.setProperty("dw.server.adminConnectors[0].port","8081");
+//        System.setProperty("dw.server.adminConnectors","[]");
         System.setProperty("dw.baseUri","http://localhost:0");
         System.setProperty("dw.collectionFilters.elasticsearch.hostname", "" + elasticsearch.getContainerIpAddress());
         System.setProperty("dw.collectionFilters.elasticsearch.port",""+elasticsearch.getMappedPort(9200));
@@ -88,7 +92,10 @@ public String startSut() {
 
 
         try {
-            application.run("server", "em/embedded/graphql/timbuctoo/src/main/resources/timbuctoo_evomaster.yaml");
+            application.run("server",
+                    //"em/embedded/graphql/timbuctoo/src/main/resources/timbuctoo_evomaster.yaml"
+                    "/timbuctoo_evomaster.yaml"
+            );
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -188,3 +195,14 @@ private void deleteDir(File file) {
         }
     }
 }
+
+
+class TimbuctooResource extends TimbuctooV4{
+
+    @Override
+    public void initialize(Bootstrap<TimbuctooConfiguration> bootstrap) {
+        super.initialize(bootstrap);
+        bootstrap.setConfigurationSourceProvider(new ResourceConfigurationSourceProvider());
+    }
+
+}

jdk_11_maven/em/embedded/graphql/timbuctoo/src/main/resources/timbuctoo_evomaster.yaml

@@ -131,8 +131,8 @@ server:
   applicationConnectors:
     - type: http #Note! if you change this you might or might not also want to change the baseUri
 #      port: $#{timbuctoo_port} #Note! if you change this you might or might not also want to change the baseUri
-  adminConnectors:
-    - type: http
+  adminConnectors: []
+    #- type: http
 #      port: $#{timbuctoo_adminPort}
   requestLog:
     appenders: [] #All requests are already logged using logging.LoggingFilter so the seperate requestlog is not needed

jdk_11_maven/em/external/graphql/timbuctoo/src/main/java/em/external/nl/knaw/huygens/ExternalEvoMasterController.java

@@ -131,7 +131,7 @@ public String[] getJVMParameters() {
                 "-Ddw.securityConfiguration.localAuthentication.permissionConfig="+tmpFolder +"/permissionConfig.json",
                 "-Ddw.securityConfiguration.localAuthentication.loginsFilePath="+tmpFolder+"/logins.json",
                 "-Ddw.securityConfiguration.localAuthentication.usersFilePath="+tmpFolder + "/users.json",
-                "-Ddw.server.adminConnectors[0].port="+(sutPort+1),
+//                "-Ddw.server.adminConnectors[0].port="+(sutPort+1),
                 "-Ddw.baseUri=http://localhost:0",
                 "-Ddw.collectionFilters.elasticsearch.hostname="+elasticsearch.getContainerIpAddress(),
                 "-Ddw.collectionFilters.elasticsearch.port="+elasticsearch.getMappedPort(9200),

jdk_11_maven/em/external/graphql/timbuctoo/src/main/resources/timbuctoo_evomaster.yaml

@@ -131,8 +131,8 @@ server:
   applicationConnectors:
     - type: http #Note! if you change this you might or might not also want to change the baseUri
 #      port: $#{timbuctoo_port} #Note! if you change this you might or might not also want to change the baseUri
-  adminConnectors:
-    - type: http
+  adminConnectors: []
+#    - type: http
 #      port: $#{timbuctoo_adminPort}
   requestLog:
     appenders: [] #All requests are already logged using logging.LoggingFilter so the seperate requestlog is not needed