Skip to content

Commit a5a4c63

Browse files
jdahmubedjdahmubed
committed
Code style changes
1 parent 5037817 commit a5a4c63

37 files changed

Lines changed: 977 additions & 1001 deletions

‎lib/src/main/java/com/auth0/jwt/creators/AccessJwtCreator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.auth0.jwt.algorithms.Algorithm;
2323
import com.auth0.jwt.exceptions.JWTCreationException;
24-
import com.auth0.jwt.impl.PublicClaims;
24+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2525
import com.auth0.jwt.jwts.JWT;
2626

2727
import java.util.Date;
@@ -41,8 +41,8 @@ public class AccessJwtCreator {
4141
public AccessJwtCreator() {
4242
jwt = JWT.create();
4343
addedClaims = new HashMap<String, Boolean>() {{
44-
put("Issuer", false);
45-
put("Subject", false);
44+
put(Constants.ISSUER_CAPITALIZED, false);
45+
put(Constants.SUBJECT_CAPITALIZED, false);
4646
put("Iat", false);
4747
}};
4848
publicClaims = new HashSet<String>() {{
@@ -65,7 +65,7 @@ public AccessJwtCreator() {
6565
*/
6666
public AccessJwtCreator withIssuer(String... issuer) {
6767
jwt.withIssuer(issuer);
68-
addedClaims.put("Issuer", true);
68+
addedClaims.put(Constants.ISSUER_CAPITALIZED, true);
6969
return this;
7070
}
7171

@@ -78,7 +78,7 @@ public AccessJwtCreator withIssuer(String... issuer) {
7878
*/
7979
public AccessJwtCreator withSubject(String... subject) {
8080
jwt.withSubject(subject);
81-
addedClaims.put("Subject", true);
81+
addedClaims.put(Constants.SUBJECT_CAPITALIZED, true);
8282
return this;
8383
}
8484

‎lib/src/main/java/com/auth0/jwt/creators/FbJwtCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.auth0.jwt.algorithms.Algorithm;
2323
import com.auth0.jwt.exceptions.JWTCreationException;
24-
import com.auth0.jwt.impl.PublicClaims;
24+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2525
import com.auth0.jwt.jwts.JWT;
2626

2727
import java.util.Date;

‎lib/src/main/java/com/auth0/jwt/creators/GoogleJwtCreator.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121

2222
import com.auth0.jwt.algorithms.Algorithm;
2323
import com.auth0.jwt.exceptions.JWTCreationException;
24-
import com.auth0.jwt.impl.PublicClaims;
24+
import com.auth0.jwt.interfaces.constants.Constants;
25+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2526
import com.auth0.jwt.jwts.JWT;
2627

2728
import java.util.Date;
@@ -41,11 +42,11 @@ public class GoogleJwtCreator {
4142
public GoogleJwtCreator() {
4243
jwt = JWT.create();
4344
addedClaims = new HashMap<String, Boolean>() {{
44-
put("Name", false);
45-
put("Email", false);
46-
put("Picture", false);
47-
put("Issuer", false);
48-
put("Subject", false);
45+
put(Constants.NAME_CAPITALIZED, false);
46+
put(Constants.EMAIL_CAPITALIZED, false);
47+
put(Constants.PICTURE_CAPITALIZED, false);
48+
put(Constants.ISSUER_CAPITALIZED, false);
49+
put(Constants.SUBJECT_CAPITALIZED, false);
4950
put("Iat", false);
5051
}};
5152
publicClaims = new HashSet<String>() {{
@@ -68,7 +69,7 @@ public GoogleJwtCreator() {
6869
*/
6970
public GoogleJwtCreator withName(String name) {
7071
jwt.withNonStandardClaim("name", name);
71-
addedClaims.put("Name", true);
72+
addedClaims.put(Constants.NAME_CAPITALIZED, true);
7273
return this;
7374
}
7475

@@ -79,8 +80,8 @@ public GoogleJwtCreator withName(String name) {
7980
* @return this same Builder instance.
8081
*/
8182
public GoogleJwtCreator withEmail(String email) {
82-
jwt.withNonStandardClaim("email", email);
83-
addedClaims.put("Email", true);
83+
jwt.withNonStandardClaim(Constants.EMAIL, email);
84+
addedClaims.put(Constants.EMAIL_CAPITALIZED, true);
8485
return this;
8586
}
8687

@@ -91,8 +92,8 @@ public GoogleJwtCreator withEmail(String email) {
9192
* @return this same Builder instance.
9293
*/
9394
public GoogleJwtCreator withPicture(String picture) {
94-
jwt.withNonStandardClaim("picture", picture);
95-
addedClaims.put("Picture", true);
95+
jwt.withNonStandardClaim(Constants.PICTURE, picture);
96+
addedClaims.put(Constants.PICTURE_CAPITALIZED, true);
9697
return this;
9798
}
9899

@@ -105,7 +106,7 @@ public GoogleJwtCreator withPicture(String picture) {
105106
*/
106107
public GoogleJwtCreator withIssuer(String... issuer) {
107108
jwt.withIssuer(issuer);
108-
addedClaims.put("Issuer", true);
109+
addedClaims.put(Constants.ISSUER_CAPITALIZED, true);
109110
return this;
110111
}
111112

@@ -118,7 +119,7 @@ public GoogleJwtCreator withIssuer(String... issuer) {
118119
*/
119120
public GoogleJwtCreator withSubject(String... subject) {
120121
jwt.withSubject(subject);
121-
addedClaims.put("Subject", true);
122+
addedClaims.put(Constants.SUBJECT_CAPITALIZED, true);
122123
return this;
123124
}
124125

‎lib/src/main/java/com/auth0/jwt/creators/ImplicitJwtCreator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.auth0.jwt.algorithms.Algorithm;
2323
import com.auth0.jwt.exceptions.JWTCreationException;
24-
import com.auth0.jwt.impl.PublicClaims;
24+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2525
import com.auth0.jwt.jwts.JWT;
2626

2727
import java.util.Date;
@@ -41,8 +41,8 @@ public class ImplicitJwtCreator {
4141
public ImplicitJwtCreator() {
4242
jwt = JWT.create();
4343
addedClaims = new HashMap<String, Boolean>() {{
44-
put("Issuer", false);
45-
put("Subject", false);
44+
put(Constants.ISSUER_CAPITALIZED, false);
45+
put(Constants.SUBJECT_CAPITALIZED, false);
4646
put("Iat", false);
4747
}};
4848
publicClaims = new HashSet<String>() {{
@@ -62,7 +62,7 @@ public ImplicitJwtCreator() {
6262
*/
6363
public ImplicitJwtCreator withIssuer(String... issuer) {
6464
jwt.withIssuer(issuer);
65-
addedClaims.put("Issuer", true);
65+
addedClaims.put(Constants.ISSUER_CAPITALIZED, true);
6666
return this;
6767
}
6868

@@ -75,7 +75,7 @@ public ImplicitJwtCreator withIssuer(String... issuer) {
7575
*/
7676
public ImplicitJwtCreator withSubject(String... subject) {
7777
jwt.withSubject(subject);
78-
addedClaims.put("Subject", true);
78+
addedClaims.put(Constants.SUBJECT_CAPITALIZED, true);
7979
return this;
8080
}
8181

‎lib/src/main/java/com/auth0/jwt/creators/JWTCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.auth0.jwt.exceptions.SignatureGenerationException;
2525
import com.auth0.jwt.impl.ClaimsHolder;
2626
import com.auth0.jwt.impl.PayloadSerializer;
27-
import com.auth0.jwt.impl.PublicClaims;
27+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2828
import com.fasterxml.jackson.core.JsonProcessingException;
2929
import com.fasterxml.jackson.databind.MapperFeature;
3030
import com.fasterxml.jackson.databind.ObjectMapper;

‎lib/src/main/java/com/auth0/jwt/creators/RiscJwtCreator.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121

2222
import com.auth0.jwt.algorithms.Algorithm;
2323
import com.auth0.jwt.exceptions.JWTCreationException;
24-
import com.auth0.jwt.impl.PublicClaims;
24+
import com.auth0.jwt.interfaces.constants.Constants;
25+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2526
import com.auth0.jwt.jwts.JWT;
2627

2728
import java.util.Date;
@@ -42,8 +43,8 @@ public RiscJwtCreator() {
4243
jwt = JWT.create();
4344
addedClaims = new HashMap<String, Boolean>() {{
4445
put("Jti", false);
45-
put("Issuer", false);
46-
put("Subject", false);
46+
put(Constants.ISSUER_CAPITALIZED, false);
47+
put(Constants.SUBJECT_CAPITALIZED, false);
4748
put("Iat", false);
4849
}};
4950
publicClaims = new HashSet<String>() {{
@@ -78,7 +79,7 @@ public RiscJwtCreator withJWTId(String jwtId) {
7879
*/
7980
public RiscJwtCreator withIssuer(String... issuer) {
8081
jwt.withIssuer(issuer);
81-
addedClaims.put("Issuer", true);
82+
addedClaims.put(Constants.ISSUER_CAPITALIZED, true);
8283
return this;
8384
}
8485

@@ -91,7 +92,7 @@ public RiscJwtCreator withIssuer(String... issuer) {
9192
*/
9293
public RiscJwtCreator withSubject(String... subject) {
9394
jwt.withSubject(subject);
94-
addedClaims.put("Subject", true);
95+
addedClaims.put(Constants.SUBJECT_CAPITALIZED, true);
9596
return this;
9697
}
9798

‎lib/src/main/java/com/auth0/jwt/creators/ScopedJwtCreator.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121

2222
import com.auth0.jwt.algorithms.Algorithm;
2323
import com.auth0.jwt.exceptions.JWTCreationException;
24-
import com.auth0.jwt.impl.PublicClaims;
24+
import com.auth0.jwt.interfaces.constants.Constants;
25+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2526
import com.auth0.jwt.jwts.JWT;
2627

2728
import java.util.Date;
@@ -41,9 +42,9 @@ public class ScopedJwtCreator {
4142
public ScopedJwtCreator() {
4243
jwt = JWT.create();
4344
addedClaims = new HashMap<String, Boolean>() {{
44-
put("Scope", false);
45-
put("Issuer", false);
46-
put("Subject", false);
45+
put(Constants.SCOPE_CAPITALIZED, false);
46+
put(Constants.ISSUER_CAPITALIZED, false);
47+
put(Constants.SUBJECT_CAPITALIZED, false);
4748
put("Iat", false);
4849
}};
4950
publicClaims = new HashSet<String>() {{
@@ -65,8 +66,8 @@ public ScopedJwtCreator() {
6566
* @return this same Builder instance.
6667
*/
6768
public ScopedJwtCreator withScope(String scope) {
68-
jwt.withNonStandardClaim("scope", scope);
69-
addedClaims.put("Scope", true);
69+
jwt.withNonStandardClaim(Constants.SCOPE, scope);
70+
addedClaims.put(Constants.SCOPE_CAPITALIZED, true);
7071
return this;
7172
}
7273

@@ -79,7 +80,7 @@ public ScopedJwtCreator withScope(String scope) {
7980
*/
8081
public ScopedJwtCreator withIssuer(String... issuer) {
8182
jwt.withIssuer(issuer);
82-
addedClaims.put("Issuer", true);
83+
addedClaims.put(Constants.ISSUER_CAPITALIZED, true);
8384
return this;
8485
}
8586

@@ -92,7 +93,7 @@ public ScopedJwtCreator withIssuer(String... issuer) {
9293
*/
9394
public ScopedJwtCreator withSubject(String... subject) {
9495
jwt.withSubject(subject);
95-
addedClaims.put("Subject", true);
96+
addedClaims.put(Constants.SUBJECT_CAPITALIZED, true);
9697
return this;
9798
}
9899

‎lib/src/main/java/com/auth0/jwt/impl/HeaderDeserializer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package com.auth0.jwt.impl;
2121

2222
import com.auth0.jwt.exceptions.JWTDecodeException;
23+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2324
import com.fasterxml.jackson.core.JsonParser;
2425
import com.fasterxml.jackson.core.type.TypeReference;
2526
import com.fasterxml.jackson.databind.DeserializationContext;

‎lib/src/main/java/com/auth0/jwt/impl/PayloadDeserializer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import com.auth0.jwt.exceptions.JWTDecodeException;
2323
import com.auth0.jwt.interfaces.Payload;
24+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2425
import com.fasterxml.jackson.core.JsonParser;
2526
import com.fasterxml.jackson.core.JsonProcessingException;
2627
import com.fasterxml.jackson.core.type.TypeReference;

‎lib/src/main/java/com/auth0/jwt/impl/PayloadSerializer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package com.auth0.jwt.impl;
2121

22+
import com.auth0.jwt.interfaces.constants.PublicClaims;
2223
import com.fasterxml.jackson.core.JsonGenerator;
2324
import com.fasterxml.jackson.databind.SerializerProvider;
2425
import com.fasterxml.jackson.databind.ser.std.StdSerializer;

0 commit comments

Comments
 (0)