adoroszlai commented on code in PR #7598:
URL: https://github.com/apache/ozone/pull/7598#discussion_r1891558092
##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/ClientVersion.java:
##########
@@ -75,8 +76,8 @@ public static ClientVersion fromProtoValue(int value) {
}
private static ClientVersion latest() {
- ClientVersion[] versions = ClientVersion.values();
- return versions[versions.length - 2];
+ return Arrays.stream(ClientVersion.values())
+
.max(Comparator.comparingInt(ComponentVersion::toProtoValue)).orElse(null);
Review Comment:
nit:
```suggestion
.max(Comparator.comparingInt(ClientVersion::toProtoValue)).orElseThrow();
```
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/validation/TestVersionExtractor.java:
##########
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package org.apache.hadoop.ozone.om.request.validation;
+
+import org.apache.hadoop.ozone.ClientVersion;
+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.EnumSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class TestVersionExtractor {
+
+ @ParameterizedTest
+ @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);
+ Versioned version =
VersionExtractor.LAYOUT_VERSION_EXTRACTOR.extractVersion(null, context);
+ assertEquals(layoutVersionValue, version);
+ assertEquals(OMLayoutFeature.class,
VersionExtractor.LAYOUT_VERSION_EXTRACTOR.getVersionClass());
+ }
+
+ @ParameterizedTest
+ @EnumSource(ClientVersion.class)
+ void testClientVersionExtractor(ClientVersion expectedClientVersion) {
+ OMRequest request = mock(OMRequest.class);
+ 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
+ @ValueSource(ints = {1, 2, 5, 10, 1000, 10000})
+ void testClientVersionExtractorForFutureValues(int futureVersion) {
+ OMRequest request = mock(OMRequest.class);
+ when(request.getVersion()).thenReturn(ClientVersion.CURRENT_VERSION +
futureVersion);
+ Versioned version =
VersionExtractor.CLIENT_VERSION_EXTRACTOR.extractVersion(request, null);
+ assertEquals(ClientVersion.FUTURE_VERSION, version);
+ assertEquals(ClientVersion.class,
VersionExtractor.CLIENT_VERSION_EXTRACTOR.getVersionClass());
Review Comment:
nit: move assertion about classes to separate test case
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
