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 7e70ed855bc HDDS-13562. Convert redundant fields to local var in
ozone-manager module (#8991)
7e70ed855bc is described below
commit 7e70ed855bcee4235e7a8d91e143bac4cd0ade4b
Author: Ivan Zlenko <[email protected]>
AuthorDate: Mon Sep 8 11:07:29 2025 +0400
HDDS-13562. Convert redundant fields to local var in ozone-manager module
(#8991)
---
.../java/org/apache/hadoop/ozone/om/OmTestManagers.java | 3 +--
.../hadoop/ozone/om/TestGrpcOzoneManagerServer.java | 9 +++------
.../org/apache/hadoop/ozone/om/TestKeyManagerUnit.java | 3 +--
.../apache/hadoop/ozone/om/TestOMTenantCreateRequest.java | 3 +--
.../java/org/apache/hadoop/ozone/om/TestScmClient.java | 6 ++----
.../apache/hadoop/ozone/om/TestServiceInfoProvider.java | 3 +--
.../org/apache/hadoop/ozone/om/ha/TestOMHAMetrics.java | 9 +++------
.../hadoop/ozone/om/lock/TestOzoneLockProvider.java | 4 +---
.../ratis/TestOzoneManagerDoubleBufferWithOMResponse.java | 6 ++----
.../ozone/om/ratis/TestOzoneManagerRatisRequest.java | 5 ++---
.../ozone/om/ratis/TestOzoneManagerRatisServer.java | 3 +--
.../ozone/om/request/TestOMClientRequestWithUserInfo.java | 6 ++----
.../request/file/TestOMDirectoryCreateRequestWithFSO.java | 3 +--
.../om/request/s3/security/TestS3GetSecretRequest.java | 6 ++----
.../hadoop/ozone/om/service/TestCompactionService.java | 3 +--
.../ozone/om/service/TestDirectoryDeletingService.java | 3 +--
.../hadoop/ozone/security/TestAWSV4AuthValidator.java | 13 ++-----------
.../ozone/security/TestOmCertificateClientInit.java | 6 ++----
.../apache/hadoop/ozone/security/acl/TestOzoneObj.java | 6 ++----
.../apache/hadoop/ozone/security/acl/TestParentAcl.java | 15 +++++----------
.../apache/hadoop/ozone/security/acl/TestVolumeOwner.java | 15 +++++----------
21 files changed, 41 insertions(+), 89 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
index 0e0088430ce..8b74dcd8a3d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
@@ -47,7 +47,6 @@ public final class OmTestManagers {
private final OzoneManager om;
private final KeyManager keyManager;
private final OMMetadataManager metadataManager;
- private KeyProviderCryptoExtension kmsProvider;
private final VolumeManager volumeManager;
private final BucketManager bucketManager;
private final PrefixManager prefixManager;
@@ -148,7 +147,7 @@ public OmTestManagers(OzoneConfiguration conf,
//initializing and returning a mock kmsProvider
public KeyProviderCryptoExtension kmsProviderInit() {
- kmsProvider = mock(KeyProviderCryptoExtension.class);
+ KeyProviderCryptoExtension kmsProvider =
mock(KeyProviderCryptoExtension.class);
HddsWhiteboxTestUtils.setInternalState(om,
"kmsProvider", kmsProvider);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestGrpcOzoneManagerServer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestGrpcOzoneManagerServer.java
index 2401e62bcd1..106efd73d68 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestGrpcOzoneManagerServer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestGrpcOzoneManagerServer.java
@@ -27,17 +27,14 @@
* Tests for GrpcOzoneManagerServer.
*/
public class TestGrpcOzoneManagerServer {
- private OzoneManager ozoneManager;
- private OzoneManagerProtocolServerSideTranslatorPB omServerProtocol;
- private GrpcOzoneManagerServer server;
@Test
public void testStartStop() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
- ozoneManager = mock(OzoneManager.class);
- omServerProtocol = ozoneManager.getOmServerProtocol();
+ OzoneManager ozoneManager = mock(OzoneManager.class);
+ OzoneManagerProtocolServerSideTranslatorPB omServerProtocol =
ozoneManager.getOmServerProtocol();
- server = new GrpcOzoneManagerServer(conf,
+ GrpcOzoneManagerServer server = new GrpcOzoneManagerServer(conf,
omServerProtocol,
ozoneManager.getDelegationTokenMgr(),
ozoneManager.getCertificateClient(),
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
index 60200cf1c71..8c0c936985f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
@@ -100,7 +100,6 @@ class TestKeyManagerUnit extends OzoneTestBase {
private static final AtomicLong CONTAINER_ID = new AtomicLong();
- private OzoneConfiguration configuration;
private OMMetadataManager metadataManager;
private StorageContainerLocationProtocol containerClient;
private KeyManagerImpl keyManager;
@@ -114,7 +113,7 @@ class TestKeyManagerUnit extends OzoneTestBase {
@BeforeAll
void setup(@TempDir Path testDir) throws Exception {
ExitUtils.disableSystemExit();
- configuration = new OzoneConfiguration();
+ OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.toString());
containerClient = mock(StorageContainerLocationProtocol.class);
blockClient = mock(ScmBlockLocationProtocol.class);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMTenantCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMTenantCreateRequest.java
index 6c05ef8f36f..a37879e9c76 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMTenantCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMTenantCreateRequest.java
@@ -60,7 +60,6 @@ public class TestOMTenantCreateRequest {
private OzoneManager ozoneManager;
private OMMetrics omMetrics;
private OMMetadataManager omMetadataManager;
- private AuditLogger auditLogger;
@BeforeEach
public void setup() throws Exception {
@@ -78,7 +77,7 @@ public void setup() throws Exception {
when(lvm.getMetadataLayoutVersion()).thenReturn(0);
when(lvm.isAllowed(anyString())).thenReturn(true);
when(ozoneManager.getVersionManager()).thenReturn(lvm);
- auditLogger = mock(AuditLogger.class);
+ AuditLogger auditLogger = mock(AuditLogger.class);
when(ozoneManager.getAuditLogger()).thenReturn(auditLogger);
doNothing().when(auditLogger).logWrite(any(AuditMessage.class));
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java
index 750fb9bf601..d055ac246c1 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java
@@ -57,16 +57,14 @@
* ScmClient test-cases.
*/
public class TestScmClient {
- private ScmBlockLocationProtocol scmBlockLocationProtocol;
private StorageContainerLocationProtocol containerLocationProtocol;
- private OzoneConfiguration conf;
private ScmClient scmClient;
@BeforeEach
public void setUp() {
- scmBlockLocationProtocol = mock(ScmBlockLocationProtocol.class);
+ ScmBlockLocationProtocol scmBlockLocationProtocol =
mock(ScmBlockLocationProtocol.class);
containerLocationProtocol = mock(StorageContainerLocationProtocol.class);
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
scmClient = new ScmClient(scmBlockLocationProtocol,
containerLocationProtocol, conf);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestServiceInfoProvider.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestServiceInfoProvider.java
index a686f18d4e7..f437e441f67 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestServiceInfoProvider.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestServiceInfoProvider.java
@@ -92,7 +92,6 @@ public void test() throws Exception {
public class TestSecureEnvironment {
private CertificateClient certClient;
- private X509Certificate cert1;
private String pem1;
private X509Certificate cert2;
private String pem2;
@@ -102,7 +101,7 @@ public class TestSecureEnvironment {
public void setup() throws Exception {
conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
certClient = mock(CertificateClient.class);
- cert1 = createSelfSignedCert(aKeyPair(conf), "1st", Duration.ofDays(1));
+ X509Certificate cert1 = createSelfSignedCert(aKeyPair(conf), "1st",
Duration.ofDays(1));
pem1 = getPEMEncodedString(cert1);
cert2 = createSelfSignedCert(aKeyPair(conf), "2nd", Duration.ofDays(2));
pem2 = getPEMEncodedString(cert2);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMHAMetrics.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMHAMetrics.java
index ee17a916bd0..f00ff60c8ea 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMHAMetrics.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMHAMetrics.java
@@ -33,8 +33,6 @@ public class TestOMHAMetrics {
new MetricsCollectorImpl();
private static final String NODE_ID =
"om" + RandomStringUtils.secure().nextNumeric(5);
- private OMHAMetrics omhaMetrics;
- private String leaderId;
@AfterEach
public void cleanUp() {
@@ -43,8 +41,7 @@ public void cleanUp() {
@Test
public void testGetMetricsWithLeader() {
- leaderId = NODE_ID;
- omhaMetrics = OMHAMetrics.create(NODE_ID, leaderId);
+ OMHAMetrics omhaMetrics = OMHAMetrics.create(NODE_ID, NODE_ID);
omhaMetrics.getMetrics(METRICS_COLLECTOR, true);
assertEquals(1, omhaMetrics.getOmhaInfoOzoneManagerHALeaderState());
@@ -52,8 +49,8 @@ public void testGetMetricsWithLeader() {
@Test
public void testGetMetricsWithFollower() {
- leaderId = "om" + RandomStringUtils.secure().nextNumeric(5);
- omhaMetrics = OMHAMetrics.create(NODE_ID, leaderId);
+ String leaderId = "om" + RandomStringUtils.secure().nextNumeric(5);
+ OMHAMetrics omhaMetrics = OMHAMetrics.create(NODE_ID, leaderId);
omhaMetrics.getMetrics(METRICS_COLLECTOR, true);
assertEquals(0, omhaMetrics.getOmhaInfoOzoneManagerHALeaderState());
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneLockProvider.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneLockProvider.java
index 84c75e87bc5..f42dfad3df5 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneLockProvider.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneLockProvider.java
@@ -40,7 +40,6 @@ public class TestOzoneLockProvider {
LoggerFactory.getLogger(TestOzoneLockProvider.class);
private OzoneManager ozoneManager;
- private OzoneLockStrategy ozoneLockStrategy;
private boolean keyPathLockEnabled;
private boolean enableFileSystemPaths;
@@ -77,8 +76,7 @@ public void testOzoneLockProviderUtil(BucketLayout
bucketLayout) {
when(ozoneManager.getOzoneLockProvider()).thenReturn(
new OzoneLockProvider(keyPathLockEnabled, enableFileSystemPaths));
- ozoneLockStrategy =
- ozoneManager.getOzoneLockProvider().createLockStrategy(bucketLayout);
+ OzoneLockStrategy ozoneLockStrategy =
ozoneManager.getOzoneLockProvider().createLockStrategy(bucketLayout);
if (keyPathLockEnabled) {
if (bucketLayout == BucketLayout.OBJECT_STORE) {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
index 3f1d1df52f3..4ba3c6b5d1b 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
@@ -80,8 +80,6 @@ public class TestOzoneManagerDoubleBufferWithOMResponse {
private static final int MAX_VOLUMES = 1000;
private OzoneManager ozoneManager;
- private OMMetrics omMetrics;
- private AuditLogger auditLogger;
private OMMetadataManager omMetadataManager;
private OzoneManagerDoubleBuffer doubleBuffer;
private final AtomicLong trxId = new AtomicLong(0);
@@ -93,7 +91,7 @@ public class TestOzoneManagerDoubleBufferWithOMResponse {
@BeforeEach
public void setup() throws IOException {
ozoneManager = mock(OzoneManager.class, withSettings().stubOnly());
- omMetrics = OMMetrics.create();
+ OMMetrics omMetrics = OMMetrics.create();
OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.toAbsolutePath().toString());
@@ -102,7 +100,7 @@ public void setup() throws IOException {
when(ozoneManager.getMetrics()).thenReturn(omMetrics);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
when(ozoneManager.getMaxUserVolumeCount()).thenReturn(10L);
- auditLogger = mock(AuditLogger.class);
+ AuditLogger auditLogger = mock(AuditLogger.class);
when(ozoneManager.getAuditLogger()).thenReturn(auditLogger);
when(ozoneManager.getConfiguration()).thenReturn(ozoneConfiguration);
when(ozoneManager.getConfig()).thenReturn(ozoneConfiguration.getObject(OmConfig.class));
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java
index 50ffa6c3538..fdc9e0f008d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java
@@ -57,14 +57,13 @@ public class TestOzoneManagerRatisRequest {
private OzoneManager ozoneManager;
private final OzoneConfiguration ozoneConfiguration =
new OzoneConfiguration();
- private OMMetadataManager omMetadataManager;
@Test
public void testRequestWithNonExistentBucket() throws Exception {
ozoneManager = mock(OzoneManager.class);
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.resolve("om").toAbsolutePath().toString());
- omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration,
+ OMMetadataManager omMetadataManager = new
OmMetadataManagerImpl(ozoneConfiguration,
ozoneManager);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
@@ -105,7 +104,7 @@ public void testUnknownRequestHandling()
ozoneManager = mock(OzoneManager.class);
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.resolve("om").toAbsolutePath().toString());
- omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration,
+ OMMetadataManager omMetadataManager = new
OmMetadataManagerImpl(ozoneConfiguration,
ozoneManager);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
OMExecutionFlow omExecutionFlow = new OMExecutionFlow(ozoneManager);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
index f832c61d9e8..f5e1b2dce81 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
@@ -69,7 +69,6 @@ public class TestOzoneManagerRatisServer {
private OzoneConfiguration conf;
private OzoneManagerRatisServer omRatisServer;
- private String omID;
private String clientId = UUID.randomUUID().toString();
private static final long RATIS_RPC_TIMEOUT = 500L;
private OMMetadataManager omMetadataManager;
@@ -86,7 +85,7 @@ public static void setup() {
@BeforeEach
public void init(@TempDir Path metaDirPath) throws Exception {
conf = new OzoneConfiguration();
- omID = UUID.randomUUID().toString();
+ String omID = UUID.randomUUID().toString();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, metaDirPath.toString());
conf.setTimeDuration(OMConfigKeys.OZONE_OM_RATIS_MINIMUM_TIMEOUT_KEY,
RATIS_RPC_TIMEOUT, TimeUnit.MILLISECONDS);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMClientRequestWithUserInfo.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMClientRequestWithUserInfo.java
index 138f6f28122..f2542251ab7 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMClientRequestWithUserInfo.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMClientRequestWithUserInfo.java
@@ -61,8 +61,6 @@ public class TestOMClientRequestWithUserInfo {
private Path folder;
private OzoneManager ozoneManager;
- private OMMetrics omMetrics;
- private OMMetadataManager omMetadataManager;
private UserGroupInformation userGroupInformation =
UserGroupInformation.createRemoteUser("temp");
private InetAddress inetAddress;
@@ -70,11 +68,11 @@ public class TestOMClientRequestWithUserInfo {
@BeforeEach
public void setup() throws Exception {
ozoneManager = mock(OzoneManager.class);
- omMetrics = OMMetrics.create();
+ OMMetrics omMetrics = OMMetrics.create();
OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.toAbsolutePath().toString());
- omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration,
+ OMMetadataManager omMetadataManager = new
OmMetadataManagerImpl(ozoneConfiguration,
ozoneManager);
when(ozoneManager.getMetrics()).thenReturn(omMetrics);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
index 2f8fdffc5f5..0c87607c3bc 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
@@ -85,7 +85,6 @@ public class TestOMDirectoryCreateRequestWithFSO {
private OzoneManager ozoneManager;
private OMMetrics omMetrics;
private OMMetadataManager omMetadataManager;
- private AuditLogger auditLogger;
@BeforeEach
public void setup() throws Exception {
@@ -101,7 +100,7 @@ public void setup() throws Exception {
when(ozoneManager.getConfig()).thenReturn(ozoneConfiguration.getObject(OmConfig.class));
when(ozoneManager.getMetrics()).thenReturn(omMetrics);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
- auditLogger = mock(AuditLogger.class);
+ AuditLogger auditLogger = mock(AuditLogger.class);
when(ozoneManager.getAuditLogger()).thenReturn(auditLogger);
doNothing().when(auditLogger).logWrite(any(AuditMessage.class));
when(ozoneManager.resolveBucketLink(any(KeyArgs.class),
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
index b41bc687807..b5080d24eb1 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
@@ -97,7 +97,6 @@ public class TestS3GetSecretRequest {
private OzoneManager ozoneManager;
private OMMetrics omMetrics;
- private AuditLogger auditLogger;
private OmMetadataManagerImpl omMetadataManager;
// Multi-tenant related vars
@@ -112,7 +111,6 @@ public class TestS3GetSecretRequest {
private UserGroupInformation ugiCarol;
private OMMultiTenantManager omMultiTenantManager;
- private Tenant tenant;
@BeforeEach
public void setUp() throws Exception {
@@ -154,13 +152,13 @@ public void setUp() throws Exception {
);
when(ozoneManager.getS3SecretManager()).thenReturn(secretManager);
- auditLogger = mock(AuditLogger.class);
+ AuditLogger auditLogger = mock(AuditLogger.class);
when(ozoneManager.getAuditLogger()).thenReturn(auditLogger);
doNothing().when(auditLogger).logWrite(any(AuditMessage.class));
// Multi-tenant related initializations
omMultiTenantManager = mock(OMMultiTenantManager.class);
- tenant = mock(Tenant.class);
+ Tenant tenant = mock(Tenant.class);
when(ozoneManager.getMultiTenantManager()).thenReturn(omMultiTenantManager);
when(tenant.getTenantAccessPolicies()).thenReturn(new ArrayList<>());
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestCompactionService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestCompactionService.java
index bd10bd59e55..d2542315670 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestCompactionService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestCompactionService.java
@@ -58,7 +58,6 @@ class TestCompactionService {
private static final int SERVICE_INTERVAL = 1;
private static final int WAIT_TIME = (int) Duration.ofSeconds(10).toMillis();
private OzoneManager ozoneManager;
- private OMMetadataManager metadataManager;
@BeforeAll
void setup(@TempDir Path tempDir) {
@@ -73,7 +72,7 @@ void setup(@TempDir Path tempDir) {
conf.setQuietMode(false);
ozoneManager = mock(OzoneManager.class);
- metadataManager = mock(OMMetadataManager.class);
+ OMMetadataManager metadataManager = mock(OMMetadataManager.class);
when(ozoneManager.getMetadataManager()).thenReturn(metadataManager);
TypedTable table = mock(TypedTable.class);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java
index 1a55b63bb27..9fabe5a4650 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java
@@ -72,7 +72,6 @@ public class TestDirectoryDeletingService {
@TempDir
private Path folder;
- private OzoneManagerProtocol writeClient;
private OzoneManager om;
private String volumeName;
private String bucketName;
@@ -115,7 +114,7 @@ public void testDeleteDirectoryCrossingSizeLimit() throws
Exception {
OmTestManagers omTestManagers
= new OmTestManagers(conf);
KeyManager keyManager = omTestManagers.getKeyManager();
- writeClient = omTestManagers.getWriteClient();
+ OzoneManagerProtocol writeClient = omTestManagers.getWriteClient();
om = omTestManagers.getOzoneManager();
OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestAWSV4AuthValidator.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestAWSV4AuthValidator.java
index c036ac3c7ee..5564947c1bb 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestAWSV4AuthValidator.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestAWSV4AuthValidator.java
@@ -29,11 +29,6 @@
*/
public class TestAWSV4AuthValidator {
- private String strToSign;
- private String signature;
- private String awsAccessKey;
- private Boolean result;
-
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{
@@ -77,11 +72,7 @@ public static Collection<Object[]> data() {
@MethodSource("data")
public void testValidateRequest(String stringToSign, String sign,
String accessKey, Boolean testResult) {
- this.strToSign = stringToSign;
- this.signature = sign;
- this.awsAccessKey = accessKey;
- this.result = testResult;
- assertEquals(result, AWSV4AuthValidator.validateRequest(
- strToSign, signature, awsAccessKey));
+ assertEquals(testResult, AWSV4AuthValidator.validateRequest(
+ stringToSign, sign, accessKey));
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOmCertificateClientInit.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOmCertificateClientInit.java
index 73f8656ea0a..d5fdd032a38 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOmCertificateClientInit.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOmCertificateClientInit.java
@@ -60,9 +60,7 @@
public class TestOmCertificateClientInit {
private KeyPair keyPair;
- private String certSerialId = "3284792342234";
private OMCertificateClient omCertificateClient;
- private HDDSKeyGenerator keyGenerator;
private SecurityConfig securityConfig;
private KeyStorage omKeyStorage;
private X509Certificate x509Certificate;
@@ -86,10 +84,10 @@ public void setUp(@TempDir Path metaDirPath) 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();
OMStorage storage = mock(OMStorage.class);
when(storage.getOmCertSerialId()).thenReturn(certSerialId);
when(storage.getClusterID()).thenReturn("test");
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObj.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObj.java
index b750b1a85ca..e65d8eb17c8 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObj.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObj.java
@@ -32,8 +32,6 @@
*/
public class TestOzoneObj {
- private OzoneObjInfo objInfo;
- private OzoneObjInfo.Builder builder;
private String volume = "vol1";
private String bucket = "bucket1";
private String key = "key1";
@@ -42,8 +40,8 @@ public class TestOzoneObj {
@Test
public void testGetPathViewer() throws IOException {
- builder = getBuilder(volume, bucket, key);
- objInfo = builder.build();
+ OzoneObjInfo.Builder builder = getBuilder(volume, bucket, key);
+ OzoneObjInfo objInfo = builder.build();
assertEquals(objInfo.getVolumeName(), volume);
assertNotNull(objInfo.getOzonePrefixPathViewer(),
"unexpected path accessor");
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
index 92bcc7b7a2b..ed47b957826 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
@@ -74,11 +74,6 @@
* Test parent acl requirements when accessing children with native authorizer.
*/
public class TestParentAcl {
- private static OzoneConfiguration ozConfig;
- private static KeyManager keyManager;
- private static VolumeManager volumeManager;
- private static BucketManager bucketManager;
- private static PrefixManager prefixManager;
private static OMMetadataManager metadataManager;
private static OzoneNativeAuthorizer nativeAuthorizer;
private static UserGroupInformation adminUgi;
@@ -89,7 +84,7 @@ public class TestParentAcl {
@BeforeAll
static void setup() throws Exception {
- ozConfig = new OzoneConfiguration();
+ OzoneConfiguration ozConfig = new OzoneConfiguration();
ozConfig.set(OZONE_ACL_AUTHORIZER_CLASS,
OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
ozConfig.set(OZONE_METADATA_DIRS, testDir.toString());
@@ -98,10 +93,10 @@ static void setup() throws Exception {
OmTestManagers omTestManagers =
new OmTestManagers(ozConfig);
metadataManager = omTestManagers.getMetadataManager();
- volumeManager = omTestManagers.getVolumeManager();
- bucketManager = omTestManagers.getBucketManager();
- prefixManager = omTestManagers.getPrefixManager();
- keyManager = omTestManagers.getKeyManager();
+ VolumeManager volumeManager = omTestManagers.getVolumeManager();
+ BucketManager bucketManager = omTestManagers.getBucketManager();
+ PrefixManager prefixManager = omTestManagers.getPrefixManager();
+ KeyManager keyManager = omTestManagers.getKeyManager();
writeClient = omTestManagers.getWriteClient();
nativeAuthorizer = new OzoneNativeAuthorizer(volumeManager, bucketManager,
keyManager, prefixManager,
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
index acddf20d27b..43c0d0a39ac 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestVolumeOwner.java
@@ -59,12 +59,7 @@
*/
public class TestVolumeOwner {
- private static OzoneConfiguration ozoneConfig;
private static OzoneNativeAuthorizer nativeAuthorizer;
- private static KeyManager keyManager;
- private static VolumeManager volumeManager;
- private static BucketManager bucketManager;
- private static PrefixManager prefixManager;
private static OMMetadataManager metadataManager;
private static UserGroupInformation testUgi;
private static OzoneManagerProtocol writeClient;
@@ -73,7 +68,7 @@ public class TestVolumeOwner {
@BeforeAll
static void setup() throws Exception {
- ozoneConfig = new OzoneConfiguration();
+ OzoneConfiguration ozoneConfig = new OzoneConfiguration();
ozoneConfig.set(OZONE_ACL_AUTHORIZER_CLASS,
OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
ozoneConfig.set(OZONE_METADATA_DIRS, testDir.toString());
@@ -81,10 +76,10 @@ static void setup() throws Exception {
OmTestManagers omTestManagers =
new OmTestManagers(ozoneConfig);
metadataManager = omTestManagers.getMetadataManager();
- volumeManager = omTestManagers.getVolumeManager();
- bucketManager = omTestManagers.getBucketManager();
- keyManager = omTestManagers.getKeyManager();
- prefixManager = omTestManagers.getPrefixManager();
+ VolumeManager volumeManager = omTestManagers.getVolumeManager();
+ BucketManager bucketManager = omTestManagers.getBucketManager();
+ KeyManager keyManager = omTestManagers.getKeyManager();
+ PrefixManager prefixManager = omTestManagers.getPrefixManager();
writeClient = omTestManagers.getWriteClient();
nativeAuthorizer = new OzoneNativeAuthorizer(volumeManager, bucketManager,
keyManager, prefixManager,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
