Skip to content

Multiple code quality fix-2 #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adietish merged 1 commit into from
Jun 9, 2016
Merged

Multiple code quality fix-2 #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/test/java/com/openshift/client/fakes/HttpsServerFake.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/openshift/client/utils/CartridgeTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

};
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/openshift/internal/client/httpclient/HttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
});
Expand Down