HDDS-11963. Address review comments

Change-Id: I11bff280f429d2eb64f8828887f7349e169e938f
swamirishi · Dec 19, 2024 · bfa7618 · bfa7618
1 parent b819b63
commit bfa7618
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ComponentVersion.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ComponentVersion.java
@@ -17,12 +17,12 @@
  */
 package org.apache.hadoop.hdds;
 
-import org.apache.hadoop.ozone.Version;
+import org.apache.hadoop.ozone.Versioned;
 
 /**
  * Base type for component version enums.
  */
-public interface ComponentVersion extends Version {
+public interface ComponentVersion extends Versioned {
 
   /**
    * Returns the description of the version enum value.

diff --git a/...java/org/apache/hadoop/ozone/Version.java → ...va/org/apache/hadoop/ozone/Versioned.java b/...java/org/apache/hadoop/ozone/Version.java → ...va/org/apache/hadoop/ozone/Versioned.java
@@ -21,6 +21,6 @@
 /**
  * Base class defining the version in the entire system.
  */
-public interface Version {
+public interface Versioned {
   int version();
 }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutFeature.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutFeature.java
@@ -18,14 +18,14 @@
 
 package org.apache.hadoop.ozone.upgrade;
 
-import org.apache.hadoop.ozone.Version;
+import org.apache.hadoop.ozone.Versioned;
 
 import java.util.Optional;
 
 /**
  * Generic Layout feature interface for Ozone.
  */
-public interface LayoutFeature extends Version {
+public interface LayoutFeature extends Versioned {
   String name();
 
   int layoutVersion();

diff --git a/...manager/src/main/java/org/apache/hadoop/ozone/om/request/validation/VersionExtractor.java b/...manager/src/main/java/org/apache/hadoop/ozone/om/request/validation/VersionExtractor.java
@@ -17,7 +17,7 @@
 package org.apache.hadoop.ozone.om.request.validation;
 
 import org.apache.hadoop.ozone.ClientVersion;
-import org.apache.hadoop.ozone.Version;
+import org.apache.hadoop.ozone.Versioned;
 import org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.upgrade.LayoutVersionManager;
@@ -31,7 +31,7 @@ public enum VersionExtractor {
    */
   LAYOUT_VERSION_EXTRACTOR {
     @Override
-    public Version extractVersion(OMRequest req, ValidationContext ctx) {
+    public Versioned extractVersion(OMRequest req, ValidationContext ctx) {
       LayoutVersionManager layoutVersionManager = ctx.versionManager();
       return ctx.versionManager().getFeature(layoutVersionManager.getMetadataLayoutVersion());
     }
@@ -47,7 +47,7 @@ public Class<OMLayoutFeature> getVersionClass() {
    */
   CLIENT_VERSION_EXTRACTOR {
     @Override
-    public Version extractVersion(OMRequest req, ValidationContext ctx) {
+    public Versioned extractVersion(OMRequest req, ValidationContext ctx) {
       return req.getVersion() > ClientVersion.CURRENT_VERSION ?
           ClientVersion.FUTURE_VERSION : ClientVersion.fromProtoValue(req.getVersion());
     }
@@ -58,6 +58,6 @@ public Class<ClientVersion> getVersionClass() {
     }
   };
 
-  public abstract Version extractVersion(OMRequest req, ValidationContext ctx);
-  public abstract Class<? extends Version> getVersionClass();
+  public abstract Versioned extractVersion(OMRequest req, ValidationContext ctx);
+  public abstract Class<? extends Versioned> getVersionClass();
 }
diff --git a/...ger/src/test/java/org/apache/hadoop/ozone/om/request/validation/TestVersionExtractor.java b/...ger/src/test/java/org/apache/hadoop/ozone/om/request/validation/TestVersionExtractor.java
@@ -17,18 +17,17 @@
 package org.apache.hadoop.ozone.om.request.validation;
 
 import org.apache.hadoop.ozone.ClientVersion;
-import org.apache.hadoop.ozone.Version;
+import org.apache.hadoop.ozone.Versioned;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
 import org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature;
 import org.apache.hadoop.ozone.om.upgrade.OMLayoutVersionManager;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.upgrade.LayoutVersionManager;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.Arrays;
-import java.util.function.Function;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
@@ -38,37 +37,38 @@
 
 class TestVersionExtractor {
 
-  private static Stream<Arguments> layoutValues() {
-    return Arrays.stream(OMLayoutFeature.values()).map(Arguments::of);
-  }
-
-  private static Stream<Arguments> clientVersionValues() {
-    return Stream.of(
-        Arrays.stream(ClientVersion.values())
-            .map(clientVersion -> Arguments.of(clientVersion, clientVersion.version())),
-        IntStream.range(1, 10)
-            .mapToObj(delta -> Arguments.of(ClientVersion.FUTURE_VERSION, ClientVersion.CURRENT_VERSION + delta))
-        ).flatMap(Function.identity());
+  private static Stream<Arguments> futureClientVersionValues() {
+    return IntStream.range(1, 10).mapToObj(delta -> Arguments.of(ClientVersion.CURRENT_VERSION + delta));
   }
 
   @ParameterizedTest
-  @MethodSource("layoutValues")
+  @EnumSource(OMLayoutFeature.class)
   void testLayoutVersionExtractor(OMLayoutFeature layoutVersionValue) throws OMException {
     ValidationContext context = mock(ValidationContext.class);
     LayoutVersionManager layoutVersionManager = new OMLayoutVersionManager(layoutVersionValue.version());
     when(context.versionManager()).thenReturn(layoutVersionManager);
-    Version version = VersionExtractor.LAYOUT_VERSION_EXTRACTOR.extractVersion(null, context);
+    Versioned version = VersionExtractor.LAYOUT_VERSION_EXTRACTOR.extractVersion(null, context);
     assertEquals(layoutVersionValue, version);
     assertEquals(OMLayoutFeature.class, VersionExtractor.LAYOUT_VERSION_EXTRACTOR.getVersionClass());
   }
 
   @ParameterizedTest
-  @MethodSource("clientVersionValues")
-  void testClientVersionExtractor(ClientVersion expectedClientVersion, int clientVersion) {
+  @EnumSource(ClientVersion.class)
+  void testClientVersionExtractor(ClientVersion expectedClientVersion) {
     OMRequest request = mock(OMRequest.class);
-    when(request.getVersion()).thenReturn(clientVersion);
-    Version version = VersionExtractor.CLIENT_VERSION_EXTRACTOR.extractVersion(request, null);
+    when(request.getVersion()).thenReturn(expectedClientVersion.version());
+    Versioned version = VersionExtractor.CLIENT_VERSION_EXTRACTOR.extractVersion(request, null);
     assertEquals(expectedClientVersion, version);
     assertEquals(ClientVersion.class, VersionExtractor.CLIENT_VERSION_EXTRACTOR.getVersionClass());
   }
+
+  @ParameterizedTest
+  @MethodSource("futureClientVersionValues")
+  void testClientVersionExtractorForFutureValues(int clientVersion) {
+    OMRequest request = mock(OMRequest.class);
+    when(request.getVersion()).thenReturn(clientVersion);
+    Versioned version = VersionExtractor.CLIENT_VERSION_EXTRACTOR.extractVersion(request, null);
+    assertEquals(ClientVersion.FUTURE_VERSION, version);
+    assertEquals(ClientVersion.class, VersionExtractor.CLIENT_VERSION_EXTRACTOR.getVersionClass());
+  }
 }