Skip to content

Commit 8ffc9c8

Browse files
authored
switch to revelc formatter and format code (#18)
1 parent 74c6392 commit 8ffc9c8

23 files changed

+381
-427
lines changed

core/pom.xml

+11-4
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,19 @@
193193
</configuration>
194194
</plugin>
195195
<plugin>
196-
<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
197-
<artifactId>maven-java-formatter-plugin</artifactId>
198-
<version>0.4</version>
196+
<groupId>net.revelc.code.formatter</groupId>
197+
<artifactId>formatter-maven-plugin</artifactId>
198+
<version>2.16.0</version>
199199
<configuration>
200-
<configFile>${project.basedir}/hbase-formatter.xml</configFile>
200+
<configFile>${project.basedir}/../hbase-formatter.xml</configFile>
201201
</configuration>
202+
<executions>
203+
<execution>
204+
<goals>
205+
<goal>validate</goal>
206+
</goals>
207+
</execution>
208+
</executions>
202209
</plugin>
203210
<plugin>
204211
<artifactId>maven-jar-plugin</artifactId>

core/src/main/java/redis/clients/authentication/core/IdentityProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
package redis.clients.authentication.core;
88

99
public interface IdentityProvider {
10-
10+
1111
Token requestToken();
1212
}

core/src/main/java/redis/clients/authentication/core/RenewalScheduler.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ public RenewalScheduler(Supplier<Token> renewToken) {
3333
*/
3434
public RenewalTask scheduleNext(long delay) {
3535
// Schedule the task to run after the given delay
36-
lastTask = new RenewalTask(
37-
scheduler.schedule(() -> renewToken.get(), delay, TimeUnit.MILLISECONDS));
36+
lastTask = new RenewalTask(scheduler.schedule(() -> renewToken.get(), delay, TimeUnit.MILLISECONDS));
3837
return lastTask;
3938
}
4039

core/src/main/java/redis/clients/authentication/core/SimpleToken.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public class SimpleToken implements Token {
1616
private long receivedAt;
1717
private Map<String, ?> claims;
1818

19-
public SimpleToken(String user, String value, long expiresAt, long receivedAt,
20-
Map<String, ?> claims) {
19+
public SimpleToken(String user, String value, long expiresAt, long receivedAt, Map<String, ?> claims) {
2120
this.user = user;
2221
this.value = value;
2322
this.expiresAt = expiresAt;

core/src/main/java/redis/clients/authentication/core/TokenAuthConfig.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ public class TokenAuthConfig {
1111
private TokenManagerConfig tokenManagerConfig;
1212
private IdentityProviderConfig identityProviderConfig;
1313

14-
public TokenAuthConfig(TokenManagerConfig tokenManagerConfig,
15-
IdentityProviderConfig identityProviderConfig) {
14+
public TokenAuthConfig(TokenManagerConfig tokenManagerConfig, IdentityProviderConfig identityProviderConfig) {
1615
this.tokenManagerConfig = tokenManagerConfig;
1716
this.identityProviderConfig = identityProviderConfig;
1817
}
@@ -68,18 +67,17 @@ public T identityProviderConfig(IdentityProviderConfig identityProviderConfig) {
6867
}
6968

7069
public TokenAuthConfig build() {
71-
return new TokenAuthConfig(new TokenManagerConfig(expirationRefreshRatio,
72-
lowerRefreshBoundMillis, tokenRequestExecTimeoutInMs,
73-
new TokenManagerConfig.RetryPolicy(maxAttemptsToRetry, delayInMsToRetry)),
70+
return new TokenAuthConfig(
71+
new TokenManagerConfig(expirationRefreshRatio, lowerRefreshBoundMillis, tokenRequestExecTimeoutInMs,
72+
new TokenManagerConfig.RetryPolicy(maxAttemptsToRetry, delayInMsToRetry)),
7473
identityProviderConfig);
7574
}
7675

7776
public static Builder from(Builder sample) {
7877
return new Builder().expirationRefreshRatio(sample.expirationRefreshRatio)
7978
.lowerRefreshBoundMillis(sample.lowerRefreshBoundMillis)
8079
.tokenRequestExecTimeoutInMs(sample.tokenRequestExecTimeoutInMs)
81-
.maxAttemptsToRetry(sample.maxAttemptsToRetry)
82-
.delayInMsToRetry(sample.delayInMsToRetry)
80+
.maxAttemptsToRetry(sample.maxAttemptsToRetry).delayInMsToRetry(sample.delayInMsToRetry)
8381
.identityProviderConfig(sample.identityProviderConfig);
8482
}
8583
}

core/src/main/java/redis/clients/authentication/core/TokenListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package redis.clients.authentication.core;
88

99
public interface TokenListener {
10-
10+
1111
void onTokenRenewed(Token newToken);
1212

1313
void onError(Exception reason);

core/src/main/java/redis/clients/authentication/core/TokenManager.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public TokenManager(IdentityProvider identityProvider, TokenManagerConfig tokenM
2828
maxRetries = tokenManagerConfig.getRetryPolicy().getMaxAttempts();
2929
retryDelay = tokenManagerConfig.getRetryPolicy().getdelayInMs();
3030
renewalScheduler = new RenewalScheduler(this::renewToken);
31-
dispatcher = new Dispatcher(identityProvider,
32-
tokenManagerConfig.getTokenRequestExecTimeoutInMs());
31+
dispatcher = new Dispatcher(identityProvider, tokenManagerConfig.getTokenRequestExecTimeoutInMs());
3332
}
3433

3534
/**
@@ -158,8 +157,7 @@ protected long ttlForLowerRefresh(long expireDate) {
158157
*/
159158
protected long ttlForRatioRefresh(long expireDate, long issueDate) {
160159
long totalLifetime = expireDate - issueDate;
161-
long intendedUsageDuration = (long) (totalLifetime
162-
* tokenManagerConfig.getExpirationRefreshRatio());
160+
long intendedUsageDuration = (long) (totalLifetime * tokenManagerConfig.getExpirationRefreshRatio());
163161
long startOfRenewalZone = issueDate + intendedUsageDuration;
164162
return startOfRenewalZone - System.currentTimeMillis(); // TTL to renewal zone
165163
}

core/src/main/java/redis/clients/authentication/core/TokenRequestException.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ private static String getMessage(Exception identityProviderFailedWith) {
2424
if (identityProviderFailedWith == null) {
2525
return msg;
2626
}
27-
return msg + " Identity provider request failed!"
28-
+ identityProviderFailedWith.getMessage();
27+
return msg + " Identity provider request failed!" + identityProviderFailedWith.getMessage();
2928
}
3029

3130
}

0 commit comments

Comments
 (0)