Skip to content

Commit 993dec4

Browse files
author
TanyaEf
committed
Deleted duplicated code in JerseyRequest
1 parent 5ebc381 commit 993dec4

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/JerseyRequest.java

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,17 @@ protected JerseyRequest(SessionStorage sessionStorage, Class<ResponseType> respo
6666
operationResultFactory = new OperationResultFactoryImpl();
6767
this.responseClass = responseClass;
6868
this.responseGenericType = null;
69-
RestClientConfiguration configuration = sessionStorage.getConfiguration();
69+
init(sessionStorage);
7070

71-
contentType = configuration.getContentMimeType() == JSON ? APPLICATION_JSON : APPLICATION_XML;
72-
acceptType = configuration.getAcceptMimeType() == JSON ? APPLICATION_JSON : APPLICATION_XML;
73-
headers = new MultivaluedHashMap<String, String>();
74-
usersWebTarget = sessionStorage.getRootTarget()
75-
.path("/rest_v2")
76-
.register(CustomRepresentationTypeProvider.class)
77-
.register(JacksonFeature.class)
78-
.register(MultiPartWriter.class);
7971
}
8072

8173
protected JerseyRequest(SessionStorage sessionStorage, GenericType<ResponseType> genericType) {
8274
operationResultFactory = new OperationResultFactoryImpl();
8375
this.responseClass = (Class<ResponseType>) genericType.getRawType();
8476
this.responseGenericType = genericType;
77+
init(sessionStorage);
78+
}
79+
private void init(SessionStorage sessionStorage) {
8580
RestClientConfiguration configuration = sessionStorage.getConfiguration();
8681

8782
contentType = configuration.getContentMimeType() == JSON ? APPLICATION_JSON : APPLICATION_XML;
@@ -90,7 +85,6 @@ protected JerseyRequest(SessionStorage sessionStorage, GenericType<ResponseType>
9085
usersWebTarget = sessionStorage.getRootTarget()
9186
.path("/rest_v2")
9287
.register(CustomRepresentationTypeProvider.class)
93-
.register(JacksonFeature.class)
9488
.register(MultiPartWriter.class);
9589
}
9690

@@ -100,15 +94,14 @@ public static <T> JerseyRequest<T> buildRequest(SessionStorage sessionStorage, C
10094

10195
public static <T> JerseyRequest<T> buildRequest(SessionStorage sessionStorage, Class<T> responseClass, String[] path, ErrorHandler errorHandler) {
10296
JerseyRequest<T> request = new JerseyRequest<T>(sessionStorage, responseClass);
103-
request.errorHandler = errorHandler != null ? errorHandler : new DefaultErrorHandler();
104-
for (String pathElem : path) {
105-
request.setPath(pathElem);
106-
}
107-
return request;
97+
return configRequest(request, path, errorHandler);
10898
}
10999

110100
public static <T> JerseyRequest<T> buildRequest(SessionStorage sessionStorage, GenericType<T> genericType, String[] path, ErrorHandler errorHandler) {
111101
JerseyRequest<T> request = new JerseyRequest<T>(sessionStorage, genericType);
102+
return configRequest(request, path, errorHandler);
103+
}
104+
private static <T> JerseyRequest<T> configRequest(JerseyRequest<T> request, String[] path, ErrorHandler errorHandler){
112105
request.errorHandler = errorHandler != null ? errorHandler : new DefaultErrorHandler();
113106
for (String pathElem : path) {
114107
request.setPath(pathElem);

0 commit comments

Comments
 (0)