[cayenne] 01/02: Minor cleanup

[nt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit f021e0c771cf631b38316e601bab9a0e5061c6f2
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Aug 24 17:15:24 2022 +0300

    Minor cleanup
---
 .../apache/cayenne/access/flush/ReplacementIdVisitor.java   |  2 +-
 .../java/org/apache/cayenne/access/jdbc/BatchAction.java    | 13 +++++--------
 .../cayenne/access/jdbc/reader/DefaultRowReaderFactory.java |  3 +--
 .../cayenne/access/translator/select/TranslatorContext.java |  4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/flush/ReplacementIdVisitor.java b/cayenne-server/src/main/java/org/apache/cayenne/access/flush/ReplacementIdVisitor.java
index 0f21b3f75..3194e7fff 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/flush/ReplacementIdVisitor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/flush/ReplacementIdVisitor.java
@@ -59,7 +59,7 @@ class ReplacementIdVisitor implements DbRowOpVisitor<Void> {
                 // resolve lazy suppliers
                 for (Map.Entry<String, Object> next : id.getReplacementIdMap().entrySet()) {
                     if (next.getValue() instanceof Supplier) {
-                        next.setValue(((Supplier) next.getValue()).get());
+                        next.setValue(((Supplier<?>) next.getValue()).get());
                     }
                 }
                 store.markFlattenedPath(dbRow.getChangeId(), path, id.createReplacementId());
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
index 2788e4110..03b105614 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
@@ -261,14 +261,11 @@ public class BatchAction extends BaseSQLAction {
 
 		ResultSet keysRS = statement.getGeneratedKeys();
 
-		// TODO: andrus, 7/4/2007 - (1) get the type of meaningful PK's from
-		// their
-		// ObjAttributes; (2) use a different form of Statement.execute -
-		// "execute(String,String[])" to be able to map generated column names
-		// (this way
-		// we can support multiple columns.. although need to check how well
-		// this works
-		// with most common drivers)
+		// TODO: andrus, 7/4/2007 -
+		//  	(1) get the type of meaningful PK's from their ObjAttributes;
+		//  	(2) use a different form of Statement.execute - "execute(String,String[])" to be able to map
+		//  		generated column names (this way we can support multiple columns.. although need to check how well
+		// 			this works with most common drivers)
 
 		RowDescriptorBuilder builder = new RowDescriptorBuilder();
 
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
index a22ea0b5e..5e3a2fe15 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
@@ -178,8 +178,7 @@ public class DefaultRowReaderFactory implements RowReaderFactory {
 				for (int i = 0; i < columns.length; i++) {
 					if (columns[i] == entry.getValue()) {
 
-						// if attribute type is the same as column, there is no
-						// conflict
+						// if attribute type is the same as column, there is no conflict
 						if (!attribute.getType().equals(columns[i].getJavaClass())) {
 							// note that JDBC index is "1" based
 							index = i + 1;
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/TranslatorContext.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/TranslatorContext.java
index 702bc3a51..fc41f8b97 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/TranslatorContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/TranslatorContext.java
@@ -99,8 +99,8 @@ public class TranslatorContext implements SQLGenerationContext {
     // index of a last result node of a root entity
     private int rootSegmentEnd;
     // should current entity be linked to root object
-    // (prefetch entity should, while unrelated entity in a column select should't)
-    // this flag can be removed if logic that converts result row into an object tree allow random order of columns if a row.
+    // (prefetch entity should, while unrelated entity in a column select shouldn't)
+    // this flag can be removed if logic that converts result row into an object tree allows random order of columns in a row.
     private boolean appendResultToRoot;
 
     private SQLResult sqlResult;