Skip to content

Commit 95a4353

Browse files
KrasnyanskiyKrasnyanskiy
committed
Update dependencies.
1 parent a42673c commit 95a4353

File tree

19 files changed

+66
-542
lines changed

19 files changed

+66
-542
lines changed

‎pom.xml‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,30 @@
1616
<powermock.version>1.5.5</powermock.version>
1717
</properties>
1818

19+
<scm>
20+
<connection>scm:git:http://github.com/Jaspersoft/jrs-rest-java-client</connection>
21+
<developerConnection>scm:git:https://github.com/Jaspersoft/jrs-rest-java-client</developerConnection>
22+
<tag>HEAD</tag>
23+
</scm>
24+
25+
<distributionManagement>
26+
<!--<repository>-->
27+
<!--<id>jaspersoft</id>-->
28+
<!--<name>jaspersoft-releases</name>-->
29+
<!--<url>http://jaspersoft.artifactoryonline.com/jaspersoft/jrs-ce-releases</url>-->
30+
<!--</repository>-->
31+
<snapshotRepository>
32+
<id>jaspersoft</id>
33+
<name>jaspersoft-snapshots</name>
34+
<url>http://jaspersoft.artifactoryonline.com/jaspersoft/jrs-ce-snapshots</url>
35+
</snapshotRepository>
36+
</distributionManagement>
37+
1938
<dependencies>
2039
<dependency>
2140
<groupId>com.jaspersoft.jasperserver</groupId>
2241
<artifactId>jasperserver-dto</artifactId>
23-
<version>5.6.1</version>
42+
<version>6.1.0-SNAPSHOT</version>
2443
</dependency>
2544
<dependency>
2645
<groupId>org.glassfish.jersey.core</groupId>
@@ -42,6 +61,8 @@
4261
<artifactId>jersey-media-json-jackson</artifactId>
4362
<version>2.5.1</version>
4463
</dependency>
64+
65+
<!-- TestNG -->
4566
<dependency>
4667
<groupId>org.testng</groupId>
4768
<artifactId>testng</artifactId>
@@ -60,18 +81,21 @@
6081
<groupId>org.powermock</groupId>
6182
<artifactId>powermock-api-mockito</artifactId>
6283
<version>${powermock.version}</version>
84+
<scope>test</scope>
6385
</dependency>
6486
<dependency>
6587
<groupId>org.powermock</groupId>
6688
<artifactId>powermock-api-easymock</artifactId>
6789
<version>${powermock.version}</version>
90+
<scope>test</scope>
6891
</dependency>
6992

7093
<!-- EasyMock -->
7194
<dependency>
7295
<groupId>org.easymock</groupId>
7396
<artifactId>easymock</artifactId>
7497
<version>3.2</version>
98+
<scope>test</scope>
7599
</dependency>
76100

77101
<dependency>
@@ -101,23 +125,7 @@
101125
</dependency>
102126
</dependencies>
103127

104-
<repositories>
105-
<repository>
106-
<id>jrs-ce-releases</id>
107-
<name>JasperReports Server CE releases repository</name>
108-
<url>http://jaspersoft.artifactoryonline.com/jaspersoft/jrs-ce-releases/</url>
109-
</repository>
110-
<repository>
111-
<id>jrs-ce-snapshots</id>
112-
<name>JasperReports Server CE snapshots repository</name>
113-
<url>http://jaspersoft.artifactoryonline.com/jaspersoft/jrs-ce-snapshots/</url>
114-
</repository>
115-
</repositories>
116-
<scm>
117-
<connection>scm:git:http://github.com/Jaspersoft/jrs-rest-java-client</connection>
118-
<developerConnection>scm:git:https://github.com/Jaspersoft/jrs-rest-java-client</developerConnection>
119-
<tag>HEAD</tag>
120-
</scm>
128+
121129
<build>
122130
<plugins>
123131
<plugin>
@@ -177,7 +185,6 @@
177185
<artifactId>maven-failsafe-plugin</artifactId>
178186
<version>2.12</version>
179187
<configuration>
180-
<!-- it gives more memory for IT -->
181188
<argLine>-Xmx512m -XX:MaxPermSize=256m</argLine>
182189
</configuration>
183190
<executions>

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourceServiceParameter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public enum ResourceServiceParameter {
5151

5252
private String name;
5353

54-
private ResourceServiceParameter(String name) {
54+
ResourceServiceParameter(String name) {
5555
this.name = name;
5656
}
5757

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesService.java‎

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

23+
import com.jaspersoft.jasperserver.dto.resources.ClientMondrianConnection;
24+
import com.jaspersoft.jasperserver.dto.resources.ClientReportUnit;
25+
import com.jaspersoft.jasperserver.dto.resources.ClientSecureMondrianConnection;
26+
import com.jaspersoft.jasperserver.dto.resources.ClientSemanticLayerDataSource;
2327
import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
28+
import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.builder.DomainResourceBuilder;
29+
import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.builder.MondrianConnectionResourceBuilder;
30+
import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.builder.ReportUnitResourceBuilder;
31+
import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.builder.SecureMondrianConnectionResourceBuilder;
2432
import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
2533

34+
import static com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.support.ResourceBuilderFactory.getBuilder;
35+
2636
public class ResourcesService extends AbstractAdapter {
2737

2838
public ResourcesService(SessionStorage sessionStorage) {
@@ -37,23 +47,32 @@ public SingleResourceAdapter resource(String uri) {
3747
return new SingleResourceAdapter(sessionStorage, uri);
3848
}
3949

40-
// public DomainResourceBuilder resource(ClientSemanticLayerDataSource resource) {
41-
// ClientSemanticLayerDataSource copy = new ClientSemanticLayerDataSource(resource);
42-
// return ResourceBuilderFactory.getBuilder(copy, sessionStorage);
43-
// }
44-
45-
// public ReportUnitResourceBuilder resource(ClientReportUnit resource) {
46-
// ClientReportUnit copy = new ClientReportUnit(resource);
47-
// return ResourceBuilderFactory.getBuilder(copy, sessionStorage);
48-
// }
49-
50-
// public MondrianConnectionResourceBuilder resource(ClientMondrianConnection resource) {
51-
// ClientMondrianConnection copy = new ClientMondrianConnection(resource);
52-
// return ResourceBuilderFactory.getBuilder(copy, sessionStorage);
53-
// }
54-
55-
// public SecureMondrianConnectionResourceBuilder resource(ClientSecureMondrianConnection resource) {
56-
// ClientSecureMondrianConnection copy = new ClientSecureMondrianConnection(resource);
57-
// return ResourceBuilderFactory.getBuilder(copy, sessionStorage);
58-
// }
50+
51+
/**
52+
* Additional features to work with such resources as
53+
* - SemanticLayerDataSource
54+
* - ReportUnit
55+
* - MondrianConnection
56+
* - SecureMondrianConnection
57+
*/
58+
59+
public DomainResourceBuilder resource(ClientSemanticLayerDataSource resource) {
60+
ClientSemanticLayerDataSource copy = new ClientSemanticLayerDataSource(resource);
61+
return getBuilder(copy, sessionStorage);
62+
}
63+
64+
public ReportUnitResourceBuilder resource(ClientReportUnit resource) {
65+
ClientReportUnit copy = new ClientReportUnit(resource);
66+
return getBuilder(copy, sessionStorage);
67+
}
68+
69+
public MondrianConnectionResourceBuilder resource(ClientMondrianConnection resource) {
70+
ClientMondrianConnection copy = new ClientMondrianConnection(resource);
71+
return getBuilder(copy, sessionStorage);
72+
}
73+
74+
public SecureMondrianConnectionResourceBuilder resource(ClientSecureMondrianConnection resource) {
75+
ClientSecureMondrianConnection copy = new ClientSecureMondrianConnection(resource);
76+
return getBuilder(copy, sessionStorage);
77+
}
5978
}

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/builder/DomainResourceBuilder.java‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ public DomainResourceBuilder(ClientSemanticLayerDataSource domain, SessionStorag
4343
super(sessionStorage, domain);
4444
}
4545

46-
// public DomainResourceBuilder withSchema(InputStream schema) {
47-
// multipart.field("schema", schema, MediaType.APPLICATION_XML_TYPE);
48-
// return this;
49-
// }
50-
51-
// public DomainResourceBuilder withSchema(String schema) {
52-
// multipart.field("schema", schema, MediaType.APPLICATION_XML_TYPE);
53-
// return this;
54-
// }
55-
5646
public DomainResourceBuilder withSchema(String schema, ClientFile schemaRef) {
5747
super.multipart.field("schema", schema, MediaType.APPLICATION_XML_TYPE);
5848
super.domain.setSchema(schemaRef);
@@ -65,33 +55,18 @@ public DomainResourceBuilder withSchema(InputStream schema, ClientFile schemaRef
6555
return this;
6656
}
6757

68-
// public DomainResourceBuilder withSecurityFile(InputStream securityFile) {
69-
// multipart.field("securityFile", securityFile, MediaType.APPLICATION_XML_TYPE);
70-
// return this;
71-
// }
72-
7358
public DomainResourceBuilder withSecurityFile(InputStream securityFile, ClientFile securityFileRef) {
7459
super.multipart.field("securityFile", securityFile, MediaType.APPLICATION_XML_TYPE);
7560
super.domain.setSecurityFile(securityFileRef);
7661
return this;
7762
}
7863

79-
// public DomainResourceBuilder withSecurityFile(String securityFile) {
80-
// multipart.field("securityFile", securityFile, MediaType.APPLICATION_XML_TYPE);
81-
// return this;
82-
// }
83-
8464
public DomainResourceBuilder withSecurityFile(String securityFile, ClientFile securityFileRef) {
8565
super.multipart.field("securityFile", securityFile, MediaType.APPLICATION_XML_TYPE);
8666
super.domain.setSecurityFile(securityFileRef);
8767
return this;
8868
}
8969

90-
// public DomainResourceBuilder withBundle(InputStream bundle) {
91-
// multipart.field("bundles.bundle[" + bundleCounter++ + "]", bundle, MediaType.TEXT_PLAIN_TYPE);
92-
// return this;
93-
// }
94-
9570
public DomainResourceBuilder withBundle(InputStream bundle, ClientBundle bundleRef) {
9671
super.multipart.field("bundles.bundle[" + bundleCounter++ + "]", bundle, MediaType.TEXT_PLAIN_TYPE);
9772
List<ClientBundle> bundles = super.domain.getBundles();
@@ -132,18 +107,6 @@ public DomainResourceBuilder withBundle(String bundle, ClientBundle bundleRef) {
132107
return this;
133108
}
134109

135-
// public DomainResourceBuilder withBundle(String bundle) {
136-
// multipart.field("bundles.bundle[" + bundleCounter++ + "]", bundle, MediaType.TEXT_PLAIN_TYPE);
137-
// return this;
138-
// }
139-
140-
// public DomainResourceBuilder withBundles(List<InputStream> bundles) {
141-
// for (InputStream bundle : bundles) {
142-
// this.multipart.field("bundles.bundle[" + bundleCounter++ + "]", bundle, MediaType.TEXT_PLAIN_TYPE);
143-
// }
144-
// return this;
145-
// }
146-
147110
public DomainResourceBuilder withBundles(List<InputStream> bundles, List<ClientBundle> bundlesRef) {
148111
for (InputStream bundle : bundles) {
149112
this.multipart.field("bundles.bundle[" + bundleCounter++ + "]", bundle, MediaType.TEXT_PLAIN_TYPE);
@@ -152,11 +115,6 @@ public DomainResourceBuilder withBundles(List<InputStream> bundles, List<ClientB
152115
return this;
153116
}
154117

155-
// public DomainResourceBuilder withDataSource(String uri) {
156-
// super.domain.setDataSource(new ClientReference().setUri(uri));
157-
// return this;
158-
// }
159-
160118
public DomainResourceBuilder withDataSource(ClientReference dataSource) {
161119
super.domain.setDataSource(dataSource);
162120
return this;

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/support/builder/ReportUnitResourceBuilder.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -40,47 +40,18 @@ public ReportUnitResourceBuilder(ClientReportUnit entity, SessionStorage session
4040
super(entity, sessionStorage);
4141
}
4242

43-
// public ReportUnitResourceBuilder withJrxml(InputStream jrxml) {
44-
// multipart.field("jrxml", jrxml, MediaType.APPLICATION_XML_TYPE);
45-
// return this;
46-
// }
47-
4843
public ReportUnitResourceBuilder withJrxml(InputStream jrxml, ClientFile jrxmlDescriptor) {
4944
multipart.field("jrxml", jrxml, MediaType.APPLICATION_XML_TYPE);
5045
super.reportUnit.setJrxml(jrxmlDescriptor);
5146
return this;
5247
}
5348

54-
// public ReportUnitResourceBuilder withJrxml(String jrxml) {
55-
// multipart.field("jrxml", jrxml, MediaType.APPLICATION_XML_TYPE);
56-
// return this;
57-
// }
58-
5949
public ReportUnitResourceBuilder withJrxml(String jrxml, ClientFile jrxmlDescriptor) {
6050
multipart.field("jrxml", jrxml, MediaType.APPLICATION_XML_TYPE);
6151
super.reportUnit.setJrxml(jrxmlDescriptor);
6252
return this;
6353
}
6454

65-
// public ReportUnitResourceBuilder withFile(String fileName, String file) {
66-
// multipart.field("files." + fileName, file, MediaType.TEXT_PLAIN_TYPE);
67-
// return this;
68-
// }
69-
70-
// public ReportUnitResourceBuilder withFiles(Map<String, InputStream> files) {
71-
// for (Map.Entry<String, InputStream> entry : files.entrySet()) {
72-
// String fileName = entry.getKey();
73-
// InputStream fileContent = entry.getValue();
74-
// this.multipart.field("files." + fileName, fileContent, MediaType.TEXT_PLAIN_TYPE);
75-
// }
76-
// return this;
77-
// }
78-
79-
// public ReportUnitResourceBuilder withFile(String fileName, InputStream file) {
80-
// multipart.field("files." + fileName, file, MediaType.TEXT_PLAIN_TYPE);
81-
// return this;
82-
// }
83-
8455
public ReportUnitResourceBuilder withNewFile(String content, String fileName, ClientFile fileDescriptor) {
8556
multipart.field("files." + fileName, content, MediaType.TEXT_PLAIN_TYPE);
8657
Map<String, ClientReferenceableFile> files = super.reportUnit.getFiles();

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/exceptions/handling/DefaultErrorHandler.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ protected void handleStatusCodeError(Response response, String overridingMessage
112112
} catch (Exception e) {
113113
// log.error("Cannot instantiate exception", e);
114114
}
115-
if (exception != null) {
116-
throw exception;
117-
}
115+
throw exception;
118116
}
119117
}

‎src/main/resources/complex/adhocview.json‎

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

‎src/main/resources/complex/awsSettings.json‎

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

‎src/main/resources/complex/dashboardSettings.json‎

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

0 commit comments

Comments
 (0)