Merge pull request #165 from CourseOrchestra/dependabot/maven/celesta.version-7.4.8

Bump celesta.version from 7.3.48 to 7.4.8

Author: inponomarev

pom.xml

@@ -50,7 +50,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!--dependency versions -->
-        <celesta.version>7.3.48</celesta.version>
+        <celesta.version>7.4.8</celesta.version>
         <checkstyle.version>9.0.1</checkstyle.version>
         <junit.version>5.7.2</junit.version>
         <junit.platform.version>1.5.2</junit.platform.version>

src/main/java/ru/curs/bass/Bass.java

@@ -62,8 +62,9 @@ void setupDBConnection() {
                 final OutputStream os;
                 if (properties.getFilePath() != null) {
                     File f = new File(properties.getFilePath());
-                    if (!f.getParentFile().exists())
+                    if (!f.getParentFile().exists()) {
                         f.mkdirs();
+                    }
                     os = new FileOutputStream(f);
                     this.ddlConsumer = new OutputStreamDdlConsumer(os);
                 } else {
@@ -78,8 +79,9 @@ void setupDBConnection() {
 
         this.dbAdaptor = daf.createDbAdaptor();
         try (Connection conn = connectionPool.get()) {
-            if (!dbAdaptor.isValidConnection(conn, 10))
+            if (!dbAdaptor.isValidConnection(conn, 10)) {
                 throw new CelestaException("Cannot connect to database.");
+            }
         } catch (SQLException e) {
             throw new BassException(e);
         }
@@ -138,8 +140,9 @@ void outputDdlScript() {
 
     @Override
     public void close() {
-        if (connectionPool != null)
+        if (connectionPool != null) {
             connectionPool.close();
+        }
     }
 
     DBAdaptor getDbAdaptor() {

src/main/java/ru/curs/bass/ConsoleHelper.java

@@ -28,7 +28,7 @@ public final void error(String message) {
         errMessage(message);
     }
 
-    protected void errMessage(String message){
+    protected void errMessage(String message) {
         out.println(ansi().fgBrightRed().a("   ERROR: ").a(message).reset());
     }
 

src/main/java/ru/curs/bass/SchemaDataAccessor.java

@@ -8,17 +8,16 @@
 import ru.curs.celesta.dbutils.stmt.PreparedStmtHolder;
 import ru.curs.celesta.dbutils.term.AlwaysTrue;
 import ru.curs.celesta.dbutils.term.FromTerm;
-import ru.curs.celesta.score.*;
+import ru.curs.celesta.score.DataGrainElement;
+import ru.curs.celesta.score.ParseException;
+import ru.curs.celesta.score.Table;
 import ru.curs.celesta.syscursors.ISchemaCursor;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class SchemaDataAccessor extends CsqlBasicDataAccessor<CallContext> implements ISchemaCursor {
 
@@ -103,8 +102,9 @@ public String getId() {
     }
 
     @Override
-    public void setId(String id) {
+    public SchemaDataAccessor setId(String id) {
         this.id = id;
+        return this;
     }
 
     @Override
@@ -113,8 +113,9 @@ public String getVersion() {
     }
 
     @Override
-    public void setVersion(String version) {
+    public SchemaDataAccessor setVersion(String version) {
         this.version = version;
+        return this;
     }
 
     @Override
@@ -123,8 +124,9 @@ public Integer getLength() {
     }
 
     @Override
-    public void setLength(Integer length) {
+    public SchemaDataAccessor setLength(Integer length) {
         this.length = length;
+        return this;
     }
 
     @Override
@@ -133,8 +135,9 @@ public String getChecksum() {
     }
 
     @Override
-    public void setChecksum(String checksum) {
+    public SchemaDataAccessor setChecksum(String checksum) {
         this.checksum = checksum;
+        return this;
     }
 
     @Override
@@ -143,8 +146,9 @@ public Integer getState() {
     }
 
     @Override
-    public void setState(Integer state) {
+    public SchemaDataAccessor setState(Integer state) {
         this.state = state;
+        return this;
     }
 
     @Override
@@ -153,24 +157,27 @@ public Date getLastmodified() {
     }
 
     @Override
-    public void setLastmodified(Date lastmodified) {
+    public SchemaDataAccessor setLastmodified(Date lastmodified) {
         this.lastmodified = lastmodified;
+        return this;
     }
 
     public String getMessage() {
         return message;
     }
 
     @Override
-    public void setMessage(String message) {
+    public SchemaDataAccessor setMessage(String message) {
         this.message = message;
+        return this;
     }
 
 
     @Override
     public void update() throws CelestaException {
-        if (updatingIsDisabled)
+        if (updatingIsDisabled) {
             return;
+        }
         try (PreparedStatement stmt = update.getStatement(currentValues(), 0)) {
             stmt.execute();
         } catch (SQLException e) {
@@ -179,15 +186,15 @@ public void update() throws CelestaException {
     }
 
     @Override
-    public void get(Object... values) throws CelestaException {
-        try (PreparedStatement stmt = get.getStatement(values, 0);
+    public void get(String id) throws CelestaException {
+        try (PreparedStatement stmt = get.getStatement(new String[]{id}, 0);
              ResultSet rs = stmt.executeQuery()) {
             if (rs.next()) {
                 parseResult(rs);
             } else {
-                String sb = Arrays.stream(values).map(Objects::toString).collect(Collectors.joining(", "));
-                if (!updatingIsDisabled)
-                    throw new CelestaException("There is no %s (%s).", meta().getName(), sb);
+                if (!updatingIsDisabled) {
+                    throw new CelestaException("There is no %s (%s).", meta().getName(), id);
+                }
             }
         } catch (SQLException e) {
             throw new CelestaException(e);
@@ -205,9 +212,9 @@ public boolean nextInSet() throws CelestaException {
 
         boolean result;
         try {
-            if (cursor == null)
+            if (cursor == null) {
                 result = findSet();
-            else {
+            } else {
                 result = cursor.next();
             }
             if (result) {
@@ -226,8 +233,9 @@ private boolean findSet() throws CelestaException {
         PreparedStatement ps = findSet.getStatement(currentValues(), 0);
         boolean result;
         try {
-            if (cursor != null)
+            if (cursor != null) {
                 cursor.close();
+            }
             cursor = ps.executeQuery();
             result = cursor.next();
             if (result) {
@@ -251,8 +259,9 @@ private void parseResult(ResultSet rs) throws SQLException {
 
     @Override
     public void insert() throws CelestaException {
-        if (updatingIsDisabled)
+        if (updatingIsDisabled) {
             return;
+        }
         try (PreparedStatement stmt = insert.getStatement(currentValues(), 0)) {
             stmt.execute();
         } catch (SQLException e) {
@@ -266,9 +275,8 @@ public final Table meta() throws CelestaException {
     }
 
     private Object[] currentValues() {
-        Object[] result = {id != null ? id.replace("\"", "") : null, version, length, checksum, state, lastmodified,
-                message};
-        return result;
+        return new Object[]{id != null ? id.replace("\"", "") : null,
+                version, length, checksum, state, lastmodified, message};
     }
 
 }

src/main/java/ru/curs/bass/SyntaxHighlighter.java

@@ -158,4 +158,4 @@ void colorize(Ansi output, String group) {
     String getPattern() {
         return "'[^']*'('([^'])*')*";
     }
-}
+}