Re: [PR] HDDS-12983. Validator Registry Changes for Supporting Version based validations [ozone]

[via GitHub]

swamirishi commented on code in PR #8404:
URL: https://github.com/apache/ozone/pull/8404#discussion_r2103207575


##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/validation/TestValidatorRegistry.java:
##########
@@ -71,121 +80,148 @@ public void tearDown() {
 
   @Test
   public void testNoValidatorsReturnedForEmptyConditionList() {
-    ValidatorRegistry registry = new ValidatorRegistry(PACKAGE);
-    List<Method> validators =
-        registry.validationsFor(emptyList(), CreateKey, PRE_PROCESS);
+    ValidatorRegistry<OzoneManagerProtocolProtos.Type> registry =
+        new ValidatorRegistry<>(OzoneManagerProtocolProtos.Type.class, PACKAGE,
+            
Arrays.stream(VersionExtractor.values()).map(VersionExtractor::getValidatorClass)
+                .collect(Collectors.toSet()), REQUEST_PROCESSING_PHASES);
+    List<Method> validators = registry.validationsFor(CreateKey, PRE_PROCESS,
+        CLIENT_VERSION_EXTRACTOR.getValidatorClass(), ClientVersion.CURRENT);
 
     assertTrue(validators.isEmpty());
   }
 
   @Test
   public void testRegistryHasThePreFinalizePreProcessCreateKeyValidator() {
-    ValidatorRegistry registry = new ValidatorRegistry(PACKAGE);
+    ValidatorRegistry<OzoneManagerProtocolProtos.Type> registry = new 
ValidatorRegistry<>(
+        OzoneManagerProtocolProtos.Type.class, PACKAGE,
+        
Arrays.stream(VersionExtractor.values()).map(VersionExtractor::getValidatorClass).collect(Collectors.toSet()),
+        REQUEST_PROCESSING_PHASES);
     List<Method> validators =
-        registry.validationsFor(
-            asList(CLUSTER_NEEDS_FINALIZATION), CreateKey, PRE_PROCESS);
+        registry.validationsFor(CreateKey, PRE_PROCESS,
+            ImmutableMap.of(CLIENT_VERSION_EXTRACTOR.getValidatorClass(), 
ClientVersion.CURRENT,
+                LAYOUT_VERSION_EXTRACTOR.getValidatorClass(), 
OMLayoutFeature.FILESYSTEM_SNAPSHOT));
 
     assertEquals(1, validators.size());
-    String expectedMethodName = "preFinalizePreProcessCreateKeyValidator";
+    String expectedMethodName = "preProcessCreateKeyQuotaLayoutValidator";
     assertEquals(expectedMethodName, validators.get(0).getName());
   }
 
   @Test
   public void testRegistryHasThePreFinalizePostProcessCreateKeyValidator() {
-    ValidatorRegistry registry = new ValidatorRegistry(PACKAGE);
-    List<Method> validators =
-        registry.validationsFor(
-            asList(CLUSTER_NEEDS_FINALIZATION), CreateKey, POST_PROCESS);
+    ValidatorRegistry<OzoneManagerProtocolProtos.Type> registry =
+        new ValidatorRegistry<>(OzoneManagerProtocolProtos.Type.class, PACKAGE,
+        
Arrays.stream(VersionExtractor.values()).map(VersionExtractor::getValidatorClass).collect(Collectors.toSet()),
+        REQUEST_PROCESSING_PHASES);
+    List<Method> validators = registry.validationsFor(CreateKey, POST_PROCESS,
+        ImmutableMap.of(CLIENT_VERSION_EXTRACTOR.getValidatorClass(), 
ClientVersion.CURRENT,
+            LAYOUT_VERSION_EXTRACTOR.getValidatorClass(), 
OMLayoutFeature.BUCKET_LAYOUT_SUPPORT));
 
     assertEquals(1, validators.size());
-    String expectedMethodName = "preFinalizePostProcessCreateKeyValidator";
+    String expectedMethodName = "postProcessCreateKeyQuotaLayoutValidator";
     assertEquals(expectedMethodName, validators.get(0).getName());
   }
 
   @Test
   public void testRegistryHasTheOldClientPreProcessCreateKeyValidator() {
-    ValidatorRegistry registry = new ValidatorRegistry(PACKAGE);
+    ValidatorRegistry<OzoneManagerProtocolProtos.Type> registry =
+        new ValidatorRegistry<>(OzoneManagerProtocolProtos.Type.class, PACKAGE,
+        
Arrays.stream(VersionExtractor.values()).map(VersionExtractor::getValidatorClass).collect(Collectors.toSet()),
+        REQUEST_PROCESSING_PHASES);
     List<Method> validators =
-        registry.validationsFor(
-            asList(OLDER_CLIENT_REQUESTS), CreateKey, PRE_PROCESS);
+        registry.validationsFor(CreateKey, PRE_PROCESS, 
CLIENT_VERSION_EXTRACTOR.getValidatorClass(),
+            ClientVersion.ERASURE_CODING_SUPPORT);
 
     assertEquals(2, validators.size());
     List<String> methodNames =
         validators.stream().map(Method::getName).collect(Collectors.toList());
-    assertThat(methodNames).contains("oldClientPreProcessCreateKeyValidator");
-    assertThat(methodNames).contains("oldClientPreProcessCreateKeyValidator2");
+    
assertEquals(Arrays.asList("preProcessCreateKeyBucketLayoutClientValidator",
+        "preProcessCreateKeyBucketLayoutClientValidator"), methodNames);
   }
 
   @Test
   public void testRegistryHasTheOldClientPostProcessCreateKeyValidator() {
-    ValidatorRegistry registry = new ValidatorRegistry(PACKAGE);
-    List<Method> validators =
-        registry.validationsFor(
-            asList(OLDER_CLIENT_REQUESTS), CreateKey, POST_PROCESS);
+    ValidatorRegistry<OzoneManagerProtocolProtos.Type> registry =
+        new ValidatorRegistry<>(OzoneManagerProtocolProtos.Type.class, PACKAGE,
+        
Arrays.stream(VersionExtractor.values()).map(VersionExtractor::getValidatorClass).collect(Collectors.toSet()),
+        REQUEST_PROCESSING_PHASES);

Review Comment:
   done



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscr...@ozone.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@ozone.apache.org
For additional commands, e-mail: issues-h...@ozone.apache.org