This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 04d8ade1862 Rename SQLFederationWrapperAdapter (#37295)
04d8ade1862 is described below
commit 04d8ade186216c1aad9208c01c9b181760df2ac4
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Dec 7 23:42:49 2025 +0800
Rename SQLFederationWrapperAdapter (#37295)
* Rename SQLFederationWrapperAdapter
* Rename SQLFederationWrapperAdapter
* Rename SQLFederationWrapperAdapter
---
...portedUpdateOperationSQLFederationResultSet.java | 2 +-
.../resultset/SQLFederationResultSetMetaData.java | 21 +++++++--------------
...dapter.java => SQLFederationWrapperAdapter.java} | 13 +++++++------
3 files changed, 15 insertions(+), 21 deletions(-)
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/AbstractUnsupportedUpdateOperationSQLFederationResultSet.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/AbstractUnsupportedUpdateOperationSQLFederationResultSet.java
index bf8a9529939..5db0f403b9d 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/AbstractUnsupportedUpdateOperationSQLFederationResultSet.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/AbstractUnsupportedUpdateOperationSQLFederationResultSet.java
@@ -37,7 +37,7 @@ import java.sql.Timestamp;
/**
* Unsupported {@code ResultSet} update methods for SQL federation.
*/
-public abstract class AbstractUnsupportedUpdateOperationSQLFederationResultSet
extends WrapperAdapter implements ResultSet {
+public abstract class AbstractUnsupportedUpdateOperationSQLFederationResultSet
extends SQLFederationWrapperAdapter implements ResultSet {
@Override
public final void updateNull(final int columnIndex) throws SQLException {
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaData.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaData.java
index 1e2cf572335..48250b1fb39 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaData.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaData.java
@@ -40,7 +40,7 @@ import java.util.Optional;
/**
* SQL federation result set meta data.
*/
-public final class SQLFederationResultSetMetaData extends WrapperAdapter
implements ResultSetMetaData {
+public final class SQLFederationResultSetMetaData extends
SQLFederationWrapperAdapter implements ResultSetMetaData {
private final Schema sqlFederationSchema;
@@ -105,8 +105,7 @@ public final class SQLFederationResultSetMetaData extends
WrapperAdapter impleme
@Override
public int getColumnDisplaySize(final int column) {
- return findTableName(column).flatMap(optional ->
Optional.ofNullable(sqlFederationSchema.tables().get(optional))).map(optional
-> optional.getRowType(typeFactory).getPrecision())
- .orElse(0);
+ return findTableName(column).flatMap(optional ->
Optional.ofNullable(sqlFederationSchema.tables().get(optional))).map(optional
-> optional.getRowType(typeFactory).getPrecision()).orElse(0);
}
@Override
@@ -119,10 +118,7 @@ public final class SQLFederationResultSetMetaData extends
WrapperAdapter impleme
@Override
public String getColumnName(final int column) {
- if (expandProjections.size() < column) {
- return resultColumnType.getFieldList().get(column - 1).getName();
- }
- return expandProjections.get(column - 1).getColumnName();
+ return expandProjections.size() < column ?
resultColumnType.getFieldList().get(column - 1).getName() :
expandProjections.get(column - 1).getColumnName();
}
@Override
@@ -190,12 +186,9 @@ public final class SQLFederationResultSetMetaData extends
WrapperAdapter impleme
}
private Optional<String> findTableName(final int column) {
- Projection projection =
- expandProjections.size() < column ? new ColumnProjection(null,
resultColumnType.getFieldList().get(column - 1).getName(), null, databaseType)
- : expandProjections.get(column - 1);
- if (projection instanceof ColumnProjection) {
- return Optional.ofNullable(((ColumnProjection)
projection).getOriginalTable().getValue());
- }
- return Optional.empty();
+ Projection projection = expandProjections.size() < column
+ ? new ColumnProjection(null,
resultColumnType.getFieldList().get(column - 1).getName(), null, databaseType)
+ : expandProjections.get(column - 1);
+ return projection instanceof ColumnProjection ?
Optional.ofNullable(((ColumnProjection)
projection).getOriginalTable().getValue()) : Optional.empty();
}
}
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/WrapperAdapter.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationWrapperAdapter.java
similarity index 74%
rename from
kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/WrapperAdapter.java
rename to
kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationWrapperAdapter.java
index eb54c2beb6f..500bd022546 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/WrapperAdapter.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationWrapperAdapter.java
@@ -17,22 +17,23 @@
package org.apache.shardingsphere.sqlfederation.resultset;
+import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
+
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.Wrapper;
/**
- * Adapter for {@code java.sql.Wrapper}.
+ * SQL federation wrapper adapter.
*/
-public abstract class WrapperAdapter implements Wrapper {
+public abstract class SQLFederationWrapperAdapter implements Wrapper {
@SuppressWarnings("unchecked")
@Override
public final <T> T unwrap(final Class<T> iface) throws SQLException {
- if (isWrapperFor(iface)) {
- return (T) this;
- }
- throw new SQLFeatureNotSupportedException(String.format("`%s` cannot
be unwrapped as `%s`", getClass().getName(), iface.getName()));
+ ShardingSpherePreconditions.checkState(isWrapperFor(iface),
+ () -> new SQLFeatureNotSupportedException(String.format("`%s`
cannot be unwrapped as `%s`", getClass().getName(), iface.getName())));
+ return (T) this;
}
@Override
