Merge pull request #5665 from dizzzz/feature/more_syntaxchanges_2

dizzzz · web-flow · commit 26e39d242940 · 2025-03-14T18:26:27.000+01:00
[refactor] revise Java code to newer java language levels
diff --git a/exist-core/src/test/java/org/exist/collections/triggers/TestTrigger.java b/exist-core/src/test/java/org/exist/collections/triggers/TestTrigger.java
@@ -86,8 +86,8 @@ private void addRecord(DBBroker broker, Txn transaction, String xupdate) throws
             XUpdateProcessor processor = new XUpdateProcessor(broker, docs);
             // process the XUpdate
             Modification modifications[] = processor.parse(new InputSource(new StringReader(xupdate)));
-            for (int i = 0; i < modifications.length; i++) {
-                modifications[i].process(transaction);
+            for (Modification modification : modifications) {
+                modification.process(transaction);
             }
 
             broker.flush();
diff --git a/exist-core/src/test/java/org/exist/deadlocks/GetReleaseBrokerDeadlocks.java b/exist-core/src/test/java/org/exist/deadlocks/GetReleaseBrokerDeadlocks.java
@@ -134,11 +134,11 @@ public void testingGetReleaseCycle() {
 		            	sb.append("THREAD: ");
 		            	sb.append(entry.getKey().getName());
 	            		sb.append("\n");
-		            	for (int n = 0; n < stacks.length; n++) {
-		            		sb.append(" ");
-		            		sb.append(stacks[n]);
-		            		sb.append("\n");
-		            	}
+                        for (StackTraceElement stack : stacks) {
+                            sb.append(" ");
+                            sb.append(stack);
+                            sb.append("\n");
+                        }
 		            }
 		            
 		            if (stackTraces.isEmpty())
diff --git a/exist-core/src/test/java/org/exist/storage/NodePathTest.java b/exist-core/src/test/java/org/exist/storage/NodePathTest.java
@@ -367,8 +367,7 @@ public void equalsAfterResetAndAddComponent() throws QName.IllegalQNameException
 
     private void addComponents(final NodePath destination, final String path) throws QName.IllegalQNameException {
         final String[] components = path.split("/");
-        for (int i = 0; i < components.length; i++) {
-            final String component = components[i];
+        for (final String component : components) {
             if (!component.isEmpty()) {
                 destination.addComponent(new QName(component));
             }
diff --git a/exist-core/src/test/java/org/exist/util/hashtable/SequencedLongHashMapTest.java b/exist-core/src/test/java/org/exist/util/hashtable/SequencedLongHashMapTest.java
@@ -72,9 +72,9 @@ public void sequencedMap2() {
 
 		final SequencedLongHashMap<String> map = new SequencedLongHashMap<>();
 
-		for (int i = 0; i < l.length; i++) {
-			map.put(l[i], "k" + l[i]);
-		}
+        for (long value : l) {
+            map.put(value, "k" + value);
+        }
 
 		map.removeFirst();
 		final Iterator<Long2ObjectMap.Entry<String>> entries = map.fastEntrySetIterator();
diff --git a/exist-core/src/test/java/org/exist/util/io/ByteBufferInputStreamTest.java b/exist-core/src/test/java/org/exist/util/io/ByteBufferInputStreamTest.java
@@ -81,8 +81,8 @@ public void readByteByByteCorrectAndThenReturnMinus1AtEndOfStream() throws IOExc
 
         InputStream is = new ByteBufferInputStream(new TestableByteBufferAccessor(buf));
 
-        for(int i = 0; i < testData.length; i++) {
-            assertEquals(testData[i], is.read());
+        for (byte testDatum : testData) {
+            assertEquals(testDatum, is.read());
         }
 
         //ensure reading past the end of the stream returns -1
diff --git a/exist-core/src/test/java/org/exist/util/sorters/ListChecker.java b/exist-core/src/test/java/org/exist/util/sorters/ListChecker.java
@@ -70,9 +70,9 @@ int getLength() {
 	 */
 	void init(int[] values) throws Exception {
 		a = new ArrayList<Integer>(values.length);
-		for (int i = 0; i < values.length; i++) {
-			a.add(Integer.valueOf(values[i]));
-		}
+        for (int value : values) {
+            a.add(Integer.valueOf(value));
+        }
 	}
 
 	/**
diff --git a/exist-core/src/test/java/org/exist/xmlrpc/QuerySessionTest.java b/exist-core/src/test/java/org/exist/xmlrpc/QuerySessionTest.java
@@ -158,9 +158,9 @@ public static void startServer() throws ClassNotFoundException, IllegalAccessExc
 
         final TestDataGenerator generator = new TestDataGenerator("xdb", DOC_COUNT);
         final Path[] files = generator.generate(test, generateXQ);
-        for (int i = 0; i < files.length; i++) {
-            Resource resource = test.createResource(files[i].getFileName().toString(), XMLResource.class);
-            resource.setContent(files[i].toFile());
+        for (Path file : files) {
+            Resource resource = test.createResource(file.getFileName().toString(), XMLResource.class);
+            resource.setContent(file.toFile());
             test.storeResource(resource);
         }
         generator.releaseAll();
diff --git a/exist-core/src/test/java/org/exist/xmlrpc/XmlRpcTest.java b/exist-core/src/test/java/org/exist/xmlrpc/XmlRpcTest.java
@@ -652,8 +652,8 @@ public void testCollectionWithAccentsAndSpaces() throws XmlRpcException, Malform
         Object[] collections = (Object[]) collection.get("collections");
         boolean foundMatch = false;
         String targetCollectionName = SPECIAL_COLLECTION.lastSegment().toString();
-        for (int i = 0; i < collections.length; i++) {
-            String childName = (String) collections[i];
+        for (Object o : collections) {
+            String childName = (String) o;
             if (childName.equals(targetCollectionName)) {
                 foundMatch = true;
                 break;
diff --git a/exist-core/src/test/java/org/exist/xquery/StoredModuleTest.java b/exist-core/src/test/java/org/exist/xquery/StoredModuleTest.java
@@ -103,8 +103,8 @@ public void testQuery() throws Exception {
         xqService.setNamespace("itg-modules", "http://localhost:80/itg/xquery");
 
         CompiledExpression compiledQuery = xqService.compile(query);
-        for (int i = 0; i < cols.length; i++) {
-            xqService.declareVariable("itg-modules:coll", cols[i]);
+        for (String col : cols) {
+            xqService.declareVariable("itg-modules:coll", col);
             ResourceSet result = xqService.execute(compiledQuery);
             result.getResource(0).getContent();
         }
diff --git a/exist-core/src/test/java/org/exist/xquery/value/MockBinaryValueManager.java b/exist-core/src/test/java/org/exist/xquery/value/MockBinaryValueManager.java
@@ -44,12 +44,11 @@ public void registerBinaryValueInstance(final BinaryValue binaryValue) {
     public void runCleanupTasks(final Predicate<Object> predicate) {
         if (values != null) {
             List<BinaryValue> removable = null;
-            for(final Iterator<BinaryValue> iterator = values.iterator(); iterator.hasNext();) {
-                final BinaryValue bv = iterator.next();
+            for (final BinaryValue bv : values) {
                 try {
                     if (predicate.test(bv)) {
                         bv.close();
-                        if(removable == null) {
+                        if (removable == null) {
                             removable = new ArrayList<>();
                         }
                         removable.add(bv);
diff --git a/extensions/expath/src/test/java/org/expath/exist/HttpClientTest.java b/extensions/expath/src/test/java/org/expath/exist/HttpClientTest.java
@@ -81,8 +81,7 @@ private boolean hasInternetAccess() {
         try {
             final URL url = new URL("http://www.exist-db.org");
             final URLConnection con = url.openConnection();
-            if (con instanceof HttpURLConnection) {
-                final HttpURLConnection httpConnection = (HttpURLConnection) con;
+            if (con instanceof HttpURLConnection httpConnection) {
                 hasInternetAccess = (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK);
             }
         } catch(final MalformedURLException e) {
diff --git a/extensions/indexes/ngram/src/test/java/org/exist/indexing/ngram/CustomIndexTest.java b/extensions/indexes/ngram/src/test/java/org/exist/indexing/ngram/CustomIndexTest.java
@@ -601,8 +601,7 @@ private void checkIndex(DBBroker broker, DocumentSet docs, String term, int coun
         XQueryContext context = new XQueryContext(broker.getBrokerPool());
         Occurrences[] occurrences = index.scanIndex(context, docs, null, null);
         int found = 0;
-        for (int i = 0; i < occurrences.length; i++) {
-            Occurrences occurrence = occurrences[i];
+        for (Occurrences occurrence : occurrences) {
             if (occurrence.getTerm().compareTo(term) == 0)
                 found++;
         }        
diff --git a/extensions/indexes/spatial/src/test/java/org/exist/indexing/spatial/GMLIndexTest.java b/extensions/indexes/spatial/src/test/java/org/exist/indexing/spatial/GMLIndexTest.java
@@ -119,9 +119,9 @@ public static void setup() throws EXistException, PermissionDeniedException, IOE
             final CollectionConfigurationManager mgr = pool.getConfigurationManager();
             mgr.addConfiguration(transaction, broker, testCollection, COLLECTION_CONFIG);
 
-            for (int i = 0; i < FILES.length; i++) {
-                final URL url = GMLIndexTest.class.getResource("/" + FILES[i]);
-                broker.storeDocument(transaction, XmldbURI.create(FILES[i]), new FileInputSource(Paths.get(url.toURI())), MimeType.XML_TYPE, testCollection);
+            for (String file : FILES) {
+                final URL url = GMLIndexTest.class.getResource("/" + file);
+                broker.storeDocument(transaction, XmldbURI.create(file), new FileInputSource(Paths.get(url.toURI())), MimeType.XML_TYPE, testCollection);
             }
 
             transaction.commit();
@@ -175,8 +175,8 @@ public void indexDocument() throws EXistException, CollectionConfigurationExcept
                 Connection conn = null;
                 try {
                     conn = indexWorker.acquireConnection();
-                    for (int i = 0; i < FILES.length; i++) {
-                        try (final LockedDocument lockedDoc = broker.getXMLResource(TEST_COLLECTION_URI.append(FILES[i]), Lock.LockMode.READ_LOCK)) {
+                    for (String file : FILES) {
+                        try (final LockedDocument lockedDoc = broker.getXMLResource(TEST_COLLECTION_URI.append(file), Lock.LockMode.READ_LOCK)) {
                             final DocumentImpl doc = lockedDoc.getDocument();
 
                             PreparedStatement ps = conn.prepareStatement(
diff --git a/extensions/modules/file/src/test/java/org/exist/xquery/modules/file/EmbeddedBinariesTest.java b/extensions/modules/file/src/test/java/org/exist/xquery/modules/file/EmbeddedBinariesTest.java
@@ -143,8 +143,7 @@ protected boolean isBooleanType(final Item item) throws IOException {
 
     @Override
     protected byte[] getBytes(final Item item) throws IOException {
-        if (item instanceof Base64BinaryDocument) {
-            final Base64BinaryDocument doc = (Base64BinaryDocument) item;
+        if (item instanceof Base64BinaryDocument doc) {
             try (final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
                 doc.streamBinaryTo(baos);
                 return baos.toByteArray();
diff --git a/extensions/modules/sql/src/test/java/org/exist/xquery/modules/sql/ImplicitConnectionCloseIT.java b/extensions/modules/sql/src/test/java/org/exist/xquery/modules/sql/ImplicitConnectionCloseIT.java
@@ -247,8 +247,7 @@ public static class StubDataSourceFactory implements ObjectFactory {
 
         @Override
         public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?, ?> environment) throws Exception {
-            if (obj instanceof Reference) {
-                final Reference reference = (Reference)obj;
+            if (obj instanceof Reference reference) {
                 if (reference.getClassName().equals(StubDataSource.class.getName())) {
                     final StubDataSource dataSource = new StubDataSource();
                     dataSource.setURL((String)reference.get("url").getContent());

Original file line number	Diff line number	Diff line change
`@@ -367,8 +367,7 @@ public void equalsAfterResetAndAddComponent() throws QName.IllegalQNameException`
`367`	`367`
`368`	`368`	`private void addComponents(final NodePath destination, final String path) throws QName.IllegalQNameException {`
`369`	`369`	`final String[] components = path.split("/");`
`370`		`- for (int i = 0; i < components.length; i++) {`
`371`		`- final String component = components[i];`
	`370`	`+ for (final String component : components) {`
`372`	`371`	`if (!component.isEmpty()) {`
`373`	`372`	`destination.addComponent(new QName(component));`
`374`	`373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ public void readByteByByteCorrectAndThenReturnMinus1AtEndOfStream() throws IOExc`
`81`	`81`
`82`	`82`	`InputStream is = new ByteBufferInputStream(new TestableByteBufferAccessor(buf));`
`83`	`83`
`84`		`- for(int i = 0; i < testData.length; i++) {`
`85`		`- assertEquals(testData[i], is.read());`
	`84`	`+ for (byte testDatum : testData) {`
	`85`	`+ assertEquals(testDatum, is.read());`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`//ensure reading past the end of the stream returns -1`