Skip to content

Commit d4edc86

Browse files
committed
formatting fixes
1 parent 2f321df commit d4edc86

File tree

8 files changed

+57
-53
lines changed

8 files changed

+57
-53
lines changed

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencyResolutionManagement {
44
versionCatalogs {
55
libs {
66
// main sdk version
7-
version('sdk', '1.8.3');
7+
version('sdk', '1.9.0-SNAPSHOT');
88

99
// sdk deps
1010
version('okhttp3', '4.12.0')

src/main/java/io/harness/cf/client/api/PollingProcessor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ public CompletableFuture<List<Segment>> retrieveSegments() {
7171
completableFuture.complete(segments);
7272
} catch (Throwable e) {
7373
log.error(
74-
"Exception was raised when fetching segments data with the message {}", e.getMessage(), e);
74+
"Exception was raised when fetching segments data with the message {}",
75+
e.getMessage(),
76+
e);
7577
completableFuture.completeExceptionally(e);
7678
}
7779
return completableFuture;
Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
package io.harness.cf.client.connector;
22

3-
import javax.net.SocketFactory;
43
import java.io.IOException;
54
import java.net.InetAddress;
65
import java.net.Socket;
6+
import javax.net.SocketFactory;
77

88
final class DelegatingSocketFactory extends SocketFactory {
9-
private final SocketFactory delegate;
10-
11-
public DelegatingSocketFactory(SocketFactory delegate) {
12-
this.delegate = delegate;
13-
}
14-
15-
@Override
16-
public Socket createSocket() throws IOException {
17-
return configureSocket(delegate.createSocket());
18-
}
19-
20-
@Override
21-
public Socket createSocket(String host, int port) throws IOException {
22-
return configureSocket(delegate.createSocket(host, port));
23-
}
24-
25-
@Override
26-
public Socket createSocket(String host, int port, InetAddress localAddress,
27-
int localPort) throws IOException {
28-
return configureSocket(delegate.createSocket(host, port, localAddress, localPort));
29-
}
30-
31-
@Override
32-
public Socket createSocket(InetAddress host, int port) throws IOException {
33-
return configureSocket(delegate.createSocket(host, port));
34-
}
35-
36-
@Override
37-
public Socket createSocket(InetAddress host, int port, InetAddress localAddress,
38-
int localPort) throws IOException {
39-
return configureSocket(delegate.createSocket(host, port, localAddress, localPort));
40-
}
41-
42-
Socket configureSocket(Socket socket) {
43-
return socket;
44-
}
45-
}
9+
private final SocketFactory delegate;
10+
11+
public DelegatingSocketFactory(SocketFactory delegate) {
12+
this.delegate = delegate;
13+
}
14+
15+
@Override
16+
public Socket createSocket() throws IOException {
17+
return configureSocket(delegate.createSocket());
18+
}
19+
20+
@Override
21+
public Socket createSocket(String host, int port) throws IOException {
22+
return configureSocket(delegate.createSocket(host, port));
23+
}
24+
25+
@Override
26+
public Socket createSocket(String host, int port, InetAddress localAddress, int localPort)
27+
throws IOException {
28+
return configureSocket(delegate.createSocket(host, port, localAddress, localPort));
29+
}
30+
31+
@Override
32+
public Socket createSocket(InetAddress host, int port) throws IOException {
33+
return configureSocket(delegate.createSocket(host, port));
34+
}
35+
36+
@Override
37+
public Socket createSocket(InetAddress host, int port, InetAddress localAddress, int localPort)
38+
throws IOException {
39+
return configureSocket(delegate.createSocket(host, port, localAddress, localPort));
40+
}
41+
42+
Socket configureSocket(Socket socket) {
43+
return socket;
44+
}
45+
}

src/main/java/io/harness/cf/client/connector/HarnessConnector.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,20 @@ ApiClient makeApiClient(int retryBackOfDelay) {
8888

8989
setupTls(apiClient);
9090

91-
final OkHttpClient.Builder builder = apiClient
92-
.getHttpClient()
93-
.newBuilder();
91+
final OkHttpClient.Builder builder = apiClient.getHttpClient().newBuilder();
9492

9593
ProxyConfig.configureTls(builder);
9694

9795
// if http client response is 403 we need to reauthenticate
98-
apiClient.setHttpClient(builder.proxy(ProxyConfig.getProxyConfig())
99-
.proxyAuthenticator(ProxyConfig.getProxyAuthentication())
100-
.addInterceptor(this::reauthInterceptor)
101-
.addInterceptor(new NewRetryInterceptor(options.getMaxRequestRetry(), retryBackOfDelay, isShuttingDown))
102-
.build());
96+
apiClient.setHttpClient(
97+
builder
98+
.proxy(ProxyConfig.getProxyConfig())
99+
.proxyAuthenticator(ProxyConfig.getProxyAuthentication())
100+
.addInterceptor(this::reauthInterceptor)
101+
.addInterceptor(
102+
new NewRetryInterceptor(
103+
options.getMaxRequestRetry(), retryBackOfDelay, isShuttingDown))
104+
.build());
103105

104106
return apiClient;
105107
}

src/main/java/io/harness/cf/client/connector/NewRetryInterceptor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ int getRetryAfterHeaderInSeconds(Response response) {
157157
seconds = (int) Duration.between(Instant.now(), then.toInstant()).getSeconds();
158158
}
159159
} catch (ParseException ignored) {
160-
log.warn("Unable to parse Retry-After header value: `{}` as integer or date", retryAfterValue);
160+
log.warn(
161+
"Unable to parse Retry-After header value: `{}` as integer or date", retryAfterValue);
161162
}
162163
}
163164

src/main/java/io/harness/cf/client/connector/ProxyConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
import java.net.InetSocketAddress;
44
import java.net.Proxy;
5+
import javax.net.ssl.SSLSocketFactory;
56
import lombok.extern.slf4j.Slf4j;
67
import okhttp3.Authenticator;
78
import okhttp3.Credentials;
89
import okhttp3.OkHttpClient;
910

10-
import javax.net.ssl.SSLSocketFactory;
11-
1211
@Slf4j
1312
public class ProxyConfig {
1413

src/test/java/io/harness/cf/client/api/EvaluatorIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public List<DynamicTest> getTestCases() throws Exception {
3535

3636
assertTrue(
3737
testCasesDirectory.exists(),
38-
"ff-test-cases folder missing - please check 'git submodule init' has been run");
38+
"ff-test-cases folder missing - please check 'git submodule update --init' has been run");
3939

4040
try (Stream<Path> pathStream = Files.walk(Paths.get(testCasesBasePath))) {
4141
pathStream

src/test/java/io/harness/cf/client/api/dispatchers/JwtMissingFieldsAuthDispatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public MockResponse dispatch(@NotNull RecordedRequest recordedRequest) {
6060
case SIMPLE_BOOL_FLAG_ENDPOINT:
6161
assertHeaders(recordedRequest);
6262
return makeMockSingleBoolFlagResponse(200, "simplebool", "off", version.get());
63-
// TODO add metrics here
63+
// TODO add metrics here
6464
default:
6565
throw new UnsupportedOperationException(
6666
"ERROR: url not mapped " + recordedRequest.getPath());

0 commit comments

Comments
 (0)