From 94eee5725e6e2f0a9af58287e246f84dfbdc2a80 Mon Sep 17 00:00:00 2001 From: Faisal Hameed Date: Thu, 2 Jun 2016 11:41:27 +0500 Subject: [PATCH] Fixing squid:S1197, squid:LowerCaseLongSuffixCheck, squid:S1125 --- .../com/openshift/client/fakes/HttpsServerFake.java | 2 +- .../openshift/client/utils/CartridgeTestUtils.java | 12 ++++++------ .../internal/client/httpclient/HttpClientTest.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/java/com/openshift/client/fakes/HttpsServerFake.java b/src/test/java/com/openshift/client/fakes/HttpsServerFake.java index 47c00ffe..a63ef595 100644 --- 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 index 9c83d8cf..a598b9da 100644 --- 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 index 2eec9ef4..f02b9e99 100755 --- 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; } } });