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 6222aed33e HDDS-10495. Removed JMockit dependency (#6352)
6222aed33e is described below
commit 6222aed33e104cc2740dac0d3fe598e46028dbde
Author: Maksim Myskov <[email protected]>
AuthorDate: Fri Mar 8 18:56:55 2024 +0300
HDDS-10495. Removed JMockit dependency (#6352)
---
hadoop-ozone/ozone-manager/pom.xml | 5 --
.../request/TestOMClientRequestWithUserInfo.java | 92 ++++++++++------------
pom.xml | 6 --
3 files changed, 41 insertions(+), 62 deletions(-)
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index d076e12932..5af36fb229 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -231,11 +231,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
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 d44b16808a..00b94824bb 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
@@ -25,8 +25,7 @@ import java.nio.file.Path;
import java.util.UUID;
import io.grpc.Context;
-import mockit.Mock;
-import mockit.MockUp;
+import org.apache.hadoop.ipc.Server;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.request.key.OMKeyCommitRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.BucketInfo;
@@ -37,7 +36,6 @@ import org.junit.jupiter.api.io.TempDir;
import org.mockito.MockedStatic;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ipc.ProtobufRpcEngine;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OMMetrics;
@@ -89,54 +87,46 @@ public class TestOMClientRequestWithUserInfo {
@Test
public void testUserInfoInCaseOfHadoopTransport() throws Exception {
- new MockUp<ProtobufRpcEngine.Server>() {
- @Mock
- public UserGroupInformation getRemoteUser() {
- return userGroupInformation;
- }
-
- @Mock
- public InetAddress getRemoteIp() {
- return inetAddress;
- }
-
- public InetAddress getRemoteAddress() {
- return inetAddress;
- }
- };
-
- String bucketName = UUID.randomUUID().toString();
- String volumeName = UUID.randomUUID().toString();
- BucketInfo.Builder bucketInfo =
- newBucketInfoBuilder(bucketName, volumeName)
- .setIsVersionEnabled(true)
- .setStorageType(OzoneManagerProtocolProtos.StorageTypeProto.DISK);
- OMRequest omRequest = newCreateBucketRequest(bucketInfo).build();
-
- OMBucketCreateRequest omBucketCreateRequest =
- new OMBucketCreateRequest(omRequest);
-
- assertFalse(omRequest.hasUserInfo());
-
- OMRequest modifiedRequest =
- omBucketCreateRequest.preExecute(ozoneManager);
-
- assertTrue(modifiedRequest.hasUserInfo());
-
- // Now pass modified request to OMBucketCreateRequest and check ugi and
- // remote Address.
- omBucketCreateRequest = new OMBucketCreateRequest(modifiedRequest);
-
- InetAddress remoteAddress = omBucketCreateRequest.getRemoteAddress();
- UserGroupInformation ugi = omBucketCreateRequest.createUGI();
- String hostName = omBucketCreateRequest.getHostName();
-
-
- // Now check we have original user info, remote address and hostname or
not.
- // Here from OMRequest user info, converted to UGI, InetAddress and String.
- assertEquals(inetAddress.getHostAddress(), remoteAddress.getHostAddress());
- assertEquals(userGroupInformation.getUserName(), ugi.getUserName());
- assertEquals(inetAddress.getHostName(), hostName);
+ try (MockedStatic<Server> mockedRpcServer =
+ mockStatic(Server.class)) {
+
+
mockedRpcServer.when(Server::getRemoteUser).thenReturn(userGroupInformation);
+ mockedRpcServer.when(Server::getRemoteIp).thenReturn(inetAddress);
+
mockedRpcServer.when(Server::getRemoteAddress).thenReturn(inetAddress.toString());
+
+ String bucketName = UUID.randomUUID().toString();
+ String volumeName = UUID.randomUUID().toString();
+ BucketInfo.Builder bucketInfo =
+ newBucketInfoBuilder(bucketName, volumeName)
+ .setIsVersionEnabled(true)
+
.setStorageType(OzoneManagerProtocolProtos.StorageTypeProto.DISK);
+ OMRequest omRequest = newCreateBucketRequest(bucketInfo).build();
+
+ OMBucketCreateRequest omBucketCreateRequest =
+ new OMBucketCreateRequest(omRequest);
+
+ assertFalse(omRequest.hasUserInfo());
+
+ OMRequest modifiedRequest =
+ omBucketCreateRequest.preExecute(ozoneManager);
+
+ assertTrue(modifiedRequest.hasUserInfo());
+
+ // Now pass modified request to OMBucketCreateRequest and check ugi and
+ // remote Address.
+ omBucketCreateRequest = new OMBucketCreateRequest(modifiedRequest);
+
+ InetAddress remoteAddress = omBucketCreateRequest.getRemoteAddress();
+ UserGroupInformation ugi = omBucketCreateRequest.createUGI();
+ String hostName = omBucketCreateRequest.getHostName();
+
+
+ // Now check we have original user info, remote address and hostname or
not.
+ // Here from OMRequest user info, converted to UGI, InetAddress and
String.
+ assertEquals(inetAddress.getHostAddress(),
remoteAddress.getHostAddress());
+ assertEquals(userGroupInformation.getUserName(), ugi.getUserName());
+ assertEquals(inetAddress.getHostName(), hostName);
+ }
}
@Test
diff --git a/pom.xml b/pom.xml
index 2689a3ccf8..942ed30409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,7 +217,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<okio.version>3.6.0</okio.version>
<mockito.version>4.11.0</mockito.version>
<hamcrest.version>2.2</hamcrest.version>
- <jmockit.version>1.24</jmockit.version>
<junit5.version>5.10.1</junit5.version>
<zookeeper.version>3.7.2</zookeeper.version>
@@ -1269,11 +1268,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
