Fixing squid:S1197, squid:LowerCaseLongSuffixCheck, squid:S1125 (#243)

Faisal Hameed · adietish · commit 644f8b0c1853 · 2016-06-09T10:46:39.000+02:00
diff --git a/src/test/java/com/openshift/client/fakes/HttpsServerFake.java b/src/test/java/com/openshift/client/fakes/HttpsServerFake.java
@@ -83,7 +83,7 @@ protected ServerSocket createServerSocket(int port) throws Exception {
 			KeyManagerFactory keyManagerFactory = 
 					KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
 			keyManagerFactory.init(keyStore, KEYSTORE_PASSWORD.toCharArray());
-			KeyManager keyManagers[] = keyManagerFactory.getKeyManagers();
+			KeyManager[] keyManagers = keyManagerFactory.getKeyManagers();
 			
 			SSLContext sslContext = SSLContext.getInstance("TLS");
 			sslContext.init(keyManagers, null, null);
diff --git a/src/test/java/com/openshift/client/utils/CartridgeTestUtils.java b/src/test/java/com/openshift/client/utils/CartridgeTestUtils.java
@@ -126,18 +126,18 @@ public static IEmbeddableCartridge foreman063() throws MalformedURLException {
 	
 	public static IEmbeddableCartridge createObsoleteEmbeddableCartridge(boolean obsolete) {
 		return new EmbeddableCartridge(
-				obsolete == true ? "obsolete-0.1" : "non-obsolete-0.1"
-				, obsolete == true ? "Obsolete 0.1" : "Non-Obsolete 0.1"
-				, obsolete == true ? "Obsolete Cartridge 0.1" : "Non-Obsolete Cartridge 0.1"
+				obsolete ? "obsolete-0.1" : "non-obsolete-0.1"
+				, obsolete ? "Obsolete 0.1" : "Non-Obsolete 0.1"
+				, obsolete ? "Obsolete Cartridge 0.1" : "Non-Obsolete Cartridge 0.1"
 				, obsolete) {
 		};
 	}
 	
 	public static IStandaloneCartridge createObsoleteStandaloneCartridge(boolean obsolete) {
 		return new StandaloneCartridge(
-				obsolete == true ? "obsolete-0.1" : "non-obsolete-0.1"
-				, obsolete == true ? "Obsolete 0.1" : "Non-Obsolete 0.1"
-				, obsolete == true ? "Obsolete Cartridge 0.1" : "Non-Obsolete Cartridge 0.1"
+				obsolete ? "obsolete-0.1" : "non-obsolete-0.1"
+				, obsolete ? "Obsolete 0.1" : "Non-Obsolete 0.1"
+				, obsolete ? "Obsolete Cartridge 0.1" : "Non-Obsolete Cartridge 0.1"
 				, obsolete) {
 
 		};
diff --git a/src/test/java/com/openshift/internal/client/httpclient/HttpClientTest.java b/src/test/java/com/openshift/internal/client/httpclient/HttpClientTest.java
@@ -609,9 +609,9 @@ public void shouldFallbackToDefaultTimeout() throws Throwable {
 			public Long call() throws Exception {
 				try {
 					httpClient.get(serverFake.getUrl(), IHttpClient.NO_TIMEOUT);
-					return -1l;
+					return -1L;
 				} catch (SocketTimeoutException e) {
-					return -1l;
+					return -1L;
 				}
 			}
 		});

Original file line number	Diff line number	Diff line change
`@@ -609,9 +609,9 @@ public void shouldFallbackToDefaultTimeout() throws Throwable {`
`609`	`609`	`public Long call() throws Exception {`
`610`	`610`	`try {`
`611`	`611`	`httpClient.get(serverFake.getUrl(), IHttpClient.NO_TIMEOUT);`
`612`		`- return -1l;`
	`612`	`+ return -1L;`
`613`	`613`	`} catch (SocketTimeoutException e) {`
`614`		`- return -1l;`
	`614`	`+ return -1L;`
`615`	`615`	`}`
`616`	`616`	`}`
`617`	`617`	`});`