Skip to content

Commit b27a8c5

Browse files
author
TanyaEf
committed
Restored deprecated methods in Organization and User services
1 parent a973cdd commit b27a8c5

File tree

9 files changed

+932
-11
lines changed

9 files changed

+932
-11
lines changed

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,68 @@ private <T> JerseyRequest<T> buildRequest(Class<T> responseType) {
7979
new DefaultErrorHandler());
8080
}
8181
}
82+
//
83+
//private final MultivaluedMap<String, String> params;
84+
//
85+
// public BatchOrganizationsAdapter(SessionStorage sessionStorage) {
86+
// super(sessionStorage);
87+
// params = new MultivaluedHashMap<String, String>();
88+
// }
89+
//
90+
// public BatchOrganizationsAdapter parameter(OrganizationParameter orgParam, String value) {
91+
// params.add(orgParam.getParamName(), value);
92+
// return this;
93+
// }
94+
//
95+
// public OperationResult<OrganizationsListWrapper> get() {
96+
// JerseyRequest<OrganizationsListWrapper> request = buildRequest(OrganizationsListWrapper.class);
97+
// request.addParams(params);
98+
// return request.get();
99+
// }
100+
//
101+
// public <R> RequestExecution asyncGet(final Callback<OperationResult<OrganizationsListWrapper>, R> callback) {
102+
// final JerseyRequest<OrganizationsListWrapper> request = buildRequest(OrganizationsListWrapper.class);
103+
// request.addParams(params);
104+
//
105+
// RequestExecution task = new RequestExecution(new Runnable() {
106+
// @Override
107+
// public void run() {
108+
// callback.execute(request.get());
109+
// }
110+
// });
111+
//
112+
// ThreadPoolUtil.runAsynchronously(task);
113+
// return task;
114+
// }
115+
//
116+
// public OperationResult<Organization> create(Organization clientTenant) {
117+
// JerseyRequest<Organization> request = buildRequest(Organization.class);
118+
// request.addParams(params);
119+
// return request.post(clientTenant);
120+
// }
121+
//
122+
// public <R> RequestExecution asyncCreate(final Organization clientTenant, final Callback<OperationResult<Organization>, R> callback){
123+
// final JerseyRequest<Organization> request = buildRequest(Organization.class);
124+
// request.addParams(params);
125+
//
126+
// RequestExecution task = new RequestExecution(new Runnable() {
127+
// @Override
128+
// public void run() {
129+
// callback.execute(request.post(clientTenant));
130+
// }
131+
// });
132+
//
133+
// ThreadPoolUtil.runAsynchronously(task);
134+
// return task;
135+
// }
136+
//
137+
// private <T> JerseyRequest<T> buildRequest(Class<T> responseType) {
138+
// return JerseyRequest.buildRequest(sessionStorage, responseType,
139+
// new String[]{"/organizations"},
140+
// new DefaultErrorHandler());
141+
// }
142+
143+
144+
145+
146+

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,11 @@ public SingleOrganizationAdapter organization(String organizationId) {
4545
public BatchOrganizationsAdapter allOrganizations() {
4646
return new BatchOrganizationsAdapter(sessionStorage);
4747
}
48+
49+
// Deprecated method, use allOrganizations() method
50+
@Deprecated
51+
public BatchOrganizationsAdapter organizations() {
52+
return new BatchOrganizationsAdapter(sessionStorage);
53+
}
54+
4855
}

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,10 @@
3131
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
3232
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
3333
import javax.ws.rs.core.MultivaluedHashMap;
34-
import org.apache.commons.logging.Log;
35-
import org.apache.commons.logging.LogFactory;
3634

3735

3836
public class SingleOrganizationAdapter extends AbstractAdapter {
3937

40-
private static final Log log = LogFactory.getLog(SingleOrganizationAdapter.class);
41-
4238
private final ClientTenant clientTenant;
4339
private final MultivaluedHashMap<String, String> params;
4440

@@ -145,4 +141,12 @@ private JerseyRequest<ClientTenant> request() {
145141
new DefaultErrorHandler()
146142
);
147143
}
148-
}
144+
// Deprecated method, use organization(organizationID).create() methods
145+
@Deprecated
146+
public OperationResult<ClientTenant> create(ClientTenant clientTenant) {
147+
JerseyRequest<ClientTenant> request = request();
148+
return params.size() != 0
149+
? request.addParams(params).post(clientTenant)
150+
: request.post(clientTenant);
151+
}
152+
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,4 @@ private JerseyRequest<UsersListWrapper> buildRequest() {
7575
return request;
7676
}
7777

78-
79-
}
78+
}

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

Lines changed: 125 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@
1010
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
1111
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
1212

13+
import static java.util.regex.Pattern.compile;
14+
1315
public class SingleUserRequestAdapter extends AbstractAdapter {
1416

1517
private StringBuilder uri = new StringBuilder("");
1618

1719
private ClientUser user;
20+
//the field should be deleted after deleting deprecated methods
21+
@Deprecated
22+
private String userUriPrefix;
23+
1824

1925
public SingleUserRequestAdapter(SessionStorage sessionStorage, ClientUser user) {
2026
super(sessionStorage);
@@ -48,7 +54,6 @@ public OperationResult<ClientUser> createOrUpdate(ClientUser user) {
4854
}
4955

5056

51-
5257
public <R> RequestExecution asyncCreateOrUpdate(final ClientUser user, final Callback<OperationResult<ClientUser>, R> callback) {
5358
final JerseyRequest<ClientUser> request = buildRequest();
5459
RequestExecution task = new RequestExecution(new Runnable() {
@@ -79,13 +84,130 @@ public void run() {
7984
}
8085

8186

82-
8387
private JerseyRequest<ClientUser> buildRequest() {
8488
return JerseyRequest.buildRequest(sessionStorage,
8589
ClientUser.class,
8690
new String[]{uri.toString(), user.getUsername()},
8791
new DefaultErrorHandler());
8892
}
8993

94+
@Deprecated
95+
public SingleUserRequestAdapter(SessionStorage sessionStorage, String organizationId, String username) {
96+
super(sessionStorage);
97+
if (organizationId != null) {
98+
userUriPrefix = "/organizations/" + organizationId + "/users/";
99+
} else {
100+
userUriPrefix = "/users/";
101+
}
102+
user = new ClientUser();
103+
user.setUsername(username);
104+
uri.append(userUriPrefix);
105+
}
106+
107+
@Deprecated
108+
public SingleUserRequestAdapter(SessionStorage sessionStorage, String organizationId) {
109+
super(sessionStorage);
110+
if (organizationId != null) {
111+
uri.append("/organizations/").append(organizationId).append("/users/");
112+
} else {
113+
uri.append("/users/");
114+
}
115+
}
116+
117+
@Deprecated
118+
public SingleUserRequestAdapter(String userId, String organizationId, SessionStorage sessionStorage) {
119+
super(sessionStorage);
120+
if (organizationId != null && !organizationId.equals("") && userId != null && !userId.equals("")) {
121+
uri.append("/organizations/").append(organizationId).append("/users/").append(userId);
122+
} else if (organizationId == null && userId != null && !userId.equals("")) {
123+
uri.append("/users/").append(userId);
124+
} else {
125+
throw new IllegalArgumentException("Wrong parameters has been passed!");
126+
}
127+
}
128+
129+
@Deprecated
130+
public OperationResult<ClientUser> get(String userId) {
131+
132+
/* checks if we already have setted userId */
133+
if (compile("^.*?users/([^/]+)$").matcher(uri.toString()).find()) {
134+
return request().get();
135+
}
136+
137+
uri.append(userId);
138+
return request().get();
139+
}
140+
141+
@Deprecated
142+
private JerseyRequest<ClientUser> request() {
143+
return JerseyRequest.buildRequest(sessionStorage, ClientUser.class, new String[]{uri.toString()}, new DefaultErrorHandler());
144+
}
145+
146+
@Deprecated
147+
public <R> RequestExecution asyncGet(final Callback<OperationResult<ClientUser>, R> callback, String userId) {
148+
if (!compile("^.*?users/([^/]+)$").matcher(uri.toString()).find()) {
149+
uri.append(userId);
150+
}
151+
final JerseyRequest<ClientUser> request = request();
152+
RequestExecution task = new RequestExecution(new Runnable() {
153+
@Override
154+
public void run() {
155+
callback.execute(request.get());
156+
}
157+
});
158+
ThreadPoolUtil.runAsynchronously(task);
159+
return task;
160+
}
161+
162+
@Deprecated
163+
public OperationResult<ClientUser> updateOrCreate(ClientUser user) {
164+
uri.append(user.getUsername());
165+
if (!uri.toString().contains("organizations") && user.getTenantId() != null) {
166+
uri.insert(0, "/organizations/" + user.getTenantId());
167+
}
168+
return request().put(user);
169+
}
170+
171+
@Deprecated
172+
public <R> RequestExecution asyncCreateOrUpdate(final ClientUser user, final Callback<OperationResult<ClientUser>, R> callback, final String userId) {
173+
if (!compile("^.*?users/([^/]+)$").matcher(uri.toString()).find()) {
174+
uri.append(userId);
175+
}
176+
final JerseyRequest<ClientUser> request = request();
177+
RequestExecution task = new RequestExecution(new Runnable() {
178+
@Override
179+
public void run() {
180+
callback.execute(request.put(user));
181+
}
182+
});
183+
ThreadPoolUtil.runAsynchronously(task);
184+
return task;
185+
}
186+
187+
@Deprecated
188+
public OperationResult delete(String userId) {
189+
uri.append(userId);
190+
return request().delete();
191+
}
192+
193+
@Deprecated
194+
public OperationResult delete(ClientUser user) {
195+
uri.append(user.getUsername());
196+
return request().delete();
197+
}
198+
199+
@Deprecated
200+
public <R> RequestExecution asyncDelete(final Callback<OperationResult<ClientUser>, R> callback, String userId) {
201+
uri.append(userId);
202+
final JerseyRequest<ClientUser> request = request();
203+
RequestExecution task = new RequestExecution(new Runnable() {
204+
@Override
205+
public void run() {
206+
callback.execute(request.delete());
207+
}
208+
});
209+
ThreadPoolUtil.runAsynchronously(task);
210+
return task;
211+
}
90212

91-
}
213+
}

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,29 @@ public BatchUsersRequestAdapter allUsers() {
6969

7070
return new BatchUsersRequestAdapter(sessionStorage, organizationId);
7171
}
72+
@Deprecated
73+
public UsersService organization(String organizationId) {
74+
if ("".equals(organizationId) || "/".equals(organizationId)) {
75+
throw new IllegalArgumentException("'organizationId' mustn't be an empty string");
76+
}
77+
this.organizationId = organizationId;
78+
return this;
79+
}
80+
81+
// Deprecated method, use user(userName) method
82+
@Deprecated
83+
public SingleUserRequestAdapter username(String username) {
84+
if ("".equals(username) || "/".equals(username)) {
85+
throw new IllegalArgumentException("'username' mustn't be an empty string");
86+
}
87+
return new SingleUserRequestAdapter(sessionStorage, organizationId, username);
88+
}
89+
// Deprecated method, use user(userName) method
90+
@Deprecated
91+
public SingleUserRequestAdapter user() {
92+
return new SingleUserRequestAdapter(sessionStorage, organizationId);
93+
}
94+
7295
}
96+
97+

‎src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsServiceTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,21 @@ public void should_throw_exception_when_organization_id_is_empty() throws Except
109109
// When
110110
service.organization("");
111111
}
112+
//test should be deleted after deleting appropriate method
113+
@Deprecated
114+
@Test
115+
public void should_return_proper_instance_of_BatchOrganizationsAdapter_deprecated() throws Exception {
116+
117+
// Given
118+
whenNew(BatchOrganizationsAdapter.class).withArguments(sessionStorageMock).thenReturn(batchOrganizationsAdapter);
119+
OrganizationsService service = new OrganizationsService(sessionStorageMock);
120+
121+
// When
122+
BatchOrganizationsAdapter retrieved = service.organizations();
123+
124+
// Then
125+
assertSame(retrieved, batchOrganizationsAdapter);
126+
}
112127

113128

114129
@AfterMethod

0 commit comments

Comments
 (0)