Skip to content

Commit b75207f

Browse files
author
TanyaEf
committed
Resolving conflicts
2 parents 5a3f01f + a273d88 commit b75207f

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/operationresult/OperationResultFactoryImpl.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ public <T> OperationResult<T> getOperationResult(Response response, GenericType<
4242
return getAppropriateOperationResultInstance(response, genericType);
4343
}
4444

45-
46-
47-
48-
/**
49-
* This method is to be changed in the next release when real ResourceThumbnailListWrapper class will be added.
50-
*/
51-
@Deprecated
5245
private <T> OperationResult<T> getAppropriateOperationResultInstance(Response response, Class<T> responseClass) {
5346
OperationResult<T> result;
5447

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/thumbnails/ResourceThumbnailListWrapper.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.dto.thumbnails;
22
import com.jaspersoft.jasperserver.dto.thumbnails.ResourceThumbnail;
33

4+
import java.util.LinkedList;
45
import java.util.List;
56
import javax.xml.bind.annotation.XmlElement;
67
import javax.xml.bind.annotation.XmlRootElement;
78

8-
/**
9-
* Fake wrapper class for ResourceThumbnail collection.
10-
*/
119
@Deprecated
1210
@XmlRootElement(name = "thumbnails")
1311
public class ResourceThumbnailListWrapper {
@@ -18,7 +16,7 @@ public ResourceThumbnailListWrapper() {
1816
}
1917

2018
public ResourceThumbnailListWrapper(List<ResourceThumbnail> thumbnail) {
21-
this.thumbnails = thumbnail;
19+
this.thumbnails = new LinkedList<ResourceThumbnail>(thumbnail);
2220
}
2321

2422
public List<ResourceThumbnail> getThumbnails() {

0 commit comments

Comments
 (0)