From b533ad45181e365343aeb6476481edf5f434f2b4 Mon Sep 17 00:00:00 2001 From: henry3260 Date: Sun, 30 Aug 2026 23:58:40 +0800 Subject: [PATCH 1/2] HDDS-16351. FeatureProvider.Feature.of throws NoSuchElementException instead of IllegalArgumentException Feature.of used Optional.get() followed by a null check on the result. Optional.get() never returns null, so the null check was dead code and an unrecognized feature name produced a bare NoSuchElementException instead of the intended IllegalArgumentException naming the offending value. Replace both with orElseThrow. --- .../recon/api/types/FeatureProvider.java | 10 ++--- .../recon/api/types/TestFeatureProvider.java | 42 +++++++++++++++++++ 2 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/types/TestFeatureProvider.java diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/FeatureProvider.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/FeatureProvider.java index 33e7744ee875..8afc5c21d4ed 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/FeatureProvider.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/FeatureProvider.java @@ -58,14 +58,10 @@ public String getFeatureName() { } public static Feature of(String featureName) { - Feature featureEnum = Arrays.stream(Feature.values()) + return Arrays.stream(Feature.values()) .filter(feature -> feature.getFeatureName().equals(featureName)) - .findFirst().get(); - if (null == featureEnum) { - throw new IllegalArgumentException("Unrecognized value for " + - "Features enum: " + featureName); - } - return featureEnum; + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("Unrecognized value for Features enum: " + featureName)); } } diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/types/TestFeatureProvider.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/types/TestFeatureProvider.java new file mode 100644 index 000000000000..dc059727a37d --- /dev/null +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/types/TestFeatureProvider.java @@ -0,0 +1,42 @@ +/* + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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.recon.api.types; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import org.apache.hadoop.ozone.recon.api.types.FeatureProvider.Feature; +import org.junit.jupiter.api.Test; + +/** + * Unit tests for {@link FeatureProvider.Feature} name lookup. + */ +class TestFeatureProvider { + + @Test + void ofReturnsFeatureForKnownName() { + assertThat(Feature.of(Feature.HEATMAP.getFeatureName())).isEqualTo(Feature.HEATMAP); + } + + @Test + void ofRejectsUnknownName() { + assertThatThrownBy(() -> Feature.of("NoSuchFeature")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("NoSuchFeature"); + } +} From 245601bb8d237d7d6bd1859633a80dbf55206224 Mon Sep 17 00:00:00 2001 From: henry3260 Date: Mon, 31 Aug 2026 16:54:48 +0800 Subject: [PATCH 2/2] HDDS-16351. Reference FeatureProvider.Feature directly in the test The test lives in the same package as FeatureProvider, so the nested enum can be qualified through its outer class instead of imported. --- .../hadoop/ozone/recon/api/types/TestFeatureProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/types/TestFeatureProvider.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/types/TestFeatureProvider.java index dc059727a37d..a94a4dd17ccd 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/types/TestFeatureProvider.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/types/TestFeatureProvider.java @@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.apache.hadoop.ozone.recon.api.types.FeatureProvider.Feature; import org.junit.jupiter.api.Test; /** @@ -30,12 +29,13 @@ class TestFeatureProvider { @Test void ofReturnsFeatureForKnownName() { - assertThat(Feature.of(Feature.HEATMAP.getFeatureName())).isEqualTo(Feature.HEATMAP); + assertThat(FeatureProvider.Feature.of(FeatureProvider.Feature.HEATMAP.getFeatureName())) + .isEqualTo(FeatureProvider.Feature.HEATMAP); } @Test void ofRejectsUnknownName() { - assertThatThrownBy(() -> Feature.of("NoSuchFeature")) + assertThatThrownBy(() -> FeatureProvider.Feature.of("NoSuchFeature")) .isInstanceOf(IllegalArgumentException.class) .hasMessageContaining("NoSuchFeature"); }