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 21d8d9dafe6 Add default impl for ShardingSphereRule.getAttributes()
(#31818)
21d8d9dafe6 is described below
commit 21d8d9dafe606a8f2875cb3b03e6cddf75962762
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jun 23 01:40:31 2024 +0800
Add default impl for ShardingSphereRule.getAttributes() (#31818)
---
.../org/apache/shardingsphere/infra/rule/ShardingSphereRule.java | 4 +++-
.../infra/metadata/database/rule/ShardingSphereRuleFixture.java | 6 ------
.../infra/rule/builder/fixture/FixtureGlobalRule.java | 6 ------
.../infra/merge/fixture/rule/DecoratorRuleFixture.java | 6 ------
.../infra/merge/fixture/rule/MergerRuleFixture.java | 6 ------
.../infra/route/fixture/rule/RouteFailureRuleFixture.java | 6 ------
.../shardingsphere/infra/route/fixture/rule/RouteRuleFixture.java | 6 ------
.../org/apache/shardingsphere/authority/rule/AuthorityRule.java | 6 ------
.../apache/shardingsphere/globalclock/rule/GlobalClockRule.java | 6 ------
.../java/org/apache/shardingsphere/logging/rule/LoggingRule.java | 8 +-------
.../engine/fixture/rule/SQLFederationDeciderRuleMatchFixture.java | 6 ------
.../fixture/rule/SQLFederationDeciderRuleNotMatchFixture.java | 6 ------
.../java/org/apache/shardingsphere/parser/rule/SQLParserRule.java | 6 ------
.../shardingsphere/sqltranslator/rule/SQLTranslatorRule.java | 6 ------
.../timeservice/core/rule/TimestampServiceRule.java | 6 ------
.../org/apache/shardingsphere/mode/fixture/ModeRuleFixture.java | 6 ------
.../apache/shardingsphere/test/fixture/infra/rule/MockedRule.java | 6 ------
17 files changed, 4 insertions(+), 98 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/ShardingSphereRule.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/ShardingSphereRule.java
index 2593a3f3ca9..61f6bb7b97b 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/ShardingSphereRule.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/ShardingSphereRule.java
@@ -37,5 +37,7 @@ public interface ShardingSphereRule {
*
* @return rule attributes
*/
- RuleAttributes getAttributes();
+ default RuleAttributes getAttributes() {
+ return new RuleAttributes();
+ }
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/rule/ShardingSphereRuleFixture.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/rule/ShardingSphereRuleFixture.java
index b140619a36d..67f6ca44944 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/rule/ShardingSphereRuleFixture.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/rule/ShardingSphereRuleFixture.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.infra.metadata.database.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import static org.mockito.Mockito.mock;
@@ -29,9 +28,4 @@ public class ShardingSphereRuleFixture implements
ShardingSphereRule {
public RuleConfiguration getConfiguration() {
return mock(RuleConfiguration.class);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureGlobalRule.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureGlobalRule.java
index a6a6b6ad3c3..7ca342e2b9f 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureGlobalRule.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureGlobalRule.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.rule.builder.fixture;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import static org.mockito.Mockito.mock;
@@ -29,9 +28,4 @@ public final class FixtureGlobalRule implements GlobalRule {
public RuleConfiguration getConfiguration() {
return mock(RuleConfiguration.class);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/infra/merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/rule/DecoratorRuleFixture.java
b/infra/merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/rule/DecoratorRuleFixture.java
index 86f8b0b88f3..6e2b3cdaa8c 100644
---
a/infra/merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/rule/DecoratorRuleFixture.java
+++
b/infra/merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/rule/DecoratorRuleFixture.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.merge.fixture.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import static org.mockito.Mockito.mock;
@@ -29,9 +28,4 @@ public final class DecoratorRuleFixture implements
ShardingSphereRule {
public RuleConfiguration getConfiguration() {
return mock(RuleConfiguration.class);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/infra/merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/rule/MergerRuleFixture.java
b/infra/merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/rule/MergerRuleFixture.java
index 0c965ba9853..6d15a2d293b 100644
---
a/infra/merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/rule/MergerRuleFixture.java
+++
b/infra/merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/rule/MergerRuleFixture.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.merge.fixture.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import static org.mockito.Mockito.mock;
@@ -29,9 +28,4 @@ public final class MergerRuleFixture implements
ShardingSphereRule {
public RuleConfiguration getConfiguration() {
return mock(RuleConfiguration.class);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/infra/route/src/test/java/org/apache/shardingsphere/infra/route/fixture/rule/RouteFailureRuleFixture.java
b/infra/route/src/test/java/org/apache/shardingsphere/infra/route/fixture/rule/RouteFailureRuleFixture.java
index ee58632a5b7..3e0c24fea42 100644
---
a/infra/route/src/test/java/org/apache/shardingsphere/infra/route/fixture/rule/RouteFailureRuleFixture.java
+++
b/infra/route/src/test/java/org/apache/shardingsphere/infra/route/fixture/rule/RouteFailureRuleFixture.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.route.fixture.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import static org.mockito.Mockito.mock;
@@ -29,9 +28,4 @@ public final class RouteFailureRuleFixture implements
ShardingSphereRule {
public RuleConfiguration getConfiguration() {
return mock(RuleConfiguration.class);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/infra/route/src/test/java/org/apache/shardingsphere/infra/route/fixture/rule/RouteRuleFixture.java
b/infra/route/src/test/java/org/apache/shardingsphere/infra/route/fixture/rule/RouteRuleFixture.java
index 97783668bf6..edb1c534dcf 100644
---
a/infra/route/src/test/java/org/apache/shardingsphere/infra/route/fixture/rule/RouteRuleFixture.java
+++
b/infra/route/src/test/java/org/apache/shardingsphere/infra/route/fixture/rule/RouteRuleFixture.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.route.fixture.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import static org.mockito.Mockito.mock;
@@ -29,9 +28,4 @@ public final class RouteRuleFixture implements
ShardingSphereRule {
public RuleConfiguration getConfiguration() {
return mock(RuleConfiguration.class);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
index 9a80214947e..178c0862aba 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import java.util.Map;
@@ -83,9 +82,4 @@ public final class AuthorityRule implements GlobalRule {
public Optional<ShardingSpherePrivileges> findPrivileges(final Grantee
grantee) {
return privileges.keySet().stream().filter(each ->
each.accept(grantee)).findFirst().map(privileges::get);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java
index 50c6ade0063..f39c77ee07c 100644
---
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java
+++
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.transaction.spi.TransactionHook;
@@ -73,9 +72,4 @@ public final class GlobalClockRule implements GlobalRule {
public String getGlobalClockProviderType() {
return String.join(".", configuration.getType(),
configuration.getProvider());
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/LoggingRule.java
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/LoggingRule.java
index 1de95548351..2e9782ce754 100644
---
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/LoggingRule.java
+++
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/LoggingRule.java
@@ -19,23 +19,17 @@ package org.apache.shardingsphere.logging.rule;
import lombok.Getter;
import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.logging.config.LoggingRuleConfiguration;
/**
* Logging rule.
*/
+@Getter
public final class LoggingRule implements GlobalRule {
- @Getter
private final LoggingRuleConfiguration configuration;
public LoggingRule(final LoggingRuleConfiguration ruleConfig) {
configuration = ruleConfig;
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/fixture/rule/SQLFederationDeciderRuleMatchFixture.java
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/fixture/rule/SQLFederationDeciderRuleMatchFixture.java
index b8bb7bb6910..6e48683b209 100644
---
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/fixture/rule/SQLFederationDeciderRuleMatchFixture.java
+++
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/fixture/rule/SQLFederationDeciderRuleMatchFixture.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.sqlfederation.engine.fixture.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
import
org.apache.shardingsphere.sqlfederation.config.SQLFederationRuleConfiguration;
@@ -31,9 +30,4 @@ public final class SQLFederationDeciderRuleMatchFixture
implements ShardingSpher
public RuleConfiguration getConfiguration() {
return new SQLFederationRuleConfiguration(true, false,
mock(CacheOption.class));
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/fixture/rule/SQLFederationDeciderRuleNotMatchFixture.java
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/fixture/rule/SQLFederationDeciderRuleNotMatchFixture.java
index f19da000fd7..d392506149a 100644
---
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/fixture/rule/SQLFederationDeciderRuleNotMatchFixture.java
+++
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/fixture/rule/SQLFederationDeciderRuleNotMatchFixture.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.sqlfederation.engine.fixture.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
import
org.apache.shardingsphere.sqlfederation.config.SQLFederationRuleConfiguration;
@@ -31,9 +30,4 @@ public final class SQLFederationDeciderRuleNotMatchFixture
implements ShardingSp
public RuleConfiguration getConfiguration() {
return new SQLFederationRuleConfiguration(false, false,
mock(CacheOption.class));
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/rule/SQLParserRule.java
b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/rule/SQLParserRule.java
index 8a25390cd0e..a70d28f725a 100644
---
a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/rule/SQLParserRule.java
+++
b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/rule/SQLParserRule.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.parser.SQLParserEngine;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.apache.shardingsphere.infra.parser.SimpleSQLParserEngine;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
@@ -59,9 +58,4 @@ public final class SQLParserRule implements GlobalRule {
? new ShardingSphereSQLParserEngine(databaseType,
sqlStatementCache, parseTreeCache)
: new SimpleSQLParserEngine();
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRule.java
b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRule.java
index 5cd1cbf159f..747ab3186d6 100644
---
a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRule.java
+++
b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRule.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.sqltranslator.config.SQLTranslatorRuleConfiguration;
@@ -76,9 +75,4 @@ public final class SQLTranslatorRule implements GlobalRule {
throw ex;
}
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/kernel/time-service/core/src/main/java/org/apache/shardingsphere/timeservice/core/rule/TimestampServiceRule.java
b/kernel/time-service/core/src/main/java/org/apache/shardingsphere/timeservice/core/rule/TimestampServiceRule.java
index 2d71ff9728b..9fe58602bd4 100644
---
a/kernel/time-service/core/src/main/java/org/apache/shardingsphere/timeservice/core/rule/TimestampServiceRule.java
+++
b/kernel/time-service/core/src/main/java/org/apache/shardingsphere/timeservice/core/rule/TimestampServiceRule.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.timeservice.core.rule;
import lombok.Getter;
import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.timeservice.config.TimestampServiceRuleConfiguration;
import org.apache.shardingsphere.timeservice.spi.TimestampService;
@@ -50,9 +49,4 @@ public final class TimestampServiceRule implements GlobalRule
{
public Timestamp getTimestamp() {
return timestampService.getTimestamp();
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleFixture.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleFixture.java
index 6d55e3bc567..f0130971eaf 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleFixture.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleFixture.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.mode.fixture;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.scope.DatabaseRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import static org.mockito.Mockito.mock;
@@ -29,9 +28,4 @@ public final class ModeRuleFixture implements DatabaseRule {
public RuleConfiguration getConfiguration() {
return mock(RuleConfiguration.class);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
diff --git
a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRule.java
b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRule.java
index 53fb93b99d2..0425cec047c 100644
---
a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRule.java
+++
b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/rule/MockedRule.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.test.fixture.infra.rule;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import static org.mockito.Mockito.mock;
@@ -32,9 +31,4 @@ public final class MockedRule implements ShardingSphereRule {
public RuleConfiguration getConfiguration() {
return mock(RuleConfiguration.class);
}
-
- @Override
- public RuleAttributes getAttributes() {
- return new RuleAttributes();
- }
}
