From 13b04e5cc36d30eb7179946ea4a28afd4d774243 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Mon, 24 Jul 2023 14:49:34 -0400 Subject: [PATCH] fix: remame classes --- ...ecutionEngine.java => ExecutionEngineConfig.java} | 12 ++++++------ ...erverDetails.java => FileUploadServerConfig.java} | 4 ++-- .../config/{Publisher.java => PublisherConfig.java} | 12 ++++++------ .../isi/wings/portal/controllers/DataController.java | 4 ++-- .../isi/wings/portal/controllers/RunController.java | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) rename portal/src/main/java/edu/isi/wings/portal/classes/config/{ExecutionEngine.java => ExecutionEngineConfig.java} (80%) rename portal/src/main/java/edu/isi/wings/portal/classes/config/{ServerDetails.java => FileUploadServerConfig.java} (96%) rename portal/src/main/java/edu/isi/wings/portal/classes/config/{Publisher.java => PublisherConfig.java} (81%) diff --git a/portal/src/main/java/edu/isi/wings/portal/classes/config/ExecutionEngine.java b/portal/src/main/java/edu/isi/wings/portal/classes/config/ExecutionEngineConfig.java similarity index 80% rename from portal/src/main/java/edu/isi/wings/portal/classes/config/ExecutionEngine.java rename to portal/src/main/java/edu/isi/wings/portal/classes/config/ExecutionEngineConfig.java index 042b230d..b990f558 100644 --- a/portal/src/main/java/edu/isi/wings/portal/classes/config/ExecutionEngine.java +++ b/portal/src/main/java/edu/isi/wings/portal/classes/config/ExecutionEngineConfig.java @@ -5,7 +5,7 @@ /** * Created by varun on 13/07/2015. */ -public class ExecutionEngine { +public class ExecutionEngineConfig { public static enum Type { PLAN, @@ -13,15 +13,15 @@ public static enum Type { 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/src/main/java/edu/isi/wings/portal/classes/config/ServerDetails.java b/portal/src/main/java/edu/isi/wings/portal/classes/config/FileUploadServerConfig.java similarity index 96% rename from portal/src/main/java/edu/isi/wings/portal/classes/config/ServerDetails.java rename to portal/src/main/java/edu/isi/wings/portal/classes/config/FileUploadServerConfig.java index 85882a42..6e2e803b 100644 --- a/portal/src/main/java/edu/isi/wings/portal/classes/config/ServerDetails.java +++ b/portal/src/main/java/edu/isi/wings/portal/classes/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/portal/src/main/java/edu/isi/wings/portal/classes/config/Publisher.java b/portal/src/main/java/edu/isi/wings/portal/classes/config/PublisherConfig.java similarity index 81% rename from portal/src/main/java/edu/isi/wings/portal/classes/config/Publisher.java rename to portal/src/main/java/edu/isi/wings/portal/classes/config/PublisherConfig.java index 36647111..e67f1c77 100644 --- a/portal/src/main/java/edu/isi/wings/portal/classes/config/Publisher.java +++ b/portal/src/main/java/edu/isi/wings/portal/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,7 +50,7 @@ public String getTstoreQueryUrl() { return tstoreQueryUrl; } - public ServerDetails getUploadServer() { + public FileUploadServerConfig getUploadServer() { return uploadServer; } @@ -58,7 +58,7 @@ 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 index 551b0942..7487d93b 100644 --- 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 index 5e0619b7..a79778d5 100644 --- 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();