fixed signature problem

keeps · Nov 9, 2016 · d527562 · d527562
1 parent f1e4723
commit d527562
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/dbptk-core/src/main/java/com/databasepreservation/modules/solr/SolrExportModule.java b/dbptk-core/src/main/java/com/databasepreservation/modules/solr/SolrExportModule.java
@@ -27,14 +27,22 @@ public class SolrExportModule implements DatabaseExportModule {
 
   private ViewerTable currentTable;
 
+  private String preSetDatabaseUUID;
+
   private long rowIndex = 0;
 
   private final String zookeeperHostAndPort;
 
   public SolrExportModule(String hostname, Integer port, String endpoint, String zookeeperHost, Integer zookeeperPort) {
+    this(hostname, port, endpoint, zookeeperHost, zookeeperPort, null);
+  }
+
+  public SolrExportModule(String hostname, Integer port, String endpoint, String zookeeperHost, Integer zookeeperPort,
+    String databaseUUID) {
     zookeeperHostAndPort = zookeeperHost + ":" + zookeeperPort;
     String url = "http://" + hostname + ":" + port + "/" + endpoint;
     solrManager = new SolrManager(url);
+    preSetDatabaseUUID = databaseUUID;
   }
 
   /**

diff --git a/dbptk-core/src/main/java/com/databasepreservation/modules/solr/SolrModuleFactory.java b/dbptk-core/src/main/java/com/databasepreservation/modules/solr/SolrModuleFactory.java
@@ -36,11 +36,11 @@ public class SolrModuleFactory implements DatabaseModuleFactory {
     .valueIfNotSet("127.0.0.1");
 
   private static final Parameter zookeeperPort = new Parameter().longName("zookeeper-port").shortName("zp")
-          .description("Zookeeper server port").required(false).hasArgument(true).setOptionalArgument(false)
-          .valueIfNotSet("9983");
+    .description("Zookeeper server port").required(false).hasArgument(true).setOptionalArgument(false)
+    .valueIfNotSet("9983");
 
   private static final Parameter databaseUUID = new Parameter().longName("database-id").shortName("dbid")
-          .description("Database UUID to use in Solr").required(false).hasArgument(true).setOptionalArgument(false);
+    .description("Database UUID to use in Solr").required(false).hasArgument(true).setOptionalArgument(false);
 
   @Override
   public boolean producesImportModules() {
@@ -120,10 +120,11 @@ public DatabaseExportModule buildExportModule(Map<Parameter, String> parameters)
     Reporter.exportModuleParameters(getModuleName(), "hostname", pHostname, "port", pPortNumber.toString(), "endpoint",
       pEndpoint, "zookeeper-hostname", pZookeperHostname, "zookeeper-port", pZookeeperPortNumber.toString());
 
-    if(StringUtils.isBlank(pDatabaseUUID)){
+    if (StringUtils.isBlank(pDatabaseUUID)) {
       return new SolrExportModule(pHostname, pPortNumber, pEndpoint, pZookeperHostname, pZookeeperPortNumber);
-    }else{
-      return new SolrExportModule(pDatabaseUUID, pHostname, pPortNumber, pEndpoint, pZookeperHostname, pZookeeperPortNumber);
+    } else {
+      return new SolrExportModule(pHostname, pPortNumber, pEndpoint, pZookeperHostname, pZookeeperPortNumber,
+        pDatabaseUUID);
     }
   }
 }