Skip to content

Commit 5cc246e

Browse files
pathobpathob
committed
WIP_BUILDERS
1 parent e22fbb3 commit 5cc246e

File tree

12 files changed

+121
-140
lines changed

12 files changed

+121
-140
lines changed

‎commons/src/main/java/com/deftdevs/bootstrapi/commons/model/AbstractAuthenticationIdpModel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.fasterxml.jackson.annotation.JsonTypeInfo;
66
import io.swagger.v3.oas.annotations.media.Schema;
77
import lombok.Data;
8-
import lombok.NoArgsConstructor;
8+
import lombok.experimental.SuperBuilder;
99

1010
import javax.xml.bind.annotation.XmlElement;
1111
import javax.xml.bind.annotation.XmlRootElement;
@@ -14,7 +14,7 @@
1414

1515

1616
@Data
17-
@NoArgsConstructor
17+
@SuperBuilder
1818
@XmlRootElement
1919
@JsonTypeInfo(
2020
use = JsonTypeInfo.Id.NAME,

‎commons/src/main/java/com/deftdevs/bootstrapi/commons/model/AuthenticationIdpOidcModel.java‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import com.deftdevs.bootstrapi.commons.constants.BootstrAPI;
44
import lombok.Data;
55
import lombok.EqualsAndHashCode;
6-
import lombok.NoArgsConstructor;
6+
import lombok.experimental.SuperBuilder;
77

88
import javax.xml.bind.annotation.XmlElement;
99
import javax.xml.bind.annotation.XmlRootElement;
1010
import java.util.Collections;
1111
import java.util.List;
1212

1313
@Data
14-
@NoArgsConstructor
14+
@SuperBuilder
1515
@EqualsAndHashCode(callSuper = true)
1616
@XmlRootElement(name = BootstrAPI.AUTHENTICATION + "-" + BootstrAPI.AUTHENTICATION_IDP + "-" + BootstrAPI.AUTHENTICATION_IDP_OIDC)
1717
public class AuthenticationIdpOidcModel extends AbstractAuthenticationIdpModel {
@@ -44,24 +44,21 @@ public class AuthenticationIdpOidcModel extends AbstractAuthenticationIdpModel {
4444

4545
// Example instances for documentation and tests
4646

47-
public static final AuthenticationIdpOidcModel EXAMPLE_1;
48-
49-
static {
50-
EXAMPLE_1 = new AuthenticationIdpOidcModel();
51-
EXAMPLE_1.setId(1L);
52-
EXAMPLE_1.setName("OIDC");
53-
EXAMPLE_1.setEnabled(true);
54-
EXAMPLE_1.setUrl("https://oidc.example.com");
55-
EXAMPLE_1.setEnableRememberMe(true);
56-
EXAMPLE_1.setButtonText("Login with OIDC");
57-
EXAMPLE_1.setClientId("oidc");
58-
EXAMPLE_1.setClientSecret("s3cr3t");
59-
EXAMPLE_1.setUsernameClaim("userName");
60-
EXAMPLE_1.setAdditionalScopes(Collections.emptyList());
61-
EXAMPLE_1.setDiscoveryEnabled(false);
62-
EXAMPLE_1.setAuthorizationEndpoint("https://oidc.example.com/authorization");
63-
EXAMPLE_1.setTokenEndpoint("https://oidc.example.com/token");
64-
EXAMPLE_1.setUserInfoEndpoint("https://oidc.example.com/userinfo");
65-
}
47+
public static final AuthenticationIdpOidcModel EXAMPLE_1 = AuthenticationIdpOidcModel.builder()
48+
.id(1L)
49+
.name("OIDC")
50+
.enabled(true)
51+
.url("https://oidc.example.com")
52+
.enableRememberMe(true)
53+
.buttonText("Login with OIDC")
54+
.clientId("oidc")
55+
.clientSecret("s3cr3t")
56+
.usernameClaim("userName")
57+
.additionalScopes(Collections.emptyList())
58+
.discoveryEnabled(false)
59+
.authorizationEndpoint("https://oidc.example.com/authorization")
60+
.tokenEndpoint("https://oidc.example.com/token")
61+
.userInfoEndpoint("https://oidc.example.com/userinfo")
62+
.build();
6663

6764
}

‎commons/src/main/java/com/deftdevs/bootstrapi/commons/model/AuthenticationIdpSamlModel.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import com.deftdevs.bootstrapi.commons.constants.BootstrAPI;
44
import lombok.Data;
55
import lombok.EqualsAndHashCode;
6-
import lombok.NoArgsConstructor;
6+
import lombok.experimental.SuperBuilder;
77

88
import javax.xml.bind.annotation.XmlElement;
99
import javax.xml.bind.annotation.XmlRootElement;
1010

1111
@Data
12-
@NoArgsConstructor
12+
@SuperBuilder
1313
@EqualsAndHashCode(callSuper = true)
1414
@XmlRootElement(name = BootstrAPI.AUTHENTICATION + "-" + BootstrAPI.AUTHENTICATION_IDP + "-" + BootstrAPI.AUTHENTICATION_IDP_SAML)
1515
public class AuthenticationIdpSamlModel extends AbstractAuthenticationIdpModel {
@@ -24,18 +24,15 @@ public class AuthenticationIdpSamlModel extends AbstractAuthenticationIdpModel {
2424

2525
// Example instances for documentation and tests
2626

27-
public static final AuthenticationIdpSamlModel EXAMPLE_1;
28-
29-
static {
30-
EXAMPLE_1 = new AuthenticationIdpSamlModel();
31-
EXAMPLE_1.setId(1L);
32-
EXAMPLE_1.setName("SAML");
33-
EXAMPLE_1.setEnabled(true);
34-
EXAMPLE_1.setUrl("https://saml.example.com");
35-
EXAMPLE_1.setEnableRememberMe(true);
36-
EXAMPLE_1.setButtonText("Login with SAML");
37-
EXAMPLE_1.setCertificate("certificate");
38-
EXAMPLE_1.setUsernameAttribute("username");
39-
}
27+
public static final AuthenticationIdpSamlModel EXAMPLE_1 = AuthenticationIdpSamlModel.builder()
28+
.id(1L)
29+
.name("SAML")
30+
.enabled(true)
31+
.url("https://saml.example.com")
32+
.enableRememberMe(true)
33+
.buttonText("Login with SAML")
34+
.certificate("certificate")
35+
.usernameAttribute("username")
36+
.build();
4037

4138
}

‎commons/src/main/java/com/deftdevs/bootstrapi/commons/model/AuthenticationSsoModel.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.deftdevs.bootstrapi.commons.model;
22

33
import com.deftdevs.bootstrapi.commons.constants.BootstrAPI;
4+
import lombok.Builder;
45
import lombok.Data;
5-
import lombok.NoArgsConstructor;
66

77
import javax.xml.bind.annotation.XmlElement;
88
import javax.xml.bind.annotation.XmlRootElement;
99

1010
@Data
11-
@NoArgsConstructor
11+
@Builder
1212
@XmlRootElement(name = BootstrAPI.AUTHENTICATION + "-" + BootstrAPI.AUTHENTICATION_SSO)
1313
public class AuthenticationSsoModel {
1414

@@ -23,13 +23,10 @@ public class AuthenticationSsoModel {
2323

2424
// Example instances for documentation and tests
2525

26-
public static final AuthenticationSsoModel EXAMPLE_1;
27-
28-
static {
29-
EXAMPLE_1 = new AuthenticationSsoModel();
30-
EXAMPLE_1.setShowOnLogin(true);
31-
EXAMPLE_1.setShowOnLoginForJsm(true);
32-
EXAMPLE_1.setEnableAuthenticationFallback(true);
33-
}
26+
public static final AuthenticationSsoModel EXAMPLE_1 = AuthenticationSsoModel.builder()
27+
.showOnLogin(true)
28+
.showOnLoginForJsm(true)
29+
.enableAuthenticationFallback(true)
30+
.build();
3431

3532
}

‎confluence/src/main/java/com/deftdevs/bootstrapi/confluence/model/util/AuthenticationIdpModelUtil.java‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -109,22 +109,21 @@ private static AuthenticationIdpOidcModel toAuthenticationIdpOidcModel(
109109

110110
final OidcConfig oidcConfig = (OidcConfig) idpConfig;
111111

112-
final AuthenticationIdpOidcModel authenticationIdpOidcModel = new AuthenticationIdpOidcModel();
113-
authenticationIdpOidcModel.setId(oidcConfig.getId());
114-
authenticationIdpOidcModel.setName(oidcConfig.getName());
115-
authenticationIdpOidcModel.setEnabled(oidcConfig.isEnabled());
116-
authenticationIdpOidcModel.setUrl(oidcConfig.getIssuer());
117-
authenticationIdpOidcModel.setEnableRememberMe(oidcConfig.isEnableRememberMe());
118-
authenticationIdpOidcModel.setButtonText(oidcConfig.getButtonText());
119-
authenticationIdpOidcModel.setClientId(oidcConfig.getClientId());
120-
authenticationIdpOidcModel.setUsernameClaim(oidcConfig.getUsernameClaim());
121-
authenticationIdpOidcModel.setAdditionalScopes(oidcConfig.getAdditionalScopes());
122-
authenticationIdpOidcModel.setDiscoveryEnabled(oidcConfig.isDiscoveryEnabled());
123-
authenticationIdpOidcModel.setAuthorizationEndpoint(oidcConfig.getAuthorizationEndpoint());
124-
authenticationIdpOidcModel.setTokenEndpoint(oidcConfig.getTokenEndpoint());
125-
authenticationIdpOidcModel.setUserInfoEndpoint(oidcConfig.getUserInfoEndpoint());
126-
127-
return authenticationIdpOidcModel;
112+
return AuthenticationIdpOidcModel.builder()
113+
.id(oidcConfig.getId())
114+
.name(oidcConfig.getName())
115+
.enabled(oidcConfig.isEnabled())
116+
.url(oidcConfig.getIssuer())
117+
.enableRememberMe(oidcConfig.isEnableRememberMe())
118+
.buttonText(oidcConfig.getButtonText())
119+
.clientId(oidcConfig.getClientId())
120+
.usernameClaim(oidcConfig.getUsernameClaim())
121+
.additionalScopes(oidcConfig.getAdditionalScopes())
122+
.discoveryEnabled(oidcConfig.isDiscoveryEnabled())
123+
.authorizationEndpoint(oidcConfig.getAuthorizationEndpoint())
124+
.tokenEndpoint(oidcConfig.getTokenEndpoint())
125+
.userInfoEndpoint(oidcConfig.getUserInfoEndpoint())
126+
.build();
128127
}
129128

130129
private static AuthenticationIdpSamlModel toAuthenticationIdpSamlModel(
@@ -136,17 +135,16 @@ private static AuthenticationIdpSamlModel toAuthenticationIdpSamlModel(
136135

137136
final SamlConfig samlConfig = (SamlConfig) idpConfig;
138137

139-
final AuthenticationIdpSamlModel authenticationIdpSamlModel = new AuthenticationIdpSamlModel();
140-
authenticationIdpSamlModel.setId(samlConfig.getId());
141-
authenticationIdpSamlModel.setName(samlConfig.getName());
142-
authenticationIdpSamlModel.setEnabled(samlConfig.isEnabled());
143-
authenticationIdpSamlModel.setUrl(samlConfig.getIssuer());
144-
authenticationIdpSamlModel.setEnableRememberMe(samlConfig.isEnableRememberMe());
145-
authenticationIdpSamlModel.setButtonText(samlConfig.getButtonText());
146-
// is it wanted to return the certificate here?
147-
authenticationIdpSamlModel.setUsernameAttribute(samlConfig.getUsernameAttribute());
148-
149-
return authenticationIdpSamlModel;
138+
return AuthenticationIdpSamlModel.builder()
139+
.id(samlConfig.getId())
140+
.name(samlConfig.getName())
141+
.enabled(samlConfig.isEnabled())
142+
.url(samlConfig.getIssuer())
143+
.enableRememberMe(samlConfig.isEnableRememberMe())
144+
.buttonText(samlConfig.getButtonText())
145+
// is it wanted to return the certificate here?
146+
.usernameAttribute(samlConfig.getUsernameAttribute())
147+
.build();
150148
}
151149

152150
private static void verifyIdAndType(

‎confluence/src/main/java/com/deftdevs/bootstrapi/confluence/model/util/AuthenticationSsoModelUtil.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ public static SsoConfig toSsoConfig(
3838
public static AuthenticationSsoModel toAuthenticationSsoModel(
3939
final SsoConfig ssoConfig) {
4040

41-
final AuthenticationSsoModel authenticationSsoModel = new AuthenticationSsoModel();
42-
authenticationSsoModel.setShowOnLogin(ssoConfig.getShowLoginForm());
43-
authenticationSsoModel.setEnableAuthenticationFallback(ssoConfig.enableAuthenticationFallback());
44-
45-
return authenticationSsoModel;
41+
return AuthenticationSsoModel.builder()
42+
.showOnLogin(ssoConfig.getShowLoginForm())
43+
.enableAuthenticationFallback(ssoConfig.enableAuthenticationFallback())
44+
.build();
4645
}
4746

4847
private AuthenticationSsoModelUtil() {

‎confluence/src/test/java/com/deftdevs/bootstrapi/confluence/service/AuthenticationServiceTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void testSetAuthenticationIdpsWithUpdate() {
8181

8282
@Test
8383
void testSetAuthenticationIdpsNameNull() {
84-
final AuthenticationIdpOidcModel authenticationIdpOidcModel = new AuthenticationIdpOidcModel();
84+
final AuthenticationIdpOidcModel authenticationIdpOidcModel = AuthenticationIdpOidcModel.builder().build();
8585
final List<AbstractAuthenticationIdpModel> authenticationIdpModels = Collections.singletonList(authenticationIdpOidcModel);
8686

8787
assertThrows(BadRequestException.class, () -> {
@@ -91,8 +91,9 @@ void testSetAuthenticationIdpsNameNull() {
9191

9292
@Test
9393
void testSetAuthenticationIdpsNameEmpty() {
94-
final AuthenticationIdpOidcModel authenticationIdpOidcModel = new AuthenticationIdpOidcModel();
95-
authenticationIdpOidcModel.setName("");
94+
final AuthenticationIdpOidcModel authenticationIdpOidcModel = AuthenticationIdpOidcModel.builder()
95+
.name("")
96+
.build();
9697
final List<AbstractAuthenticationIdpModel> authenticationIdpModels = Collections.singletonList(authenticationIdpOidcModel);
9798

9899
assertThrows(BadRequestException.class, () -> {

‎crowd/src/main/java/com/deftdevs/bootstrapi/crowd/model/SessionConfigModel.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.deftdevs.bootstrapi.crowd.model;
22

33
import com.deftdevs.bootstrapi.crowd.rest.api.SessionConfigResource;
4+
import lombok.Builder;
45
import lombok.Data;
5-
import lombok.NoArgsConstructor;
66

77
import javax.xml.bind.annotation.XmlElement;
88
import javax.xml.bind.annotation.XmlRootElement;
99

1010
@Data
11-
@NoArgsConstructor
11+
@Builder
1212
@XmlRootElement(name = SessionConfigResource.SESSION_CONFIG)
1313
public class SessionConfigModel {
1414

@@ -18,18 +18,14 @@ public class SessionConfigModel {
1818
@XmlElement
1919
private Boolean requireConsistentClientIP;
2020

21-
public static final SessionConfigModel EXAMPLE_1;
22-
public static final SessionConfigModel EXAMPLE_2;
21+
public static final SessionConfigModel EXAMPLE_1 = SessionConfigModel.builder()
22+
.sessionTimeoutInMinutes(20L)
23+
.requireConsistentClientIP(false)
24+
.build();
2325

24-
static {
25-
EXAMPLE_1 = new SessionConfigModel();
26-
EXAMPLE_1.setSessionTimeoutInMinutes(20L);
27-
EXAMPLE_1.setRequireConsistentClientIP(false);
28-
}
26+
public static final SessionConfigModel EXAMPLE_2 = SessionConfigModel.builder()
27+
.sessionTimeoutInMinutes(30L)
28+
.requireConsistentClientIP(true)
29+
.build();
2930

30-
static {
31-
EXAMPLE_2 = new SessionConfigModel();
32-
EXAMPLE_2.setSessionTimeoutInMinutes(30L);
33-
EXAMPLE_2.setRequireConsistentClientIP(true);
34-
}
3531
}

‎crowd/src/main/java/com/deftdevs/bootstrapi/crowd/service/SessionConfigServiceImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ public SessionConfigServiceImpl(
1616

1717
@Override
1818
public SessionConfigModel getSessionConfig() {
19-
final SessionConfigModel sessionConfigModel = new SessionConfigModel();
20-
sessionConfigModel.setSessionTimeoutInMinutes(propertyManager.getSessionTime());
21-
sessionConfigModel.setRequireConsistentClientIP(propertyManager.isIncludeIpAddressInValidationFactors());
22-
23-
return sessionConfigModel;
19+
return SessionConfigModel.builder()
20+
.sessionTimeoutInMinutes(propertyManager.getSessionTime())
21+
.requireConsistentClientIP(propertyManager.isIncludeIpAddressInValidationFactors())
22+
.build();
2423
}
2524

2625
@Override
@@ -37,4 +36,5 @@ public SessionConfigModel setSessionConfig(
3736

3837
return getSessionConfig();
3938
}
39+
4040
}

‎jira/src/main/java/com/deftdevs/bootstrapi/jira/model/util/AuthenticationIdpModelUtil.java‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -112,23 +112,21 @@ private static AuthenticationIdpOidcModel toAuthenticationIdpOidcModel(
112112

113113
final OidcConfig oidcConfig = (OidcConfig) idpConfig;
114114

115-
final AuthenticationIdpOidcModel authenticationIdpOidcModel = new AuthenticationIdpOidcModel();
116-
authenticationIdpOidcModel.setId(oidcConfig.getId());
117-
authenticationIdpOidcModel.setName(oidcConfig.getName());
118-
authenticationIdpOidcModel.setEnabled(oidcConfig.isEnabled());
119-
authenticationIdpOidcModel.setEnabledForJsm(oidcConfig.isIncludeCustomerLogins());
120-
authenticationIdpOidcModel.setUrl(oidcConfig.getIssuer());
121-
authenticationIdpOidcModel.setEnableRememberMe(oidcConfig.isEnableRememberMe());
122-
authenticationIdpOidcModel.setButtonText(oidcConfig.getButtonText());
123-
authenticationIdpOidcModel.setClientId(oidcConfig.getClientId());
124-
authenticationIdpOidcModel.setUsernameClaim(oidcConfig.getUsernameClaim());
125-
authenticationIdpOidcModel.setAdditionalScopes(oidcConfig.getAdditionalScopes());
126-
authenticationIdpOidcModel.setDiscoveryEnabled(oidcConfig.isDiscoveryEnabled());
127-
authenticationIdpOidcModel.setAuthorizationEndpoint(oidcConfig.getAuthorizationEndpoint());
128-
authenticationIdpOidcModel.setTokenEndpoint(oidcConfig.getTokenEndpoint());
129-
authenticationIdpOidcModel.setUserInfoEndpoint(oidcConfig.getUserInfoEndpoint());
130-
131-
return authenticationIdpOidcModel;
115+
return AuthenticationIdpOidcModel.builder()
116+
.id(oidcConfig.getId())
117+
.name(oidcConfig.getName())
118+
.enabled(oidcConfig.isEnabled())
119+
.url(oidcConfig.getIssuer())
120+
.enableRememberMe(oidcConfig.isEnableRememberMe())
121+
.buttonText(oidcConfig.getButtonText())
122+
.clientId(oidcConfig.getClientId())
123+
.usernameClaim(oidcConfig.getUsernameClaim())
124+
.additionalScopes(oidcConfig.getAdditionalScopes())
125+
.discoveryEnabled(oidcConfig.isDiscoveryEnabled())
126+
.authorizationEndpoint(oidcConfig.getAuthorizationEndpoint())
127+
.tokenEndpoint(oidcConfig.getTokenEndpoint())
128+
.userInfoEndpoint(oidcConfig.getUserInfoEndpoint())
129+
.build();
132130
}
133131

134132
private static AuthenticationIdpSamlModel toAuthenticationIdpSamlModel(
@@ -140,18 +138,16 @@ private static AuthenticationIdpSamlModel toAuthenticationIdpSamlModel(
140138

141139
final SamlConfig samlConfig = (SamlConfig) idpConfig;
142140

143-
final AuthenticationIdpSamlModel authenticationIdpSamlModel = new AuthenticationIdpSamlModel();
144-
authenticationIdpSamlModel.setId(samlConfig.getId());
145-
authenticationIdpSamlModel.setName(samlConfig.getName());
146-
authenticationIdpSamlModel.setEnabled(samlConfig.isEnabled());
147-
authenticationIdpSamlModel.setEnabledForJsm(samlConfig.isIncludeCustomerLogins());
148-
authenticationIdpSamlModel.setUrl(samlConfig.getIssuer());
149-
authenticationIdpSamlModel.setEnableRememberMe(samlConfig.isEnableRememberMe());
150-
authenticationIdpSamlModel.setButtonText(samlConfig.getButtonText());
151-
// is it wanted to return the certificate here?
152-
authenticationIdpSamlModel.setUsernameAttribute(samlConfig.getUsernameAttribute());
153-
154-
return authenticationIdpSamlModel;
141+
return AuthenticationIdpSamlModel.builder()
142+
.id(samlConfig.getId())
143+
.name(samlConfig.getName())
144+
.enabled(samlConfig.isEnabled())
145+
.url(samlConfig.getIssuer())
146+
.enableRememberMe(samlConfig.isEnableRememberMe())
147+
.buttonText(samlConfig.getButtonText())
148+
// is it wanted to return the certificate here?
149+
.usernameAttribute(samlConfig.getUsernameAttribute())
150+
.build();
155151
}
156152

157153
private static void verifyIdAndType(

0 commit comments

Comments
 (0)