Skip to content

Commit 5c40bb3

Browse files
author
TanyaEf
committed
Merge branch 'enhancement' into develop
2 parents e0108b6 + bbae726 commit 5c40bb3

File tree

12 files changed

+51
-408
lines changed

12 files changed

+51
-408
lines changed

‎src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/ServerAttributesServiceIT.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.attributes;
22

3+
import com.jaspersoft.jasperserver.dto.authority.ClientUserAttribute;
34
import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
45
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.NullEntityOperationResult;
56
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
6-
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ServerAttribute;
77
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ServerAttributesListWrapper;
88
import java.util.List;
99
import org.testng.Assert;
@@ -13,6 +13,8 @@
1313

1414
import static java.util.Arrays.asList;
1515
import static org.hamcrest.core.IsInstanceOf.instanceOf;
16+
import static org.testng.AssertJUnit.assertEquals;
17+
import static org.testng.AssertJUnit.assertNotNull;
1618

1719
public class ServerAttributesServiceIT extends RestClientTestUtil {
1820

@@ -27,20 +29,21 @@ public void before() {
2729
public void should_create_attributes() {
2830
ServerAttributesListWrapper serverAttributes = new ServerAttributesListWrapper();
2931
serverAttributes.setAttributes(asList(
30-
new ServerAttribute("max_threads", "512"),
31-
new ServerAttribute("admin_cell_phone", "03")));
32+
new ClientUserAttribute().setName("max_threads").setValue("512"),
33+
new ClientUserAttribute().setName("admin_cell_phone").setValue("03")));
3234

3335
OperationResult<ServerAttributesListWrapper> attributes = session
3436
.serverAttributesService()
3537
.attributes()
3638
.createOrUpdate(serverAttributes);
3739

38-
Assert.assertTrue(instanceOf(NullEntityOperationResult.class).matches(attributes));
40+
assertNotNull(attributes);
41+
3942
}
4043

4144
@Test(dependsOnMethods = "should_create_attributes")
4245
public void should_return_server_attributes() {
43-
List<ServerAttribute> attributes = session
46+
List<ClientUserAttribute> attributes = session
4447
.serverAttributesService()
4548
.attributes()
4649
.get()
@@ -52,7 +55,7 @@ public void should_return_server_attributes() {
5255

5356
@Test(dependsOnMethods = "should_return_server_attributes")
5457
public void should_return_specified_server_attributes() {
55-
List<ServerAttribute> attributes = session
58+
List<ClientUserAttribute> attributes = session
5659
.serverAttributesService()
5760
.attributes(asList("max_threads", "admin_cell_phone"))
5861
.get()
@@ -80,40 +83,41 @@ public void should_delete_server_attributes() {
8083
.delete()
8184
.getEntity();
8285

83-
Assert.assertNull(null);
86+
Assert.assertNull(entity);
8487
}
8588

8689
@Test(dependsOnMethods = "should_delete_server_attributes")
8790
public void should_create_single_attribute() {
88-
ServerAttribute attribute = new ServerAttribute();
91+
ClientUserAttribute attribute = new ClientUserAttribute();
8992
attribute.setName("latency");
9093
attribute.setValue("5700");
9194

92-
ServerAttribute entity = session
95+
ClientUserAttribute entity = session
9396
.serverAttributesService()
9497
.attribute()
9598
.createOrUpdate(attribute)
9699
.getEntity();
97-
Assert.assertNull(entity);
100+
assertNotNull(entity);
98101
}
99102

100103
@Test(dependsOnMethods = "should_create_single_attribute")
101104
public void should_return_attribute() {
102-
ServerAttribute entity = session
105+
ClientUserAttribute entity = session
103106
.serverAttributesService()
104107
.attribute("latency")
105108
.get()
106109
.getEntity();
107-
Assert.assertEquals(entity.getValue(), "5700");
110+
assertEquals(entity.getValue(), "5700");
108111
}
109112

110113
@Test(dependsOnMethods = "should_return_attribute")
111114
public void should_delete_attribute() {
112-
OperationResult<ServerAttribute> entity = session
115+
OperationResult<ClientUserAttribute> entity = session
113116
.serverAttributesService()
114117
.attribute("latency")
115118
.delete();
116-
Assert.assertTrue(instanceOf(NullEntityOperationResult.class).matches(entity));
119+
120+
assertNotNull(entity);
117121
}
118122

119123
@AfterClass

‎src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsServiceIT.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations;
22

3+
import com.jaspersoft.jasperserver.dto.authority.ClientUserAttribute;
34
import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
45
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
5-
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ClientTenantAttribute;
66
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.TenantAttributesListWrapper;
77
import java.util.Arrays;
88
import org.testng.annotations.AfterClass;
@@ -29,9 +29,10 @@ public void should_create_tenant_attributes() {
2929

3030
TenantAttributesListWrapper attributes = new TenantAttributesListWrapper();
3131
attributes.setAttributes(Arrays.asList(
32-
new ClientTenantAttribute("number_of_employees", "1000+"),
33-
new ClientTenantAttribute("number_of_units", "29"),
34-
new ClientTenantAttribute("country_code", "FR")));
32+
new ClientUserAttribute().setName("number_of_employees").setValue("1000+"),
33+
new ClientUserAttribute().setName("number_of_units").setValue("29"),
34+
new ClientUserAttribute().setName("country_code").setValue("FR")
35+
));
3536

3637
OperationResult<TenantAttributesListWrapper> retrieved = session
3738
.organizationsService()

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
*/
2121
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.attributes;
2222

23+
import com.jaspersoft.jasperserver.dto.authority.ClientUserAttribute;
2324
import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
2425
import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
2526
import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
2627
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
2728
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
28-
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ServerAttribute;
2929

3030
/**
3131
* @author Alex Krasnyanskiy
@@ -44,21 +44,21 @@ public ServerSingleAttributeAdapter(SessionStorage sessionStorage, String attrib
4444
this.attributeName = attributeName;
4545
}
4646

47-
public OperationResult<ServerAttribute> get() {
47+
public OperationResult<ClientUserAttribute> get() {
4848
return request().get();
4949
}
5050

51-
public OperationResult<ServerAttribute> delete() {
51+
public OperationResult<ClientUserAttribute> delete() {
5252
return request().delete();
5353
}
5454

55-
public OperationResult<ServerAttribute> createOrUpdate(ServerAttribute attribute) {
55+
public OperationResult<ClientUserAttribute> createOrUpdate(ClientUserAttribute attribute) {
5656
attributeName = attribute.getName();
5757
return request().put(attribute);
5858
}
5959

60-
private JerseyRequest<ServerAttribute> request() {
61-
return JerseyRequest.buildRequest(sessionStorage, ServerAttribute.class,
60+
private JerseyRequest<ClientUserAttribute> request() {
61+
return JerseyRequest.buildRequest(sessionStorage, ClientUserAttribute.class,
6262
new String[]{"/attributes/" + attributeName}, new DefaultErrorHandler());
6363
}
6464
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations.attributes;
22

3+
import com.jaspersoft.jasperserver.dto.authority.ClientUserAttribute;
34
import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
45
import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
56
import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
67
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
78
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
8-
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ClientTenantAttribute;
99

1010
/**
1111
* @author Alex Krasnyanskiy
@@ -27,21 +27,21 @@ public OrganizationSingleAttributeAdapter(SessionStorage sessionStorage, String
2727
this.attributeName = attributeName;
2828
}
2929

30-
public OperationResult<ClientTenantAttribute> get() {
30+
public OperationResult<ClientUserAttribute> get() {
3131
return request().get();
3232
}
3333

34-
public OperationResult<ClientTenantAttribute> createOrUpdate(ClientTenantAttribute attribute) {
34+
public OperationResult<ClientUserAttribute> createOrUpdate(ClientUserAttribute attribute) {
3535
attributeName = attribute.getName();
3636
return request().put(attribute);
3737
}
3838

39-
public OperationResult<ClientTenantAttribute> delete() {
39+
public OperationResult<ClientUserAttribute> delete() {
4040
return request().delete();
4141
}
4242

43-
private JerseyRequest<ClientTenantAttribute> request() {
44-
return JerseyRequest.buildRequest(sessionStorage, ClientTenantAttribute.class,
43+
private JerseyRequest<ClientUserAttribute> request() {
44+
return JerseyRequest.buildRequest(sessionStorage, ClientUserAttribute.class,
4545
new String[]{"/organizations/" + organizationId + "/attributes/" + attributeName},
4646
new DefaultErrorHandler());
4747
}

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/enums/ResourceMediaType.java‎

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)