Skip to content

Commit cda1656

Browse files
lbalmacedalbalmaceda
committed
rename factory methods
1 parent 2345159 commit cda1656

5 files changed

Lines changed: 19 additions & 27 deletions

File tree

‎lib/src/main/java/com/auth0/authentication/AuthenticationAPIClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void setDefaultDbConnection(String defaultDbConnection) {
145145
* @return a request to configure and start that will yield {@link Token} and {@link UserProfile}
146146
*/
147147
public AuthenticationRequest login(String usernameOrEmail, String password) {
148-
Map<String, Object> requestParameters = ParameterBuilder.newBuilder()
148+
Map<String, Object> requestParameters = ParameterBuilder.newAuthenticationBuilder()
149149
.set(USERNAME_KEY, usernameOrEmail)
150150
.set(PASSWORD_KEY, password)
151151
.setGrantType(GRANT_TYPE_PASSWORD)
@@ -166,7 +166,7 @@ public AuthenticationRequest loginWithOAuthAccessToken(String token, String conn
166166
.addPathSegment(ACCESS_TOKEN_PATH)
167167
.build();
168168

169-
Map<String, Object> parameters = ParameterBuilder.newBuilder()
169+
Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
170170
.setClientId(getClientId())
171171
.setConnection(connection)
172172
.setAccessToken(token)
@@ -186,7 +186,7 @@ public AuthenticationRequest loginWithOAuthAccessToken(String token, String conn
186186
* @return a request to configure and start that will yield {@link Token} and {@link UserProfile}
187187
*/
188188
public AuthenticationRequest loginWithPhoneNumber(String phoneNumber, String verificationCode) {
189-
Map<String, Object> parameters = ParameterBuilder.newBuilder()
189+
Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
190190
.set(USERNAME_KEY, phoneNumber)
191191
.set(PASSWORD_KEY, verificationCode)
192192
.setGrantType(GRANT_TYPE_PASSWORD)
@@ -204,7 +204,7 @@ public AuthenticationRequest loginWithPhoneNumber(String phoneNumber, String ver
204204
* @return a request to configure and start that will yield {@link Token} and {@link UserProfile}
205205
*/
206206
public AuthenticationRequest loginWithEmail(String email, String verificationCode) {
207-
Map<String, Object> parameters = ParameterBuilder.newBuilder()
207+
Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
208208
.set(USERNAME_KEY, email)
209209
.set(PASSWORD_KEY, verificationCode)
210210
.setGrantType(GRANT_TYPE_PASSWORD)

‎lib/src/main/java/com/auth0/authentication/ParameterBuilder.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,6 @@ public class ParameterBuilder {
5050

5151
private Map<String, Object> parameters;
5252

53-
/**
54-
* Creates a new builder
55-
*/
56-
private ParameterBuilder() {
57-
this.parameters = new HashMap<>();
58-
setScope(SCOPE_OFFLINE_ACCESS);
59-
}
60-
6153
/**
6254
* Creates a new builder with default parameters
6355
*
@@ -197,17 +189,18 @@ public Map<String, Object> asDictionary() {
197189
*
198190
* @return a new builder
199191
*/
200-
public static ParameterBuilder newBuilder() {
201-
return new ParameterBuilder();
192+
public static ParameterBuilder newAuthenticationBuilder() {
193+
return newBuilder()
194+
.setScope(SCOPE_OFFLINE_ACCESS);
202195
}
203196

204197
/**
205198
* Creates a new instance of the builder without any default values
206199
*
207200
* @return a new builder
208201
*/
209-
public static ParameterBuilder newEmptyBuilder() {
210-
return new ParameterBuilder(new HashMap<String, Object>());
202+
public static ParameterBuilder newBuilder() {
203+
return newBuilder(new HashMap<String, Object>());
211204
}
212205

213206
/**

‎lib/src/main/java/com/auth0/internal/BaseRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public BaseRequest(HttpUrl url, OkHttpClient client, ObjectReader reader, Object
6969
this.writer = writer;
7070
this.callback = callback;
7171
this.headers = new HashMap<>();
72-
this.builder = ParameterBuilder.newEmptyBuilder();
72+
this.builder = ParameterBuilder.newBuilder();
7373
}
7474

7575
protected void setCallback(BaseCallback<T> callback) {

‎lib/src/test/java/com/auth0/authentication/AuthenticationAPIClientTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void shouldLoginWithResourceOwner() throws Exception {
9797
mockAPI.willReturnSuccessfulLogin();
9898
final MockBaseCallback<Token> callback = new MockBaseCallback<>();
9999

100-
final Map<String, Object> parameters = ParameterBuilder.newBuilder()
100+
final Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
101101
.setConnection("DB")
102102
.setGrantType(ParameterBuilder.GRANT_TYPE_PASSWORD)
103103
.set("username", "support@auth0.com")
@@ -126,7 +126,7 @@ public void shouldLoginWithResourceOwner() throws Exception {
126126
public void shouldLoginWithResourceOwnerSync() throws Exception {
127127
mockAPI.willReturnSuccessfulLogin();
128128

129-
final Map<String, Object> parameters = ParameterBuilder.newBuilder()
129+
final Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
130130
.setConnection("DB")
131131
.setGrantType(ParameterBuilder.GRANT_TYPE_PASSWORD)
132132
.set("username", "support@auth0.com")
@@ -156,7 +156,7 @@ public void shouldFailLoginWithResourceOwner() throws Exception {
156156
mockAPI.willReturnFailedLogin();
157157
final MockBaseCallback<Token> callback = new MockBaseCallback<>();
158158

159-
final Map<String, Object> parameters = ParameterBuilder.newBuilder()
159+
final Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
160160
.setConnection(CONNECTION)
161161
.setGrantType(ParameterBuilder.GRANT_TYPE_PASSWORD)
162162
.set("username", "support@auth0.com")
@@ -174,7 +174,7 @@ public void shouldFailLoginWithResourceOwnerSync() throws Exception {
174174
mockAPI.willReturnFailedLogin();
175175
final MockBaseCallback<Token> callback = new MockBaseCallback<>();
176176

177-
final Map<String, Object> parameters = ParameterBuilder.newBuilder()
177+
final Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
178178
.setConnection(CONNECTION)
179179
.setGrantType(ParameterBuilder.GRANT_TYPE_PASSWORD)
180180
.set("username", "support@auth0.com")
@@ -857,7 +857,7 @@ public void shouldStartPasswordless() throws Exception {
857857
mockAPI.willReturnSuccessfulPasswordlessStart();
858858

859859
final MockBaseCallback<Void> callback = new MockBaseCallback<>();
860-
final Map<String, Object> parameters = ParameterBuilder.newEmptyBuilder()
860+
final Map<String, Object> parameters = ParameterBuilder.newBuilder()
861861
.setConnection("email")
862862
.set("send", "code")
863863
.set("email", "support@auth0.com")
@@ -883,7 +883,7 @@ public void shouldStartPasswordless() throws Exception {
883883
public void shouldStartPasswordlessSync() throws Exception {
884884
mockAPI.willReturnSuccessfulPasswordlessStart();
885885

886-
final Map<String, Object> parameters = ParameterBuilder.newEmptyBuilder()
886+
final Map<String, Object> parameters = ParameterBuilder.newBuilder()
887887
.setConnection("email")
888888
.set("send", "code")
889889
.set("email", "support@auth0.com")

‎lib/src/test/java/com/auth0/authentication/ParameterBuilderTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
import static org.hamcrest.Matchers.equalTo;
3939
import static org.hamcrest.Matchers.equalToIgnoringCase;
40-
import static org.hamcrest.Matchers.instanceOf;
4140
import static org.hamcrest.Matchers.is;
4241
import static org.hamcrest.Matchers.not;
4342
import static org.hamcrest.Matchers.notNullValue;
@@ -56,17 +55,17 @@ public class ParameterBuilderTest {
5655

5756
@Before
5857
public void setUp() throws Exception {
59-
this.builder = ParameterBuilder.newBuilder();
58+
this.builder = ParameterBuilder.newAuthenticationBuilder();
6059
}
6160

6261
@Test
6362
public void shouldInstantiateWithNoArguments() throws Exception {
64-
assertThat(ParameterBuilder.newBuilder(), is(notNullValue()));
63+
assertThat(ParameterBuilder.newAuthenticationBuilder(), is(notNullValue()));
6564
}
6665

6766
@Test
6867
public void shouldInstantiateWithDefaultScope() throws Exception {
69-
assertThat(ParameterBuilder.newBuilder().asDictionary(), hasEntry("scope", ParameterBuilder.SCOPE_OFFLINE_ACCESS));
68+
assertThat(ParameterBuilder.newAuthenticationBuilder().asDictionary(), hasEntry("scope", ParameterBuilder.SCOPE_OFFLINE_ACCESS));
7069
}
7170

7271
@Test

0 commit comments

Comments
 (0)