Skip to content

Commit 6613350

Browse files
gmsdelmundogmsdelmundo
committed
Updated formatting
1 parent 4e3c31b commit 6613350

File tree

6 files changed

+31
-47
lines changed

6 files changed

+31
-47
lines changed

‎src/main/java/com/uid2/operator/model/UserIdentity.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ public class UserIdentity {
1111
public final Instant establishedAt;
1212
public final Instant refreshedAt;
1313

14-
public UserIdentity(IdentityScope identityScope, IdentityType identityType,
15-
byte[] id, int privacyBits,
14+
public UserIdentity(IdentityScope identityScope, IdentityType identityType, byte[] id, int privacyBits,
1615
Instant establishedAt, Instant refreshedAt) {
1716
this.identityScope = identityScope;
1817
this.identityType = identityType;

‎src/main/java/com/uid2/operator/service/InputUtil.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ public static InputVal normalizePhoneHash(String input) {
5050
return InputVal.invalidPhoneHash(input);
5151
}
5252

53-
public static boolean isAsciiDigit(char d)
54-
{
53+
public static boolean isAsciiDigit(char d) {
5554
return d >= '0' && d <= '9';
5655
}
5756

@@ -80,7 +79,7 @@ public static boolean isPhoneNumberNormalized(String phoneNumber) {
8079

8180
public static InputVal normalizeEmail(String email) {
8281
final String normalize = normalizeEmailString(email);
83-
if (normalize != null && !normalize.isEmpty()) {
82+
if (normalize != null && normalize.length() > 0) {
8483
return InputVal.validEmail(email, normalize);
8584
}
8685
return InputVal.invalidEmail(email);
@@ -143,15 +142,15 @@ public static String normalizeEmailString(String email) {
143142
wsBuffer.append(c);
144143
break;
145144
}
146-
if (!wsBuffer.isEmpty()) {
147-
sb.append(wsBuffer);
145+
if (wsBuffer.length() > 0) {
146+
sb.append(wsBuffer.toString());
148147
wsBuffer = new StringBuilder();
149148
}
150149
sb.append(c);
151150
}
152151
}
153152
}
154-
if (sb.isEmpty()) {
153+
if (sb.length() == 0) {
155154
return null;
156155
}
157156
final String domainPart = sb.toString();
@@ -162,7 +161,7 @@ public static String normalizeEmailString(String email) {
162161
} else {
163162
addressPartToUse = preSb;
164163
}
165-
if (addressPartToUse.isEmpty()) {
164+
if (addressPartToUse.length() == 0) {
166165
return null;
167166
}
168167

@@ -179,7 +178,7 @@ private enum EmailParsingState {
179178
Pre,
180179
SubDomain,
181180
Domain,
182-
Terminal,
181+
Terminal
183182
}
184183

185184
public static class InputVal {
@@ -273,5 +272,4 @@ public UserIdentity toUserIdentity(IdentityScope identityScope, int privacyBits,
273272
establishedAt);
274273
}
275274
}
276-
277275
}

‎src/main/java/com/uid2/operator/service/UIDOperatorService.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public class UIDOperatorService implements IUIDOperatorService {
5454
private final UidInstanceIdProvider uidInstanceIdProvider;
5555

5656
public UIDOperatorService(IOptOutStore optOutStore, ISaltProvider saltProvider, ITokenEncoder encoder, Clock clock,
57-
IdentityScope identityScope,
58-
Handler<Boolean> saltRetrievalResponseHandler, boolean identityV3Enabled, UidInstanceIdProvider uidInstanceIdProvider) {
57+
IdentityScope identityScope, Handler<Boolean> saltRetrievalResponseHandler, boolean identityV3Enabled, UidInstanceIdProvider uidInstanceIdProvider) {
5958
this.saltProvider = saltProvider;
6059
this.encoder = encoder;
6160
this.optOutStore = optOutStore;
@@ -101,10 +100,8 @@ public IdentityTokens generateIdentity(IdentityRequest request, Duration refresh
101100
final Instant now = EncodingUtils.NowUTCMillis(this.clock);
102101
final byte[] firstLevelHash = getFirstLevelHash(request.userIdentity.id, now);
103102
final UserIdentity firstLevelHashIdentity = new UserIdentity(
104-
request.userIdentity.identityScope, request.userIdentity.identityType,
105-
firstLevelHash, request.userIdentity.privacyBits,
106-
request.userIdentity.establishedAt, request.userIdentity.refreshedAt
107-
);
103+
request.userIdentity.identityScope, request.userIdentity.identityType, firstLevelHash, request.userIdentity.privacyBits,
104+
request.userIdentity.establishedAt, request.userIdentity.refreshedAt);
108105

109106
if (request.shouldCheckOptOut() && getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
110107
return IdentityTokens.LogoutToken;
@@ -231,8 +228,7 @@ private MappedIdentity getMappedIdentity(UserIdentity firstLevelHashIdentity, In
231228
advertisingId,
232229
rotatingSalt.hashedId(),
233230
previousAdvertisingId,
234-
refreshFrom
235-
);
231+
refreshFrom);
236232
}
237233

238234
private byte[] getAdvertisingId(UserIdentity firstLevelHashIdentity, String salt, SaltEntry.KeyMaterial key, IdentityEnvironment env) {
@@ -296,8 +292,7 @@ private RefreshToken createRefreshToken(PublisherIdentity publisherIdentity, Use
296292
now.plusMillis(refreshExpiresAfter.toMillis()),
297293
this.operatorIdentity,
298294
publisherIdentity,
299-
userIdentity
300-
);
295+
userIdentity);
301296
}
302297

303298
private AdvertisingToken createAdvertisingToken(PublisherIdentity publisherIdentity, UserIdentity userIdentity, Instant now, Duration identityExpiresAfter) {

‎src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,6 @@ public UIDOperatorVerticle(IConfigStore configStore,
162162
SecureLinkValidatorService secureLinkValidatorService,
163163
Handler<Boolean> saltRetrievalResponseHandler,
164164
UidInstanceIdProvider uidInstanceIdProvider) {
165-
this.identityScope = IdentityScope.fromString(config.getString("identity_scope", "uid2"));
166-
167-
168-
169165
this.keyManager = keyManager;
170166
this.secureLinkValidatorService = secureLinkValidatorService;
171167
try {
@@ -177,12 +173,13 @@ public UIDOperatorVerticle(IConfigStore configStore,
177173
this.clientSideTokenGenerate = clientSideTokenGenerate;
178174
this.healthComponent.setHealthStatus(false, "not started");
179175
this.auth = new AuthMiddleware(clientKeyProvider);
176+
this.encoder = new EncryptedTokenEncoder(keyManager);
180177
this.siteProvider = siteProvider;
181178
this.clientSideKeypairProvider = clientSideKeypairProvider;
182179
this.saltProvider = saltProvider;
183180
this.optOutStore = optOutStore;
184181
this.clock = clock;
185-
this.encoder = new EncryptedTokenEncoder(keyManager);
182+
this.identityScope = IdentityScope.fromString(config.getString("identity_scope", "uid2"));
186183
this.encryptedPayloadHandler = new V2PayloadHandler(keyManager, config.getBoolean("enable_v2_encryption", true), this.identityScope, siteProvider);
187184
this.phoneSupport = config.getBoolean("enable_phone_support", true);
188185
this.tcfVendorId = config.getInteger("tcf_vendor_id", 21);
@@ -496,10 +493,10 @@ private void handleClientSideTokenGenerateImpl(RoutingContext rc) throws NoSuchA
496493
if (identityTokens.isEmptyToken()) {
497494
response = ResponseUtil.SuccessNoBodyV2(ResponseStatus.OptOut);
498495
responseStatus = TokenResponseStatsCollector.ResponseStatus.OptOut;
499-
} else { //user not opted out and already generated valid identity token
496+
} else { // user not opted out and already generated valid identity token
500497
response = ResponseUtil.SuccessV2(toTokenResponseJson(identityTokens));
501498
}
502-
//if returning an optout token or a successful identity token created originally
499+
// if returning an optout token or a successful identity token created originally
503500
if (responseStatus == TokenResponseStatsCollector.ResponseStatus.Success) {
504501
V2RequestUtil.handleRefreshTokenInResponseBody(response.getJsonObject("body"), keyManager, this.identityScope);
505502
}

‎src/test/java/com/uid2/operator/UIDOperatorServiceTest.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -323,12 +323,10 @@ void testTestOptOutKeyIdentityScopeMismatch() {
323323
}
324324

325325
@ParameterizedTest
326-
@CsvSource({
327-
"Email,[email protected],UID2",
326+
@CsvSource({"Email,[email protected],UID2",
328327
"Email,[email protected],EUID",
329328
"Phone,+01010101010,UID2",
330-
"Phone,+01010101010,EUID"
331-
})
329+
"Phone,+01010101010,EUID"})
332330
void testGenerateTokenForOptOutUser(IdentityType type, String identity, IdentityScope scope) {
333331
final UserIdentity userIdentity = createUserIdentity(identity, scope, type);
334332

@@ -802,14 +800,12 @@ void testNormalIdentityOptIn(TestIdentityInputType type, String id, IdentityScop
802800
}
803801

804802
@ParameterizedTest
805-
@CsvSource({
806-
"Email,[email protected],UID2",
803+
@CsvSource({"Email,[email protected],UID2",
807804
"EmailHash,[email protected],UID2",
808805
"Phone,+61401234567,EUID",
809806
"PhoneHash,+61401234567,EUID",
810807
"Email,[email protected],EUID",
811-
"EmailHash,[email protected],EUID"
812-
})
808+
"EmailHash,[email protected],EUID"})
813809
void testExpiredSaltsNotifiesShutdownHandler(TestIdentityInputType type, String id, IdentityScope scope) throws Exception {
814810
RotatingSaltProvider saltProvider = new RotatingSaltProvider(
815811
new EmbeddedResourceStorage(Main.class),

‎src/test/java/com/uid2/operator/UIDOperatorVerticleTest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@ void identityMapNewClientWrongPolicySpecifiedOlderKeySuccessful(String policyPar
11241124
}
11251125

11261126
@ParameterizedTest
1127-
@CsvSource(value = {
1127+
@CsvSource({
11281128
// After - V4 UID, V4 previous UID
11291129
"true,true,text/plain",
11301130
"true,true,application/octet-stream",
@@ -1761,7 +1761,7 @@ void tokenGenerateOptOutTokenWithDisableOptoutTokenFF(String policyParameterKey,
17611761
}
17621762

17631763
@ParameterizedTest
1764-
@CsvSource(value = {
1764+
@CsvSource({
17651765
"true,text/plain",
17661766
"true,application/octet-stream",
17671767

@@ -1856,7 +1856,7 @@ void tokenGenerateForEmailHash(Vertx vertx, VertxTestContext testContext) {
18561856
}
18571857

18581858
@ParameterizedTest
1859-
@CsvSource(value = {
1859+
@CsvSource({
18601860
// Before - v4 UID, v4 refreshed UID
18611861
"true,true,text/plain",
18621862
"true,true,application/octet-stream",
@@ -2806,7 +2806,7 @@ void optOutStatusUnauthorized(String contentType, Vertx vertx, VertxTestContext
28062806
}
28072807

28082808
@ParameterizedTest
2809-
@CsvSource(value = {
2809+
@CsvSource({
28102810
"true,text/plain",
28112811
"true,application/octet-stream",
28122812

@@ -3314,7 +3314,7 @@ void identityMapBatchRequestTooLargeForPhone(Vertx vertx, VertxTestContext testC
33143314
}
33153315

33163316
@ParameterizedTest
3317-
@CsvSource(value = {
3317+
@CsvSource({
33183318
"true,policy",
33193319
"true,optout_check",
33203320

@@ -3393,7 +3393,7 @@ void identityMapOptoutDefaultOption(boolean useV4Uid, Vertx vertx, VertxTestCont
33933393
}
33943394

33953395
@ParameterizedTest
3396-
@CsvSource(value = {
3396+
@CsvSource({
33973397
"true,policy",
33983398
"true,optout_check",
33993399

@@ -4286,7 +4286,7 @@ private Tuple.Tuple2<JsonObject, SecretKey> createClientSideTokenGenerateRequest
42864286
identity.put("email_hash", getSha256(rawId));
42874287
} else if (identityType == IdentityType.Phone) {
42884288
identity.put("phone_hash", getSha256(rawId));
4289-
} else { //can't be other types
4289+
} else { // can't be other types
42904290
org.junit.jupiter.api.Assertions.fail("Identity type is not: [email_hash,phone_hash]");
42914291
}
42924292

@@ -4298,7 +4298,6 @@ private Tuple.Tuple2<JsonObject, SecretKey> createClientSideTokenGenerateRequest
42984298
return createClientSideTokenGenerateRequestWithPayload(identity, timestamp, null);
42994299
}
43004300

4301-
43024301
@ParameterizedTest
43034302
@CsvSource({
43044303
"[email protected],Email",
@@ -4347,9 +4346,9 @@ void cstgUserOptsOutAfterTokenGenerate(String id, IdentityType identityType, Ver
43474346
}
43484347

43494348
// tests for opted out user should lead to generating ad tokens with optout success response
4350-
// tests for non-opted out user should generate the UID2 identity and the generated refresh token can be
4351-
// refreshed again
4352-
// tests for all email/phone combos
4349+
// tests for non-opted out user should generate the UID2 identity and the generated refresh token can be
4350+
// refreshed again
4351+
// tests for all email/phone combos
43534352
@ParameterizedTest
43544353
@CsvSource({
43554354
// After - v4 UID, refreshed v4 UID

0 commit comments

Comments
 (0)