Skip to content

Commit 4cd81b6

Browse files
dizzzzdizzzz
committed
[refactor] Java7 - use try resources
1 parent 852443c commit 4cd81b6

File tree

12 files changed

+33
-210
lines changed

12 files changed

+33
-210
lines changed

‎exist-core/src/test/java/org/exist/storage/blob/BlobStoreImplTest.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -434,19 +434,13 @@ private BlobId addAndVerify(final BlobStore blobStore, final Tuple2<byte[], Mess
434434
}
435435

436436
private void getAndVerify(final BlobStore blobStore, final BlobId blobId, final Tuple2<byte[], MessageDigest> expectedBlob) throws IOException {
437-
InputStream is = null;
438-
try {
439-
is = blobStore.get(null, blobId);
437+
try (InputStream is = blobStore.get(null, blobId)) {
440438
assertNotNull(is);
441439

442440
final Tuple2<byte[], MessageDigest> actualBlob = readAll(is);
443441
assertArrayEquals(expectedBlob._1, actualBlob._1);
444442
assertArrayEquals(expectedBlob._2.getValue(), actualBlob._2.getValue());
445443

446-
} finally {
447-
if (is != null) {
448-
is.close();
449-
}
450444
}
451445
}
452446

‎exist-core/src/test/java/org/exist/validation/DtdEntityTest.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ public class DtdEntityTest {
4343
public void loadWithEntities() throws XMLDBException {
4444
final String input = "<a>first empty: &empty; then trade: &trade; </a>";
4545

46-
Collection col = null;
47-
try {
48-
col = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "entity");
46+
try (Collection col = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "entity")) {
4947
ExistXmldbEmbeddedServer.storeResource(col, "docname.xml", input.getBytes());
5048

5149
// should throw XMLDBException
@@ -54,10 +52,6 @@ public void loadWithEntities() throws XMLDBException {
5452
} catch (final XMLDBException e) {
5553
assertTrue(e.getMessage().contains("The entity \"empty\" was referenced, but not declared"));
5654
return;
57-
} finally {
58-
if(col != null) {
59-
col.close();
60-
}
6155
}
6256

6357
fail("Should have thrown XMLDBException");
@@ -69,9 +63,7 @@ public void bugloadWithEntities() throws XMLDBException {
6963
+ "<!DOCTYPE procedure PUBLIC \"-//AAAA//DTD Procedure 0.4//EN\" \"aaaa.dtd\" >"
7064
+ "<a>first empty: &empty; then trade: &trade; </a>";
7165

72-
Collection col = null;
73-
try {
74-
col = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "entity");
66+
try (Collection col = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "entity")) {
7567
ExistXmldbEmbeddedServer.storeResource(col, "docname.xml", input.getBytes(UTF_8));
7668

7769
// should throw XMLDBException
@@ -80,10 +72,6 @@ public void bugloadWithEntities() throws XMLDBException {
8072
} catch (final XMLDBException e) {
8173
assertTrue(e.getMessage().contains("The entity \"empty\" was referenced, but not declared"));
8274
return;
83-
} finally {
84-
if(col != null) {
85-
col.close();
86-
}
8775
}
8876

8977
fail("Should have thrown XMLDBException");

‎exist-core/src/test/java/org/exist/xquery/XmldbBinariesTest.java‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ private final String getBaseUri() {
7171

7272
@Override
7373
protected void storeBinaryFile(final XmldbURI filePath, byte[] content) throws Exception {
74-
Collection colRoot = null;
75-
try {
76-
colRoot = DatabaseManager.getCollection(getBaseUri() + "/db", ADMIN_DB_USER, ADMIN_DB_PWD);
74+
try (Collection colRoot = DatabaseManager.getCollection(getBaseUri() + "/db", ADMIN_DB_USER, ADMIN_DB_PWD)) {
7775

7876
final XmldbURI collectionNames[] = filePath.removeLastSegment().getPathSegments();
7977

@@ -92,18 +90,14 @@ protected void storeBinaryFile(final XmldbURI filePath, byte[] content) throws E
9290
current.storeResource(resource);
9391

9492
} finally {
95-
while(!cols.isEmpty()) {
93+
while (!cols.isEmpty()) {
9694
try {
9795
cols.pop().close();
98-
} catch(XMLDBException e) {
96+
} catch (XMLDBException e) {
9997

10098
}
10199
}
102100
}
103-
} finally {
104-
if(colRoot != null) {
105-
colRoot.close();
106-
}
107101
}
108102
}
109103

@@ -118,34 +112,21 @@ private Collection getOrCreateCollection(final Collection parent, final String c
118112

119113
@Override
120114
protected void removeCollection(final XmldbURI collectionUri) throws Exception {
121-
Collection colRoot = null;
122-
try {
123-
colRoot = DatabaseManager.getCollection(getBaseUri() + "/db", ADMIN_DB_USER, ADMIN_DB_PWD);
115+
try (Collection colRoot = DatabaseManager.getCollection(getBaseUri() + "/db", ADMIN_DB_USER, ADMIN_DB_PWD)) {
124116

125-
final Collection colTest = colRoot.getChildCollection("test");
126-
try {
117+
try (Collection colTest = colRoot.getChildCollection("test")) {
127118
final CollectionManagementService cms = colTest.getService(CollectionManagementService.class);
128119

129120
final String testCollectionName = collectionUri.lastSegment().toString();
130121
cms.removeCollection(testCollectionName);
131-
} finally {
132-
if(colTest != null) {
133-
colTest.close();
134-
}
135-
}
136-
} finally {
137-
if(colRoot != null) {
138-
colRoot.close();
139122
}
140123
}
141124
}
142125

143126
@Override
144127
protected QueryResultAccessor<ResourceSet, XMLDBException> executeXQuery(final String query) {
145128
return consumer -> {
146-
Collection colRoot = null;
147-
try {
148-
colRoot = DatabaseManager.getCollection(getBaseUri() + "/db", ADMIN_DB_USER, ADMIN_DB_PWD);
129+
try (Collection colRoot = DatabaseManager.getCollection(getBaseUri() + "/db", ADMIN_DB_USER, ADMIN_DB_PWD)) {
149130
final XQueryService xqueryService = colRoot.getService(XQueryService.class);
150131

151132
final CompiledExpression compiledExpression = xqueryService.compile(query);
@@ -161,8 +142,6 @@ protected QueryResultAccessor<ResourceSet, XMLDBException> executeXQuery(final S
161142
results.clear();
162143
compiledExpression.reset();
163144
}
164-
} finally {
165-
colRoot.close();
166145
}
167146
};
168147
}

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JaxpDtdCatalogTest.java‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,47 +58,27 @@ public class JaxpDtdCatalogTest {
5858
public static void prepareResources() throws Exception {
5959

6060
// Switch off validation
61-
Collection conf = null;
62-
try {
63-
conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/parse");
61+
try (Collection conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/parse")) {
6462
ExistXmldbEmbeddedServer.storeResource(conf, DEFAULT_COLLECTION_CONFIG_FILE, noValidation.getBytes());
65-
} finally {
66-
if(conf != null) {
67-
conf.close();
68-
}
6963
}
7064

71-
Collection dtdsCollection = null;
72-
try {
73-
dtdsCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse/dtds");
65+
try (Collection dtdsCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse/dtds")) {
7466

7567
try (final InputStream is = SAMPLES.getSample("validation/parse/dtds/MyNameSpace.dtd")) {
7668
assertNotNull(is);
7769
ExistXmldbEmbeddedServer.storeResource(dtdsCollection, "MyNameSpace.dtd", InputStreamUtil.readAll(is));
7870
}
79-
} finally {
80-
if(dtdsCollection != null) {
81-
dtdsCollection.close();
82-
}
8371
}
8472

85-
Collection parseCollection = null;
86-
try {
87-
parseCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse");
73+
try (Collection parseCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse")) {
8874

8975
try (final InputStream is = SAMPLES.getSample("validation/parse/catalog.xml")) {
9076
assertNotNull(is);
9177
ExistXmldbEmbeddedServer.storeResource(parseCollection, "catalog.xml", InputStreamUtil.readAll(is));
9278
}
93-
} finally {
94-
if(parseCollection != null) {
95-
parseCollection.close();
96-
}
9779
}
9880

99-
Collection instanceCollection = null;
100-
try {
101-
instanceCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse/instance");
81+
try (Collection instanceCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse/instance")) {
10282

10383
try (final InputStream is = SAMPLES.getSample("validation/parse/instance/valid-dtd.xml")) {
10484
assertNotNull(is);
@@ -109,10 +89,6 @@ public static void prepareResources() throws Exception {
10989
assertNotNull(is);
11090
ExistXmldbEmbeddedServer.storeResource(instanceCollection, "invalid-dtd.xml", InputStreamUtil.readAll(is));
11191
}
112-
} finally {
113-
if(instanceCollection != null) {
114-
instanceCollection.close();
115-
}
11692
}
11793
}
11894

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JaxpParseTest.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,30 +60,18 @@ public class JaxpParseTest {
6060
public static void prepareResources() throws Exception {
6161

6262
// Switch off validation
63-
Collection conf = null;
64-
try {
65-
conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/parse_validate");
63+
try (Collection conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/parse_validate")) {
6664
ExistXmldbEmbeddedServer.storeResource(conf, DEFAULT_COLLECTION_CONFIG_FILE, noValidation.getBytes());
67-
} finally {
68-
if(conf != null) {
69-
conf.close();
70-
}
7165
}
7266

73-
Collection schemasCollection = null;
74-
try {
75-
schemasCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse_validate");
67+
try (Collection schemasCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse_validate")) {
7668

7769
for (final String testResource : TEST_RESOURCES) {
7870
try (final InputStream is = SAMPLES.getSample("validation/parse_validate/" + testResource)) {
7971
assertNotNull(is);
8072
ExistXmldbEmbeddedServer.storeResource(schemasCollection, testResource, InputStreamUtil.readAll(is));
8173
}
8274
}
83-
} finally {
84-
if(schemasCollection != null) {
85-
schemasCollection.close();
86-
}
8775
}
8876

8977
}

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JaxpXsdCatalogTest.java‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,11 @@ public class JaxpXsdCatalogTest {
5959
public static void prepareResources() throws XMLDBException, IOException, URISyntaxException {
6060

6161
// Switch off validation
62-
Collection conf = null;
63-
try {
64-
conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/parse");
62+
try (Collection conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/parse")) {
6563
ExistXmldbEmbeddedServer.storeResource(conf, DEFAULT_COLLECTION_CONFIG_FILE, noValidation.getBytes());
66-
} finally {
67-
if(conf != null) {
68-
conf.close();
69-
}
7064
}
7165

72-
Collection schemasCollection = null;
73-
try {
74-
schemasCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse/schemas");
66+
try (Collection schemasCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse/schemas")) {
7567

7668
try (final InputStream is = SAMPLES.getSample("validation/parse/schemas/MyNameSpace.xsd")) {
7769
assertNotNull(is);
@@ -83,28 +75,16 @@ public static void prepareResources() throws XMLDBException, IOException, URISyn
8375
ExistXmldbEmbeddedServer.storeResource(schemasCollection, "AnotherNamespace.xsd", InputStreamUtil.readAll(is));
8476
}
8577

86-
} finally {
87-
if(schemasCollection != null) {
88-
schemasCollection.close();
89-
}
9078
}
9179

92-
Collection parseCollection = null;
93-
try {
94-
parseCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse");
80+
try (Collection parseCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse")) {
9581
try (final InputStream is = SAMPLES.getSample("validation/parse/catalog.xml")) {
9682
assertNotNull(is);
9783
ExistXmldbEmbeddedServer.storeResource(parseCollection, "catalog.xml", InputStreamUtil.readAll(is));
9884
}
99-
} finally {
100-
if(parseCollection != null) {
101-
parseCollection.close();
102-
}
10385
}
10486

105-
Collection instanceCollection = null;
106-
try {
107-
instanceCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse/instance");
87+
try (Collection instanceCollection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "parse/instance")) {
10888

10989
try (final InputStream is = SAMPLES.getSample("validation/parse/instance/valid.xml")) {
11090
assertNotNull(is);
@@ -115,10 +95,6 @@ public static void prepareResources() throws XMLDBException, IOException, URISyn
11595
assertNotNull(is);
11696
ExistXmldbEmbeddedServer.storeResource(instanceCollection, "invalid.xml", InputStreamUtil.readAll(is));
11797
}
118-
} finally {
119-
if(instanceCollection != null) {
120-
instanceCollection.close();
121-
}
12298
}
12399
}
124100

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JaxvTest.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,30 +60,18 @@ public static void prepareResources() throws Exception {
6060
"<validation mode=\"no\"/>" +
6161
"</collection>";
6262

63-
Collection conf = null;
64-
try {
65-
conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/personal");
63+
try (Collection conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/personal")) {
6664
ExistXmldbEmbeddedServer.storeResource(conf, DEFAULT_COLLECTION_CONFIG_FILE, noValidation.getBytes());
67-
} finally {
68-
if(conf != null) {
69-
conf.close();
70-
}
7165
}
7266

73-
Collection collection = null;
74-
try {
75-
collection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "personal");
67+
try (Collection collection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "personal")) {
7668

7769
for (final String testResource : TEST_RESOURCES) {
7870
try (final InputStream is = SAMPLES.getSample("validation/personal/" + testResource)) {
7971
assertNotNull(is);
8072
ExistXmldbEmbeddedServer.storeResource(collection, testResource, InputStreamUtil.readAll(is));
8173
}
8274
}
83-
} finally {
84-
if(collection != null) {
85-
collection.close();
86-
}
8775
}
8876
}
8977

‎exist-core/src/test/java/org/exist/xquery/functions/validate/JingRelaxNgTest.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,30 +59,18 @@ public static void prepareResources() throws XMLDBException, IOException {
5959
" <validation mode='no'/>" +
6060
"</collection>";
6161

62-
Collection conf = null;
63-
try {
64-
conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/personal");
62+
try (Collection conf = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "system/config/db/personal")) {
6563
ExistXmldbEmbeddedServer.storeResource(conf, DEFAULT_COLLECTION_CONFIG_FILE, noValidation.getBytes());
66-
} finally {
67-
if(conf != null) {
68-
conf.close();
69-
}
7064
}
7165

72-
Collection collection = null;
73-
try {
74-
collection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "personal");
66+
try (Collection collection = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), "personal")) {
7567

7668
for (final String testResource : TEST_RESOURCES) {
7769
try (final InputStream is = SAMPLES.getSample("validation/personal/" + testResource)) {
7870
assertNotNull(is);
7971
ExistXmldbEmbeddedServer.storeResource(collection, testResource, InputStreamUtil.readAll(is));
8072
}
8173
}
82-
} finally {
83-
if(collection != null) {
84-
collection.close();
85-
}
8674
}
8775
}
8876

0 commit comments

Comments
 (0)