Celesta 8: upgrade to Java 11 (#632)

* move to Java 11

* jdk 11 everywhere

* fix listing style in Asciidoctor

* remove dbClassName instantiation machinery

* remove the deprecated constructor from cursor

* code cleanup

Author: inponomarev

.github/workflows/docs.yml

@@ -12,25 +12,15 @@ jobs:
   build-docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '8'
-          
-      - name: Set up JDK11
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: '11'
-          targets: 'JDK_11'
-          
-      - uses: actions/cache@v1
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'maven'
+
       - name: Install aspell and graphviz
         run: sudo apt-get install -y aspell-en aspell-ru graphviz
       - name: Install jsyntrax
@@ -51,7 +41,6 @@ jobs:
       - name: Build documentation
         run: mvn generate-resources -pl :celesta-documentation
         env:
-          JAVA_HOME: ${{ env.JDK_11 }}
           DIAGRAM_JSYNTRAX_HOME: ${{ github.workspace }}/jsyntrax-1.37
       - name: Move Javadoc
         run: mv target/site/apidocs celesta-documentation/target/generated-docs/apidocs

.github/workflows/main.yml

@@ -10,13 +10,13 @@ jobs:
   build-main:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: '11'
           cache: 'maven'
 
       - name: Setup Testcontainers Cloud Client

celesta-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>celesta-parent</artifactId>
         <groupId>ru.curs</groupId>
-        <version>7.4.41-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,12 @@
         <dependency>
             <groupId>ru.curs</groupId>
             <artifactId>celesta-sql</artifactId>
-            <version>7.4.41-SNAPSHOT</version>
+            <version>8.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
         </dependency>
 
         <!-- TEST DEPENDENCIES -->

celesta-core/src/main/java/ru/curs/celesta/BaseAppSettings.java

@@ -174,15 +174,6 @@ public String getScorePath() {
         return scorePath;
     }
 
-    /**
-     * Returns parameter value "JDBC connection class".
-     *
-     * @return
-     */
-    public String getDbClassName() {
-        return dbType.getDriverClassName();
-    }
-
     /**
      * Returns parameter value "JDBC connection string".
      *

celesta-core/src/main/java/ru/curs/celesta/dbutils/BasicCursor.java

@@ -65,6 +65,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -820,7 +821,7 @@ final ColumnMeta<?> validateColumnName(String name) {
 
     private Object validateColumnValue(ColumnMeta<?> column, Object value) {
         if (value == null) {
-            return value;
+            return null;
         }
         if (!column.getJavaClass().isAssignableFrom(value.getClass())) {
             throw new CelestaException("Value %s is not of type %s.", value, column.getJavaClass());
@@ -1371,7 +1372,7 @@ public final void clearBuffer(boolean withKeys) {
      * @param context call context
      * @param fetchedFields  list of fields to be fetched
      */
-    public final BasicCursor getBufferCopy(CallContext context, List<String> fetchedFields) {
+    public final BasicCursor getBufferCopy(CallContext context, Collection<? extends ColumnMeta<?>> fetchedFields) {
         return _getBufferCopy(context, fetchedFields);
     }
 
@@ -1382,7 +1383,7 @@ public final BasicCursor getBufferCopy(CallContext context, List<String> fetched
      * can be caused.
      */
     @SuppressWarnings("MethodName")
-    protected abstract BasicCursor _getBufferCopy(CallContext context, List<String> fields);
+    protected abstract BasicCursor _getBufferCopy(CallContext context, Collection<? extends ColumnMeta<?>> fields);
 
     @SuppressWarnings("MethodName")
     protected abstract Object[] _currentValues();

celesta-core/src/main/java/ru/curs/celesta/dbutils/Cursor.java

@@ -123,7 +123,7 @@ public Cursor(CallContext context, ColumnMeta<?>... columns) {
         this(context, Arrays.stream(columns).map(ColumnMeta::getName).collect(Collectors.toSet()));
     }
 
-    public Cursor(CallContext context, Set<String> fields) {
+    Cursor(CallContext context, Set<String> fields) {
         super(context, fields);
 
         CursorGetHelper.CursorGetHelperBuilder cghb = new CursorGetHelper.CursorGetHelperBuilder();

celesta-core/src/main/java/ru/curs/celesta/dbutils/filter/Filter.java

@@ -8,6 +8,7 @@
 import ru.curs.celesta.score.StringColumn;
 
 import java.util.HashMap;
+import java.util.Objects;
 
 /**
  * Single field filter.
@@ -46,7 +47,7 @@ public String makeWhereClause(String quotedName, final QueryBuildingHelper dba)
     public boolean filterEquals(AbstractFilter f) {
         if (f instanceof Filter) {
             Object v2 = ((Filter) f).value;
-            return value == null ? v2 == null : value.equals(v2);
+            return Objects.equals(value, v2);
         } else {
             return false;
         }

celesta-core/src/main/java/ru/curs/celesta/dbutils/filter/value/FieldsLookup.java

@@ -275,7 +275,7 @@ public void validate() {
 
             columnOrdersInIndicesSet.retainAll(otherColumnOrdersInIndicesSet);
 
-            columnOrdersInIndicesSet.stream().forEach(Collections::sort);
+            columnOrdersInIndicesSet.forEach(Collections::sort);
             Optional<List<Integer>> match = columnOrdersInIndicesSet.stream()
                     .filter(l -> l.equals(IntStream.range(0, l.size()).boxed().collect(Collectors.toList()))).findAny();
 

celesta-core/src/main/java/ru/curs/celesta/score/Score.java

@@ -10,7 +10,7 @@ public final class Score extends AbstractScore {
      */
     public static final String SYSTEM_SCHEMA_NAME = "celesta";
 
-    private IdentifierParser identifierParser = new PlainIdentifierParser();
+    private final IdentifierParser identifierParser = new PlainIdentifierParser();
 
     public Score() {
     }

celesta-documentation/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>celesta-parent</artifactId>
         <groupId>ru.curs</groupId>
-        <version>7.4.41-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>