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 bd5f7cce879 Add @SuppressWarnings annotation to getCalendarValue
method parameters to address obsolete DateTime API usage (#35764)
bd5f7cce879 is described below
commit bd5f7cce8799704ed6922d2e44a73d6a1a39c5db
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Jun 20 17:55:58 2025 +0800
Add @SuppressWarnings annotation to getCalendarValue method parameters to
address obsolete DateTime API usage (#35764)
---
.../apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java | 2 +-
.../java/org/apache/shardingsphere/mask/merge/dql/MaskMergedResult.java | 2 +-
.../sharding/merge/dql/groupby/GroupByStreamMergedResult.java | 2 +-
.../query/impl/driver/jdbc/type/stream/JDBCStreamQueryResult.java | 2 +-
.../sql/execute/result/query/type/memory/AbstractMemoryQueryResult.java | 2 +-
.../java/org/apache/shardingsphere/infra/merge/result/MergedResult.java | 2 +-
.../infra/merge/result/impl/decorator/DecoratorMergedResult.java | 2 +-
.../infra/merge/result/impl/local/LocalDataMergedResult.java | 2 +-
.../infra/merge/result/impl/memory/MemoryMergedResult.java | 2 +-
.../infra/merge/result/impl/stream/StreamMergedResult.java | 2 +-
.../infra/merge/result/impl/transparent/TransparentMergedResult.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java
index 0fac8c12157..b3b64e65653 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java
@@ -83,7 +83,7 @@ public final class EncryptMergedResult implements
MergedResult {
}
@Override
- public Object getCalendarValue(final int columnIndex, final Class<?> type,
final Calendar calendar) throws SQLException {
+ public Object getCalendarValue(final int columnIndex, final Class<?> type,
@SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) throws
SQLException {
return mergedResult.getCalendarValue(columnIndex, type, calendar);
}
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/dql/MaskMergedResult.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/dql/MaskMergedResult.java
index 2a1c2990e94..366c871f5dc 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/dql/MaskMergedResult.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/merge/dql/MaskMergedResult.java
@@ -76,7 +76,7 @@ public final class MaskMergedResult implements MergedResult {
}
@Override
- public Object getCalendarValue(final int columnIndex, final Class<?> type,
final Calendar calendar) throws SQLException {
+ public Object getCalendarValue(final int columnIndex, final Class<?> type,
@SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) throws
SQLException {
return mergedResult.getCalendarValue(columnIndex, type, calendar);
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResult.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResult.java
index 42eb459f014..1dd05c7aa0e 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResult.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResult.java
@@ -134,7 +134,7 @@ public final class GroupByStreamMergedResult extends
OrderByStreamMergedResult {
}
@Override
- public Object getCalendarValue(final int columnIndex, final Class<?> type,
final Calendar calendar) {
+ public Object getCalendarValue(final int columnIndex, final Class<?> type,
@SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) {
Object result = currentRow.get(columnIndex - 1);
setWasNull(null == result);
return result;
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/stream/JDBCStreamQueryResult.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/stream/JDBCStreamQueryResult.java
index 97e21a2f411..0cb2d058e33 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/stream/JDBCStreamQueryResult.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/stream/JDBCStreamQueryResult.java
@@ -112,7 +112,7 @@ public final class JDBCStreamQueryResult extends
AbstractStreamQueryResult {
}
@Override
- public Object getCalendarValue(final int columnIndex, final Class<?> type,
final Calendar calendar) throws SQLException {
+ public Object getCalendarValue(final int columnIndex, final Class<?> type,
@SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) throws
SQLException {
if (Date.class == type) {
return resultSet.getDate(columnIndex, calendar);
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/type/memory/AbstractMemoryQueryResult.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/type/memory/AbstractMemoryQueryResult.java
index 0a92070ea4f..526f9a22998 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/type/memory/AbstractMemoryQueryResult.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/type/memory/AbstractMemoryQueryResult.java
@@ -79,7 +79,7 @@ public abstract class AbstractMemoryQueryResult implements
QueryResult {
}
@Override
- public final Object getCalendarValue(final int columnIndex, final Class<?>
type, final Calendar calendar) {
+ public final Object getCalendarValue(final int columnIndex, final Class<?>
type, @SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) {
Object result = currentRow.getValue().get(columnIndex - 1);
wasNull = null == result;
return result;
diff --git
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/MergedResult.java
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/MergedResult.java
index 9b7f807c2e9..de03a3c19cb 100644
---
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/MergedResult.java
+++
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/MergedResult.java
@@ -54,7 +54,7 @@ public interface MergedResult {
* @return calendar value
* @throws SQLException SQL exception
*/
- Object getCalendarValue(int columnIndex, Class<?> type, Calendar calendar)
throws SQLException;
+ Object getCalendarValue(int columnIndex, Class<?> type,
@SuppressWarnings("UseOfObsoleteDateTimeApi") Calendar calendar) throws
SQLException;
/**
* Get InputStream.
diff --git
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/decorator/DecoratorMergedResult.java
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/decorator/DecoratorMergedResult.java
index 7a00e7117f9..fecfbfb7925 100644
---
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/decorator/DecoratorMergedResult.java
+++
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/decorator/DecoratorMergedResult.java
@@ -41,7 +41,7 @@ public abstract class DecoratorMergedResult implements
MergedResult {
}
@Override
- public final Object getCalendarValue(final int columnIndex, final Class<?>
type, final Calendar calendar) throws SQLException {
+ public final Object getCalendarValue(final int columnIndex, final Class<?>
type, @SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar)
throws SQLException {
return mergedResult.getCalendarValue(columnIndex, type, calendar);
}
diff --git
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/local/LocalDataMergedResult.java
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/local/LocalDataMergedResult.java
index d615f66ed97..6bccb8bc083 100644
---
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/local/LocalDataMergedResult.java
+++
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/local/LocalDataMergedResult.java
@@ -55,7 +55,7 @@ public final class LocalDataMergedResult implements
MergedResult {
}
@Override
- public Object getCalendarValue(final int columnIndex, final Class<?> type,
final Calendar calendar) {
+ public Object getCalendarValue(final int columnIndex, final Class<?> type,
@SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) {
return currentRow.getCell(columnIndex);
}
diff --git
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryMergedResult.java
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryMergedResult.java
index b4310c5a231..ccd0183ccb3 100644
---
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryMergedResult.java
+++
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryMergedResult.java
@@ -81,7 +81,7 @@ public abstract class MemoryMergedResult<T extends
ShardingSphereRule> implement
}
@Override
- public final Object getCalendarValue(final int columnIndex, final Class<?>
type, final Calendar calendar) {
+ public final Object getCalendarValue(final int columnIndex, final Class<?>
type, @SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) {
// TODO implement with calendar
Object result = currentResultSetRow.getCell(columnIndex);
wasNull = null == result;
diff --git
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
index 69e4a59ce33..631be547948 100644
---
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
+++
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
@@ -50,7 +50,7 @@ public abstract class StreamMergedResult implements
MergedResult {
}
@Override
- public Object getCalendarValue(final int columnIndex, final Class<?> type,
final Calendar calendar) throws SQLException {
+ public Object getCalendarValue(final int columnIndex, final Class<?> type,
@SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) throws
SQLException {
Object result = getCurrentQueryResult().getCalendarValue(columnIndex,
type, calendar);
wasNull = getCurrentQueryResult().wasNull();
return result;
diff --git
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResult.java
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResult.java
index db55ad768ed..01477a04134 100644
---
a/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResult.java
+++
b/infra/merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResult.java
@@ -45,7 +45,7 @@ public final class TransparentMergedResult implements
MergedResult {
}
@Override
- public Object getCalendarValue(final int columnIndex, final Class<?> type,
final Calendar calendar) throws SQLException {
+ public Object getCalendarValue(final int columnIndex, final Class<?> type,
@SuppressWarnings("UseOfObsoleteDateTimeApi") final Calendar calendar) throws
SQLException {
return queryResult.getCalendarValue(columnIndex, type, calendar);
}
