Skip to content

Commit 55303c3

Browse files
committed
formatter
1 parent 2622c9a commit 55303c3

17 files changed

+319
-272
lines changed

camunda-sdk-java/java-common/src/main/java/io/camunda/common/auth/Authentication.java

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
public interface Authentication {
66

7-
87
Map.Entry<String, String> getTokenHeader(Product product);
98

109
void resetToken(Product product);

camunda-sdk-java/java-common/src/main/java/io/camunda/common/auth/JwtAuthentication.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package io.camunda.common.auth;
22

3-
import org.slf4j.Logger;
4-
import org.slf4j.LoggerFactory;
5-
63
import java.lang.invoke.MethodHandles;
74
import java.time.LocalDateTime;
85
import java.util.AbstractMap;
96
import java.util.HashMap;
107
import java.util.Map;
118
import java.util.Map.Entry;
12-
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
1311

1412
public abstract class JwtAuthentication implements Authentication {
15-
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles
16-
.lookup().lookupClass());
13+
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
1714

1815
private final JwtConfig jwtConfig;
1916
private final Map<Product, JwtToken> tokens = new HashMap<>();
2017

21-
protected JwtAuthentication(JwtConfig jwtConfig) {this.jwtConfig = jwtConfig;}
18+
protected JwtAuthentication(JwtConfig jwtConfig) {
19+
this.jwtConfig = jwtConfig;
20+
}
2221

2322
public JwtConfig getJwtConfig() {
2423
return jwtConfig;
@@ -28,18 +27,19 @@ public JwtConfig getJwtConfig() {
2827
public final void resetToken(Product product) {
2928
tokens.remove(product);
3029
}
30+
3131
@Override
3232
public final Entry<String, String> getTokenHeader(Product product) {
3333
if (!tokens.containsKey(product) || !isValid(tokens.get(product))) {
34-
JwtToken newToken = generateToken(product,jwtConfig.getProduct(product));
34+
JwtToken newToken = generateToken(product, jwtConfig.getProduct(product));
3535
tokens.put(product, newToken);
3636
}
3737
return authHeader(tokens.get(product).getToken());
3838
}
3939

4040
protected abstract JwtToken generateToken(Product product, JwtCredential credential);
4141

42-
private Entry<String,String> authHeader(String token){
42+
private Entry<String, String> authHeader(String token) {
4343
return new AbstractMap.SimpleEntry<>("Authorization", "Bearer " + token);
4444
}
4545

@@ -48,8 +48,6 @@ private boolean isValid(JwtToken jwtToken) {
4848
return jwtToken.getExpiry().isAfter(LocalDateTime.now().minusSeconds(30));
4949
}
5050

51-
52-
5351
protected static class JwtToken {
5452
private final String token;
5553
private final LocalDateTime expiry;

camunda-sdk-java/java-common/src/main/java/io/camunda/common/auth/JwtAuthenticationBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import io.camunda.common.auth.Authentication.AuthenticationBuilder;
44

5-
public abstract class JwtAuthenticationBuilder<
6-
T extends JwtAuthenticationBuilder<?>> implements AuthenticationBuilder {
5+
public abstract class JwtAuthenticationBuilder<T extends JwtAuthenticationBuilder<?>>
6+
implements AuthenticationBuilder {
77
private JwtConfig jwtConfig;
88

99
public final T withJwtConfig(JwtConfig jwtConfig) {

camunda-sdk-java/java-common/src/main/java/io/camunda/common/auth/SaaSAuthentication.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package io.camunda.common.auth;
22

33
import io.camunda.common.json.JsonMapper;
4-
import io.camunda.common.json.SdkObjectMapper;
4+
import java.lang.invoke.MethodHandles;
5+
import java.time.LocalDateTime;
56
import org.apache.hc.client5.http.classic.methods.HttpPost;
67
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
78
import org.apache.hc.client5.http.impl.classic.HttpClients;
@@ -10,12 +11,6 @@
1011
import org.slf4j.Logger;
1112
import org.slf4j.LoggerFactory;
1213

13-
import java.lang.invoke.MethodHandles;
14-
import java.time.LocalDateTime;
15-
import java.util.AbstractMap;
16-
import java.util.HashMap;
17-
import java.util.Map;
18-
1914
public class SaaSAuthentication extends JwtAuthentication {
2015

2116
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -31,7 +26,6 @@ public static SaaSAuthenticationBuilder builder() {
3126
return new SaaSAuthenticationBuilder();
3227
}
3328

34-
3529
private TokenResponse retrieveToken(Product product, JwtCredential jwtCredential) {
3630
try (CloseableHttpClient client = HttpClients.createDefault()) {
3731
HttpPost request = buildRequest(jwtCredential);
@@ -57,8 +51,6 @@ private HttpPost buildRequest(JwtCredential jwtCredential) {
5751
return httpPost;
5852
}
5953

60-
61-
6254
@Override
6355
protected JwtToken generateToken(Product product, JwtCredential credential) {
6456
TokenResponse tokenResponse = retrieveToken(product, credential);

camunda-sdk-java/java-common/src/main/java/io/camunda/common/auth/SelfManagedAuthentication.java

-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import io.camunda.identity.sdk.authentication.Tokens;
66
import java.lang.invoke.MethodHandles;
77
import java.time.LocalDateTime;
8-
import java.util.AbstractMap;
9-
import java.util.HashMap;
10-
import java.util.Map;
118
import org.slf4j.Logger;
129
import org.slf4j.LoggerFactory;
1310

@@ -37,5 +34,4 @@ private Tokens getIdentityToken(Product product, JwtCredential credential) {
3734
String audience = credential.getAudience();
3835
return identity.authentication().requestToken(audience);
3936
}
40-
4137
}

camunda-sdk-java/java-common/src/main/java/io/camunda/common/auth/SimpleAuthentication.java

+23-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.camunda.common.auth;
22

3+
import java.lang.invoke.MethodHandles;
4+
import java.util.*;
35
import org.apache.hc.client5.http.classic.methods.HttpPost;
46
import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
57
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -10,9 +12,6 @@
1012
import org.slf4j.Logger;
1113
import org.slf4j.LoggerFactory;
1214

13-
import java.lang.invoke.MethodHandles;
14-
import java.util.*;
15-
1615
public class SimpleAuthentication implements Authentication {
1716

1817
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -24,30 +23,35 @@ public class SimpleAuthentication implements Authentication {
2423

2524
public SimpleAuthentication(String simpleUrl, SimpleConfig simpleConfig) {
2625
this.simpleConfig = simpleConfig;
27-
this.authUrl = simpleUrl+"/api/login";
26+
this.authUrl = simpleUrl + "/api/login";
2827
}
2928

30-
public static SimpleAuthenticationBuilder builder() { return new SimpleAuthenticationBuilder(); }
29+
public static SimpleAuthenticationBuilder builder() {
30+
return new SimpleAuthenticationBuilder();
31+
}
3132

3233
public SimpleConfig getSimpleConfig() {
3334
return simpleConfig;
3435
}
3536

3637
private String retrieveToken(Product product, SimpleCredential simpleCredential) {
37-
try(CloseableHttpClient client = HttpClients.createDefault()) {
38+
try (CloseableHttpClient client = HttpClients.createDefault()) {
3839
HttpPost request = buildRequest(simpleCredential);
39-
String cookie = client.execute(request, response -> {
40-
Header[] cookieHeaders = response.getHeaders("Set-Cookie");
41-
String cookieCandidate = null;
42-
String cookiePrefix = product.toString().toUpperCase() + "-SESSION";
43-
for (Header cookieHeader : cookieHeaders) {
44-
if (cookieHeader.getValue().startsWith(cookiePrefix)) {
45-
cookieCandidate = response.getHeader("Set-Cookie").getValue();
46-
break;
47-
}
48-
}
49-
return cookieCandidate;
50-
});
40+
String cookie =
41+
client.execute(
42+
request,
43+
response -> {
44+
Header[] cookieHeaders = response.getHeaders("Set-Cookie");
45+
String cookieCandidate = null;
46+
String cookiePrefix = product.toString().toUpperCase() + "-SESSION";
47+
for (Header cookieHeader : cookieHeaders) {
48+
if (cookieHeader.getValue().startsWith(cookiePrefix)) {
49+
cookieCandidate = response.getHeader("Set-Cookie").getValue();
50+
break;
51+
}
52+
}
53+
return cookieCandidate;
54+
});
5155
if (cookie == null) {
5256
throw new RuntimeException("Unable to authenticate due to missing Set-Cookie");
5357
}
@@ -68,7 +72,7 @@ private HttpPost buildRequest(SimpleCredential simpleCredential) {
6872
return httpPost;
6973
}
7074

71-
@Override
75+
@Override
7276
public Map.Entry<String, String> getTokenHeader(Product product) {
7377
String token;
7478
if (tokens.containsKey(product)) {

camunda-sdk-java/java-common/src/main/java/io/camunda/common/auth/SimpleAuthenticationBuilder.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@ public class SimpleAuthenticationBuilder implements AuthenticationBuilder {
66
private String simpleUrl;
77
private SimpleConfig simpleConfig;
88

9-
public SimpleAuthenticationBuilder withSimpleUrl(String simpleUrl){
9+
public SimpleAuthenticationBuilder withSimpleUrl(String simpleUrl) {
1010
this.simpleUrl = simpleUrl;
1111
return this;
1212
}
1313

14-
public SimpleAuthenticationBuilder withSimpleConfig(SimpleConfig simpleConfig){
14+
public SimpleAuthenticationBuilder withSimpleConfig(SimpleConfig simpleConfig) {
1515
this.simpleConfig = simpleConfig;
1616
return this;
1717
}
1818

19-
2019
@Override
2120
public Authentication build() {
22-
return new SimpleAuthentication(simpleUrl,simpleConfig);
21+
return new SimpleAuthentication(simpleUrl, simpleConfig);
2322
}
2423
}

spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/CamundaAutoConfiguration.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class CamundaAutoConfiguration {
4747
@ConditionalOnMissingBean(
4848
SpringZeebeTestContext
4949
.class) // only run if we are not running in a test case - as otherwise the the lifecycle
50-
// is controlled by the test
50+
// is controlled by the test
5151
public ZeebeLifecycleEventProducer zeebeLifecycleEventProducer(
5252
final ZeebeClient client, final ApplicationEventPublisher publisher) {
5353
return new ZeebeLifecycleEventProducer(client, publisher);
@@ -71,7 +71,6 @@ public JsonMapper jsonMapper(ObjectMapper objectMapper) {
7171
return new ZeebeObjectMapper(objectMapper);
7272
}
7373

74-
7574
@Bean(name = "commonJsonMapper")
7675
@ConditionalOnMissingBean
7776
public io.camunda.common.json.JsonMapper commonJsonMapper(ObjectMapper objectMapper) {

0 commit comments

Comments
 (0)