This is an automated email from the ASF dual-hosted git repository.
kfaraz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 0217c8c5416 Change Inspection Profile to set "Method is identical to
its super method" as error (#16976)
0217c8c5416 is described below
commit 0217c8c5416fb696392a1df91d41372b5186e73d
Author: Virushade <[email protected]>
AuthorDate: Sat Aug 31 12:07:34 2024 +0800
Change Inspection Profile to set "Method is identical to its super method"
as error (#16976)
* Make IntelliJ's MethodIsIdenticalToSuperMethod an error
* Change codebase to follow new IntelliJ inspection
* Restore non-short-circuit boolean expressions to pass tests
---
.idea/inspectionProfiles/Druid.xml | 1 +
.../batch/parallel/LegacySinglePhaseSubTask.java | 21 ----------
.../testing/tools/CustomNodeRoleClientModule.java | 9 -----
.../apache/druid/testing/tools/SleepModule.java | 9 -----
.../org/apache/druid/math/expr/ConstantExpr.java | 12 ------
.../java/org/apache/druid/math/expr/Function.java | 45 ----------------------
.../query/aggregation/CountBufferAggregator.java | 7 ----
.../query/aggregation/NoopBufferAggregator.java | 7 ----
.../groupby/epinephelinae/BufferHashGrouper.java | 7 ----
.../epinephelinae/RowBasedGrouperHelper.java | 6 ---
.../apache/druid/segment/AutoTypeColumnMerger.java | 5 ---
.../druid/segment/DictionaryMergingIterator.java | 6 ---
.../segment/SimpleDictionaryMergingIterator.java | 6 ---
.../column/StringUtf8DictionaryEncodedColumn.java | 7 ----
.../segment/join/table/FrameBasedIndexedTable.java | 6 ---
.../segment/virtual/NestedFieldVirtualColumn.java | 12 ------
.../druid/catalog/model/table/DatasourceDefn.java | 7 ----
17 files changed, 1 insertion(+), 172 deletions(-)
diff --git a/.idea/inspectionProfiles/Druid.xml
b/.idea/inspectionProfiles/Druid.xml
index d1f72dd2763..0889de4cc67 100644
--- a/.idea/inspectionProfiles/Druid.xml
+++ b/.idea/inspectionProfiles/Druid.xml
@@ -120,6 +120,7 @@
<inspection_tool class="MavenDuplicatePluginInspection" enabled="true"
level="ERROR" enabled_by_default="true" />
<inspection_tool class="MavenModelInspection" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodComplexity" enabled="false" level="WARNING"
enabled_by_default="false" />
+ <inspection_tool class="MethodIsIdenticalToSuperMethod" enabled="true"
level="ERROR" enabled_by_default="true" />
<inspection_tool class="MismatchedArrayReadWrite" enabled="true"
level="ERROR" enabled_by_default="true" />
<inspection_tool class="MismatchedCollectionQueryUpdate" enabled="true"
level="ERROR" enabled_by_default="true">
<option name="queryNames">
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
index 27a242885c3..d2694c7afd9 100644
---
a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
+++
b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
@@ -20,20 +20,11 @@
package org.apache.druid.indexing.common.task.batch.parallel;
import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.collect.ImmutableSet;
import org.apache.druid.indexing.common.task.TaskResource;
-import org.apache.druid.server.security.Action;
-import org.apache.druid.server.security.Resource;
-import org.apache.druid.server.security.ResourceAction;
-import org.apache.druid.server.security.ResourceType;
-import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
public class LegacySinglePhaseSubTask extends SinglePhaseSubTask
{
@@ -66,16 +57,4 @@ public class LegacySinglePhaseSubTask extends
SinglePhaseSubTask
return SinglePhaseSubTask.OLD_TYPE_NAME;
}
- @Nonnull
- @JsonIgnore
- @Override
- public Set<ResourceAction> getInputSourceResources()
- {
- return getIngestionSchema().getIOConfig().getInputSource() != null ?
- getIngestionSchema().getIOConfig().getInputSource().getTypes()
- .stream()
- .map(i -> new ResourceAction(new Resource(i,
ResourceType.EXTERNAL), Action.READ))
- .collect(Collectors.toSet()) :
- ImmutableSet.of();
- }
}
diff --git
a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CustomNodeRoleClientModule.java
b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CustomNodeRoleClientModule.java
index f1171ffa4a6..df73a8c7d80 100644
---
a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CustomNodeRoleClientModule.java
+++
b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CustomNodeRoleClientModule.java
@@ -19,13 +19,9 @@
package org.apache.druid.testing.tools;
-import com.fasterxml.jackson.databind.Module;
import com.google.inject.Binder;
import org.apache.druid.initialization.DruidModule;
-import java.util.Collections;
-import java.util.List;
-
/**
* Super-simple "client" for the custom node role which defines
* the node role so that REST APIs and the system tables are
@@ -40,9 +36,4 @@ public class CustomNodeRoleClientModule implements DruidModule
// NodeRoles.addRole(binder, CliCustomNodeRole.NODE_ROLE);
}
- @Override
- public List<? extends Module> getJacksonModules()
- {
- return Collections.emptyList();
- }
}
diff --git
a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/SleepModule.java
b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/SleepModule.java
index a8028f6920f..6e7362b3b38 100644
---
a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/SleepModule.java
+++
b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/SleepModule.java
@@ -19,22 +19,13 @@
package org.apache.druid.testing.tools;
-import com.fasterxml.jackson.databind.Module;
import com.google.inject.Binder;
import org.apache.druid.guice.ExpressionModule;
import org.apache.druid.initialization.DruidModule;
import org.apache.druid.sql.guice.SqlBindings;
-import java.util.Collections;
-import java.util.List;
-
public class SleepModule implements DruidModule
{
- @Override
- public List<? extends Module> getJacksonModules()
- {
- return Collections.emptyList();
- }
@Override
public void configure(Binder binder)
diff --git
a/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
b/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
index 85cebd478ee..f6007512f6c 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
@@ -246,12 +246,6 @@ class LongExpr extends ConstantExpr<Long>
super(ExpressionType.LONG, Preconditions.checkNotNull(value, "value"));
}
- @Override
- public String toString()
- {
- return String.valueOf(value);
- }
-
@Override
protected ExprEval realEval()
{
@@ -329,12 +323,6 @@ class DoubleExpr extends ConstantExpr<Double>
super(ExpressionType.DOUBLE, Preconditions.checkNotNull(value, "value"));
}
- @Override
- public String toString()
- {
- return String.valueOf(value);
- }
-
@Override
protected ExprEval realEval()
{
diff --git a/processing/src/main/java/org/apache/druid/math/expr/Function.java
b/processing/src/main/java/org/apache/druid/math/expr/Function.java
index a7fc7f8c186..3f0a6e7aa9b 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/Function.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/Function.java
@@ -530,11 +530,6 @@ public interface Function extends NamedFunction
*/
abstract class ArraysMergeFunction extends ArraysFunction
{
- @Override
- public Set<Expr> getArrayInputs(List<Expr> args)
- {
- return ImmutableSet.copyOf(args);
- }
@Override
public boolean hasArrayOutput()
@@ -1183,16 +1178,6 @@ public interface Function extends NamedFunction
return NAME;
}
- @Nullable
- @Override
- public ExpressionType getOutputType(Expr.InputBindingInspector inspector,
List<Expr> args)
- {
- return ExpressionTypeConversion.function(
- args.get(0).getOutputType(inspector),
- args.get(1).getOutputType(inspector)
- );
- }
-
@Override
public boolean canVectorize(Expr.InputBindingInspector inspector,
List<Expr> args)
{
@@ -2315,18 +2300,6 @@ public interface Function extends NamedFunction
return ExprEval.ofLongBoolean(!super.apply(args, bindings).asBoolean());
}
- @Override
- public void validateArguments(List<Expr> args)
- {
- validationHelperCheckArgumentCount(args, 2);
- }
-
- @Nullable
- @Override
- public ExpressionType getOutputType(Expr.InputBindingInspector inspector,
List<Expr> args)
- {
- return ExpressionType.LONG;
- }
}
/**
@@ -3399,18 +3372,6 @@ public interface Function extends NamedFunction
return ExprEval.ofArray(arrayType, out);
}
- @Override
- public Set<Expr> getScalarInputs(List<Expr> args)
- {
- return ImmutableSet.copyOf(args);
- }
-
- @Override
- public Set<Expr> getArrayInputs(List<Expr> args)
- {
- return Collections.emptySet();
- }
-
@Override
public boolean hasArrayOutput()
{
@@ -3544,12 +3505,6 @@ public interface Function extends NamedFunction
return ExprEval.ofStringArray(arrayString.split(split != null ? split :
""));
}
- @Override
- public Set<Expr> getScalarInputs(List<Expr> args)
- {
- return ImmutableSet.copyOf(args);
- }
-
@Override
public boolean hasArrayOutput()
{
diff --git
a/processing/src/main/java/org/apache/druid/query/aggregation/CountBufferAggregator.java
b/processing/src/main/java/org/apache/druid/query/aggregation/CountBufferAggregator.java
index 7f30fa0006e..7b966d6f1e1 100644
---
a/processing/src/main/java/org/apache/druid/query/aggregation/CountBufferAggregator.java
+++
b/processing/src/main/java/org/apache/druid/query/aggregation/CountBufferAggregator.java
@@ -19,8 +19,6 @@
package org.apache.druid.query.aggregation;
-import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
-
import java.nio.ByteBuffer;
/**
@@ -71,9 +69,4 @@ public class CountBufferAggregator implements BufferAggregator
// no resources to cleanup
}
- @Override
- public void inspectRuntimeShape(RuntimeShapeInspector inspector)
- {
- // nothing to inspect
- }
}
diff --git
a/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java
b/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java
index 95774203d03..ab348273e3b 100644
---
a/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java
+++
b/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java
@@ -19,8 +19,6 @@
package org.apache.druid.query.aggregation;
-import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
-
import java.nio.ByteBuffer;
public final class NoopBufferAggregator implements BufferAggregator
@@ -75,9 +73,4 @@ public final class NoopBufferAggregator implements
BufferAggregator
{
}
- @Override
- public void inspectRuntimeShape(RuntimeShapeInspector inspector)
- {
- // nothing to inspect
- }
}
diff --git
a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
index c4d04697716..182a4857760 100644
---
a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
+++
b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
@@ -32,7 +32,6 @@ import java.util.AbstractList;
import java.util.Collections;
import java.util.List;
import java.util.NoSuchElementException;
-import java.util.function.ToIntFunction;
public class BufferHashGrouper<KeyType> extends
AbstractBufferHashGrouper<KeyType>
{
@@ -128,12 +127,6 @@ public class BufferHashGrouper<KeyType> extends
AbstractBufferHashGrouper<KeyTyp
return initialized;
}
- @Override
- public ToIntFunction<KeyType> hashFunction()
- {
- return Groupers::hashObject;
- }
-
@Override
public void newBucketHook(int bucketOffset)
{
diff --git
a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
index 0e73d5db6f4..8c42bb935d8 100644
---
a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
+++
b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
@@ -1815,12 +1815,6 @@ public class RowBasedGrouperHelper
);
}
- @Override
- public int getKeyBufferValueSize()
- {
- return Integer.BYTES;
- }
-
@Override
public BufferComparator getBufferComparator()
{
diff --git
a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnMerger.java
b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnMerger.java
index 801eaf112a5..7ce9709f30f 100644
---
a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnMerger.java
+++
b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnMerger.java
@@ -445,11 +445,6 @@ public class AutoTypeColumnMerger implements
DimensionMergerV9
return counter;
}
- @Override
- public void remove()
- {
- throw new UnsupportedOperationException("remove");
- }
}
public static class IdLookupArrayIterator implements Iterator<int[]>
diff --git
a/processing/src/main/java/org/apache/druid/segment/DictionaryMergingIterator.java
b/processing/src/main/java/org/apache/druid/segment/DictionaryMergingIterator.java
index 2e570c7d3de..bfbfe1aee38 100644
---
a/processing/src/main/java/org/apache/druid/segment/DictionaryMergingIterator.java
+++
b/processing/src/main/java/org/apache/druid/segment/DictionaryMergingIterator.java
@@ -162,12 +162,6 @@ public class DictionaryMergingIterator<T extends
Comparable<T>> implements Close
return value;
}
- @Override
- public void remove()
- {
- throw new UnsupportedOperationException("remove");
- }
-
@Override
public void close()
{
diff --git
a/processing/src/main/java/org/apache/druid/segment/SimpleDictionaryMergingIterator.java
b/processing/src/main/java/org/apache/druid/segment/SimpleDictionaryMergingIterator.java
index d38506fe724..75c47f70766 100644
---
a/processing/src/main/java/org/apache/druid/segment/SimpleDictionaryMergingIterator.java
+++
b/processing/src/main/java/org/apache/druid/segment/SimpleDictionaryMergingIterator.java
@@ -106,12 +106,6 @@ public class SimpleDictionaryMergingIterator<T extends
Comparable<T>> implements
return counter;
}
- @Override
- public void remove()
- {
- throw new UnsupportedOperationException("remove");
- }
-
@Override
public void close()
{
diff --git
a/processing/src/main/java/org/apache/druid/segment/column/StringUtf8DictionaryEncodedColumn.java
b/processing/src/main/java/org/apache/druid/segment/column/StringUtf8DictionaryEncodedColumn.java
index c3ebde1854c..a5966096a6e 100644
---
a/processing/src/main/java/org/apache/druid/segment/column/StringUtf8DictionaryEncodedColumn.java
+++
b/processing/src/main/java/org/apache/druid/segment/column/StringUtf8DictionaryEncodedColumn.java
@@ -222,13 +222,6 @@ public class StringUtf8DictionaryEncodedColumn implements
DictionaryEncodedColum
return DimensionSelectorUtils.makeValueMatcherGeneric(this,
predicateFactory);
}
- @Nullable
- @Override
- public Object getObject()
- {
- return defaultGetObject();
- }
-
@Override
public Class classOfObject()
{
diff --git
a/processing/src/main/java/org/apache/druid/segment/join/table/FrameBasedIndexedTable.java
b/processing/src/main/java/org/apache/druid/segment/join/table/FrameBasedIndexedTable.java
index 080a3c920ae..ceaffe846e2 100644
---
a/processing/src/main/java/org/apache/druid/segment/join/table/FrameBasedIndexedTable.java
+++
b/processing/src/main/java/org/apache/druid/segment/join/table/FrameBasedIndexedTable.java
@@ -263,12 +263,6 @@ public class FrameBasedIndexedTable implements IndexedTable
};
}
- @Override
- public boolean isCacheable()
- {
- return false;
- }
-
@Override
public void close()
{
diff --git
a/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
b/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
index 160415924a3..aa7dd8b88b7 100644
---
a/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
+++
b/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
@@ -1423,13 +1423,6 @@ public class NestedFieldVirtualColumn implements
VirtualColumn
return Numbers.tryParseLong(o, 0L);
}
- @Override
- public void inspectRuntimeShape(RuntimeShapeInspector inspector)
- {
- inspector.visit("baseSelector", baseSelector);
- inspector.visit("parts", parts);
- }
-
@Override
public boolean isNull()
{
@@ -1461,11 +1454,6 @@ public class NestedFieldVirtualColumn implements
VirtualColumn
return null;
}
- @Override
- public Class<?> classOfObject()
- {
- return Object.class;
- }
}
/**
diff --git
a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
index b3dc953cf8e..cca497f0b7f 100644
---
a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
+++
b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
@@ -21,7 +21,6 @@ package org.apache.druid.catalog.model.table;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.druid.catalog.model.CatalogUtils;
import org.apache.druid.catalog.model.ColumnSpec;
import org.apache.druid.catalog.model.Columns;
import org.apache.druid.catalog.model.ModelProperties;
@@ -78,12 +77,6 @@ public class DatasourceDefn extends TableDefn
super(SEGMENT_GRANULARITY_PROPERTY);
}
- @Override
- public void validate(Object value, ObjectMapper jsonMapper)
- {
- String gran = decode(value, jsonMapper);
- CatalogUtils.validateGranularity(gran);
- }
}
public static class HiddenColumnsDefn extends StringListPropertyDefn
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
