From 9e2f76deabe0853a6d5933b5779c6fe34385b30e Mon Sep 17 00:00:00 2001 From: Aldrin Batac Date: Tue, 14 Jan 2020 10:32:54 +0800 Subject: [PATCH] Rename web.api.url to an appropriate name. IBP-3273 --- .../util/BreedingViewXMLWriter.java | 26 +++++++++---------- src/main/resources/workbench.properties | 2 +- .../util/BreedingViewXMLWriterTest.java | 4 +-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/generationcp/ibpworkbench/util/BreedingViewXMLWriter.java b/src/main/java/org/generationcp/ibpworkbench/util/BreedingViewXMLWriter.java index 5bc4265150..92aa1bf3fd 100644 --- a/src/main/java/org/generationcp/ibpworkbench/util/BreedingViewXMLWriter.java +++ b/src/main/java/org/generationcp/ibpworkbench/util/BreedingViewXMLWriter.java @@ -63,8 +63,8 @@ public class BreedingViewXMLWriter implements InitializingBean, Serializable { @Autowired private ContextUtil contextUtil; - @Value("${web.api.url}") - private String webApiUrl; + @Value("${single.site.analysis.result.upload.url}") + private String singleSiteAnalysisResultUploadURL; @Value("${workbench.is.server.app}") private String isServerApp; @@ -164,7 +164,7 @@ private Pipelines createPipelines(final DataConfiguration dataConfiguration) { private SSAParameters createSSAParameters() { final SSAParameters ssaParameters = new SSAParameters(); - ssaParameters.setWebApiUrl(this.getWebApiUrl()); + ssaParameters.setWebApiUrl(this.generateSingleSiteResultUploadURL()); ssaParameters.setStudyId(this.breedingViewInput.getStudyId()); ssaParameters.setInputDataSetId(this.breedingViewInput.getDatasetId()); ssaParameters.setOutputDataSetId(this.breedingViewInput.getOutputDatasetId()); @@ -190,8 +190,8 @@ protected Project getLastOpenedProject() { return this.contextUtil.getProjectInContext(); } - protected String getWebApiUrl() { - final String url = this.webApiUrl + "?restartApplication"; + protected String generateSingleSiteResultUploadURL() { + final String url = this.singleSiteAnalysisResultUploadURL + "?"; final Project project = this.contextUtil.getProjectInContext(); final String contextParameterString = org.generationcp.commons.util.ContextUtil @@ -200,19 +200,19 @@ protected String getWebApiUrl() { final String authenticationTokenString = org.generationcp.commons.util.ContextUtil .addQueryParameter(ContextConstants.PARAM_AUTH_TOKEN, SecurityUtil.getEncodedToken()); - String webApiUrlWithCropName = this.replaceCropNameInWebApiUrl(url, project.getCropType().getCropName()); + String webApiUrlWithCropName = this.replaceCropNameInSingleSiteResultUploadURL(url, project.getCropType().getCropName()); webApiUrlWithCropName += contextParameterString + authenticationTokenString; return webApiUrlWithCropName; } - private String replaceCropNameInWebApiUrl(final String webApiUrl, final String cropNameValue) { - final StringBuilder containerWebApiUrl = new StringBuilder(webApiUrl); + private String replaceCropNameInSingleSiteResultUploadURL(final String singleSiteAnalysisResultUploadURL, final String cropNameValue) { + final StringBuilder builder = new StringBuilder(singleSiteAnalysisResultUploadURL); - final int startIndex = containerWebApiUrl.indexOf(BreedingViewXMLWriter.CROP_PLACEHOLDER); + final int startIndex = builder.indexOf(BreedingViewXMLWriter.CROP_PLACEHOLDER); final int endIndex = startIndex + BreedingViewXMLWriter.CROP_PLACEHOLDER.length(); - containerWebApiUrl.replace(startIndex, endIndex, cropNameValue); - return containerWebApiUrl.toString(); + builder.replace(startIndex, endIndex, cropNameValue); + return builder.toString(); } Environments createEnvironments() { @@ -326,8 +326,8 @@ public void afterPropertiesSet() throws Exception { // overridden method from interface } - public void setWebApiUrl(final String webApiUrl) { - this.webApiUrl = webApiUrl; + public void setSingleSiteAnalysisResultUploadURL(final String singleSiteAnalysisResultUploadURL) { + this.singleSiteAnalysisResultUploadURL = singleSiteAnalysisResultUploadURL; } public void setContextUtil(final ContextUtil contextUtil) { diff --git a/src/main/resources/workbench.properties b/src/main/resources/workbench.properties index 0a9d937966..d3206fa472 100644 --- a/src/main/resources/workbench.properties +++ b/src/main/resources/workbench.properties @@ -2,7 +2,7 @@ #Fri Feb 21 13:22:51 CST 2014 bmsapi.url=${bmsapi.url} germplasm.browser.default.url=${germplasm.browser.default.url} -web.api.url=${web.api.url} +single.site.analysis.result.upload.url=${single.site.analysis.result.upload.url} ask.for.support.url=${ask.for.support.url} about.bms.url=${about.bms.url} diff --git a/src/test/java/org/generationcp/ibpworkbench/util/BreedingViewXMLWriterTest.java b/src/test/java/org/generationcp/ibpworkbench/util/BreedingViewXMLWriterTest.java index d888c8c9fd..2ea1b51ef7 100644 --- a/src/test/java/org/generationcp/ibpworkbench/util/BreedingViewXMLWriterTest.java +++ b/src/test/java/org/generationcp/ibpworkbench/util/BreedingViewXMLWriterTest.java @@ -89,7 +89,7 @@ public void setUp() throws Exception { this.breedingViewInput = this.createBreedingViewInput(); this.breedingViewXMLWriter = new BreedingViewXMLWriter(); this.breedingViewXMLWriter.setBreedingViewInput(this.breedingViewInput); - this.breedingViewXMLWriter.setWebApiUrl(WEB_API_URL); + this.breedingViewXMLWriter.setSingleSiteAnalysisResultUploadURL(WEB_API_URL); this.breedingViewXMLWriter.setContextUtil(this.contextUtil); this.breedingViewXMLWriter.setInstallationDirectoryUtil(this.installationDirectoryUtil); this.createBreedingViewDirectories(); @@ -187,7 +187,7 @@ public void testWriteProjectXML() throws Exception { public void testGetWebApiUrl() { final Project project = ProjectTestDataInitializer.createProjectWithCropType(); Mockito.when(this.contextUtil.getProjectInContext()).thenReturn(project); - final String url = this.breedingViewXMLWriter.getWebApiUrl(); + final String url = this.breedingViewXMLWriter.generateSingleSiteResultUploadURL(); Mockito.verify(this.contextUtil).getProjectInContext(); Assert.assertTrue(url.contains(project.getCropType().getCropName())); }