From 45a4f9925f893eb3397669b8443ad7b9a6faa125 Mon Sep 17 00:00:00 2001 From: Akshay Sonvane Date: Tue, 18 Dec 2018 14:41:34 -0800 Subject: [PATCH] Code cleanup (#1697) --- .../java/com/marklogic/hub/impl/HubConfigImpl.java | 8 -------- .../marklogic/quickstart/web/ProjectsController.java | 12 +----------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/HubConfigImpl.java b/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/HubConfigImpl.java index ca60706e6d..ac6deb04b9 100644 --- a/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/HubConfigImpl.java +++ b/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/HubConfigImpl.java @@ -188,7 +188,6 @@ public HubConfigImpl() { public void createProject(String projectDirString) { hubProject.createProject(projectDirString); -// initializeApplicationConfigurations(); } public String getHost() { return appConfig.getHost(); } @@ -1620,13 +1619,6 @@ public DatabaseClient newModulesDbClient() { return this.DHFVersion; } - - /* this method takes care of setting app config and other non-injected dependencies */ - public void initializeApplicationConfigurations() { - hydrateAppConfigs(environment); - hydrateConfigs(); - } - private Map getCustomTokens() { AppConfig appConfig = getAppConfig(); diff --git a/quick-start/src/main/java/com/marklogic/quickstart/web/ProjectsController.java b/quick-start/src/main/java/com/marklogic/quickstart/web/ProjectsController.java index e83c3c529b..9a85892c1d 100644 --- a/quick-start/src/main/java/com/marklogic/quickstart/web/ProjectsController.java +++ b/quick-start/src/main/java/com/marklogic/quickstart/web/ProjectsController.java @@ -98,17 +98,7 @@ public Project initializeProject(@PathVariable int projectId, @RequestBody JsonN om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); try { hubConfig = om.readerForUpdating(hubConfig).readValue(hubConfigDelta); - - // TODO: Is this needed anymore? -// AppConfig appConfig = this.hubConfig.getAppConfig(); -// if (hubConfigDelta.get("host") != null) { -// appConfig.setHost(hubConfigDelta.get("host").asText()); -// } -// if (hubConfigDelta.get("name") != null) { -// appConfig.setName(hubConfigDelta.get("name").asText()); -// } - - this.hubConfig.createProject(project.path); + hubConfig.createProject(project.path); dataHub.initProject(); return project; } catch (Exception e) {