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 f7f966ef5dd Use @RequiredArgsConstructor (#37677)
f7f966ef5dd is described below
commit f7f966ef5dd8e144ebcdfbad5074cca0894e64a6
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jan 7 20:00:03 2026 +0800
Use @RequiredArgsConstructor (#37677)
---
.../type/standard/ShardingStandardRouteEngine.java | 13 +++----------
.../handler/RetryStreamingExceptionHandler.java | 8 ++------
.../manager/DataSourceXAResourceRecoveryHelper.java | 20 ++------------------
.../segment/ddl/property/PropertiesSegment.java | 21 ++-------------------
.../segment/dml/datetime/DatetimeExpression.java | 18 +++---------------
.../dml/item/AggregationProjectionSegment.java | 16 +++-------------
.../segment/dml/item/DatetimeProjectionSegment.java | 18 +++---------------
.../backend/response/data/QueryResponseCell.java | 13 +++++++------
8 files changed, 25 insertions(+), 102 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngine.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngine.java
index bb2d91db938..2557a2c2829 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngine.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngine.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.sharding.route.engine.type.standard;
import com.cedarsoftware.util.CaseInsensitiveSet;
+import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.datanode.DataNode;
@@ -56,6 +57,7 @@ import java.util.Optional;
/**
* Sharding standard route engine.
*/
+@RequiredArgsConstructor
public final class ShardingStandardRouteEngine implements ShardingRouteEngine {
private final String logicTableName;
@@ -64,20 +66,11 @@ public final class ShardingStandardRouteEngine implements
ShardingRouteEngine {
private final SQLStatementContext sqlStatementContext;
- private final ConfigurationProperties props;
-
private final Collection<Collection<DataNode>> originalDataNodes = new
LinkedList<>();
private final HintValueContext hintValueContext;
- public ShardingStandardRouteEngine(final String logicTableName, final
ShardingConditions shardingConditions, final SQLStatementContext
sqlStatementContext,
- final HintValueContext
hintValueContext, final ConfigurationProperties props) {
- this.logicTableName = logicTableName;
- this.shardingConditions = shardingConditions;
- this.sqlStatementContext = sqlStatementContext;
- this.props = props;
- this.hintValueContext = hintValueContext;
- }
+ private final ConfigurationProperties props;
@Override
public RouteContext route(final ShardingRule shardingRule) {
diff --git
a/kernel/data-pipeline/scenario/cdc/client/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/client/handler/RetryStreamingExceptionHandler.java
b/kernel/data-pipeline/scenario/cdc/client/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/client/handler/RetryStreamingExceptionHandler.java
index d0c943a6fae..db17379a803 100644
---
a/kernel/data-pipeline/scenario/cdc/client/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/client/handler/RetryStreamingExceptionHandler.java
+++
b/kernel/data-pipeline/scenario/cdc/client/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/client/handler/RetryStreamingExceptionHandler.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.data.pipeline.cdc.client.handler;
import io.netty.channel.ChannelHandlerContext;
+import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.data.pipeline.cdc.client.CDCClient;
@@ -30,6 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Retry streaming exception handler.
*/
+@RequiredArgsConstructor
@Slf4j
public final class RetryStreamingExceptionHandler implements ExceptionHandler {
@@ -41,12 +43,6 @@ public final class RetryStreamingExceptionHandler implements
ExceptionHandler {
private final AtomicInteger retryTimes = new AtomicInteger(0);
- public RetryStreamingExceptionHandler(final CDCClient cdcClient, final int
maxRetryTimes, final int retryIntervalMillis) {
- this.cdcClient = cdcClient;
- this.maxRetryTimes = maxRetryTimes;
- this.retryIntervalMillis = retryIntervalMillis;
- }
-
@Override
public void handleException(final ChannelHandlerContext ctx, final
Throwable throwable) {
log.error("Catch exception: ", throwable);
diff --git
a/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/DataSourceXAResourceRecoveryHelper.java
b/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/DataSourceXAResourceRecoveryHelper.java
index d40fb7de6ef..2228f33f727 100644
---
a/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/DataSourceXAResourceRecoveryHelper.java
+++
b/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/DataSourceXAResourceRecoveryHelper.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.transaction.xa.narayana.manager;
import com.arjuna.ats.jta.recovery.XAResourceRecoveryHelper;
import com.google.common.base.Preconditions;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import javax.sql.XAConnection;
@@ -31,6 +32,7 @@ import java.sql.SQLException;
/**
* XAResourceRecoveryHelper implementation which gets XIDs, which needs to be
recovered, from the database.
*/
+@RequiredArgsConstructor
@Slf4j
public final class DataSourceXAResourceRecoveryHelper implements
XAResourceRecoveryHelper, XAResource {
@@ -46,28 +48,10 @@ public final class DataSourceXAResourceRecoveryHelper
implements XAResourceRecov
private XAResource delegate;
- /**
- * Create a new {@link DataSourceXAResourceRecoveryHelper} instance.
- *
- * @param xaDataSource the XA data source
- */
public DataSourceXAResourceRecoveryHelper(final XADataSource xaDataSource)
{
this(xaDataSource, null, null);
}
- /**
- * Create a new {@link DataSourceXAResourceRecoveryHelper} instance.
- *
- * @param xaDataSource the XA data source
- * @param user the database user or {@code null}
- * @param password the database password or {@code null}
- */
- public DataSourceXAResourceRecoveryHelper(final XADataSource xaDataSource,
final String user, final String password) {
- this.xaDataSource = xaDataSource;
- this.user = user;
- this.password = password;
- }
-
@Override
public boolean initialise(final String props) {
return true;
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/ddl/property/PropertiesSegment.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/ddl/property/PropertiesSegment.java
index 938724a4eb4..542491de315 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/ddl/property/PropertiesSegment.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/ddl/property/PropertiesSegment.java
@@ -18,18 +18,19 @@
package
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.property;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.sql.parser.statement.core.segment.SQLSegment;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.stream.Collectors;
/**
* Properties segment.
*/
+@RequiredArgsConstructor
@Getter
public final class PropertiesSegment implements SQLSegment {
@@ -39,24 +40,6 @@ public final class PropertiesSegment implements SQLSegment {
private final List<PropertySegment> properties = new LinkedList<>();
- public PropertiesSegment(final int startIndex, final int stopIndex) {
- this.startIndex = startIndex;
- this.stopIndex = stopIndex;
- }
-
- /**
- * Convert to properties map.
- *
- * @return properties map
- */
- public Properties toProperties() {
- Properties result = new Properties();
- for (PropertySegment each : properties) {
- result.setProperty(each.getKey(), each.getValue());
- }
- return result;
- }
-
/**
* Convert to map.
*
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/datetime/DatetimeExpression.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/datetime/DatetimeExpression.java
index a9eef785ba9..5fc69168f8d 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/datetime/DatetimeExpression.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/datetime/DatetimeExpression.java
@@ -18,14 +18,14 @@
package
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.datetime;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
/**
* Datetime expression.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
public final class DatetimeExpression implements ExpressionSegment {
private final int startIndex;
@@ -38,19 +38,7 @@ public final class DatetimeExpression implements
ExpressionSegment {
private final String text;
- public DatetimeExpression(final int startIndex, final int stopIndex, final
ExpressionSegment left, final ExpressionSegment right, final String text) {
- this.startIndex = startIndex;
- this.stopIndex = stopIndex;
- this.left = left;
- this.right = right;
- this.text = text;
- }
-
public DatetimeExpression(final int startIndex, final int stopIndex, final
ExpressionSegment left, final String text) {
- this.startIndex = startIndex;
- this.stopIndex = stopIndex;
- this.left = left;
- right = null;
- this.text = text;
+ this(startIndex, stopIndex, left, null, text);
}
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/item/AggregationProjectionSegment.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/item/AggregationProjectionSegment.java
index 61e8ee3f3b4..50fec1b91cb 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/item/AggregationProjectionSegment.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/item/AggregationProjectionSegment.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import lombok.Setter;
import
org.apache.shardingsphere.sql.parser.statement.core.enums.AggregationType;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
@@ -32,6 +33,7 @@ import java.util.Optional;
/**
* Aggregation projection segment.
*/
+@RequiredArgsConstructor
@Getter
public class AggregationProjectionSegment implements ProjectionSegment,
AliasAvailable, ExpressionSegment {
@@ -51,19 +53,7 @@ public class AggregationProjectionSegment implements
ProjectionSegment, AliasAva
private AliasSegment alias;
public AggregationProjectionSegment(final int startIndex, final int
stopIndex, final AggregationType type, final String expression) {
- this.startIndex = startIndex;
- this.stopIndex = stopIndex;
- this.type = type;
- this.expression = expression;
- separator = null;
- }
-
- public AggregationProjectionSegment(final int startIndex, final int
stopIndex, final AggregationType type, final String expression, final String
separator) {
- this.startIndex = startIndex;
- this.stopIndex = stopIndex;
- this.type = type;
- this.expression = expression;
- this.separator = separator;
+ this(startIndex, stopIndex, type, expression, null);
}
@Override
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/item/DatetimeProjectionSegment.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/item/DatetimeProjectionSegment.java
index f8bebf2b6fc..0b6bbf3e0d0 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/item/DatetimeProjectionSegment.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/item/DatetimeProjectionSegment.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
/**
* Datetime projection segment.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
public final class DatetimeProjectionSegment implements ProjectionSegment {
private final int startIndex;
@@ -38,20 +38,8 @@ public final class DatetimeProjectionSegment implements
ProjectionSegment {
private final String text;
- public DatetimeProjectionSegment(final int startIndex, final int
stopIndex, final ExpressionSegment left, final ExpressionSegment right, final
String text) {
- this.startIndex = startIndex;
- this.stopIndex = stopIndex;
- this.left = left;
- this.right = right;
- this.text = text;
- }
-
public DatetimeProjectionSegment(final int startIndex, final int
stopIndex, final ExpressionSegment left, final String text) {
- this.startIndex = startIndex;
- this.stopIndex = stopIndex;
- this.left = left;
- right = null;
- this.text = text;
+ this(startIndex, stopIndex, null, left, text);
}
@Override
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/data/QueryResponseCell.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/data/QueryResponseCell.java
index db403b145b7..292673793ef 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/data/QueryResponseCell.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/data/QueryResponseCell.java
@@ -18,12 +18,14 @@
package org.apache.shardingsphere.proxy.backend.response.data;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import java.util.Optional;
/**
* Query response cell.
*/
+@RequiredArgsConstructor
@Getter
public final class QueryResponseCell {
@@ -37,12 +39,11 @@ public final class QueryResponseCell {
this(jdbcType, data, null);
}
- public QueryResponseCell(final int jdbcType, final Object data, final
String columnTypeName) {
- this.jdbcType = jdbcType;
- this.data = data;
- this.columnTypeName = columnTypeName;
- }
-
+ /**
+ * Get column type name.
+ *
+ * @return column type name
+ */
public Optional<String> getColumnTypeName() {
return Optional.ofNullable(columnTypeName);
}
