Skip to content

Commit 00a4fd7

Browse files
author
Attila L. Egyedi
committed
https://github.com/metadatacenter/cedar-project/issues/1198
1 parent 8012364 commit 00a4fd7

File tree

16 files changed

+43
-123
lines changed

16 files changed

+43
-123
lines changed

‎cedar-artifact-server-application/src/main/java/org/metadatacenter/cedar/artifact/resources/TemplateInstancesResource.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.metadatacenter.model.request.OutputFormatTypeDetector;
1919
import org.metadatacenter.model.trimmer.JsonLdDocument;
2020
import org.metadatacenter.model.validation.report.CedarValidationReport;
21-
import org.metadatacenter.model.validation.report.ErrorItem;
2221
import org.metadatacenter.model.validation.report.ReportUtils;
2322
import org.metadatacenter.model.validation.report.ValidationReport;
2423
import org.metadatacenter.rest.context.CedarRequestContext;

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/AbstractResourceTest.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.slf4j.Logger;
2626

2727
import java.io.IOException;
28-
import java.util.Iterator;
2928
import java.util.Map;
3029

3130
import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
@@ -86,10 +85,9 @@ protected static void performOneTimeSetup() {
8685
}
8786

8887
// Create a artifact
89-
protected static JsonNode createResource(JsonNode resource, CedarResourceType resourceType) throws IOException {
88+
protected static JsonNode createResource(JsonNode resource, CedarResourceType resourceType) {
9089
String url = TestUtil.getResourceUrlRoute(baseTestUrl, resourceType);
91-
Response response =
92-
testClient.target(url).request().header(AUTHORIZATION, authHeaderTestUser1).post(Entity.json(resource));
90+
Response response = testClient.target(url).request().header(AUTHORIZATION, authHeaderTestUser1).post(Entity.json(resource));
9391
if (response.getStatus() != CREATED) {
9492
throw new IllegalStateException("The artifact was not created! The test can not continue this way.");
9593
}
@@ -99,13 +97,10 @@ protected static JsonNode createResource(JsonNode resource, CedarResourceType re
9997
/**
10098
* Remove resources by id
10199
*/
102-
protected static void removeResources(Map<String, CedarResourceType> resourceMap) throws IOException,
103-
ArtifactServerResourceNotFoundException {
104-
Iterator it = resourceMap.entrySet().iterator();
105-
while (it.hasNext()) {
106-
Map.Entry pair = (Map.Entry) it.next();
107-
String id = (String) pair.getKey();
108-
CedarResourceType resourceType = (CedarResourceType) pair.getValue();
100+
protected static void removeResources(Map<String, CedarResourceType> resourceMap) {
101+
for (Map.Entry<String, CedarResourceType> pair : resourceMap.entrySet()) {
102+
String id = pair.getKey();
103+
CedarResourceType resourceType = pair.getValue();
109104
removeResource(id, resourceType);
110105
System.out.println("Resource: " + id + " has been removed correctly");
111106
}

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/crud/AbstractResourceCrudTest.java

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.metadatacenter.cedar.artifact.resources.utils.TestUtil;
1212
import org.metadatacenter.constant.CustomHttpConstants;
1313
import org.metadatacenter.constant.LinkedData;
14-
import org.metadatacenter.exception.ArtifactServerResourceNotFoundException;
1514
import org.metadatacenter.model.CedarResourceType;
1615
import org.slf4j.LoggerFactory;
1716

@@ -72,13 +71,7 @@ public void setUp() {
7271
@After
7372
public void tearDown() {
7473
// Remove all resources created previously
75-
try {
76-
removeResources(createdResources);
77-
} catch (IOException e) {
78-
e.printStackTrace();
79-
} catch (ArtifactServerResourceNotFoundException e) {
80-
e.printStackTrace();
81-
}
74+
removeResources(createdResources);
8275
}
8376

8477
/**
@@ -96,15 +89,11 @@ protected static int countResources(CedarResourceType resourceType) {
9689
// Creates a artifact and then creates and instance and sets schema:isBasedOn to the artifact id
9790
protected JsonNode setSchemaIsBasedOn(JsonNode template, JsonNode instance, CedarResourceType resourceType) {
9891
if (resourceType.equals(CedarResourceType.INSTANCE)) {
99-
try {
100-
JsonNode createdTemplate = createResource(template, CedarResourceType.TEMPLATE);
101-
String createdTemplateId = createdTemplate.get(LinkedData.ID).asText();
102-
createdResources.put(createdTemplateId, CedarResourceType.TEMPLATE);
103-
((ObjectNode) instance).put(SCHEMA_IS_BASED_ON, createdTemplateId);
104-
return instance;
105-
} catch (IOException e) {
106-
e.printStackTrace();
107-
}
92+
JsonNode createdTemplate = createResource(template, CedarResourceType.TEMPLATE);
93+
String createdTemplateId = createdTemplate.get(LinkedData.ID).asText();
94+
createdResources.put(createdTemplateId, CedarResourceType.TEMPLATE);
95+
((ObjectNode) instance).put(SCHEMA_IS_BASED_ON, createdTemplateId);
96+
return instance;
10897
}
10998
return instance;
11099
}

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/crud/FindResourceTest.java

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
import org.metadatacenter.http.CedarResponseStatus;
1919
import org.metadatacenter.model.CedarResourceType;
2020

21-
import java.io.IOException;
22-
import java.io.UnsupportedEncodingException;
2321
import java.net.URISyntaxException;
2422
import java.net.URLEncoder;
23+
import java.nio.charset.StandardCharsets;
2524
import java.util.ArrayList;
2625
import java.util.Arrays;
2726
import java.util.List;
@@ -52,12 +51,7 @@ public void findResourceTest(JsonNode sampleResource, CedarResourceType resource
5251
// Use generated id to retrieve the artifact
5352
String id = expected.get(LinkedData.ID).asText();
5453
String findUrl = null;
55-
try {
56-
findUrl = url + "/" + URLEncoder.encode(id, "UTF-8");
57-
} catch (UnsupportedEncodingException e) {
58-
e.printStackTrace();
59-
}
60-
;
54+
findUrl = url + "/" + URLEncoder.encode(id, StandardCharsets.UTF_8);
6155
// Service invocation - Find by Id
6256
Response findResponse = testClient.target(findUrl).request().header("Authorization", authHeader).get();
6357
// Check response is OK
@@ -72,14 +66,7 @@ public void findResourceTest(JsonNode sampleResource, CedarResourceType resource
7266
@Parameters
7367
public void findNonExistentResourceTest(CedarResourceType resourceType, String nonExistentResourceId) {
7468
String findUrl = null;
75-
try {
76-
findUrl =
77-
TestUtil.getResourceUrlRoute(baseTestUrl, resourceType) + "/" + URLEncoder.encode(nonExistentResourceId,
78-
"UTF-8");
79-
} catch (UnsupportedEncodingException e) {
80-
e.printStackTrace();
81-
}
82-
;
69+
findUrl = TestUtil.getResourceUrlRoute(baseTestUrl, resourceType) + "/" + URLEncoder.encode(nonExistentResourceId, StandardCharsets.UTF_8);
8370
// Service invocation - Find by Id
8471
Response findResponse = testClient.target(findUrl).request().header("Authorization", authHeader).get();
8572
// Check response
@@ -99,12 +86,7 @@ private Object parametersForFindNonExistentResourceTest() {
9986
@Parameters
10087
public void findInvalidIdTest(CedarResourceType resourceType, String invalidId) {
10188
String findUrl = null;
102-
try {
103-
findUrl = TestUtil.getResourceUrlRoute(baseTestUrl, resourceType) + "/" + URLEncoder.encode(invalidId, "UTF-8");
104-
} catch (UnsupportedEncodingException e) {
105-
e.printStackTrace();
106-
}
107-
;
89+
findUrl = TestUtil.getResourceUrlRoute(baseTestUrl, resourceType) + "/" + URLEncoder.encode(invalidId, StandardCharsets.UTF_8);
10890
// Service invocation - Find by Id
10991
Response findResponse = testClient.target(findUrl).request().header("Authorization", authHeader).get();
11092
// Check response
@@ -136,12 +118,7 @@ public void findResourceMissingAuthorizationHeaderTest(JsonNode sampleResource,
136118
// Use generated id to retrieve the artifact
137119
String id = expected.get(LinkedData.ID).asText();
138120
String findUrl = null;
139-
try {
140-
findUrl = url + "/" + URLEncoder.encode(id, "UTF-8");
141-
} catch (UnsupportedEncodingException e) {
142-
e.printStackTrace();
143-
}
144-
;
121+
findUrl = url + "/" + URLEncoder.encode(id, StandardCharsets.UTF_8);
145122
// Service invocation - Find by Id - missing Authorization header
146123
Response findResponse = testClient.target(findUrl).request().get();
147124
// Check response
@@ -165,12 +142,7 @@ public void findResourceUnauthorizedKeyTest(JsonNode sampleResource, CedarResour
165142
// Use generated id to retrieve the artifact
166143
String id = expected.get(LinkedData.ID).asText();
167144
String findUrl = null;
168-
try {
169-
findUrl = url + "/" + URLEncoder.encode(id, "UTF-8");
170-
} catch (UnsupportedEncodingException e) {
171-
e.printStackTrace();
172-
}
173-
;
145+
findUrl = url + "/" + URLEncoder.encode(id, StandardCharsets.UTF_8);
174146
// Service invocation - Find by Id - unauthorized user
175147
String authHeader = "apiKey " + NON_EXISTENT_API_KEY;
176148
Response findResponse = testClient.target(findUrl).request().header("Authorization", authHeader).get();
@@ -198,25 +170,21 @@ public void findAllResourcesTest(CedarResourceType resourceType, JsonNode sample
198170
sampleResource = setSchemaIsBasedOn(sampleTemplate, sampleResource, resourceType);
199171
// Create a artifact
200172
JsonNode createdResource = null;
201-
try {
202-
createdResource = createResource(sampleResource, resourceType);
203-
} catch (IOException e) {
204-
e.printStackTrace();
205-
}
173+
createdResource = createResource(sampleResource, resourceType);
206174
createdResources.put(createdResource.get(LinkedData.ID).asText(), resourceType);
207175
resources.add(createdResource);
208176
}
209177
// find All
210178
try {
211179
String url = TestUtil.getResourceUrlRoute(baseTestUrl, resourceType);
212180
URIBuilder b = new URIBuilder(url);
213-
if (limit.length() > 0) {
181+
if (!limit.isEmpty()) {
214182
b.addParameter("limit", limit);
215183
}
216-
if (offset.length() > 0) {
184+
if (!offset.isEmpty()) {
217185
b.addParameter("offset", offset);
218186
}
219-
if (summary.length() > 0) {
187+
if (!summary.isEmpty()) {
220188
b.addParameter("summary", summary);
221189
}
222190
String findAllUrl = b.build().toString();
@@ -238,7 +206,7 @@ public void findAllResourcesTest(CedarResourceType resourceType, JsonNode sample
238206
actual.add(r);
239207
}
240208
int expectedSize;
241-
if (limit.length() > 0) {
209+
if (!limit.isEmpty()) {
242210
expectedSize = Math.min(expectedCount, Integer.parseInt(limit));
243211
} else {
244212
expectedSize = Math.min(expectedCount,
@@ -265,9 +233,9 @@ private Object parametersForFindAllResourcesTest() {
265233
Arrays.asList(CedarResourceType.TEMPLATE, sampleTemplate),
266234
Arrays.asList(CedarResourceType.ELEMENT, sampleElement),
267235
Arrays.asList(CedarResourceType.INSTANCE, sampleInstance));
268-
List<Object> limitValues = Arrays.asList(Arrays.asList(""), Arrays.asList("2"), Arrays.asList("50"));
269-
List<Object> offsetValues = Arrays.asList(Arrays.asList(""), Arrays.asList("0"));
270-
List<Object> summaryValues = Arrays.asList(Arrays.asList(""), Arrays.asList("true"), Arrays.asList("false"));
236+
List<Object> limitValues = Arrays.asList(List.of(""), List.of("2"), List.of("50"));
237+
List<Object> offsetValues = Arrays.asList(List.of(""), List.of("0"));
238+
List<Object> summaryValues = Arrays.asList(List.of(""), List.of("true"), List.of("false"));
271239
return TestParameterUtil.getParameterPermutations(Arrays.asList(p1p2Values, limitValues, offsetValues, summaryValues));
272240
}
273241

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/rest/AbstractRestTest.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.junit.runner.RunWith;
1010
import org.metadatacenter.cedar.artifact.resources.AbstractResourceTest;
1111
import org.metadatacenter.cedar.artifact.resources.utils.TestUtil;
12-
import org.metadatacenter.exception.ArtifactServerResourceNotFoundException;
1312
import org.metadatacenter.model.CedarResourceType;
1413
import org.slf4j.LoggerFactory;
1514

@@ -80,13 +79,7 @@ public void setUp() {
8079
@After
8180
public void tearDown() {
8281
// Remove all resources created previously
83-
try {
84-
removeResources(createdResources);
85-
} catch (IOException e) {
86-
e.printStackTrace();
87-
} catch (ArtifactServerResourceNotFoundException e) {
88-
e.printStackTrace();
89-
}
82+
removeResources(createdResources);
9083
}
9184

9285
protected JsonNode getFileContentAsJson(String jsonFileName) throws IOException {
@@ -168,7 +161,7 @@ protected void divider(String message) {
168161
System.out.print(" ");
169162
System.out.print(DIVIDER.substring(0, l));
170163
if (l * 2 + message.length() + 2 < DIVIDER.length()) {
171-
System.out.print(DIVIDER.substring(0, 1));
164+
System.out.print(DIVIDER.charAt(0));
172165
}
173166
System.out.println();
174167
}

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/rest/element/CreateElementPostTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,7 @@ private Object getParamsCreateElementPost() {
192192
generatorForElement.registerParameter(3, authHeader, "authHeader");
193193
generatorForElement.registerParameter(4, ids(idInBody, "resourceType"), "idInBody");
194194

195-
List<TestParameterValueGenerator[]> testCases = new ArrayList<>();
196-
197-
testCases.addAll(generatorForElement.generateAllCombinations());
195+
List<TestParameterValueGenerator[]> testCases = new ArrayList<>(generatorForElement.generateAllCombinations());
198196

199197
return testCases.toArray();
200198

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/rest/element/CreateElementPutTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void createElementPutTest(TestParameterArrayGeneratorGenerator generator,
6969
testParam("jsonFileName", jsonFileName);
7070
testParam("resourceType", resourceType);
7171
testParam("putAuth", ((TestValueAuthStringGenerator) auth).getAuthSelector());
72-
testParam("idInURLPolicy", ((TestValueResourceIdGenerator) idInURLGenerator).getIdMatchingSelector());
72+
testParam("idInURLPolicy", (idInURLGenerator).getIdMatchingSelector());
7373
String policy = null;
7474
policy = idInBodyGenerator instanceof TestValueCopyFromValueGenerator
7575
? ((TestValueCopyFromValueGenerator) idInBodyGenerator).getSourceAlias()
@@ -148,8 +148,7 @@ private int getExpectedResponseStatus(TestParameterArrayGeneratorGenerator gener
148148
return CedarResponseStatus.BAD_REQUEST.getStatusCode();
149149
}
150150

151-
if (idInBodyGenerator instanceof TestValueResourceIdGenerator) {
152-
TestValueResourceIdGenerator idInBG = (TestValueResourceIdGenerator) idInBodyGenerator;
151+
if (idInBodyGenerator instanceof TestValueResourceIdGenerator idInBG) {
153152
if (idInBG.getIdMatchingSelector() == NULL_ID) {
154153
return CedarResponseStatus.BAD_REQUEST.getStatusCode();
155154
} else if (idInBG.getIdMatchingSelector() == GIBBERISH) {
@@ -224,9 +223,7 @@ private Object getParamsCreateElementPut() {
224223
generatorForElement.registerParameter(5, ids(idInBody, "resourceType"), "idInBody");
225224
generatorForElement.addParameterValue(5, copyFrom("idInURL"));
226225

227-
List<TestParameterValueGenerator[]> testCases = new ArrayList<>();
228-
229-
testCases.addAll(generatorForElement.generateAllCombinations());
226+
List<TestParameterValueGenerator[]> testCases = new ArrayList<>(generatorForElement.generateAllCombinations());
230227

231228
return testCases.toArray();
232229

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/rest/element/DeleteElementTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@ private Object getParamsDeleteElement() {
178178
generatorForElement.registerParameter(2, authHeader, "authHeader");
179179
generatorForElement.registerParameter(3, ids(idInUrl, "resourceType"), "idInUrl");
180180

181-
List<TestParameterValueGenerator[]> testCases = new ArrayList<>();
182-
183-
testCases.addAll(generatorForElement.generateAllCombinations());
181+
List<TestParameterValueGenerator[]> testCases = new ArrayList<>(generatorForElement.generateAllCombinations());
184182

185183
return testCases.toArray();
186184

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/rest/element/GetElementTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,7 @@ private Object getParamsGetElement() {
188188
generatorForElement.registerParameter(2, authHeader, "authHeader");
189189
generatorForElement.registerParameter(3, ids(idInUrl, "resourceType"), "idInUrl");
190190

191-
List<TestParameterValueGenerator[]> testCases = new ArrayList<>();
192-
193-
testCases.addAll(generatorForElement.generateAllCombinations());
191+
List<TestParameterValueGenerator[]> testCases = new ArrayList<>(generatorForElement.generateAllCombinations());
194192

195193
return testCases.toArray();
196194

‎cedar-artifact-server-application/src/test/java/org/metadatacenter/cedar/artifact/resources/rest/element/UpdateElementTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,7 @@ private Object getParamsUpdateElementPut() {
219219
generatorForElement.registerParameter(2, authHeader, "authHeader");
220220
generatorForElement.registerParameter(3, ids(idInUrl, "resourceType"), "idInUrl");
221221

222-
List<TestParameterValueGenerator[]> testCases = new ArrayList<>();
223-
224-
testCases.addAll(generatorForElement.generateAllCombinations());
222+
List<TestParameterValueGenerator[]> testCases = new ArrayList<>(generatorForElement.generateAllCombinations());
225223

226224
return testCases.toArray();
227225

0 commit comments

Comments
 (0)