From a0c076b52472f8161596e59a29721b5bb38cffbf Mon Sep 17 00:00:00 2001 From: Seva Safris Date: Tue, 20 Jun 2023 22:35:15 +0700 Subject: [PATCH] Mark for loops --- ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java | 6 +++--- .../src/test/java/org/jaxdb/jsql/KeyTest.java | 4 ++-- .../src/test/java/org/jaxdb/jsql/OnSelectTest.java | 6 +++--- jsql/src/main/java/org/jaxdb/jsql/CacheMap.java | 4 ++-- jsql/src/main/java/org/jaxdb/jsql/HashTreeCacheMap.java | 2 +- jsql/src/main/java/org/jaxdb/jsql/QueryConfig.java | 2 +- jsql/src/main/java/org/jaxdb/jsql/Schema.java | 2 +- jsql/src/main/java/org/jaxdb/jsql/TreeCacheMap.java | 2 +- jsql/src/main/java/org/jaxdb/jsql/data.java | 6 +++--- .../main/java/org/jaxdb/jsql/generator/GeneratorUtil.java | 4 ++-- jsql/src/test/java/org/jaxdb/jsql/DMLxGeneratorTest.java | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java b/ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java index bc9beca1..e9619d9c 100644 --- a/ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java +++ b/ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java @@ -199,7 +199,7 @@ public String toString() { } private static boolean matches(final DB db, final String[] testDBs) { - for (final String testDB : testDBs) + for (final String testDB : testDBs) // [A] if (testDB.equals(db.value().getSimpleName().toLowerCase())) return true; @@ -224,7 +224,7 @@ private static String[] getPropertyValues(final String property) { return null; final String[] testDBs = Strings.split(property, ','); - for (int i = 0, i$ = testDBs.length; i < i$; ++i) + for (int i = 0, i$ = testDBs.length; i < i$; ++i) // [A] testDBs[i] = testDBs[i].toLowerCase(); return testDBs; @@ -248,7 +248,7 @@ static Executor[] getExecutors(final Class testClass) { final DB[] dbs = dbs$.value(); if (testDBs == null) { final Executor[] executors = new Executor[dbs.length]; - for (int i = 0, i$ = executors.length; i < i$; ++i) + for (int i = 0, i$ = executors.length; i < i$; ++i) // [A] executors[i] = vendorToExecutor.get(dbs[i]); return executors; diff --git a/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/KeyTest.java b/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/KeyTest.java index c408c4b5..0fcb5770 100644 --- a/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/KeyTest.java +++ b/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/KeyTest.java @@ -169,7 +169,7 @@ private static void test(final data.Table t, final data.Column c, final V assertNotNull(t._primaryKeyImmutable$); assertNotNull(t._primaryKeyOldImmutable$); - for (int i = 0; i < 10; ++i) { + for (int i = 0; i < 10; ++i) { // [N] final boolean isFirst = i == 0; test(t, c, v, isFirst, set1); test(t, c, v, isFirst, set2); @@ -216,7 +216,7 @@ private static void test(final data.Table t, final data.Column c, final V assertNotNull(t._primaryKeyImmutable$); assertNotNull(t._primaryKeyOldImmutable$); - for (int i = 0; i < 10; ++i) { + for (int i = 0; i < 10; ++i) { // [N] set.run(); assertFalse(c.isNull()); diff --git a/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/OnSelectTest.java b/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/OnSelectTest.java index ede72115..1d4dd1f4 100644 --- a/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/OnSelectTest.java +++ b/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/OnSelectTest.java @@ -231,7 +231,7 @@ public void testOnConnectPreLoadAllHash(final Classicmodels classicmodels, final assertTrue(rows.nextRow()); assertEquals(rows.nextEntity().getAsLong(), classicmodels.Product$.codeToProduct().size()); - for (final Classicmodels.Product pr : classicmodels.Product$.codeToProduct().values()) + for (final Classicmodels.Product pr : classicmodels.Product$.codeToProduct().values()) // [C] assertNotNull(pr.productLine$ProductLine_productLine()); } } @@ -249,7 +249,7 @@ public void testOnConnectPreLoadAllTree(final Classicmodels classicmodels, final assertTrue(rows.nextRow()); assertEquals(rows.nextEntity().getAsLong(), classicmodels.Employee$.employeeNumberToEmployee().size()); - for (final Classicmodels.Employee em : classicmodels.Employee$.employeeNumberToEmployee().values()) + for (final Classicmodels.Employee em : classicmodels.Employee$.employeeNumberToEmployee().values()) // [C] assertNotNull(em.officeCode$Office_officeCode()); } } @@ -282,7 +282,7 @@ public void testTreeTwoDimensions(final Classicmodels classicmodels) throws IOEx p.purchaseNumber$PurchaseDetail_purchaseNumber(); assertFalse(TestConnectionFactory.called()); - for (final Classicmodels.PurchaseDetail pd1 : map.values()) { + for (final Classicmodels.PurchaseDetail pd1 : map.values()) { // [C] assertSame(p, pd1.purchaseNumber$Purchase_purchaseNumber()); assertFalse(TestConnectionFactory.called()); } diff --git a/jsql/src/main/java/org/jaxdb/jsql/CacheMap.java b/jsql/src/main/java/org/jaxdb/jsql/CacheMap.java index 307c851f..694b4bb7 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/CacheMap.java +++ b/jsql/src/main/java/org/jaxdb/jsql/CacheMap.java @@ -52,7 +52,7 @@ static data.BOOLEAN andRange(final Interval i) { final data.Key min = i.getMin(); final data.Key max = i.getMax(); data.BOOLEAN and = andRange(min.column(0), min.value(0), max.value(0)); - for (int j = 1, i$ = min.length(); j < i$; ++j) + for (int j = 1, i$ = min.length(); j < i$; ++j) // [A] and = AND(and, andRange(min.column(j), min.value(j), max.value(j))); return and; @@ -65,7 +65,7 @@ private static data.BOOLEAN eq(final type.Column c, final Object v) { static data.BOOLEAN andEq(final Interval i) { final data.Key min = i.getMin(); data.BOOLEAN and = eq(min.column(0), min.value(0)); - for (int j = 1, i$ = min.length(); j < i$; ++j) + for (int j = 1, i$ = min.length(); j < i$; ++j) // [A] and = AND(and, eq(min.column(j), min.value(j))); return and; diff --git a/jsql/src/main/java/org/jaxdb/jsql/HashTreeCacheMap.java b/jsql/src/main/java/org/jaxdb/jsql/HashTreeCacheMap.java index 1cd0ec4e..e32b3a7d 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/HashTreeCacheMap.java +++ b/jsql/src/main/java/org/jaxdb/jsql/HashTreeCacheMap.java @@ -40,7 +40,7 @@ public abstract class HashTreeCacheMap extends CacheMap implements NavigableMap { private static data.BOOLEAN where(final Interval[] intervals) { data.BOOLEAN or = andRange(intervals[0]); - for (int i = 1, i$ = intervals.length; i < i$; ++i) + for (int i = 1, i$ = intervals.length; i < i$; ++i) // [A] or = OR(or, andRange(intervals[i])); return or; diff --git a/jsql/src/main/java/org/jaxdb/jsql/QueryConfig.java b/jsql/src/main/java/org/jaxdb/jsql/QueryConfig.java index 89048309..b3509642 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/QueryConfig.java +++ b/jsql/src/main/java/org/jaxdb/jsql/QueryConfig.java @@ -535,7 +535,7 @@ private static ResultSet executeQueryPrepared(final PreparedStatement statement, final ArrayList> parameters = compilation.getParameters(); if (parameters != null) { final Compiler compiler = compilation.compiler; - for (int i = 0, i$ = parameters.size(); i < i$;) + for (int i = 0, i$ = parameters.size(); i < i$;) // [RA] parameters.get(i++).write(compiler, statement, false, i); } diff --git a/jsql/src/main/java/org/jaxdb/jsql/Schema.java b/jsql/src/main/java/org/jaxdb/jsql/Schema.java index 0862b2ce..4ab5a347 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/Schema.java +++ b/jsql/src/main/java/org/jaxdb/jsql/Schema.java @@ -101,7 +101,7 @@ Notifier getCacheNotifier() { connector.addNotificationListener(INSERT, UPGRADE, DELETE, notificationListener, queue, array); this.cacheNotifier = connector.getNotifier(); - for (int i = 0; i < len; ++i) { + for (int i = 0; i < len; ++i) { // [RA] final OnConnectPreLoad onConnectPreLoad = onConnectPreLoads.get(i); if (onConnectPreLoad != null) onConnectPreLoad.accept(array[i]); diff --git a/jsql/src/main/java/org/jaxdb/jsql/TreeCacheMap.java b/jsql/src/main/java/org/jaxdb/jsql/TreeCacheMap.java index 623bcf3d..4e267e4c 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/TreeCacheMap.java +++ b/jsql/src/main/java/org/jaxdb/jsql/TreeCacheMap.java @@ -38,7 +38,7 @@ public abstract class TreeCacheMap extends CacheMap implements NavigableMap { private static data.BOOLEAN where(final Interval[] intervals) { data.BOOLEAN or = andRange(intervals[0]); - for (int i = 1, i$ = intervals.length; i < i$; ++i) + for (int i = 1, i$ = intervals.length; i < i$; ++i) // [A] or = OR(or, andRange(intervals[i])); return or; diff --git a/jsql/src/main/java/org/jaxdb/jsql/data.java b/jsql/src/main/java/org/jaxdb/jsql/data.java index 8a20a661..2775441e 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/data.java +++ b/jsql/src/main/java/org/jaxdb/jsql/data.java @@ -4452,7 +4452,7 @@ public boolean isMinValue(final Object[] v) { public Object[] nextValue(final Object[] key) { final Object[] next = key.clone(); Object k, p; - for (int i = key.length - 1; i >= 0; --i) { + for (int i = key.length - 1; i >= 0; --i) { // [A] k = key[i]; p = next[i] = columns[i].getDiscreteTopology().nextValue(k); if (p == k) @@ -4466,7 +4466,7 @@ public Object[] nextValue(final Object[] key) { public Object[] prevValue(final Object[] key) { final Object[] prev = key.clone(); Object k, p; - for (int i = key.length - 1; i >= 0; --i) { + for (int i = key.length - 1; i >= 0; --i) { // [A] k = key[i]; p = prev[i] = columns[i].getDiscreteTopology().prevValue(k); if (p == null || p == k) @@ -5468,7 +5468,7 @@ protected final String toString(final boolean wasSetOnly) { } public final boolean set() { - for (final Column column : _column$) + for (final Column column : _column$) // [A] if (column.set()) return true; diff --git a/jsql/src/main/java/org/jaxdb/jsql/generator/GeneratorUtil.java b/jsql/src/main/java/org/jaxdb/jsql/generator/GeneratorUtil.java index 6f2767d4..f04445b6 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/generator/GeneratorUtil.java +++ b/jsql/src/main/java/org/jaxdb/jsql/generator/GeneratorUtil.java @@ -39,7 +39,7 @@ final class GeneratorUtil { static final Object COMMIT_UPDATE = new Object(); private static StringBuilder indent(final StringBuilder b, final int depth) { - for (int i = 0, i$ = depth * 2; i < i$; ++i) + for (int i = 0, i$ = depth * 2; i < i$; ++i) // [N] b.append(' '); return b; @@ -52,7 +52,7 @@ private static StringBuilder appendDocInfo(final StringBuilder b, final String t indent(b, depth).append(" *
\n"); indent(b, depth).append(" * \n"); indent(b, depth).append(" * \n"); - for (int i = 0, i$ = args.length; i < i$;) { + for (int i = 0, i$ = args.length; i < i$;) { // [A] final Object property = args[i++]; final Object value = args[i++]; indent(b, depth).append(" * \n"); diff --git a/jsql/src/test/java/org/jaxdb/jsql/DMLxGeneratorTest.java b/jsql/src/test/java/org/jaxdb/jsql/DMLxGeneratorTest.java index 7cc60fe7..097bf442 100644 --- a/jsql/src/test/java/org/jaxdb/jsql/DMLxGeneratorTest.java +++ b/jsql/src/test/java/org/jaxdb/jsql/DMLxGeneratorTest.java @@ -244,7 +244,7 @@ private static StringBuilder between(final StringBuilder builder, final int spac if (!isTypeClass) { boolean hasOneTypeClass = false; - for (final Class parameter : parameters) + for (final Class parameter : parameters) // [A] if (hasOneTypeClass = (parameter.getDeclaringClass() == type.class)) break;
").append(type).append(" \"").append(name).append("\"
").append(property).append("").append(value).append("