fix: remame classes

KnowledgeCaptureAndDiscovery · Jul 24, 2023 · 13b04e5 · 13b04e5
1 parent 53129a5
commit 13b04e5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/...ortal/classes/config/ExecutionEngine.java → ...classes/config/ExecutionEngineConfig.java b/...ortal/classes/config/ExecutionEngine.java → ...classes/config/ExecutionEngineConfig.java
@@ -5,23 +5,23 @@
 /**
  * Created by varun on 13/07/2015.
  */
-public class ExecutionEngine {
+public class ExecutionEngineConfig {
 
   public static enum Type {
     PLAN,
     STEP,
     BOTH,
   }
 
-  ExecutionEngine.Type type;
+  ExecutionEngineConfig.Type type;
   String name;
   String implementation;
   Properties props;
 
-  public ExecutionEngine(
+  public ExecutionEngineConfig(
     String name,
     String implementation,
-    ExecutionEngine.Type type
+    ExecutionEngineConfig.Type type
   ) {
     this.type = type;
     this.name = name;
@@ -37,11 +37,11 @@ public void setName(String name) {
     this.name = name;
   }
 
-  public ExecutionEngine.Type getType() {
+  public ExecutionEngineConfig.Type getType() {
     return type;
   }
 
-  public void setType(ExecutionEngine.Type type) {
+  public void setType(ExecutionEngineConfig.Type type) {
     this.type = type;
   }
 

diff --git a/.../portal/classes/config/ServerDetails.java → ...lasses/config/FileUploadServerConfig.java b/.../portal/classes/config/ServerDetails.java → ...lasses/config/FileUploadServerConfig.java
@@ -7,7 +7,7 @@
 /**
  * Created by varun on 13/07/2015.
  */
-public class ServerDetails {
+public class FileUploadServerConfig {
 
   private static final String PUBLISHER_UPLOAD_SERVER_MAX_UPLOAD_SIZE =
     "publisher.upload-server.max-upload-size";
@@ -34,7 +34,7 @@ public class ServerDetails {
   String password;
   long maxUploadSize = 0; // Defaults to No limit
 
-  public ServerDetails(PropertyListConfiguration serverConfig) {
+  public FileUploadServerConfig(PropertyListConfiguration serverConfig) {
     this.url = serverConfig.getString(PUBLISHER_UPLOAD_SERVER_URL);
     this.username = serverConfig.getString(PUBLISHER_UPLOAD_SERVER_USERNAME);
     this.password = serverConfig.getString(PUBLISHER_UPLOAD_SERVER_PASSWORD);

diff --git a/...ings/portal/classes/config/Publisher.java → ...ortal/classes/config/PublisherConfig.java b/...ings/portal/classes/config/Publisher.java → ...ortal/classes/config/PublisherConfig.java
@@ -5,7 +5,7 @@
 /**
  * Created by varun on 13/07/2015.
  */
-public class Publisher {
+public class PublisherConfig {
 
   private static final String PUBLISHER_SPARQL_DOMAINS_DIRECTORY_KEY =
     "publisher.triple-store.domains-directory";
@@ -18,19 +18,19 @@ public class Publisher {
   String url;
   String tstorePublishUrl;
   String tstoreQueryUrl;
-  ServerDetails uploadServer;
+  FileUploadServerConfig uploadServer;
 
   String domainsDir;
   String exportName;
 
-  public Publisher(PropertyListConfiguration serverConfig) {
+  public PublisherConfig(PropertyListConfiguration serverConfig) {
     this.url = serverConfig.getString(PUBLISHER_URL_KEY);
     this.exportName = serverConfig.getString(PUBLISHER_NAME_KEY);
     this.tstorePublishUrl = serverConfig.getString(PUBLISHER_ENDPOINT_POST_KEY);
     this.tstoreQueryUrl = serverConfig.getString(PUBLISHER_ENDPOINT_QUERY_KEY);
     this.domainsDir =
       serverConfig.getString(PUBLISHER_SPARQL_DOMAINS_DIRECTORY_KEY);
-    ServerDetails upserver = new ServerDetails(serverConfig);
+    FileUploadServerConfig upserver = new FileUploadServerConfig(serverConfig);
     this.setUploadServer(upserver);
   }
 
@@ -50,15 +50,15 @@ public String getTstoreQueryUrl() {
     return tstoreQueryUrl;
   }
 
-  public ServerDetails getUploadServer() {
+  public FileUploadServerConfig getUploadServer() {
     return uploadServer;
   }
 
   public String getDomainsDir() {
     return domainsDir;
   }
 
-  public void setUploadServer(ServerDetails uploadServer) {
+  public void setUploadServer(FileUploadServerConfig uploadServer) {
     this.uploadServer = uploadServer;
   }
 }
diff --git a/portal/src/main/java/edu/isi/wings/portal/controllers/DataController.java b/portal/src/main/java/edu/isi/wings/portal/controllers/DataController.java
@@ -45,7 +45,7 @@
 import edu.isi.wings.portal.classes.JsonHandler;
 import edu.isi.wings.portal.classes.StorageHandler;
 import edu.isi.wings.portal.classes.config.ConfigLoader;
-import edu.isi.wings.portal.classes.config.ServerDetails;
+import edu.isi.wings.portal.classes.config.FileUploadServerConfig;
 import edu.isi.wings.portal.classes.util.CookieHandler;
 import edu.isi.wings.portal.classes.util.TemplateBindings;
 import edu.isi.wings.workflow.plan.api.ExecutionPlan;
@@ -278,7 +278,7 @@ public String publishData(String dataid) {
     return null;
   }
 
-  private String uploadFile(ServerDetails server, File datafile) {
+  private String uploadFile(FileUploadServerConfig server, File datafile) {
     String upUrl = server.getUrl();
     String username = server.getUsername();
     String password = server.getPassword();

diff --git a/portal/src/main/java/edu/isi/wings/portal/controllers/RunController.java b/portal/src/main/java/edu/isi/wings/portal/controllers/RunController.java
@@ -40,8 +40,8 @@
 import edu.isi.wings.planner.api.impl.kb.WorkflowGenerationKB;
 import edu.isi.wings.portal.classes.JsonHandler;
 import edu.isi.wings.portal.classes.config.ConfigLoader;
+import edu.isi.wings.portal.classes.config.FileUploadServerConfig;
 import edu.isi.wings.portal.classes.config.Publisher;
-import edu.isi.wings.portal.classes.config.ServerDetails;
 import edu.isi.wings.portal.classes.util.ComponentExecutingThread;
 import edu.isi.wings.portal.classes.util.PlanningAPIBindings;
 import edu.isi.wings.portal.classes.util.PlanningAndExecutingThread;
@@ -640,7 +640,7 @@ public String publishRun(String runid) {
 
       Publisher publisher = config.portalConfig.getPublisher();
 
-      ServerDetails publishUrl = publisher.getUploadServer();
+      FileUploadServerConfig publishUrl = publisher.getUploadServer();
       String tstoreurl = publisher.getTstorePublishUrl();
       String tstorequery = publisher.getTstoreQueryUrl();
       String exportName = publisher.getExportName();