Skip to content

Commit f9ac874

Browse files
hzalazhzalaz
authored
Merge pull request #36 from auth0/chore-simplify-code
Simplify/reduce amount of code
2 parents 4423978 + 7925b52 commit f9ac874

15 files changed

Lines changed: 129 additions & 311 deletions

‎src/main/java/com/auth0/client/mgmt/BaseManagementEntity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.auth0.client.mgmt;
22

3+
import okhttp3.HttpUrl;
34
import okhttp3.OkHttpClient;
45

56
abstract class BaseManagementEntity {
67
protected final OkHttpClient client;
7-
protected final String baseUrl;
8+
protected final HttpUrl baseUrl;
89
protected final String apiToken;
910

1011
BaseManagementEntity(OkHttpClient client, String baseUrl, String apiToken) {
1112
this.client = client;
12-
this.baseUrl = baseUrl;
13+
this.baseUrl = HttpUrl.parse(baseUrl);
1314
this.apiToken = apiToken;
1415
}
1516
}

‎src/main/java/com/auth0/client/mgmt/BlacklistsEntity.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,9 @@ public class BlacklistsEntity extends BaseManagementEntity {
3131
public Request<List<Token>> getBlacklist(String audience) {
3232
Asserts.assertNotNull(audience, "audience");
3333

34-
String url = HttpUrl.parse(baseUrl)
34+
String url = baseUrl
3535
.newBuilder()
36-
.addPathSegment("api")
37-
.addPathSegment("v2")
38-
.addPathSegment("blacklists")
39-
.addPathSegment("tokens")
36+
.addPathSegments("api/v2/blacklists/tokens")
4037
.addQueryParameter("aud", audience)
4138
.build()
4239
.toString();
@@ -56,19 +53,14 @@ public Request<List<Token>> getBlacklist(String audience) {
5653
public Request blacklistToken(Token token) {
5754
Asserts.assertNotNull(token, "token");
5855

59-
String url = HttpUrl.parse(baseUrl)
56+
String url = baseUrl
6057
.newBuilder()
61-
.addPathSegment("api")
62-
.addPathSegment("v2")
63-
.addPathSegment("blacklists")
64-
.addPathSegment("tokens")
58+
.addPathSegments("api/v2/blacklists/tokens")
6559
.build()
6660
.toString();
6761
VoidRequest request = new VoidRequest(client, url, "POST");
6862
request.addHeader("Authorization", "Bearer " + apiToken);
6963
request.setBody(token);
7064
return request;
7165
}
72-
73-
7466
}

‎src/main/java/com/auth0/client/mgmt/ClientGrantsEntity.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ public class ClientGrantsEntity extends BaseManagementEntity {
2828
* @return a Request to execute.
2929
*/
3030
public Request<List<ClientGrant>> list() {
31-
String url = HttpUrl.parse(baseUrl)
31+
String url = baseUrl
3232
.newBuilder()
33-
.addPathSegment("api")
34-
.addPathSegment("v2")
35-
.addPathSegment("client-grants")
33+
.addPathSegments("api/v2/client-grants")
3634
.build()
3735
.toString();
3836
CustomRequest<List<ClientGrant>> request = new CustomRequest<>(client, url, "GET", new TypeReference<List<ClientGrant>>() {
@@ -55,11 +53,9 @@ public Request<ClientGrant> create(String clientId, String audience, String[] sc
5553
Asserts.assertNotNull(audience, "audience");
5654
Asserts.assertNotNull(scope, "scope");
5755

58-
String url = HttpUrl.parse(baseUrl)
56+
String url = baseUrl
5957
.newBuilder()
60-
.addPathSegment("api")
61-
.addPathSegment("v2")
62-
.addPathSegment("client-grants")
58+
.addPathSegments("api/v2/client-grants")
6359
.build()
6460
.toString();
6561
CustomRequest<ClientGrant> request = new CustomRequest<>(client, url, "POST", new TypeReference<ClientGrant>() {
@@ -82,11 +78,9 @@ public Request<ClientGrant> create(String clientId, String audience, String[] sc
8278
public Request delete(String clientGrantId) {
8379
Asserts.assertNotNull(clientGrantId, "client grant id");
8480

85-
String url = HttpUrl.parse(baseUrl)
81+
String url = baseUrl
8682
.newBuilder()
87-
.addPathSegment("api")
88-
.addPathSegment("v2")
89-
.addPathSegment("client-grants")
83+
.addPathSegments("api/v2/client-grants")
9084
.addPathSegment(clientGrantId)
9185
.build()
9286
.toString();
@@ -107,11 +101,9 @@ public Request<ClientGrant> update(String clientGrantId, String[] scope) {
107101
Asserts.assertNotNull(clientGrantId, "client grant id");
108102
Asserts.assertNotNull(scope, "scope");
109103

110-
String url = HttpUrl.parse(baseUrl)
104+
String url = baseUrl
111105
.newBuilder()
112-
.addPathSegment("api")
113-
.addPathSegment("v2")
114-
.addPathSegment("client-grants")
106+
.addPathSegments("api/v2/client-grants")
115107
.addPathSegment(clientGrantId)
116108
.build()
117109
.toString();
@@ -121,5 +113,4 @@ public Request<ClientGrant> update(String clientGrantId, String[] scope) {
121113
request.addParameter("scope", scope);
122114
return request;
123115
}
124-
125116
}

‎src/main/java/com/auth0/client/mgmt/ClientsEntity.java‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ public class ClientsEntity extends BaseManagementEntity {
2929
* @return a Request to execute.
3030
*/
3131
public Request<List<Client>> list() {
32-
String url = HttpUrl.parse(baseUrl)
32+
String url = baseUrl
3333
.newBuilder()
34-
.addPathSegment("api")
35-
.addPathSegment("v2")
36-
.addPathSegment("clients")
34+
.addPathSegments("api/v2/clients")
3735
.build()
3836
.toString();
3937
CustomRequest<List<Client>> request = new CustomRequest<>(client, url, "GET", new TypeReference<List<Client>>() {
@@ -52,11 +50,9 @@ public Request<List<Client>> list() {
5250
public Request<Client> get(String clientId) {
5351
Asserts.assertNotNull(clientId, "client id");
5452

55-
String url = HttpUrl.parse(baseUrl)
53+
String url = baseUrl
5654
.newBuilder()
57-
.addPathSegment("api")
58-
.addPathSegment("v2")
59-
.addPathSegment("clients")
55+
.addPathSegments("api/v2/clients")
6056
.addPathSegment(clientId)
6157
.build()
6258
.toString();
@@ -76,11 +72,9 @@ public Request<Client> get(String clientId) {
7672
public Request<Client> create(Client client) {
7773
Asserts.assertNotNull(client, "client");
7874

79-
String url = HttpUrl.parse(baseUrl)
75+
String url = baseUrl
8076
.newBuilder()
81-
.addPathSegment("api")
82-
.addPathSegment("v2")
83-
.addPathSegment("clients")
77+
.addPathSegments("api/v2/clients")
8478
.build()
8579
.toString();
8680
CustomRequest<Client> request = new CustomRequest<>(this.client, url, "POST", new TypeReference<Client>() {
@@ -100,11 +94,9 @@ public Request<Client> create(Client client) {
10094
public Request delete(String clientId) {
10195
Asserts.assertNotNull(clientId, "client id");
10296

103-
String url = HttpUrl.parse(baseUrl)
97+
String url = baseUrl
10498
.newBuilder()
105-
.addPathSegment("api")
106-
.addPathSegment("v2")
107-
.addPathSegment("clients")
99+
.addPathSegments("api/v2/clients")
108100
.addPathSegment(clientId)
109101
.build()
110102
.toString();
@@ -125,11 +117,9 @@ public Request<Client> update(String clientId, Client client) {
125117
Asserts.assertNotNull(clientId, "client id");
126118
Asserts.assertNotNull(client, "client");
127119

128-
String url = HttpUrl.parse(baseUrl)
120+
String url = baseUrl
129121
.newBuilder()
130-
.addPathSegment("api")
131-
.addPathSegment("v2")
132-
.addPathSegment("clients")
122+
.addPathSegments("api/v2/clients")
133123
.addPathSegment(clientId)
134124
.build()
135125
.toString();
@@ -151,11 +141,9 @@ public Request<Client> rotateSecret(String clientId) {
151141
Asserts.assertNotNull(clientId, "client id");
152142
Asserts.assertNotNull(client, "client");
153143

154-
String url = HttpUrl.parse(baseUrl)
144+
String url = baseUrl
155145
.newBuilder()
156-
.addPathSegment("api")
157-
.addPathSegment("v2")
158-
.addPathSegment("clients")
146+
.addPathSegments("api/v2/clients")
159147
.addPathSegment(clientId)
160148
.addPathSegment("rotate-secret")
161149
.build()
@@ -165,5 +153,4 @@ public Request<Client> rotateSecret(String clientId) {
165153
request.addHeader("Authorization", "Bearer " + apiToken);
166154
return request;
167155
}
168-
169156
}

‎src/main/java/com/auth0/client/mgmt/ConnectionsEntity.java‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ public class ConnectionsEntity extends BaseManagementEntity {
3131
* @return a Request to execute.
3232
*/
3333
public Request<List<Connection>> list(ConnectionFilter filter) {
34-
HttpUrl.Builder builder = HttpUrl.parse(baseUrl)
34+
HttpUrl.Builder builder = baseUrl
3535
.newBuilder()
36-
.addPathSegment("api")
37-
.addPathSegment("v2")
38-
.addPathSegment("connections");
36+
.addPathSegments("api/v2/connections");
3937
if (filter != null) {
4038
for (Map.Entry<String, Object> e : filter.getAsMap().entrySet()) {
4139
builder.addQueryParameter(e.getKey(), String.valueOf(e.getValue()));
@@ -59,11 +57,9 @@ public Request<List<Connection>> list(ConnectionFilter filter) {
5957
public Request<Connection> get(String connectionId, ConnectionFilter filter) {
6058
Asserts.assertNotNull(connectionId, "connection id");
6159

62-
HttpUrl.Builder builder = HttpUrl.parse(baseUrl)
60+
HttpUrl.Builder builder = baseUrl
6361
.newBuilder()
64-
.addPathSegment("api")
65-
.addPathSegment("v2")
66-
.addPathSegment("connections")
62+
.addPathSegments("api/v2/connections")
6763
.addPathSegment(connectionId);
6864
if (filter != null) {
6965
for (Map.Entry<String, Object> e : filter.getAsMap().entrySet()) {
@@ -87,11 +83,9 @@ public Request<Connection> get(String connectionId, ConnectionFilter filter) {
8783
public Request<Connection> create(Connection connection) {
8884
Asserts.assertNotNull(connection, "connection");
8985

90-
String url = HttpUrl.parse(baseUrl)
86+
String url = baseUrl
9187
.newBuilder()
92-
.addPathSegment("api")
93-
.addPathSegment("v2")
94-
.addPathSegment("connections")
88+
.addPathSegments("api/v2/connections")
9589
.build()
9690
.toString();
9791
CustomRequest<Connection> request = new CustomRequest<>(this.client, url, "POST", new TypeReference<Connection>() {
@@ -111,11 +105,9 @@ public Request<Connection> create(Connection connection) {
111105
public Request delete(String connectionId) {
112106
Asserts.assertNotNull(connectionId, "connection id");
113107

114-
String url = HttpUrl.parse(baseUrl)
108+
String url = baseUrl
115109
.newBuilder()
116-
.addPathSegment("api")
117-
.addPathSegment("v2")
118-
.addPathSegment("connections")
110+
.addPathSegments("api/v2/connections")
119111
.addPathSegment(connectionId)
120112
.build()
121113
.toString();
@@ -136,11 +128,9 @@ public Request<Connection> update(String connectionId, Connection connection) {
136128
Asserts.assertNotNull(connectionId, "connection id");
137129
Asserts.assertNotNull(connection, "connection");
138130

139-
String url = HttpUrl.parse(baseUrl)
131+
String url = baseUrl
140132
.newBuilder()
141-
.addPathSegment("api")
142-
.addPathSegment("v2")
143-
.addPathSegment("connections")
133+
.addPathSegments("api/v2/connections")
144134
.addPathSegment(connectionId)
145135
.build()
146136
.toString();
@@ -163,11 +153,9 @@ public Request deleteUser(String connectionId, String email) {
163153
Asserts.assertNotNull(connectionId, "connection id");
164154
Asserts.assertNotNull(email, "email");
165155

166-
String url = HttpUrl.parse(baseUrl)
156+
String url = baseUrl
167157
.newBuilder()
168-
.addPathSegment("api")
169-
.addPathSegment("v2")
170-
.addPathSegment("connections")
158+
.addPathSegments("api/v2/connections")
171159
.addPathSegment(connectionId)
172160
.addPathSegment("users")
173161
.addQueryParameter("email", email)
@@ -177,6 +165,4 @@ public Request deleteUser(String connectionId, String email) {
177165
request.addHeader("Authorization", "Bearer " + apiToken);
178166
return request;
179167
}
180-
181-
182168
}

‎src/main/java/com/auth0/client/mgmt/DeviceCredentialsEntity.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ public class DeviceCredentialsEntity extends BaseManagementEntity {
3131
* @return a Request to execute.
3232
*/
3333
public Request<List<DeviceCredentials>> list(DeviceCredentialsFilter filter) {
34-
HttpUrl.Builder builder = HttpUrl.parse(baseUrl)
34+
HttpUrl.Builder builder = baseUrl
3535
.newBuilder()
36-
.addPathSegment("api")
37-
.addPathSegment("v2")
38-
.addPathSegment("device-credentials");
36+
.addPathSegments("api/v2/device-credentials");
3937
if (filter != null) {
4038
for (Map.Entry<String, Object> e : filter.getAsMap().entrySet()) {
4139
builder.addQueryParameter(e.getKey(), String.valueOf(e.getValue()));
@@ -58,11 +56,9 @@ public Request<List<DeviceCredentials>> list(DeviceCredentialsFilter filter) {
5856
public Request<DeviceCredentials> create(DeviceCredentials deviceCredentials) {
5957
Asserts.assertNotNull(deviceCredentials, "device credentials");
6058

61-
String url = HttpUrl.parse(baseUrl)
59+
String url = baseUrl
6260
.newBuilder()
63-
.addPathSegment("api")
64-
.addPathSegment("v2")
65-
.addPathSegment("device-credentials")
61+
.addPathSegments("api/v2/device-credentials")
6662
.build()
6763
.toString();
6864
CustomRequest<DeviceCredentials> request = new CustomRequest<>(this.client, url, "POST", new TypeReference<DeviceCredentials>() {
@@ -82,11 +78,9 @@ public Request<DeviceCredentials> create(DeviceCredentials deviceCredentials) {
8278
public Request delete(String deviceCredentialsId) {
8379
Asserts.assertNotNull(deviceCredentialsId, "device credentials id");
8480

85-
String url = HttpUrl.parse(baseUrl)
81+
String url = baseUrl
8682
.newBuilder()
87-
.addPathSegment("api")
88-
.addPathSegment("v2")
89-
.addPathSegment("device-credentials")
83+
.addPathSegments("api/v2/device-credentials")
9084
.addPathSegment(deviceCredentialsId)
9185
.build()
9286
.toString();

0 commit comments

Comments
 (0)