This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 32aa9fae360 Use Lombok for boilerplate accessors (#39031)
32aa9fae360 is described below
commit 32aa9fae360b1d1659a787d44b0082f49319057e
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jul 7 17:36:15 2026 +0800
Use Lombok for boilerplate accessors (#39031)
Replace hand-written getter and setter methods with narrow Lombok
annotations in non-agent modules. Keep the final session getter manual because
Lombok cannot preserve its final method signature.
---
.../infra/metadata/identifier/IdentifierIndex.java | 40 +++++-----------------
.../ToggleFixtureDatabaseRuleConfiguration.java | 6 ++--
.../handler/CoreResourceHandlerSurfaceTest.java | 31 ++++-------------
.../handler/AbstractShardingResourceHandler.java | 7 ++--
.../service/ShardingWorkflowLifecycleSpec.java | 30 ++--------------
.../jdbc/AbstractMCPJdbcMetadataLoaderTest.java | 6 ++--
.../CreateViewPushDownMetaDataRefresherTest.java | 17 +++------
.../partition/AddPartitionDefinitionSegment.java | 38 ++------------------
.../value/literal/impl/DateTimeLiteralValue.java | 10 ++----
.../query/blob/upload/FirebirdBlobUpload.java | 4 ---
.../conversation/LLMMCPConversationArtifacts.java | 17 +++------
.../AbstractProductionMySQLRuntimeE2ETest.java | 12 +++----
.../e2e/mcp/support/runtime/ReadinessProbe.java | 18 ++--------
.../e2e/sql/env/DataSetEnvironmentManager.java | 20 +++--------
14 files changed, 49 insertions(+), 207 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/IdentifierIndex.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/IdentifierIndex.java
index f3d9643623b..251a15b4c0b 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/IdentifierIndex.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/IdentifierIndex.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.infra.metadata.identifier;
+import lombok.AccessLevel;
+import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.QuoteCharacter;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicy;
@@ -325,6 +327,7 @@ public final class IdentifierIndex<T> {
return snapshot.getExactValues().toString();
}
+ @Getter(AccessLevel.PRIVATE)
private static final class Snapshot<T> {
private static final Snapshot<?> EMPTY = new
Snapshot<>(Collections.emptyMap(), Collections.emptyMap(),
Collections.emptyMap());
@@ -345,32 +348,25 @@ public final class IdentifierIndex<T> {
private static <T> Snapshot<T> empty() {
return (Snapshot<T>) EMPTY;
}
-
- private Map<String, T> getExactValues() {
- return exactValues;
- }
-
- private Map<String, Collection<String>> getNormalizedIdentifierNames()
{
- return normalizedIdentifierNames;
- }
-
- private Map<String, NormalizedBucket<T>> getNormalizedBuckets() {
- return normalizedBuckets;
- }
}
private static final class NormalizedBucket<T> {
+ @Getter(AccessLevel.PRIVATE)
private final String singleIdentifier;
+ @Getter(AccessLevel.PRIVATE)
private final T singleValue;
+ @Getter(AccessLevel.PRIVATE)
private final Collection<String> identifiers;
private final String singleUnquotedIdentifier;
+ @Getter(AccessLevel.PRIVATE)
private final T singleUnquotedValue;
+ @Getter(AccessLevel.PRIVATE)
private final Collection<String> unquotedIdentifiers;
private NormalizedBucket(final String singleIdentifier, final T
singleValue, final Collection<String> identifiers,
@@ -387,18 +383,6 @@ public final class IdentifierIndex<T> {
return null != singleIdentifier;
}
- private String getSingleIdentifier() {
- return singleIdentifier;
- }
-
- private T getSingleValue() {
- return singleValue;
- }
-
- private Collection<String> getIdentifiers() {
- return identifiers;
- }
-
private boolean hasUnquotedIdentifier() {
return null != singleUnquotedIdentifier;
}
@@ -406,13 +390,5 @@ public final class IdentifierIndex<T> {
private boolean hasSingleUnquotedIdentifier() {
return null == unquotedIdentifiers && null !=
singleUnquotedIdentifier;
}
-
- private T getSingleUnquotedValue() {
- return singleUnquotedValue;
- }
-
- private Collection<String> getUnquotedIdentifiers() {
- return unquotedIdentifiers;
- }
}
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/ToggleFixtureDatabaseRuleConfiguration.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/ToggleFixtureDatabaseRuleConfiguration.java
index c66631ba823..13d6a458879 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/ToggleFixtureDatabaseRuleConfiguration.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/ToggleFixtureDatabaseRuleConfiguration.java
@@ -17,18 +17,16 @@
package org.apache.shardingsphere.infra.rule.builder.fixture;
+import lombok.Getter;
import
org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration;
import
org.apache.shardingsphere.infra.config.rule.function.EnhancedRuleConfiguration;
public final class ToggleFixtureDatabaseRuleConfiguration implements
DatabaseRuleConfiguration, EnhancedRuleConfiguration {
+ @Getter
private final boolean empty;
public ToggleFixtureDatabaseRuleConfiguration(final boolean empty) {
this.empty = empty;
}
-
- public boolean isEmpty() {
- return empty;
- }
}
diff --git
a/mcp/core/src/test/java/org/apache/shardingsphere/mcp/core/resource/handler/CoreResourceHandlerSurfaceTest.java
b/mcp/core/src/test/java/org/apache/shardingsphere/mcp/core/resource/handler/CoreResourceHandlerSurfaceTest.java
index 412ab851400..8053bb113d7 100644
---
a/mcp/core/src/test/java/org/apache/shardingsphere/mcp/core/resource/handler/CoreResourceHandlerSurfaceTest.java
+++
b/mcp/core/src/test/java/org/apache/shardingsphere/mcp/core/resource/handler/CoreResourceHandlerSurfaceTest.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.mcp.core.resource.handler;
import lombok.AccessLevel;
+import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mcp.api.MCPHandlerContext;
import
org.apache.shardingsphere.mcp.api.protocol.exception.MCPUnsupportedException;
@@ -392,42 +393,24 @@ class CoreResourceHandlerSurfaceTest {
private final String description;
+ @Getter(AccessLevel.PRIVATE)
private final MCPResourceHandler<?> handler;
+ @Getter(AccessLevel.PRIVATE)
private final String expectedUriTemplate;
+ @Getter(AccessLevel.PRIVATE)
private final String resourceUri;
+ @Getter(AccessLevel.PRIVATE)
private final HandlerResultType expectedType;
+ @Getter(AccessLevel.PRIVATE)
private final String expectedDatabase;
+ @Getter(AccessLevel.PRIVATE)
private final List<String> expectedObjectNames;
- private MCPResourceHandler<?> getHandler() {
- return handler;
- }
-
- private String getExpectedUriTemplate() {
- return expectedUriTemplate;
- }
-
- private String getResourceUri() {
- return resourceUri;
- }
-
- private HandlerResultType getExpectedType() {
- return expectedType;
- }
-
- private String getExpectedDatabase() {
- return expectedDatabase;
- }
-
- private List<String> getExpectedObjectNames() {
- return expectedObjectNames;
- }
-
@Override
public String toString() {
return description;
diff --git
a/mcp/features/sharding/src/main/java/org/apache/shardingsphere/mcp/feature/sharding/resource/handler/AbstractShardingResourceHandler.java
b/mcp/features/sharding/src/main/java/org/apache/shardingsphere/mcp/feature/sharding/resource/handler/AbstractShardingResourceHandler.java
index 6315b2ba9d3..95b6b0abd50 100644
---
a/mcp/features/sharding/src/main/java/org/apache/shardingsphere/mcp/feature/sharding/resource/handler/AbstractShardingResourceHandler.java
+++
b/mcp/features/sharding/src/main/java/org/apache/shardingsphere/mcp/feature/sharding/resource/handler/AbstractShardingResourceHandler.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.mcp.feature.sharding.resource.handler;
+import lombok.AccessLevel;
+import lombok.Getter;
import org.apache.shardingsphere.mcp.api.protocol.response.MCPResponse;
import org.apache.shardingsphere.mcp.api.resource.MCPResourceHandler;
import org.apache.shardingsphere.mcp.api.resource.MCPUriVariables;
@@ -33,6 +35,7 @@ abstract class AbstractShardingResourceHandler implements
MCPResourceHandler<MCP
private final String resourceUriTemplate;
+ @Getter(AccessLevel.PROTECTED)
private final ShardingInspectionService inspectionService;
AbstractShardingResourceHandler(final String resourceUriTemplate, final
ShardingInspectionService inspectionService) {
@@ -56,9 +59,5 @@ abstract class AbstractShardingResourceHandler implements
MCPResourceHandler<MCP
MCPResourceNavigationPayloadBuilder.create(MCPDescriptorCatalogIndex.getRequiredResourceDescriptor(getResourceUriTemplate()),
uriVariables));
}
- protected ShardingInspectionService getInspectionService() {
- return inspectionService;
- }
-
protected abstract List<Map<String, Object>>
query(MCPDatabaseHandlerContext databaseContext, MCPUriVariables uriVariables);
}
diff --git
a/mcp/features/sharding/src/main/java/org/apache/shardingsphere/mcp/feature/sharding/tool/service/ShardingWorkflowLifecycleSpec.java
b/mcp/features/sharding/src/main/java/org/apache/shardingsphere/mcp/feature/sharding/tool/service/ShardingWorkflowLifecycleSpec.java
index d2ef957a67c..988522ddd54 100644
---
a/mcp/features/sharding/src/main/java/org/apache/shardingsphere/mcp/feature/sharding/tool/service/ShardingWorkflowLifecycleSpec.java
+++
b/mcp/features/sharding/src/main/java/org/apache/shardingsphere/mcp/feature/sharding/tool/service/ShardingWorkflowLifecycleSpec.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.mcp.feature.sharding.tool.service;
+import lombok.AccessLevel;
+import lombok.Getter;
import
org.apache.shardingsphere.mcp.feature.sharding.tool.model.ShardingWorkflowRequest;
import org.apache.shardingsphere.mcp.support.workflow.model.RuleArtifact;
import
org.apache.shardingsphere.mcp.support.workflow.model.WorkflowContextSnapshot;
@@ -25,6 +27,7 @@ import
org.apache.shardingsphere.mcp.support.workflow.model.WorkflowKind;
import java.util.function.BiFunction;
import java.util.function.Function;
+@Getter(AccessLevel.PACKAGE)
final class ShardingWorkflowLifecycleSpec {
private final WorkflowKind workflowKind;
@@ -54,31 +57,4 @@ final class ShardingWorkflowLifecycleSpec {
this.artifactSupplier = artifactSupplier;
}
- WorkflowKind getWorkflowKind() {
- return workflowKind;
- }
-
- String getDefaultOperationType() {
- return defaultOperationType;
- }
-
- String getSummary() {
- return summary;
- }
-
- Function<ShardingWorkflowRequest, Boolean> getExistsSupplier() {
- return existsSupplier;
- }
-
- Function<ShardingWorkflowRequest, Boolean> getRequiredInputSupplier() {
- return requiredInputSupplier;
- }
-
- BiFunction<ShardingWorkflowRequest, WorkflowContextSnapshot, Boolean>
getAlgorithmPlanSupplier() {
- return algorithmPlanSupplier;
- }
-
- Function<ShardingWorkflowRequest, RuleArtifact> getArtifactSupplier() {
- return artifactSupplier;
- }
}
diff --git
a/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/database/metadata/jdbc/AbstractMCPJdbcMetadataLoaderTest.java
b/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/database/metadata/jdbc/AbstractMCPJdbcMetadataLoaderTest.java
index 42bd90f7466..8990a891beb 100644
---
a/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/database/metadata/jdbc/AbstractMCPJdbcMetadataLoaderTest.java
+++
b/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/database/metadata/jdbc/AbstractMCPJdbcMetadataLoaderTest.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.mcp.support.database.metadata.jdbc;
import lombok.AccessLevel;
+import lombok.Getter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
import
org.apache.shardingsphere.mcp.support.database.capability.SupportedMCPMetadataObjectType;
@@ -373,6 +374,7 @@ abstract class AbstractMCPJdbcMetadataLoaderTest {
}
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+ @Getter(AccessLevel.PROTECTED)
protected static final class LoadedMetadataCatalog {
private final Map<String, MCPDatabaseMetadata> databaseMetadataMap;
@@ -380,10 +382,6 @@ abstract class AbstractMCPJdbcMetadataLoaderTest {
protected Optional<MCPDatabaseMetadata> findMetadata(final String
databaseName) {
return Optional.ofNullable(databaseMetadataMap.get(databaseName));
}
-
- protected Map<String, MCPDatabaseMetadata> getDatabaseMetadataMap() {
- return databaseMetadataMap;
- }
}
protected static final class MockDriverRegistration implements
AutoCloseable {
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/view/CreateViewPushDownMetaDataRefresherTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/view/CreateViewPushDownMetaDataRefresherTest.java
index de1a7fa69c3..adb7e8b2d5d 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/view/CreateViewPushDownMetaDataRefresherTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/pushdown/type/view/CreateViewPushDownMetaDataRefresherTest.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.mode.metadata.refresher.pushdown.type.view;
+import lombok.AccessLevel;
+import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
@@ -242,10 +244,13 @@ class CreateViewPushDownMetaDataRefresherTest {
private static final class RecordingMetaDataManagerPersistService
implements MetaDataManagerPersistService {
+ @Getter(AccessLevel.PRIVATE)
private boolean alterSingleRuleConfigurationCalled;
+ @Getter(AccessLevel.PRIVATE)
private ShardingSphereDatabase alterSingleRuleConfigurationDatabase;
+ @Getter(AccessLevel.PRIVATE)
private RuleMetaData alterSingleRuleConfigurationRuleMetaData;
@Override
@@ -342,17 +347,5 @@ class CreateViewPushDownMetaDataRefresherTest {
public void alterProperties(final Properties props) {
throw new UnsupportedOperationException();
}
-
- private boolean isAlterSingleRuleConfigurationCalled() {
- return alterSingleRuleConfigurationCalled;
- }
-
- private ShardingSphereDatabase
getAlterSingleRuleConfigurationDatabase() {
- return alterSingleRuleConfigurationDatabase;
- }
-
- private RuleMetaData getAlterSingleRuleConfigurationRuleMetaData() {
- return alterSingleRuleConfigurationRuleMetaData;
- }
}
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/ddl/partition/AddPartitionDefinitionSegment.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/ddl/partition/AddPartitionDefinitionSegment.java
index 0987033ad1c..1e912d57a84 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/ddl/partition/AddPartitionDefinitionSegment.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/ddl/partition/AddPartitionDefinitionSegment.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.partitio
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import lombok.Setter;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.PartitionSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.AlterDefinitionSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.property.PropertiesSegment;
@@ -31,6 +32,7 @@ import java.util.Optional;
*/
@RequiredArgsConstructor
@Getter
+@Setter
public final class AddPartitionDefinitionSegment implements
AlterDefinitionSegment {
private final int startIndex;
@@ -47,15 +49,6 @@ public final class AddPartitionDefinitionSegment implements
AlterDefinitionSegme
private Integer buckets;
- /**
- * Set partition values.
- *
- * @param partitionValues partition values
- */
- public void setPartitionValues(final PartitionValuesSegment
partitionValues) {
- this.partitionValues = partitionValues;
- }
-
/**
* Get partition values.
*
@@ -65,15 +58,6 @@ public final class AddPartitionDefinitionSegment implements
AlterDefinitionSegme
return Optional.ofNullable(partitionValues);
}
- /**
- * Set properties.
- *
- * @param properties properties
- */
- public void setProperties(final PropertiesSegment properties) {
- this.properties = properties;
- }
-
/**
* Get properties.
*
@@ -83,15 +67,6 @@ public final class AddPartitionDefinitionSegment implements
AlterDefinitionSegme
return Optional.ofNullable(properties);
}
- /**
- * Set distributed column.
- *
- * @param distributedColumn distributed column
- */
- public void setDistributedColumn(final ColumnSegment distributedColumn) {
- this.distributedColumn = distributedColumn;
- }
-
/**
* Get distributed column.
*
@@ -101,15 +76,6 @@ public final class AddPartitionDefinitionSegment implements
AlterDefinitionSegme
return Optional.ofNullable(distributedColumn);
}
- /**
- * Set buckets.
- *
- * @param buckets buckets
- */
- public void setBuckets(final Integer buckets) {
- this.buckets = buckets;
- }
-
/**
* Get buckets.
*
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/value/literal/impl/DateTimeLiteralValue.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/value/literal/impl/DateTimeLiteralValue.java
index 52146250dc0..bb5b34256e5 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/value/literal/impl/DateTimeLiteralValue.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/value/literal/impl/DateTimeLiteralValue.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl;
+import lombok.Getter;
import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.QuoteCharacter;
import
org.apache.shardingsphere.sql.parser.statement.core.value.literal.LiteralValue;
@@ -27,6 +28,7 @@ public final class DateTimeLiteralValue implements
LiteralValue<String> {
private final String dateTimeType;
+ @Getter
private final String dateTimeValue;
private final QuoteCharacter quoteCharacter;
@@ -46,12 +48,4 @@ public final class DateTimeLiteralValue implements
LiteralValue<String> {
return containsBrace ? "{" + dateTimeType + " " + quotedDateTimeValue
+ "}" : dateTimeType + " " + quotedDateTimeValue;
}
- /**
- * Get date time value.
- *
- * @return date time value
- */
- public String getDateTimeValue() {
- return dateTimeValue;
- }
}
diff --git
a/proxy/frontend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/blob/upload/FirebirdBlobUpload.java
b/proxy/frontend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/blob/upload/FirebirdBlobUpload.java
index 205679a87bd..9c2c469fb0c 100644
---
a/proxy/frontend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/blob/upload/FirebirdBlobUpload.java
+++
b/proxy/frontend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/blob/upload/FirebirdBlobUpload.java
@@ -56,10 +56,6 @@ public final class FirebirdBlobUpload {
return buffer.toByteArray();
}
- public boolean isClosed() {
- return closed;
- }
-
/**
* Mark this BLOB upload as closed.
*/
diff --git
a/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/llm/conversation/LLMMCPConversationArtifacts.java
b/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/llm/conversation/LLMMCPConversationArtifacts.java
index 317d92f334e..1f05abfddc2 100644
---
a/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/llm/conversation/LLMMCPConversationArtifacts.java
+++
b/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/llm/conversation/LLMMCPConversationArtifacts.java
@@ -18,7 +18,9 @@
package org.apache.shardingsphere.test.e2e.mcp.llm.conversation;
import lombok.AccessLevel;
+import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import lombok.Setter;
import
org.apache.shardingsphere.test.e2e.mcp.llm.conversation.artifact.LLME2EArtifactBundle;
import
org.apache.shardingsphere.test.e2e.mcp.llm.conversation.artifact.LLME2EAssertionReport;
import org.apache.shardingsphere.test.e2e.mcp.llm.scenario.LLME2EScenario;
@@ -36,10 +38,13 @@ final class LLMMCPConversationArtifacts {
private final List<String> rawModelOutputs = new LinkedList<>();
+ @Getter(AccessLevel.PACKAGE)
private final List<MCPInteractionTraceRecord> interactionTrace = new
LinkedList<>();
private final List<String> mcpRuntimeLogLines = new LinkedList<>();
+ @Getter(AccessLevel.PACKAGE)
+ @Setter(AccessLevel.PACKAGE)
private String finalAnswerJson = "";
void addRawModelOutput(final String rawModelOutput) {
@@ -54,22 +59,10 @@ final class LLMMCPConversationArtifacts {
mcpRuntimeLogLines.add(runtimeLogLine);
}
- List<MCPInteractionTraceRecord> getInteractionTrace() {
- return interactionTrace;
- }
-
int nextSequence() {
return interactionTrace.size() + 1;
}
- String getFinalAnswerJson() {
- return finalAnswerJson;
- }
-
- void setFinalAnswerJson(final String finalAnswerJson) {
- this.finalAnswerJson = finalAnswerJson;
- }
-
LLME2EArtifactBundle createArtifactBundle(final LLME2EScenario scenario,
final LLME2EAssertionReport assertionReport) {
return new LLME2EArtifactBundle(scenario.getScenarioId(),
scenario.getSystemPrompt(), scenario.getUserPrompt(), modelProvider, modelName,
finalAnswerJson, rawModelOutputs, interactionTrace,
mcpRuntimeLogLines, assertionReport);
diff --git
a/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/runtime/production/AbstractProductionMySQLRuntimeE2ETest.java
b/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/runtime/production/AbstractProductionMySQLRuntimeE2ETest.java
index c83db5049d2..725e0063f39 100644
---
a/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/runtime/production/AbstractProductionMySQLRuntimeE2ETest.java
+++
b/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/runtime/production/AbstractProductionMySQLRuntimeE2ETest.java
@@ -20,6 +20,8 @@ package
org.apache.shardingsphere.test.e2e.mcp.runtime.production;
import io.modelcontextprotocol.client.McpSyncClient;
import io.modelcontextprotocol.spec.McpClientTransport;
import io.modelcontextprotocol.spec.McpSchema;
+import lombok.AccessLevel;
+import lombok.Getter;
import
org.apache.shardingsphere.mcp.support.database.metadata.jdbc.RuntimeDatabaseConfiguration;
import org.apache.shardingsphere.test.e2e.mcp.env.MCPE2ECondition;
import org.apache.shardingsphere.test.e2e.mcp.support.OfficialMCPToolNames;
@@ -59,20 +61,14 @@ abstract class AbstractProductionMySQLRuntimeE2ETest
extends AbstractTransportPa
protected static final String MASK_PLAN_TOOL_NAME =
"database_gateway_plan_mask_rule";
+ @Getter(AccessLevel.PROTECTED)
private GenericContainer<?> container;
+ @Getter(AccessLevel.PROTECTED)
private String physicalSchemaName;
private MySQLRuntimeFixture sharedRuntimeFixture;
- protected GenericContainer<?> getContainer() {
- return container;
- }
-
- protected String getPhysicalSchemaName() {
- return physicalSchemaName;
- }
-
@AfterEach
void tearDownContainer() {
if (useSharedRuntimeFixture()) {
diff --git
a/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/support/runtime/ReadinessProbe.java
b/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/support/runtime/ReadinessProbe.java
index 91273c47851..1ea0cf4cd3d 100644
---
a/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/support/runtime/ReadinessProbe.java
+++
b/test/e2e/mcp/src/test/java/org/apache/shardingsphere/test/e2e/mcp/support/runtime/ReadinessProbe.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.test.e2e.mcp.support.runtime;
import lombok.AccessLevel;
+import lombok.Getter;
import lombok.RequiredArgsConstructor;
import java.util.function.LongSupplier;
@@ -162,6 +163,7 @@ public final class ReadinessProbe {
* @param <T> ready value type
*/
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+ @Getter(AccessLevel.PRIVATE)
public static final class ReadinessResult<T> {
private final T value;
@@ -204,21 +206,5 @@ public final class ReadinessProbe {
public static <T> ReadinessResult<T> failed(final Exception failure) {
return new ReadinessResult<>(null, failure, false, true);
}
-
- private T getValue() {
- return value;
- }
-
- private Exception getFailure() {
- return failure;
- }
-
- private boolean isReady() {
- return ready;
- }
-
- private boolean isFailed() {
- return failed;
- }
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
index e22d1778484..88acda02182 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.test.e2e.sql.env;
+import lombok.AccessLevel;
+import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.sqlbatch.DialectSQLBatchOption;
@@ -308,36 +310,22 @@ public final class DataSetEnvironmentManager {
}
@RequiredArgsConstructor
+ @Getter(AccessLevel.PRIVATE)
private static final class ResetPlan {
private final Map<DataNode, InsertDataNodePlan> insertDataNodePlans;
private final Map<String, Collection<String>>
tableNamesByDataSourceName;
-
- private Map<DataNode, InsertDataNodePlan> getInsertDataNodePlans() {
- return insertDataNodePlans;
- }
-
- private Map<String, Collection<String>>
getTableNamesByDataSourceName() {
- return tableNamesByDataSourceName;
- }
}
@RequiredArgsConstructor
+ @Getter(AccessLevel.PRIVATE)
private static final class InsertDataNodePlan {
private final Collection<DataSetColumn> columnMetaData;
private final Collection<SQLValueGroup> sqlValueGroups = new
LinkedList<>();
- private Collection<DataSetColumn> getColumnMetaData() {
- return columnMetaData;
- }
-
- private Collection<SQLValueGroup> getSqlValueGroups() {
- return sqlValueGroups;
- }
-
private void addSQLValueGroup(final SQLValueGroup sqlValueGroup) {
sqlValueGroups.add(sqlValueGroup);
}
