This is an automated email from the ASF dual-hosted git repository.
myskov 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 340a7eacecc HDDS-13564. Convert redundant fields to local var in test
modules (#8993)
340a7eacecc is described below
commit 340a7eacecc24ea2f151c1d716ca3359fdbb6e3f
Author: Ivan Zlenko <[email protected]>
AuthorDate: Sun Sep 7 13:18:08 2025 +0400
HDDS-13564. Convert redundant fields to local var in test modules (#8993)
---
.../ozone/common/TestChecksumImplsComputeSameValues.java | 4 ++--
.../hdds/security/ssl/TestReloadingX509KeyManager.java | 3 +--
.../x509/certificate/client/TestDnCertificateClientInit.java | 6 ++----
.../apache/hadoop/hdds/utils/TestRDBSnapshotProvider.java | 3 +--
.../apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java | 3 +--
.../apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java | 6 ++----
.../hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java | 3 +--
.../hadoop/hdds/scm/cli/container/TestInfoSubCommand.java | 5 ++---
.../apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java | 12 +++++-------
.../ozone/fs/http/server/metrics/TestHttpFSMetrics.java | 3 +--
.../org/apache/hadoop/ozone/recon/TestNSSummaryAdmin.java | 3 +--
.../apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java | 9 +++------
.../hadoop/ozone/recon/TestReconContainerEndpoint.java | 3 +--
.../ozone/recon/TestReconInsightsForDeletedDirectories.java | 6 ++----
.../apache/hadoop/ozone/recon/TestReconWithOzoneManager.java | 5 ++---
.../hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java | 3 +--
.../org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java | 10 +++-------
.../org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java | 3 +--
.../org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java | 3 +--
.../apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java | 3 +--
.../org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java | 3 +--
.../org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java | 3 +--
.../ozone/s3/endpoint/TestMultipartUploadWithCopy.java | 9 ++++-----
.../hadoop/ozone/s3/endpoint/TestObjectTaggingDelete.java | 9 +++------
.../hadoop/ozone/s3/endpoint/TestUploadWithStream.java | 3 +--
.../apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java | 3 +--
26 files changed, 45 insertions(+), 81 deletions(-)
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksumImplsComputeSameValues.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksumImplsComputeSameValues.java
index fed48f63ff6..3cb41fd586b 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksumImplsComputeSameValues.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksumImplsComputeSameValues.java
@@ -35,8 +35,8 @@
*/
public class TestChecksumImplsComputeSameValues {
- private int dataSize = 1024 * 1024 * 64;
- private ByteBuffer data = ByteBuffer.allocate(dataSize);
+ private static final int DATA_SIZE = 1024 * 1024 * 64;
+ private ByteBuffer data = ByteBuffer.allocate(DATA_SIZE);
private int[] bytesPerChecksum = {512, 1024, 2048, 4096, 32768, 1048576};
@Test
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/ssl/TestReloadingX509KeyManager.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/ssl/TestReloadingX509KeyManager.java
index bf646e3bea6..6e4d352ddda 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/ssl/TestReloadingX509KeyManager.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/ssl/TestReloadingX509KeyManager.java
@@ -35,12 +35,11 @@
public class TestReloadingX509KeyManager {
private final LogCapturer reloaderLog =
LogCapturer.captureLogs(ReloadingX509KeyManager.class);
- private static OzoneConfiguration conf;
private static CertificateClientTestImpl caClient;
@BeforeAll
public static void setUp() throws Exception {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
caClient = new CertificateClientTestImpl(conf);
}
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDnCertificateClientInit.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDnCertificateClientInit.java
index cf7de7b11f3..b3cd6a770ba 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDnCertificateClientInit.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDnCertificateClientInit.java
@@ -56,9 +56,7 @@
public class TestDnCertificateClientInit {
private KeyPair keyPair;
- private String certSerialId = "3284792342234";
private DNCertificateClient dnCertificateClient;
- private HDDSKeyGenerator keyGenerator;
@TempDir
private Path metaDirPath;
private SecurityConfig securityConfig;
@@ -84,10 +82,10 @@ public void setUp() throws Exception {
OzoneConfiguration config = new OzoneConfiguration();
config.set(HDDS_METADATA_DIR_NAME, metaDirPath.toString());
securityConfig = new SecurityConfig(config);
- keyGenerator = new HDDSKeyGenerator(securityConfig);
+ HDDSKeyGenerator keyGenerator = new HDDSKeyGenerator(securityConfig);
keyPair = keyGenerator.generateKey();
x509Certificate = getX509Certificate();
- certSerialId = x509Certificate.getSerialNumber().toString();
+ String certSerialId = x509Certificate.getSerialNumber().toString();
DatanodeDetails dn = MockDatanodeDetails.randomDatanodeDetails();
dnCertificateClient =
new DNCertificateClient(
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/TestRDBSnapshotProvider.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/TestRDBSnapshotProvider.java
index 458a87b6682..f8a1acf8739 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/TestRDBSnapshotProvider.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/TestRDBSnapshotProvider.java
@@ -72,7 +72,6 @@ public class TestRDBSnapshotProvider {
public static final int MAX_DB_UPDATES_SIZE_THRESHOLD = 80;
private RDBStore rdbStore = null;
- private ManagedDBOptions options = null;
private Set<TableConfig> configSet;
private RDBSnapshotProvider rdbSnapshotProvider;
private File testDir;
@@ -85,7 +84,7 @@ public class TestRDBSnapshotProvider {
public void init(@TempDir File tempDir) throws Exception {
CodecBuffer.enableLeakDetection();
- options = getNewDBOptions();
+ ManagedDBOptions options = getNewDBOptions();
configSet = new HashSet<>();
for (String name : families) {
TableConfig newConfig = new TableConfig(name,
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java
index b089b87737c..f721894c0a3 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java
@@ -68,13 +68,12 @@ public class TestTypedRDBTableStore {
"Sixth", "Seven", "Eighth",
"Ninth", "Ten");
private RDBStore rdbStore = null;
- private ManagedDBOptions options = null;
@BeforeEach
public void setUp(@TempDir File tempDir) throws Exception {
CodecBuffer.enableLeakDetection();
- options = new ManagedDBOptions();
+ ManagedDBOptions options = new ManagedDBOptions();
options.setCreateIfMissing(true);
options.setCreateMissingColumnFamilies(true);
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java
index 5b6fc39f237..bc21904f9c0 100644
---
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java
@@ -312,12 +312,10 @@ public class TestRocksDBCheckpointDiffer {
private File metadataDirDir;
private File compactionLogDir;
private File sstBackUpDir;
- private ConfigurationSource config;
private ExecutorService executorService = Executors.newCachedThreadPool();
private RocksDBCheckpointDiffer rocksDBCheckpointDiffer;
private ManagedRocksDB activeRocksDB;
- private ManagedDBOptions dbOptions;
private ColumnFamilyHandle keyTableCFHandle;
private ColumnFamilyHandle directoryTableCFHandle;
private ColumnFamilyHandle fileTableCFHandle;
@@ -354,7 +352,7 @@ public void init() throws RocksDBException {
sstBackUpDir = new File(METADATA_DIR_NAME, SST_BACK_UP_DIR_NAME);
createDir(sstBackUpDir, METADATA_DIR_NAME + "/" + SST_BACK_UP_DIR_NAME);
- config = mock(ConfigurationSource.class);
+ ConfigurationSource config = mock(ConfigurationSource.class);
when(config.getTimeDuration(
OZONE_OM_SNAPSHOT_COMPACTION_DAG_MAX_TIME_ALLOWED,
@@ -387,7 +385,7 @@ public void init() throws RocksDBException {
cfOpts.optimizeUniversalStyleCompaction();
List<ColumnFamilyDescriptor> cfDescriptors = getCFDescriptorList(cfOpts);
List<ColumnFamilyHandle> cfHandles = new ArrayList<>();
- dbOptions = new ManagedDBOptions();
+ ManagedDBOptions dbOptions = new ManagedDBOptions();
dbOptions.setCreateIfMissing(true);
dbOptions.setCreateMissingColumnFamilies(true);
diff --git
a/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java
index 1a421dd7563..cdf831ec137 100644
---
a/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java
+++
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/cert/TestCleanExpiredCertsSubcommand.java
@@ -40,7 +40,6 @@
class TestCleanExpiredCertsSubcommand {
private SCMSecurityProtocol scmSecurityProtocolMock;
- private CleanExpiredCertsSubcommand cmd;
private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
private final ByteArrayOutputStream errContent = new ByteArrayOutputStream();
private final PrintStream originalOut = System.out;
@@ -63,7 +62,7 @@ public void tearDown() {
@Test
public void testCleaningOneCertificate() throws Exception {
- cmd = new CleanExpiredCertsSubcommand();
+ CleanExpiredCertsSubcommand cmd = new CleanExpiredCertsSubcommand();
KeyPair keyPair = CertificateTestUtils.aKeyPair(new OzoneConfiguration());
X509Certificate cert = createSelfSignedCert(keyPair, "aCert");
ArrayList<String> certPemList = new ArrayList<>();
diff --git
a/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
index c5a60110fc4..a0bee39530d 100644
---
a/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
+++
b/hadoop-ozone/cli-admin/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
@@ -70,7 +70,6 @@ public class TestInfoSubCommand {
private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
private final ByteArrayOutputStream errContent = new ByteArrayOutputStream();
- private ByteArrayInputStream inContent;
private final PrintStream originalOut = System.out;
private final PrintStream originalErr = System.err;
private final InputStream originalIn = System.in;
@@ -128,7 +127,7 @@ public void testMultipleContainersCanBePassed() throws
Exception {
@Test
public void testContainersCanBeReadFromStdin() throws IOException {
String input = "1\n123\n456\ninvalid\n789\n";
- inContent = new ByteArrayInputStream(input.getBytes(DEFAULT_ENCODING));
+ ByteArrayInputStream inContent = new
ByteArrayInputStream(input.getBytes(DEFAULT_ENCODING));
System.setIn(inContent);
cmd = new InfoSubcommand();
CommandLine c = new CommandLine(cmd);
@@ -155,7 +154,7 @@ private void validateMultiOutput() throws
UnsupportedEncodingException {
public void testContainersCanBeReadFromStdinJson()
throws IOException {
String input = "1\n123\n456\ninvalid\n789\n";
- inContent = new ByteArrayInputStream(input.getBytes(DEFAULT_ENCODING));
+ ByteArrayInputStream inContent = new
ByteArrayInputStream(input.getBytes(DEFAULT_ENCODING));
System.setIn(inContent);
cmd = new InfoSubcommand();
CommandLine c = new CommandLine(cmd);
diff --git
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java
b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java
index 9c76f02f0e5..58e84b2dea5 100644
---
a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java
+++
b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java
@@ -31,8 +31,6 @@
* */
public class TestOzoneObjInfo {
- private OzoneObjInfo objInfo;
- private OzoneObjInfo.Builder builder;
private String volume = "vol1";
private String bucket = "bucket1";
private String key = "key1";
@@ -41,8 +39,8 @@ public class TestOzoneObjInfo {
@Test
public void testGetVolumeName() {
- builder = getBuilder(volume, bucket, key);
- objInfo = builder.build();
+ OzoneObjInfo.Builder builder = getBuilder(volume, bucket, key);
+ OzoneObjInfo objInfo = builder.build();
assertEquals(objInfo.getVolumeName(), volume);
objInfo = getBuilder(null, null, null).build();
@@ -65,7 +63,7 @@ private OzoneObjInfo.Builder getBuilder(String withVolume,
@Test
public void testGetBucketName() {
- objInfo = getBuilder(volume, bucket, key).build();
+ OzoneObjInfo objInfo = getBuilder(volume, bucket, key).build();
assertEquals(objInfo.getBucketName(), bucket);
objInfo = getBuilder(volume, null, null).build();
@@ -77,7 +75,7 @@ public void testGetBucketName() {
@Test
public void testGetKeyName() {
- objInfo = getBuilder(volume, bucket, key).build();
+ OzoneObjInfo objInfo = getBuilder(volume, bucket, key).build();
assertEquals(objInfo.getKeyName(), key);
objInfo = getBuilder(volume, null, null).build();
@@ -102,7 +100,7 @@ public void testFromProtobufOp() {
bucket + OZONE_URI_DELIMITER + key)
.build();
- objInfo = OzoneObjInfo.fromProtobuf(protoObj);
+ OzoneObjInfo objInfo = OzoneObjInfo.fromProtobuf(protoObj);
assertEquals(objInfo.getKeyName(), key);
objInfo = getBuilder(volume, null, null).build();
assertNull(objInfo.getKeyName());
diff --git
a/hadoop-ozone/httpfsgateway/src/test/java/org/apache/ozone/fs/http/server/metrics/TestHttpFSMetrics.java
b/hadoop-ozone/httpfsgateway/src/test/java/org/apache/ozone/fs/http/server/metrics/TestHttpFSMetrics.java
index fe909631425..fd2821ec7ae 100644
---
a/hadoop-ozone/httpfsgateway/src/test/java/org/apache/ozone/fs/http/server/metrics/TestHttpFSMetrics.java
+++
b/hadoop-ozone/httpfsgateway/src/test/java/org/apache/ozone/fs/http/server/metrics/TestHttpFSMetrics.java
@@ -52,7 +52,6 @@ public class TestHttpFSMetrics {
private static FileSystem mockFs = mock(FileSystem.class);
private static FSDataOutputStream fsDataOutputStream =
mock(FSDataOutputStream.class);
- private HttpFSServerWebApp webApp;
private HttpFSServerMetrics metrics;
private Configuration conf;
private UserGroupInformation ugi;
@@ -74,7 +73,7 @@ public void setUp() throws Exception {
conf = new Configuration();
conf.setBoolean(FILE_SYSTEM_SERVICE_CREATED, true);
- webApp = new HttpFSServerWebApp();
+ HttpFSServerWebApp webApp = new HttpFSServerWebApp();
webApp.init();
webApp.setService(MockFileSystemAccessService.class);
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryAdmin.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryAdmin.java
index 6523ab97ff7..4e8e595d3c4 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryAdmin.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryAdmin.java
@@ -44,7 +44,6 @@ public class TestNSSummaryAdmin extends
StandardOutputTestBase {
private static ObjectStore store;
private static OzoneAdmin ozoneAdmin;
- private static OzoneConfiguration conf;
private static MiniOzoneCluster cluster;
private static String volumeName;
@@ -55,7 +54,7 @@ public class TestNSSummaryAdmin extends
StandardOutputTestBase {
@BeforeAll
public static void init() throws Exception {
ozoneAdmin = new OzoneAdmin();
- conf = ozoneAdmin.getOzoneConf();
+ OzoneConfiguration conf = ozoneAdmin.getOzoneConf();
OMRequestTestUtils.configureFSOptimizedPaths(conf, true);
conf.set(OZONE_RECON_ADDRESS_KEY, "localhost:9888");
cluster = MiniOzoneCluster.newBuilder(conf)
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java
index 50e85f7d8c8..5bdfe32aa02 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java
@@ -124,15 +124,12 @@ public class TestNSSummaryMemoryLeak {
private static MiniOzoneCluster cluster;
private static FileSystem fs;
- private static String volumeName;
- private static String bucketName;
private static OzoneClient client;
private static ReconService recon;
- private static OzoneConfiguration conf;
@BeforeAll
public static void init() throws Exception {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
// Configure delays for testing
conf.setInt(OZONE_DIR_DELETING_SERVICE_INTERVAL, 1000000);
conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 10000000,
TimeUnit.MILLISECONDS);
@@ -149,8 +146,8 @@ public static void init() throws Exception {
// Create FSO bucket for testing
OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client,
BucketLayout.FILE_SYSTEM_OPTIMIZED);
- volumeName = bucket.getVolumeName();
- bucketName = bucket.getName();
+ String volumeName = bucket.getVolumeName();
+ String bucketName = bucket.getName();
String rootPath = String.format("%s://%s.%s/",
OzoneConsts.OZONE_URI_SCHEME, bucketName, volumeName);
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java
index bee3f5cdbcf..b278b14bc06 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java
@@ -54,7 +54,6 @@
*/
public class TestReconContainerEndpoint {
- private OzoneConfiguration conf;
private MiniOzoneCluster cluster;
private OzoneClient client;
private ObjectStore store;
@@ -63,7 +62,7 @@ public class TestReconContainerEndpoint {
@BeforeEach
public void init() throws Exception {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
OMConfigKeys.OZONE_BUCKET_LAYOUT_FILE_SYSTEM_OPTIMIZED);
recon = new ReconService(conf);
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
index 2c926288c74..5e6fe7e4269 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
@@ -79,8 +79,6 @@ public class TestReconInsightsForDeletedDirectories {
private static MiniOzoneCluster cluster;
private static FileSystem fs;
- private static String volumeName;
- private static String bucketName;
private static OzoneClient client;
private static ReconService recon;
@@ -102,8 +100,8 @@ public static void init() throws Exception {
// create a volume and a bucket to be used by OzoneFileSystem
OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client,
BucketLayout.FILE_SYSTEM_OPTIMIZED);
- volumeName = bucket.getVolumeName();
- bucketName = bucket.getName();
+ String volumeName = bucket.getVolumeName();
+ String bucketName = bucket.getName();
String rootPath = String.format("%s://%s.%s/",
OzoneConsts.OZONE_URI_SCHEME, bucketName, volumeName);
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
index 4f3a354edfa..dfdc3de2412 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
@@ -75,7 +75,6 @@
*/
public class TestReconWithOzoneManager {
private static MiniOzoneCluster cluster = null;
- private static OzoneConfiguration conf;
private static OMMetadataManager metadataManager;
private static CloseableHttpClient httpClient;
private static String taskStatusURL;
@@ -83,7 +82,7 @@ public class TestReconWithOzoneManager {
@BeforeAll
public static void init() throws Exception {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
int socketTimeout = (int) conf.getTimeDuration(
OZONE_RECON_OM_SOCKET_TIMEOUT,
conf.get(
@@ -96,7 +95,7 @@ public static void init() throws Exception {
ReconServerConfigKeys.RECON_OM_CONNECTION_TIMEOUT,
OZONE_RECON_OM_CONNECTION_TIMEOUT_DEFAULT),
TimeUnit.MILLISECONDS);
- int connectionRequestTimeout = (int)conf.getTimeDuration(
+ int connectionRequestTimeout = (int) conf.getTimeDuration(
OZONE_RECON_OM_CONNECTION_REQUEST_TIMEOUT,
conf.get(
ReconServerConfigKeys.RECON_OM_CONNECTION_REQUEST_TIMEOUT,
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
index 6eda5b1b967..51638133e96 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
@@ -55,13 +55,12 @@ public class TestReconWithOzoneManagerFSO {
private static OzoneClient client;
private static MiniOzoneCluster cluster = null;
- private static OzoneConfiguration conf;
private static ObjectStore store;
private static ReconService recon;
@BeforeAll
public static void init() throws Exception {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
OMConfigKeys.OZONE_BUCKET_LAYOUT_FILE_SYSTEM_OPTIMIZED);
recon = new ReconService(conf);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java
index d29fa60a592..6df57448cad 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java
@@ -62,10 +62,6 @@ public class TestAuthorizationFilter {
private AuthorizationFilter authorizationFilter = new AuthorizationFilter();
- private MultivaluedMap<String, String> headerMap;
- private MultivaluedMap<String, String> queryMap;
- private MultivaluedMap<String, String> pathParamsMap;
-
private static final String DATETIME = StringToSignProducer.TIME_FORMATTER.
format(LocalDateTime.now());
@@ -267,9 +263,9 @@ private ContainerRequestContext setupContext(
String method, String authHeader, String contentMd5,
String host, String amzContentSha256, String date, String contentType,
String path) throws URISyntaxException {
- headerMap = new MultivaluedHashMap<>();
- queryMap = new MultivaluedHashMap<>();
- pathParamsMap = new MultivaluedHashMap<>();
+ MultivaluedMap<String, String> headerMap = new MultivaluedHashMap<>();
+ MultivaluedMap<String, String> queryMap = new MultivaluedHashMap<>();
+ MultivaluedMap<String, String> pathParamsMap = new MultivaluedHashMap<>();
System.err.println("Testing: " + authHeader);
headerMap.putSingle(AUTHORIZATION_HEADER, authHeader);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java
index 5e1fd3fc594..ee1d78fe884 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java
@@ -60,7 +60,6 @@ public class TestS3GatewayAuditLog {
}
private String bucketName = OzoneConsts.BUCKET;
- private OzoneClient clientStub;
private BucketEndpoint bucketEndpoint;
private RootEndpoint rootEndpoint;
private ObjectEndpoint keyEndpoint;
@@ -71,7 +70,7 @@ public class TestS3GatewayAuditLog {
@BeforeEach
public void setup() throws Exception {
parametersMap.clear();
- clientStub = new OzoneClientStub();
+ OzoneClient clientStub = new OzoneClientStub();
clientStub.getObjectStore().createS3Bucket(bucketName);
bucket = clientStub.getObjectStore().getS3Bucket(bucketName);
requestIdentifier = new RequestIdentifier();
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java
index 84bc414e37e..ffba1be4035 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java
@@ -49,7 +49,6 @@ public class TestBucketAcl {
private static final String BUCKET_NAME = OzoneConsts.S3_BUCKET;
private OzoneClient client;
- private HttpServletRequest servletRequest;
private Map<String, String[]> parameterMap;
private HttpHeaders headers;
private BucketEndpoint bucketEndpoint;
@@ -60,7 +59,7 @@ public void setup() throws IOException {
client = new OzoneClientStub();
client.getObjectStore().createS3Bucket(BUCKET_NAME);
- servletRequest = mock(HttpServletRequest.class);
+ HttpServletRequest servletRequest = mock(HttpServletRequest.class);
parameterMap = mock(Map.class);
headers = mock(HttpHeaders.class);
when(servletRequest.getParameterMap()).thenReturn(parameterMap);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java
index 54841563aef..77af36f1b48 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java
@@ -38,7 +38,6 @@
public class TestBucketDelete {
private String bucketName = OzoneConsts.BUCKET;
- private OzoneClient clientStub;
private ObjectStore objectStoreStub;
private BucketEndpoint bucketEndpoint;
@@ -46,7 +45,7 @@ public class TestBucketDelete {
public void setup() throws Exception {
//Create client stub and object store stub.
- clientStub = new OzoneClientStub();
+ OzoneClient clientStub = new OzoneClientStub();
objectStoreStub = clientStub.getObjectStore();
clientStub.getObjectStore().createS3Bucket(bucketName);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java
index 32f584c08d5..dce0a1df03b 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java
@@ -35,12 +35,11 @@
public class TestBucketHead {
private String bucketName = OzoneConsts.BUCKET;
- private OzoneClient clientStub;
private BucketEndpoint bucketEndpoint;
@BeforeEach
public void setup() throws Exception {
- clientStub = new OzoneClientStub();
+ OzoneClient clientStub = new OzoneClientStub();
clientStub.getObjectStore().createS3Bucket(bucketName);
// Create HeadBucket and setClient to OzoneClientStub
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java
index 00543678234..0464ff54edc 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java
@@ -39,14 +39,13 @@
public class TestBucketPut {
private String bucketName = OzoneConsts.BUCKET;
- private OzoneClient clientStub;
private BucketEndpoint bucketEndpoint;
@BeforeEach
public void setup() throws Exception {
//Create client stub and object store stub.
- clientStub = new OzoneClientStub();
+ OzoneClient clientStub = new OzoneClientStub();
// Create HeadBucket and setClient to OzoneClientStub
bucketEndpoint = EndpointBuilder.newBucketEndpointBuilder()
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadWithCopy.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadWithCopy.java
index 5189ddf39aa..a06811434ff 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadWithCopy.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadWithCopy.java
@@ -72,7 +72,6 @@ public class TestMultipartUploadWithCopy {
private static final String EXISTING_KEY_CONTENT = "testkey";
private static final OzoneClient CLIENT = new OzoneClientStub();
private static final long DELAY_MS = 2000;
- private static long sourceKeyLastModificationTime;
private static String beforeSourceKeyModificationTimeStr;
private static String afterSourceKeyModificationTimeStr;
private static String futureTimeStr;
@@ -99,10 +98,10 @@ public static void setUp() throws Exception {
stream.write(keyContent);
}
- sourceKeyLastModificationTime = CLIENT.getObjectStore()
- .getS3Bucket(OzoneConsts.S3_BUCKET)
- .getKey(EXISTING_KEY)
- .getModificationTime().toEpochMilli();
+ long sourceKeyLastModificationTime = CLIENT.getObjectStore()
+
.getS3Bucket(OzoneConsts.S3_BUCKET)
+ .getKey(EXISTING_KEY)
+
.getModificationTime().toEpochMilli();
beforeSourceKeyModificationTimeStr =
OzoneUtils.formatTime(sourceKeyLastModificationTime - 1000);
afterSourceKeyModificationTimeStr =
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectTaggingDelete.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectTaggingDelete.java
index 04c4bfd65c1..81a260ff4f2 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectTaggingDelete.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectTaggingDelete.java
@@ -61,11 +61,8 @@ public class TestObjectTaggingDelete {
private static final String CONTENT = "0123456789";
private static final String BUCKET_NAME = "b1";
private static final String KEY_WITH_TAG = "keyWithTag";
- private HttpHeaders headers;
private ObjectEndpoint rest;
private OzoneClient client;
- private ByteArrayInputStream body;
- private ContainerRequestContext context;
@BeforeEach
public void init() throws OS3Exception, IOException {
@@ -74,14 +71,14 @@ public void init() throws OS3Exception, IOException {
client = new OzoneClientStub();
client.getObjectStore().createS3Bucket(BUCKET_NAME);
- headers = Mockito.mock(HttpHeaders.class);
+ HttpHeaders headers = Mockito.mock(HttpHeaders.class);
rest = EndpointBuilder.newObjectEndpointBuilder()
.setClient(client)
.setConfig(config)
.setHeaders(headers)
.build();
- body = new ByteArrayInputStream(CONTENT.getBytes(UTF_8));
+ ByteArrayInputStream body = new
ByteArrayInputStream(CONTENT.getBytes(UTF_8));
// Create a key with object tags
Mockito.when(headers.getHeaderString(TAG_HEADER)).thenReturn("tag1=value1&tag2=value2");
Mockito.when(headers.getHeaderString(X_AMZ_CONTENT_SHA256))
@@ -90,7 +87,7 @@ public void init() throws OS3Exception, IOException {
1, null, null, null, body);
- context = Mockito.mock(ContainerRequestContext.class);
+ ContainerRequestContext context =
Mockito.mock(ContainerRequestContext.class);
Mockito.when(context.getUriInfo()).thenReturn(Mockito.mock(UriInfo.class));
Mockito.when(context.getUriInfo().getQueryParameters())
.thenReturn(new MultivaluedHashMap<>());
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestUploadWithStream.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestUploadWithStream.java
index 02026c2ef9c..7ed2c488c44 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestUploadWithStream.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestUploadWithStream.java
@@ -62,7 +62,6 @@ public class TestUploadWithStream {
private ObjectEndpoint rest;
private OzoneClient client;
- private ContainerRequestContext context;
@BeforeEach
public void setUp() throws Exception {
@@ -79,7 +78,7 @@ public void setUp() throws Exception {
conf.setStorageSize(OZONE_FS_DATASTREAM_AUTO_THRESHOLD, 1,
StorageUnit.BYTES);
- context = mock(ContainerRequestContext.class);
+ ContainerRequestContext context = mock(ContainerRequestContext.class);
when(context.getUriInfo()).thenReturn(mock(UriInfo.class));
when(context.getUriInfo().getQueryParameters())
.thenReturn(new MultivaluedHashMap<>());
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
index 531d45b328f..600df053c4e 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
@@ -75,7 +75,6 @@ public class TestS3GatewayMetrics {
private static final String ACL_MARKER = "acl";
private static final String CONTENT = "0123456789";
private S3GatewayMetrics metrics;
- private ContainerRequestContext context;
@BeforeEach
public void setup() throws Exception {
@@ -104,7 +103,7 @@ public void setup() throws Exception {
keyEndpoint.setHeaders(headers);
metrics = bucketEndpoint.getMetrics();
- context = mock(ContainerRequestContext.class);
+ ContainerRequestContext context = mock(ContainerRequestContext.class);
when(context.getUriInfo()).thenReturn(mock(UriInfo.class));
when(context.getUriInfo().getQueryParameters())
.thenReturn(new MultivaluedHashMap<>());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
