This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new f17abae511 HDDS-12398. Enable PMD checks for tests (#7946)
f17abae511 is described below
commit f17abae51171c18a0897afa61cdc9ea86f975c65
Author: Ivan Zlenko <[email protected]>
AuthorDate: Sat Feb 22 19:48:15 2025 +0500
HDDS-12398. Enable PMD checks for tests (#7946)
---
dev-support/pmd/pmd-ruleset.xml | 10 +++++-----
.../org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java | 1 +
.../apache/hadoop/ozone/client/io/TestECBlockInputStream.java | 1 +
.../ozoneimpl/TestBackgroundContainerDataScanner.java | 1 +
.../ozoneimpl/TestBackgroundContainerMetadataScanner.java | 1 +
.../container/ozoneimpl/TestOnDemandContainerDataScanner.java | 1 +
.../container/replication/TestCopyContainerResponseStream.java | 1 +
.../container/replication/TestSendContainerOutputStream.java | 1 +
.../java/org/apache/ozone/erasurecode/TestCodecRegistry.java | 4 ++++
.../ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java | 1 +
.../hadoop/ozone/upgrade/TestUpgradeFinalizerActions.java | 1 +
.../java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java | 3 +++
.../test/java/org/apache/hadoop/ozone/failure/Failures.java | 1 +
.../fs/contract/AbstractContractMultipartUploaderTest.java | 1 +
.../hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java | 2 ++
.../test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java | 1 +
.../java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java | 1 +
.../java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java | 3 +++
.../hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java | 1 +
.../hadoop/ozone/freon/TestHadoopDirTreeGeneratorWithFSO.java | 1 +
.../apache/hadoop/ozone/om/multitenant/RangerUserRequest.java | 5 +++++
.../hadoop/tools/contract/AbstractContractDistCpTest.java | 1 +
.../test/java/org/apache/hadoop/utils/FaultInjectorImpl.java | 4 ++++
.../java/org/apache/ozone/test/TestOzoneIntegrationNonHA.java | 1 +
.../hadoop/ozone/om/helpers/TestTransactionInfoCodec.java | 1 +
.../om/request/bucket/TestOMBucketCreateRequestWithFSO.java | 1 +
.../ozone/om/request/file/TestOMFileCreateRequestWithFSO.java | 5 +++++
.../ozone/om/request/key/TestOMKeyAclRequestWithFSO.java | 1 +
.../ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java | 2 ++
.../ozone/om/request/key/TestOMSetTimesRequestWithFSO.java | 3 +++
.../multipart/TestS3InitiateMultipartUploadRequestWithFSO.java | 2 ++
.../hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java | 1 +
.../ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java | 1 +
.../TestS3InitiateMultipartUploadResponseWithFSO.java | 2 ++
.../org/apache/hadoop/ozone/client/ClientProtocolStub.java | 2 ++
.../java/org/apache/hadoop/ozone/client/OzoneBucketStub.java | 1 +
pom.xml | 1 +
37 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/dev-support/pmd/pmd-ruleset.xml b/dev-support/pmd/pmd-ruleset.xml
index 804f1fe86b..02e7915027 100644
--- a/dev-support/pmd/pmd-ruleset.xml
+++ b/dev-support/pmd/pmd-ruleset.xml
@@ -22,11 +22,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
http://pmd.sourceforge.io/ruleset_2_0_0.xsd";>
- <description>
- PMD Ruleset for Apache Ozone
- </description>
+ <description>
+ PMD Ruleset for Apache Ozone
+ </description>
- <rule ref="category/java/bestpractices.xml/MissingOverride" />
+ <rule ref="category/java/bestpractices.xml/MissingOverride"/>
- <exclude-pattern>.*/generated-sources/.*</exclude-pattern>
+ <exclude-pattern>.*/generated-sources/.*</exclude-pattern>
</ruleset>
diff --git
a/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java
b/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java
index 20eba367f9..db7d7a111e 100644
---
a/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java
+++
b/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java
@@ -255,6 +255,7 @@ public synchronized void setFailIndexes(Integer... fail) {
failIndexes.addAll(Arrays.asList(fail));
}
+ @Override
public synchronized BlockExtendedInputStream create(
ReplicationConfig repConfig,
BlockLocationInfo blockInfo, Pipeline pipeline,
diff --git
a/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/TestECBlockInputStream.java
b/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/TestECBlockInputStream.java
index 1d26de70e2..00bf2e9157 100644
---
a/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/TestECBlockInputStream.java
+++
b/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/TestECBlockInputStream.java
@@ -570,6 +570,7 @@ public synchronized List<TestBlockInputStream>
getBlockStreams() {
return blockStreams;
}
+ @Override
public synchronized BlockExtendedInputStream create(
ReplicationConfig repConfig, BlockLocationInfo blockInfo,
Pipeline pipeline, Token<OzoneBlockTokenIdentifier> token,
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
index eb689c41d2..ee83bf1817 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
@@ -56,6 +56,7 @@ public class TestBackgroundContainerDataScanner extends
private BackgroundContainerDataScanner scanner;
+ @Override
@BeforeEach
public void setup() {
super.setup();
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
index 15640a9c83..dc2f08d217 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
@@ -55,6 +55,7 @@ public class TestBackgroundContainerMetadataScanner extends
private BackgroundContainerMetadataScanner scanner;
+ @Override
@BeforeEach
public void setup() {
super.setup();
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerDataScanner.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerDataScanner.java
index 25dfe8456a..207b140edb 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerDataScanner.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerDataScanner.java
@@ -59,6 +59,7 @@
public class TestOnDemandContainerDataScanner extends
TestContainerScannersAbstract {
+ @Override
@BeforeEach
public void setup() {
super.setup();
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestCopyContainerResponseStream.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestCopyContainerResponseStream.java
index 321f1380f6..183a00daf3 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestCopyContainerResponseStream.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestCopyContainerResponseStream.java
@@ -39,6 +39,7 @@ protected OutputStream createSubject() {
getContainerId(), getBufferSize());
}
+ @Override
protected ByteString verifyPart(CopyContainerResponseProto response,
int expectedOffset, int size) {
assertEquals(getContainerId(), response.getContainerID());
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerOutputStream.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerOutputStream.java
index c7e2f4c0e1..c688b64951 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerOutputStream.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerOutputStream.java
@@ -64,6 +64,7 @@ void usesCompression(CopyContainerCompression compression)
throws Exception {
verify(getObserver()).onCompleted();
}
+ @Override
protected ByteString verifyPart(SendContainerRequest response,
int expectedOffset, int size) {
assertEquals(getContainerId(), response.getContainerID());
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/TestCodecRegistry.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/TestCodecRegistry.java
index 4ea80a7a63..5bb2974085 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/TestCodecRegistry.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/TestCodecRegistry.java
@@ -81,18 +81,22 @@ public void testGetCoderByNameWrong() {
@Test
public void testUpdateCoders() {
class RSUserDefinedIncorrectFactory implements RawErasureCoderFactory {
+ @Override
public RawErasureEncoder createEncoder(ECReplicationConfig coderOptions)
{
return null;
}
+ @Override
public RawErasureDecoder createDecoder(ECReplicationConfig coderOptions)
{
return null;
}
+ @Override
public String getCoderName() {
return "rs_java";
}
+ @Override
public String getCodecName() {
return ECReplicationConfig.EcCodec.RS.name().toLowerCase();
}
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java
index d1e16f1bad..3009d7d84c 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java
@@ -115,6 +115,7 @@ public void testCodingNegative6x3ErasingTooMany() {
testCodingWithErasingTooMany();
}
+ @Override
@Test
public void testCoding10x4ErasingD0P0() {
prepare(null, 10, 4, new int[] {0}, new int[] {0});
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestUpgradeFinalizerActions.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestUpgradeFinalizerActions.java
index e2ac3b09cd..46681cbba6 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestUpgradeFinalizerActions.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/ozone/upgrade/TestUpgradeFinalizerActions.java
@@ -183,6 +183,7 @@ public void addAction(UpgradeActionType type, UpgradeAction
action) {
this.actions.put(type, action);
}
+ @Override
public Optional<? extends UpgradeAction> action(UpgradeActionType phase) {
return Optional.ofNullable(actions.get(phase));
}
diff --git
a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
index 406bd4c1f4..6db7b4b016 100644
---
a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
+++
b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
@@ -72,6 +72,7 @@ enum FailureService {
OZONE_MANAGER,
STORAGE_CONTAINER_MANAGER;
+ @Override
public String toString() {
switch (this) {
case DATANODE:
@@ -407,11 +408,13 @@ public Set<StorageContainerManager> scmToFail() {
return scms;
}
+ @Override
public void shutdownStorageContainerManager(StorageContainerManager scm) {
super.shutdownStorageContainerManager(scm);
failedScmSet.add(scm);
}
+ @Override
public StorageContainerManager restartStorageContainerManager(
StorageContainerManager scm, boolean waitForScm)
throws IOException, TimeoutException, InterruptedException,
diff --git
a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/failure/Failures.java
b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/failure/Failures.java
index 8d36a49ab7..9a5a19318c 100644
---
a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/failure/Failures.java
+++
b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/failure/Failures.java
@@ -133,6 +133,7 @@ public void validateFailure(MiniOzoneChaosCluster cluster) {
*/
public static class StorageContainerManagerStartStopFailure
extends ScmFailures {
+ @Override
public void fail(MiniOzoneChaosCluster cluster) {
// Get the number of OzoneManager to fail in the cluster.
boolean shouldStop = cluster.shouldStopScm();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
index 18b19c93a1..5fcbd08f28 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
@@ -128,6 +128,7 @@ public void teardown() throws Exception {
* @return a path to use in the test
* @throws IOException failure to build the path name up.
*/
+ @Override
protected Path methodPath() throws IOException {
return path(getMethodName());
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
index 4c42bd0626..b3834aa3d2 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
@@ -241,6 +241,7 @@ public void testListFilesRecursive() throws Exception {
/**
* Case-2) Cannot rename a directory to its own subdirectory.
*/
+ @Override
@Test
public void testRenameDirToItsOwnSubDir() throws Exception {
final String root = "/root";
@@ -262,6 +263,7 @@ public void testRenameDirToItsOwnSubDir() throws Exception {
* is not yet supported.
* Fails if the (a) parent of dst does not exist or (b) parent is a file.
*/
+ @Override
@Test
public void testRenameDestinationParentDoesntExist() throws Exception {
final String root = "/root_dir";
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
index e8c153696a..3539b352f6 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
@@ -251,6 +251,7 @@ void restartHddsDatanode(DatanodeDetails dn, boolean
waitForDatanode)
*/
void shutdown();
+ @Override
default void close() {
shutdown();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
index 8b81f9558c..6a77a23d9d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -453,6 +453,7 @@ public void shutdownHddsDatanode(DatanodeDetails dn) throws
IOException {
shutdownHddsDatanode(getHddsDatanodeIndex(dn));
}
+ @Override
public String getClusterId() {
return scm.getClientProtocolServer().getScmInfo().getClusterId();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
index a25122b785..7499bb234c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
@@ -258,6 +258,7 @@ public String getClusterId() {
.getClientProtocolServer().getScmInfo().getClusterId();
}
+ @Override
public StorageContainerManager getActiveSCM() {
for (StorageContainerManager scm : scmhaService.getServices()) {
if (scm.checkLeader()) {
@@ -267,6 +268,7 @@ public StorageContainerManager getActiveSCM() {
return null;
}
+ @Override
public void waitForSCMToBeReady()
throws TimeoutException, InterruptedException {
GenericTestUtils.waitFor(() -> {
@@ -1018,6 +1020,7 @@ public List<StorageContainerManager>
getStorageContainerManagers() {
return new ArrayList<>(this.scmhaService.getServices());
}
+ @Override
public StorageContainerManager getStorageContainerManager() {
return getStorageContainerManagers().get(0);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
index 5e4eb9c4b5..0ce1457bdf 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
@@ -434,6 +434,7 @@ public void testS3Auth() throws Exception {
public void testZReadKeyWithUnhealthyContainerReplica() {
}
+ @Override
@Test
public void testGetServerDefaults() throws IOException {
assertNotNull(getClient().getProxy().getServerDefaults());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorWithFSO.java
index b1bae09ee3..b13c248654 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorWithFSO.java
@@ -26,6 +26,7 @@
public class TestHadoopDirTreeGeneratorWithFSO
extends TestHadoopDirTreeGenerator {
+ @Override
protected OzoneConfiguration getOzoneConfiguration() {
OzoneConfiguration conf = new OzoneConfiguration();
OMRequestTestUtils.configureFSOptimizedPaths(conf, true);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/RangerUserRequest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/RangerUserRequest.java
index 1fcb145c6f..95266b459c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/RangerUserRequest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/RangerUserRequest.java
@@ -80,12 +80,17 @@ private void setupRangerIgnoreServerCertificate() {
// Create a trust manager that does not validate certificate chains
TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() {
+ @Override
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return null;
}
+
+ @Override
public void checkClientTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
+
+ @Override
public void checkServerTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
index 6348346ba0..7ba4509177 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
@@ -107,6 +107,7 @@ public abstract class AbstractContractDistCpTest
* are allowed to take time, especially to remote stores.
* @return the current test timeout
*/
+ @Override
protected int getTestTimeoutMillis() {
return 15 * 60 * 1000;
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/utils/FaultInjectorImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/utils/FaultInjectorImpl.java
index 4e0629c0f5..a2db436c4f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/utils/FaultInjectorImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/utils/FaultInjectorImpl.java
@@ -71,21 +71,25 @@ public void reset() throws IOException {
init();
}
+ @Override
@VisibleForTesting
public void setException(Throwable e) {
ex = e;
}
+ @Override
@VisibleForTesting
public Throwable getException() {
return ex;
}
+ @Override
@VisibleForTesting
public void setType(ContainerProtos.Type type) {
this.type = type;
}
+ @Override
@VisibleForTesting
public ContainerProtos.Type getType() {
return type;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/ozone/test/TestOzoneIntegrationNonHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/ozone/test/TestOzoneIntegrationNonHA.java
index ab2c054804..790fc69d1f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/ozone/test/TestOzoneIntegrationNonHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/ozone/test/TestOzoneIntegrationNonHA.java
@@ -23,6 +23,7 @@
/** Test Ozone with non-HA cluster. */
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class TestOzoneIntegrationNonHA extends NonHATests {
+ @Override
protected MiniOzoneCluster createCluster() throws Exception {
return newClusterBuilder()
.build();
diff --git
a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestTransactionInfoCodec.java
b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestTransactionInfoCodec.java
index 21d97b3841..7640fb20fb 100644
---
a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestTransactionInfoCodec.java
+++
b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestTransactionInfoCodec.java
@@ -47,6 +47,7 @@ public void toAndFromPersistedFormat() throws Exception {
assertEquals(transactionInfo, convertedTransactionInfo);
}
+ @Override
@Test
public void testInvalidProtocolBuffer() {
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java
index 2435dc3a73..b9bd4029a6 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java
@@ -132,6 +132,7 @@ private OMBucketCreateRequest doPreExecute(String
volumeName,
return new OMBucketCreateRequest(modifiedRequest);
}
+ @Override
protected void doValidateAndUpdateCache(String volumeName, String bucketName,
OMRequest modifiedRequest) throws Exception {
String bucketKey = omMetadataManager.getBucketKey(volumeName, bucketName);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
index 73a3d7edb8..98b7afa6f5 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
@@ -45,6 +45,7 @@
*/
public class TestOMFileCreateRequestWithFSO extends TestOMFileCreateRequest {
+ @Override
@Test
public void testValidateAndUpdateCacheWithNonRecursive() throws Exception {
testNonRecursivePath(UUID.randomUUID().toString(), false, false, false);
@@ -76,6 +77,7 @@ public void testValidateAndUpdateCacheWithNonRecursive()
throws Exception {
testNonRecursivePath("a/b/e", false, false, false);
}
+ @Override
@Test
public void testValidateAndUpdateCacheWithNamespaceQuotaExceeded()
throws Exception {
@@ -100,6 +102,7 @@ public void
testValidateAndUpdateCacheWithNamespaceQuotaExceeded()
OzoneManagerProtocolProtos.Status.QUOTA_EXCEEDED);
}
+ @Override
@Test
public void testValidateAndUpdateCacheWithRecursiveAndOverWrite()
throws Exception {
@@ -129,6 +132,7 @@ public void
testValidateAndUpdateCacheWithRecursiveAndOverWrite()
testNonRecursivePath(key, false, true, true);
}
+ @Override
@Test
public void testValidateAndUpdateCacheWithNonRecursiveAndOverWrite()
throws Exception {
@@ -159,6 +163,7 @@ public void
testValidateAndUpdateCacheWithNonRecursiveAndOverWrite()
testNonRecursivePath(key, false, false, true);
}
+ @Override
@Test
public void testCreateFileInheritParentDefaultAcls()
throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
index f422df12e9..822e270627 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
@@ -34,6 +34,7 @@
*/
public class TestOMKeyAclRequestWithFSO extends TestOMKeyAclRequest {
+ @Override
protected String addKeyToTable() throws Exception {
String parentDir = "c/d/e";
String fileName = "file1";
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
index da46e619f3..6ba5a778d9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
@@ -98,12 +98,14 @@ protected String
addKeyToOpenKeyTable(List<OmKeyLocationInfo> locationList)
return addKeyToOpenKeyTable(locationList, omKeyInfoFSO);
}
+ @Override
@Nonnull
protected OMKeyCommitRequest getOmKeyCommitRequest(OMRequest omRequest) {
return new OMKeyCommitRequestWithFSO(omRequest,
BucketLayout.FILE_SYSTEM_OPTIMIZED);
}
+ @Override
public BucketLayout getBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMSetTimesRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMSetTimesRequestWithFSO.java
index 6c5d7a7fe2..5333ae851b 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMSetTimesRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMSetTimesRequestWithFSO.java
@@ -75,6 +75,7 @@ public void testDirSetTimesRequest() throws Exception {
* Verify that setTimes() on key works as expected.
* @throws Exception
*/
+ @Override
@Test
public void testKeySetTimesRequest() throws Exception {
OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
@@ -105,6 +106,7 @@ public void testKeySetTimesRequest() throws Exception {
assertEquals(mtime, keyMtime);
}
+ @Override
protected String addKeyToTable() throws Exception {
String key = PARENT_DIR + "/" + FILE_NAME;
keyName = key; // updated key name
@@ -132,6 +134,7 @@ protected String addKeyToTable() throws Exception {
volumeId, bucketId, omKeyInfo.getParentObjectID(), FILE_NAME);
}
+ @Override
protected OMKeySetTimesRequest getOmKeySetTimesRequest(
OMRequest setTimesRequest) {
return new OMKeySetTimesRequestWithFSO(setTimesRequest, getBucketLayout());
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestWithFSO.java
index 3c39eb90b8..41e6b57dd9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequestWithFSO.java
@@ -47,6 +47,7 @@
public class TestS3InitiateMultipartUploadRequestWithFSO
extends TestS3InitiateMultipartUploadRequest {
+ @Override
@Test
public void testValidateAndUpdateCache() throws Exception {
String volumeName = UUID.randomUUID().toString();
@@ -172,6 +173,7 @@ protected S3InitiateMultipartUploadRequest
getS3InitiateMultipartUploadReq(
return request;
}
+ @Override
@Test
public void testMultipartUploadInheritParentDefaultAcls()
throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
index 5398c8e28b..f332918be9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
@@ -176,6 +176,7 @@ protected OmBucketInfo getOmBucketInfo() {
return omBucketInfo;
}
+ @Override
public BucketLayout getBucketLayout() {
return BucketLayout.OBJECT_STORE;
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java
index 88170ff197..1f99c90e4d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponseWithFSO.java
@@ -60,6 +60,7 @@ public BucketLayout getBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
}
+ @Override
protected void createPreRequisities() throws Exception {
volId = omMetadataManager.getVolumeId(volumeName);
long buckId = omMetadataManager.getBucketId(volumeName, bucketName);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseWithFSO.java
index 954bf61b58..057092ff6b 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponseWithFSO.java
@@ -36,10 +36,12 @@
public class TestS3InitiateMultipartUploadResponseWithFSO
extends TestS3InitiateMultipartUploadResponse {
+ @Override
public BucketLayout getBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
}
+ @Override
@Test
public void testAddDBToBatch() throws Exception {
String volumeName = UUID.randomUUID().toString();
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/ClientProtocolStub.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/ClientProtocolStub.java
index ff3331b2ae..c15a85dc2e 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/ClientProtocolStub.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/ClientProtocolStub.java
@@ -709,6 +709,7 @@ public ListSnapshotResponse listSnapshot(
return null;
}
+ @Override
public void deleteSnapshot(String volumeName,
String bucketName, String snapshotName)
throws IOException {
@@ -721,6 +722,7 @@ public OzoneSnapshot getSnapshotInfo(String volumeName,
String bucketName,
return null;
}
+ @Override
public String printCompactionLogDag(String fileNamePrefix,
String graphType) throws IOException {
return null;
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/OzoneBucketStub.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/OzoneBucketStub.java
index 4c4b663757..5d060c228c 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/OzoneBucketStub.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/OzoneBucketStub.java
@@ -344,6 +344,7 @@ public Iterator<? extends OzoneKey> listKeys(String
keyPrefix,
.iterator();
}
+ @Override
public Iterator<? extends OzoneKey> listKeys(String keyPrefix,
String prevKey, boolean shallow) throws IOException {
if (!shallow) {
diff --git a/pom.xml b/pom.xml
index 1ec336807d..935deca2a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1757,6 +1757,7 @@
<ruleset>dev-support/pmd/pmd-ruleset.xml</ruleset>
</rulesets>
<printFailingErrors>true</printFailingErrors>
+ <includeTests>true</includeTests>
</configuration>
</plugin>
</plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
