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..a94a4dd17ccd
--- /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.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link FeatureProvider.Feature} name lookup.
+ */
+class TestFeatureProvider {
+
+  @Test
+  void ofReturnsFeatureForKnownName() {
+    assertThat(FeatureProvider.Feature.of(FeatureProvider.Feature.HEATMAP.getFeatureName()))
+        .isEqualTo(FeatureProvider.Feature.HEATMAP);
+  }
+
+  @Test
+  void ofRejectsUnknownName() {
+    assertThatThrownBy(() -> FeatureProvider.Feature.of("NoSuchFeature"))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("NoSuchFeature");
+  }
+}