From 7cebca5417ac00f42f9cfc91719f43787fdd942e Mon Sep 17 00:00:00 2001 From: Ivan Ponomarev Date: Wed, 27 Nov 2024 13:53:43 +0000 Subject: [PATCH] code cleanup (#748) * code cleanup * remove unused imports --- .../src/main/java/ru/curs/celesta/dbutils/Cursor.java | 7 +++---- .../main/java/ru/curs/celesta/dbutils/CursorGetHelper.java | 5 ++--- .../ru/curs/celesta/dbutils/MaterializedViewCursor.java | 5 ++--- .../java/ru/curs/celesta/dbutils/adaptors/DBAdaptor.java | 7 +++---- .../ru/curs/celesta/dbutils/adaptors/FirebirdAdaptor.java | 2 +- .../java/ru/curs/celesta/dbutils/adaptors/H2Adaptor.java | 2 +- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/celesta-core/src/main/java/ru/curs/celesta/dbutils/Cursor.java b/celesta-core/src/main/java/ru/curs/celesta/dbutils/Cursor.java index 87e9e5f643..607316ee68 100644 --- a/celesta-core/src/main/java/ru/curs/celesta/dbutils/Cursor.java +++ b/celesta-core/src/main/java/ru/curs/celesta/dbutils/Cursor.java @@ -47,7 +47,6 @@ import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -231,7 +230,7 @@ public final boolean tryInsert() { ic -> _setAutoIncrement(db().getCurrentIdent(conn(), meta()))); } - getHelper.internalGet(this::_parseResultInternal, Optional.of(this::initXRec), + getHelper.internalGet(this::_parseResultInternal, this::initXRec, recversion, _currentKeyValues()); postInsert(); @@ -450,7 +449,7 @@ public boolean tryGetByValuesArray(Object... values) { if (!canRead()) { throw new PermissionDeniedException(callContext(), meta(), Action.READ); } - return getHelper.internalGet(this::_parseResultInternal, Optional.of(this::initXRec), + return getHelper.internalGet(this::_parseResultInternal, this::initXRec, recversion, values); } @@ -464,7 +463,7 @@ public final boolean tryGetCurrent() { if (!canRead()) { throw new PermissionDeniedException(callContext(), meta(), Action.READ); } - return getHelper.internalGet(this::_parseResultInternal, Optional.of(this::initXRec), + return getHelper.internalGet(this::_parseResultInternal, this::initXRec, recversion, _currentKeyValues()); } diff --git a/celesta-core/src/main/java/ru/curs/celesta/dbutils/CursorGetHelper.java b/celesta-core/src/main/java/ru/curs/celesta/dbutils/CursorGetHelper.java index f67f2539bc..5e9649892f 100644 --- a/celesta-core/src/main/java/ru/curs/celesta/dbutils/CursorGetHelper.java +++ b/celesta-core/src/main/java/ru/curs/celesta/dbutils/CursorGetHelper.java @@ -13,7 +13,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collections; -import java.util.Optional; import java.util.Set; /** @@ -52,7 +51,7 @@ PreparedStmtHolder getHolder() { return get; } - final boolean internalGet(ParseResultFunction parseResultFunc, Optional initXRecFunc, + final boolean internalGet(ParseResultFunction parseResultFunc, ParseResultCallBack initXRecFunc, int recversion, Object... values) { PreparedStatement g = prepareGet(recversion, values); LOGGER.trace("{}", g); @@ -60,7 +59,7 @@ final boolean internalGet(ParseResultFunction parseResultFunc, Optional selectStaticStrings( //prepare sql String sql = data.stream().map( str -> { - String rowStr = prepareRowColumnForSelectStaticStrings(str, columnName, maxStringLength); + String rowStr = prepareRowColumnForSelectStaticStrings(columnName, maxStringLength); return String.format("SELECT %s %s", rowStr, constantFromSql()); }) .collect(Collectors.joining(" UNION ALL ")); @@ -908,7 +907,7 @@ public int compareStrings(String left, String right) { String sql = comparisons.stream() .map(comparison -> "SELECT COUNT(*) " - + " FROM ( SELECT " + prepareRowColumnForSelectStaticStrings("?", "a", maxStringLength) + + " FROM ( SELECT " + prepareRowColumnForSelectStaticStrings("a", maxStringLength) + " " + constantFromSql() + ") r " + " WHERE a " + comparison + " ?" ) diff --git a/celesta-core/src/main/java/ru/curs/celesta/dbutils/adaptors/FirebirdAdaptor.java b/celesta-core/src/main/java/ru/curs/celesta/dbutils/adaptors/FirebirdAdaptor.java index 29e18f08ab..52fb8734c1 100644 --- a/celesta-core/src/main/java/ru/curs/celesta/dbutils/adaptors/FirebirdAdaptor.java +++ b/celesta-core/src/main/java/ru/curs/celesta/dbutils/adaptors/FirebirdAdaptor.java @@ -841,7 +841,7 @@ String constantFromSql() { } @Override - String prepareRowColumnForSelectStaticStrings(String value, String colName, int maxStringLength) { + String prepareRowColumnForSelectStaticStrings(String colName, int maxStringLength) { return String.format("CAST(? as varchar(%d)) as %s", maxStringLength, colName); } diff --git a/celesta-core/src/main/java/ru/curs/celesta/dbutils/adaptors/H2Adaptor.java b/celesta-core/src/main/java/ru/curs/celesta/dbutils/adaptors/H2Adaptor.java index 2b9c2067c1..da43306337 100644 --- a/celesta-core/src/main/java/ru/curs/celesta/dbutils/adaptors/H2Adaptor.java +++ b/celesta-core/src/main/java/ru/curs/celesta/dbutils/adaptors/H2Adaptor.java @@ -467,7 +467,7 @@ String getSelectTriggerBodySql(TriggerQuery query) { } @Override - String prepareRowColumnForSelectStaticStrings(String value, String colName, int maxStringLength) { + String prepareRowColumnForSelectStaticStrings(String colName, int maxStringLength) { return String.format("CAST(? as varchar(%d)) as %s", maxStringLength, colName); }