Skip to content

Commit 20470fc

Browse files
author
TanyaEf
committed
Changed dependensies, added integration test to UserServiceIT
1 parent d58f24e commit 20470fc

File tree

4 files changed

+30
-49
lines changed

4 files changed

+30
-49
lines changed

pom.xml

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -48,27 +48,7 @@
4848
<version>6.0.1</version>
4949
</dependency>
5050

51-
<!-- Jersey
52-
<dependency>
53-
<groupId>org.glassfish.jersey.core</groupId>
54-
<artifactId>jersey-client</artifactId>
55-
<version>${jersey.version}</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.glassfish.jersey.media</groupId>
59-
<artifactId>jersey-media-json-jettison</artifactId>
60-
<version>${jersey.version}</version>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.glassfish.jersey.media</groupId>
64-
<artifactId>jersey-media-json-jackson</artifactId>
65-
<version>${jersey.version}</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>org.glassfish.jersey.media</groupId>
69-
<artifactId>jersey-media-multipart</artifactId>
70-
<version>${jersey.version}</version>
71-
</dependency>-->
51+
<!-- Jersey-->
7252

7353
<dependency>
7454
<groupId>org.glassfish.jersey.core</groupId>
@@ -91,25 +71,6 @@
9171
<version>2.5.1</version>
9272
</dependency>
9373

94-
<dependency>
95-
<groupId>com.fasterxml.jackson.core</groupId>
96-
<artifactId>jackson-databind</artifactId>
97-
<version>2.5.4</version>
98-
</dependency>
99-
100-
101-
<!-- Jackson
102-
<dependency>
103-
<groupId>com.fasterxml.jackson.dataformat</groupId>
104-
<artifactId>jackson-dataformat-yaml</artifactId>
105-
<version>${fasterxml.version}</version>
106-
</dependency>
107-
<dependency>
108-
<groupId>com.fasterxml.jackson.dataformat</groupId>
109-
<artifactId>jackson-dataformat-xml</artifactId>
110-
<version>${fasterxml.version}</version>
111-
</dependency>-->
112-
11374
<!-- TestNG -->
11475
<dependency>
11576
<groupId>org.testng</groupId>

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/UsersServiceIT.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
import com.jaspersoft.jasperserver.dto.authority.ClientUser;
44
import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
5+
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
56
import java.util.List;
67
import org.testng.Assert;
78
import org.testng.annotations.AfterClass;
89
import org.testng.annotations.BeforeClass;
910
import org.testng.annotations.Test;
1011

12+
import static org.testng.AssertJUnit.assertNotNull;
13+
1114
/**
1215
* @author Alexander Krasnyanskiy
1316
*/
@@ -51,6 +54,22 @@ public void should_return_list_users_by_role() {
5154
Assert.assertTrue(users.size() > 3);
5255
}
5356

57+
@Test
58+
public void should_return_user_by_name() {
59+
60+
OperationResult<ClientUser> operationResult =
61+
session
62+
.usersService()
63+
.username("superuser")
64+
.get();
65+
66+
ClientUser user = operationResult.getEntity();
67+
68+
assertNotNull(user);
69+
}
70+
71+
72+
5473
@AfterClass
5574
public void after() {
5675
session.logout();

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import javax.ws.rs.client.WebTarget;
3434
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
3535
import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
36+
import org.codehaus.jackson.map.DeserializationConfig;
3637
import org.glassfish.jersey.client.ClientProperties;
3738
import org.glassfish.jersey.filter.LoggingFilter;
3839
import org.glassfish.jersey.jackson.JacksonFeature;
@@ -92,15 +93,16 @@ private void init() {
9293
client.property(ClientProperties.READ_TIMEOUT, readTimeout);
9394
}
9495

95-
JacksonJsonProvider provider = new JacksonJaxbJsonProvider();
96-
// .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
97-
JacksonJsonProvider customRepresentationTypeProvider = new CustomRepresentationTypeProvider();
98-
// .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
96+
JacksonJsonProvider provider = new JacksonJaxbJsonProvider()
97+
.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
98+
JacksonJsonProvider customRepresentationTypeProvider = new CustomRepresentationTypeProvider()
99+
.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
99100
rootTarget = client.target(configuration.getJasperReportsServerUrl());
100-
rootTarget.register(JacksonFeature.class)
101-
.register(provider)
102-
.register(customRepresentationTypeProvider)
103-
.register(MultiPartWriter.class);
101+
rootTarget
102+
.register(provider)
103+
.register(customRepresentationTypeProvider)
104+
.register(JacksonFeature.class)
105+
.register(MultiPartWriter.class);
104106
if (configuration.getLogHttp()) {
105107
rootTarget.register(initLoggingFilter());
106108
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public T getEntity() {
5656
}
5757
return entity;
5858
} catch (Exception e) {
59-
e.printStackTrace();
6059
return null;
6160
}
6261
}

0 commit comments

Comments
 (0)