Minor cleanup

kbase · Mar 21, 2019 · f1d9148 · f1d9148
1 parent 6427a4d
commit f1d9148
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/us/kbase/workspace/kbase/InitWorkspaceServer.java b/src/us/kbase/workspace/kbase/InitWorkspaceServer.java
@@ -508,9 +508,8 @@ private static ConfigurableAuthService setUpAuthClient(
 					"Warning - the Auth Service url uses insecure http. https is recommended.");
 		}
 		try {
-			final URL auth2url = cfg.getAuth2URL().toURI().resolve("api/legacy/globus").toURL();
-			c.withGlobusAuthURL(auth2url)
-				.withKBaseAuthServerURL(cfg.getAuthURL());
+			final URL globusURL = cfg.getAuth2URL().toURI().resolve("api/legacy/globus").toURL();
+			c.withGlobusAuthURL(globusURL).withKBaseAuthServerURL(cfg.getAuthURL());
 		} catch (URISyntaxException | MalformedURLException e) {
 			rep.reportFail("Invalid Auth Service url: " + cfg.getAuth2URL());
 			return null;

diff --git a/src/us/kbase/workspace/test/kbase/HandleTest.java b/src/us/kbase/workspace/test/kbase/HandleTest.java
@@ -254,19 +254,16 @@ private static WorkspaceServer startupWorkspaceServer(
 		ws.add("mongodb-type-database", typedb);
 		ws.add("backend-secret", "foo");
 		ws.add("auth-service-url-allow-insecure", "true");
-		ws.add("auth-service-url", new URL("http://localhost:" + AUTH.getServerPort() +
-				"/testmode/api/legacy/KBase"));
-		ws.add("auth2-service-url", new URL("http://localhost:" + AUTH.getServerPort() +
-				"/testmode/"));
+		ws.add("auth-service-url", "http://localhost:" + AUTH.getServerPort() +
+				"/testmode/api/legacy/KBase");
+		ws.add("auth2-service-url", "http://localhost:" + AUTH.getServerPort() + "/testmode/");
 		ws.add("backend-type", "Shock");
 		ws.add("backend-url", shockURL.toString());
 		ws.add("backend-user", shockToken.getUserName());
 		ws.add("backend-token", shockToken.getToken());
 		ws.add("ws-admin", USER2);
-		ws.add("handle-service-url", "http://localhost:" +
-				HANDLE.getHandleServerPort());
-		ws.add("handle-manager-url", "http://localhost:" +
-				HANDLE.getHandleManagerPort());
+		ws.add("handle-service-url", "http://localhost:" + HANDLE.getHandleServerPort());
+		ws.add("handle-manager-url", "http://localhost:" + HANDLE.getHandleManagerPort());
 		ws.add("handle-manager-token", handleToken.getToken());
 		ws.add("temp-dir", Paths.get(TestCommon.getTempDir())
 				.resolve("tempForJSONRPCLayerTester"));

diff --git a/src/us/kbase/workspace/test/kbase/KBaseWorkspaceConfigTest.java b/src/us/kbase/workspace/test/kbase/KBaseWorkspaceConfigTest.java
@@ -413,7 +413,6 @@ public void configFailNullRequiredEntries() throws Exception {
 		assertThat("incorrect ignore hs", kwc.ignoreHandleService(), is(false));
 	}
 
-	//TODO NOW Manual init tests
 	//TODO NOW Documentation incl release notes (admin notes)
 	//TODO NOW deploy template