This is an automated email from the ASF dual-hosted git repository.
panjuan 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 dcf6c2e Remove @SuppressWarnings("all") (#11525)
dcf6c2e is described below
commit dcf6c2ec12c0c43ba1075012d2a4ea3cb1f05b28
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jul 27 12:21:41 2021 +0800
Remove @SuppressWarnings("all") (#11525)
* Remove @SuppressWarnings("all")
* Remove @SuppressWarnings("all")
---
.../plugin/interceptor/ConstructorInterceptorTest.java | 5 ++---
.../advice/AbstractCommandExecutorTaskAdviceTest.java | 4 ++--
.../tracing/advice/AbstractSQLParserEngineAdviceTest.java | 4 ++--
.../complex/ComplexInlineShardingAlgorithmTest.java | 3 +--
.../registry/AbstractAlgorithmProvidedBeanRegistry.java | 14 ++++++--------
5 files changed, 13 insertions(+), 17 deletions(-)
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptorTest.java
b/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptorTest.java
index 9e4d57b..2253767 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptorTest.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptorTest.java
@@ -75,11 +75,10 @@ public final class ConstructorInterceptorTest {
.installOnByteBuddyAgent();
}
+ @SuppressWarnings("ConstantConditions")
@Test
- @SuppressWarnings("all")
public void assertNoArgConstructor() {
- Object material = new ConstructorMaterial();
- assertTrue(material instanceof AdviceTargetObject);
+ assertTrue(new ConstructorMaterial() instanceof AdviceTargetObject);
}
@Test
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java
index a2c32e6..1f59bed 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java
@@ -31,9 +31,9 @@ public abstract class AbstractCommandExecutorTaskAdviceTest
implements AdviceTes
@Getter
private AdviceTargetObject targetObject;
+ @SuppressWarnings("ConstantConditions")
@Override
- @SuppressWarnings("all")
- public void prepare() {
+ public final void prepare() {
Object executorTask = new CommandExecutorTask(null, new
BackendConnection(TransactionType.BASE), null, null);
targetObject = (AdviceTargetObject) executorTask;
}
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
index b42c93c..c0a1302 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
@@ -33,9 +33,9 @@ public abstract class AbstractSQLParserEngineAdviceTest
implements AdviceTestBas
private Object attachment;
- @SuppressWarnings("all")
+ @SuppressWarnings("ConstantConditions")
@Override
- public void prepare() {
+ public final void prepare() {
Object parserEngine = mock(ShardingSphereSQLParserEngine.class,
invocation -> {
switch (invocation.getMethod().getName()) {
case "getAttachment":
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithmTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithmTest.java
index 1b96ea2..d323526 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithmTest.java
@@ -65,8 +65,7 @@ public final class ComplexInlineShardingAlgorithmTest {
Map<String, Collection<Comparable<?>>> sharingValueMap = new
HashMap<>(2, 1);
sharingValueMap.put("type", Collections.singletonList(2));
sharingValueMap.put("order_id", Collections.singletonList(2));
- Map<String, Range<Comparable<?>>> rangeShardingValueMap =
Collections.emptyMap();
- ComplexKeysShardingValue<Comparable<?>> shardingValue = new
ComplexKeysShardingValue<>("t_order", sharingValueMap, rangeShardingValueMap);
+ ComplexKeysShardingValue<Comparable<?>> shardingValue = new
ComplexKeysShardingValue<>("t_order", sharingValueMap, Collections.emptyMap());
Collection<String> actual =
complexInlineShardingAlgorithm.doSharding(availableTargetNames, shardingValue);
assertTrue(actual.size() == 1 && actual.contains("t_order_0_0"));
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java
index ed62d1d..73bdc57 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java
@@ -53,14 +53,12 @@ public abstract class
AbstractAlgorithmProvidedBeanRegistry<T extends ShardingSp
private final Environment environment;
- @SuppressWarnings("all")
- protected void registerBean(final String prefix, final Class<T>
algorithmClass, final BeanDefinitionRegistry registry) {
+ @SuppressWarnings("unchecked")
+ protected final void registerBean(final String prefix, final Class<T>
algorithmClass, final BeanDefinitionRegistry registry) {
boolean existPrefix = PropertyUtil.containPropertyPrefix(environment,
prefix);
if (existPrefix) {
Map<String, Object> paramMap = PropertyUtil.handle(environment,
prefix, Map.class);
- Set<String> keys = paramMap.keySet().stream().map(key -> {
- return key.contains(POINT) ? key.substring(0,
key.indexOf(POINT)) : key;
- }).collect(Collectors.toSet());
+ Set<String> keys = paramMap.keySet().stream().map(key ->
key.contains(POINT) ? key.substring(0, key.indexOf(POINT)) :
key).collect(Collectors.toSet());
Map<String, YamlShardingSphereAlgorithmConfiguration>
shardingAlgorithmMap = new LinkedHashMap<>();
keys.forEach(each -> {
YamlShardingSphereAlgorithmConfiguration config = new
YamlShardingSphereAlgorithmConfiguration();
@@ -86,16 +84,16 @@ public abstract class
AbstractAlgorithmProvidedBeanRegistry<T extends ShardingSp
}
@Override
- public void postProcessBeanFactory(final ConfigurableListableBeanFactory
configurableListableBeanFactory) {
+ public final void postProcessBeanFactory(final
ConfigurableListableBeanFactory configurableListableBeanFactory) {
}
@Override
- public Object postProcessBeforeInitialization(final Object bean, final
String beanName) {
+ public final Object postProcessBeforeInitialization(final Object bean,
final String beanName) {
return bean;
}
@Override
- public Object postProcessAfterInitialization(final Object bean, final
String beanName) {
+ public final Object postProcessAfterInitialization(final Object bean,
final String beanName) {
if (bean instanceof ShardingSphereAlgorithmPostProcessor) {
((ShardingSphereAlgorithmPostProcessor) bean).init();
}
