Skip to content

Commit bd2dc04

Browse files
TanyaEfTanyaEf
committed
Refactoring in URIs
1 parent f052903 commit bd2dc04

File tree

44 files changed

+1320
-1321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1320
-1321
lines changed

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/BatchAttributeAdapter.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.MandatoryParameterNotFoundException;
3333
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
3434
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
35+
import java.util.ArrayList;
3536
import java.util.Collection;
3637
import java.util.Iterator;
3738
import java.util.LinkedList;
@@ -47,27 +48,25 @@
4748
*/
4849
public class BatchAttributeAdapter extends AbstractAdapter {
4950

51+
public static final String SERVICE_URI = "attributes";
52+
private static final String SEPARATOR = "/";
5053
private MultivaluedMap<String, String> params = new MultivaluedHashMap<String, String>();
5154
private Boolean includePermissions = false;
52-
private String holderUri;
5355
private String userName;
5456
private String organizationId;
55-
private final String SEPARATOR = "/";
57+
private ArrayList<String> path = new ArrayList<String>();
5658

5759
public BatchAttributeAdapter(String organizationId, String userName, SessionStorage sessionStorage) {
5860
super(sessionStorage);
59-
StringBuilder builder = new StringBuilder(SEPARATOR);
61+
6062
if (!"/" .equals(organizationId) && organizationId != null) {
61-
builder.append("organizations/");
62-
builder.append(organizationId);
63-
builder.append(SEPARATOR);
63+
path.add("organizations");
64+
path.add(organizationId);
6465
}
6566
if (userName != null) {
66-
builder.append("users/");
67-
builder.append(userName);
68-
builder.append(SEPARATOR);
67+
path.add("users/");
68+
path.add(userName);
6969
}
70-
this.holderUri = builder.toString();
7170
this.organizationId = organizationId;
7271
this.userName = userName;
7372
}
@@ -195,10 +194,11 @@ public void run() {
195194
}
196195

197196
private JerseyRequest<HypermediaAttributesListWrapper> buildRequest() {
197+
path.add(SERVICE_URI);
198198
JerseyRequest<HypermediaAttributesListWrapper> request = JerseyRequest.buildRequest(
199199
sessionStorage,
200200
HypermediaAttributesListWrapper.class,
201-
new String[]{holderUri, "attributes"}, new DefaultErrorHandler());
201+
path.toArray(new String[path.size()]), new DefaultErrorHandler());
202202
if (includePermissions) {
203203
request.setAccept(MimeTypeUtil.toCorrectAcceptMime(sessionStorage.getConfiguration(), "application/hal+{mime}"));
204204
request.addParam("_embedded", "permission");
@@ -211,7 +211,7 @@ private JerseyRequest<HypermediaAttributesListWrapper> buildSearchRequest() {
211211
JerseyRequest<HypermediaAttributesListWrapper> request = JerseyRequest.buildRequest(
212212
sessionStorage,
213213
HypermediaAttributesListWrapper.class,
214-
new String[]{"attributes"}, new DefaultErrorHandler());
214+
new String[]{SERVICE_URI}, new DefaultErrorHandler());
215215
if (includePermissions) {
216216
request.addParam("_embedded", "permission");
217217
}

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/SingleAttributeAdapter.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.jaspersoft.jasperserver.jaxrs.client.core.ThreadPoolUtil;
3232
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
3333
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
34+
import java.util.ArrayList;
3435

3536
/**
3637
* @author Alex Krasnyanskiy
@@ -42,22 +43,21 @@ public class SingleAttributeAdapter extends AbstractAdapter {
4243

4344
private String attributeName;
4445
private Boolean includePermissions = false;
45-
private String holderUri;
46+
private ArrayList<String> path = new ArrayList<String>();
4647

4748
public SingleAttributeAdapter(String organizationId, String userName, SessionStorage sessionStorage, String attributeName) {
4849
super(sessionStorage);
49-
StringBuilder builder = new StringBuilder("/");
50+
5051
if (!"/".equals(organizationId) && organizationId != null) {
51-
builder.append("organizations/");
52-
builder.append(organizationId);
53-
builder.append("/");
52+
path.add("organizations");
53+
path.add(organizationId);
5454
}
5555
if (userName != null) {
56-
builder.append("users/");
57-
builder.append(userName);
56+
path.add("users");
57+
path.add(userName);
5858
}
59-
this.holderUri = builder.toString();
60-
this.attributeName = attributeName;
59+
this.path.add("attributes");
60+
this.path.add(attributeName);
6161
}
6262

6363
public SingleAttributeAdapter setIncludePermissions(Boolean includePermissions) {
@@ -133,8 +133,9 @@ public void run() {
133133

134134
private JerseyRequest<HypermediaAttribute> buildRequest() {
135135

136+
String[] uri = path.toArray(new String[path.size()]);
136137
JerseyRequest<HypermediaAttribute> request = JerseyRequest.buildRequest(sessionStorage,HypermediaAttribute.class,
137-
new String[]{holderUri,"/attributes/",attributeName}, new DefaultErrorHandler());
138+
uri, new DefaultErrorHandler());
138139
if (includePermissions) {
139140
request.setAccept(MimeTypeUtil.toCorrectAcceptMime(sessionStorage.getConfiguration(), "application/hal+{mime}"));
140141
request.addParam("_embedded", "permission");

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/BatchOrganizationsAdapter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
public class BatchOrganizationsAdapter extends AbstractAdapter {
3737

38+
public static final String SERVICE_URI = "organizations";
3839
private final MultivaluedMap<String, String> params;
3940

4041
public BatchOrganizationsAdapter(SessionStorage sessionStorage) {
@@ -75,7 +76,7 @@ public void run() {
7576

7677
private <T> JerseyRequest<T> buildRequest(Class<T> responseType) {
7778
return JerseyRequest.buildRequest(sessionStorage, responseType,
78-
new String[]{"/organizations"},
79+
new String[]{SERVICE_URI},
7980
new DefaultErrorHandler());
8081
}
8182
}

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/SingleOrganizationAdapter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
public class SingleOrganizationAdapter extends AbstractAdapter {
3737

38+
public static final String SERVICE_URI = "organizations";
3839
private final ClientTenant clientTenant;
3940
private final MultivaluedHashMap<String, String> params;
4041

@@ -127,7 +128,7 @@ private JerseyRequest<ClientTenant> buildRequest() {
127128
return JerseyRequest.buildRequest(
128129
sessionStorage,
129130
ClientTenant.class,
130-
new String[]{"/organizations",
131+
new String[]{SERVICE_URI,
131132
(clientTenant.getId() == null) ? clientTenant.getAlias() : clientTenant.getId()},
132133
new DefaultErrorHandler()
133134
);
@@ -137,7 +138,7 @@ private JerseyRequest<ClientTenant> request() {
137138
return JerseyRequest.buildRequest(
138139
sessionStorage,
139140
ClientTenant.class,
140-
new String[]{"/organizations"},
141+
new String[]{SERVICE_URI},
141142
new DefaultErrorHandler()
142143
);
143144
}

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/roles/BatchRolesRequestAdapter.java‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@
2323

2424
import com.jaspersoft.jasperserver.dto.authority.RolesListWrapper;
2525
import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
26-
import com.jaspersoft.jasperserver.jaxrs.client.core.*;
26+
import com.jaspersoft.jasperserver.jaxrs.client.core.Callback;
27+
import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
28+
import com.jaspersoft.jasperserver.jaxrs.client.core.RequestExecution;
29+
import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
30+
import com.jaspersoft.jasperserver.jaxrs.client.core.ThreadPoolUtil;
2731
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
2832
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
29-
33+
import java.util.ArrayList;
3034
import javax.ws.rs.core.MultivaluedHashMap;
3135
import javax.ws.rs.core.MultivaluedMap;
3236

@@ -35,15 +39,17 @@
3539
public class BatchRolesRequestAdapter extends AbstractAdapter {
3640

3741
private final MultivaluedMap<String, String> params;
38-
private final String uri;
42+
private final ArrayList<String> uri = new ArrayList<String>();
3943

4044
public BatchRolesRequestAdapter(SessionStorage sessionStorage, String organizationId) {
4145
super(sessionStorage);
4246
params = new MultivaluedHashMap<String, String>();
4347
if (organizationId != null) {
44-
uri = "/organizations/" + organizationId + "/roles";
48+
uri.add("organizations");
49+
uri.add(organizationId);
50+
uri.add("roles");
4551
} else {
46-
uri = "/roles";
52+
uri.add("roles");
4753
}
4854
}
4955

@@ -53,13 +59,13 @@ public BatchRolesRequestAdapter param(RolesParameter rolesParam, String value) {
5359
}
5460

5561
public OperationResult<RolesListWrapper> get() {
56-
JerseyRequest<RolesListWrapper> request = buildRequest(sessionStorage, RolesListWrapper.class, new String[]{uri}, new DefaultErrorHandler());
62+
JerseyRequest<RolesListWrapper> request = buildRequest(sessionStorage, RolesListWrapper.class, uri.toArray(new String[uri.size()]), new DefaultErrorHandler());
5763
request.addParams(params);
5864
return request.get();
5965
}
6066

6167
public <R> RequestExecution asyncGet(final Callback<OperationResult<RolesListWrapper>, R> callback) {
62-
final JerseyRequest<RolesListWrapper> request = buildRequest(sessionStorage, RolesListWrapper.class, new String[]{uri}, new DefaultErrorHandler());
68+
final JerseyRequest<RolesListWrapper> request = buildRequest(sessionStorage, RolesListWrapper.class, uri.toArray(new String[uri.size()]), new DefaultErrorHandler());
6369
request.addParams(params);
6470
RequestExecution task = new RequestExecution(new Runnable() {
6571
@Override

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/roles/SingleRoleRequestAdapter.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,22 @@
3030
import com.jaspersoft.jasperserver.jaxrs.client.core.ThreadPoolUtil;
3131
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
3232
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
33+
import java.util.ArrayList;
3334

3435
public class SingleRoleRequestAdapter extends AbstractAdapter {
3536

36-
private final String roleUriPrefix;
37+
private final ArrayList<String> roleUri = new ArrayList<String>();
3738

3839
public SingleRoleRequestAdapter(SessionStorage sessionStorage, String organizationId, String roleName) {
3940
super(sessionStorage);
4041
if (organizationId != null) {
41-
roleUriPrefix = "/organizations/" + organizationId + "/roles/" + roleName;
42+
roleUri.add("organizations");
43+
roleUri.add(organizationId);
44+
roleUri.add("roles");
45+
roleUri.add(roleName);
4246
} else {
43-
roleUriPrefix = "/roles/" + roleName;
47+
roleUri.add("roles");
48+
roleUri.add(roleName);
4449
}
4550
}
4651

@@ -94,6 +99,6 @@ public void run() {
9499
}
95100

96101
private JerseyRequest<ClientRole> buildRequest() {
97-
return JerseyRequest.buildRequest(sessionStorage, ClientRole.class, new String[]{roleUriPrefix}, new DefaultErrorHandler());
102+
return JerseyRequest.buildRequest(sessionStorage, ClientRole.class, roleUri.toArray(new String[roleUri.size()]), new DefaultErrorHandler());
98103
}
99104
}

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/BatchUsersRequestAdapter.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,23 @@
3030
import com.jaspersoft.jasperserver.jaxrs.client.core.ThreadPoolUtil;
3131
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
3232
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
33+
import java.util.ArrayList;
3334
import javax.ws.rs.core.MultivaluedHashMap;
3435
import javax.ws.rs.core.MultivaluedMap;
3536

3637
public class BatchUsersRequestAdapter extends AbstractAdapter {
3738

3839
private MultivaluedMap<String, String> params;
39-
private StringBuilder uri = new StringBuilder("");
40+
private ArrayList<String> uri = new ArrayList<String>();
4041

4142
public BatchUsersRequestAdapter(SessionStorage sessionStorage, String organizationId) {
4243
super(sessionStorage);
4344
params = new MultivaluedHashMap<String, String>();
4445
if (organizationId != null && !organizationId.equals("")) {
45-
uri.append("organizations/").append(organizationId).append("/");
46+
uri.add("organizations");
47+
uri.add(organizationId);
4648
}
47-
uri.append("users/");
49+
uri.add("users");
4850
}
4951

5052
public BatchUsersRequestAdapter param(UsersParameter userParam, String value) {
@@ -70,7 +72,7 @@ public void run() {
7072

7173
private JerseyRequest<UsersListWrapper> buildRequest() {
7274
JerseyRequest<UsersListWrapper> request = JerseyRequest.buildRequest(sessionStorage, UsersListWrapper.class,
73-
new String[]{uri.toString()}, new DefaultErrorHandler());
75+
uri.toArray(new String[uri.size()]), new DefaultErrorHandler());
7476
request.addParams(params);
7577
return request;
7678
}

0 commit comments

Comments
 (0)