ICU-23265 Moved the alias handling code into MeasureUnit::validateAndGet(). Fixed style-checker errors in Java.

Author: richgillam

icu4c/source/i18n/measunit.cpp

@@ -2767,16 +2767,21 @@ StringEnumeration* MeasureUnit::getAvailableTypes(UErrorCode &errorCode) {
 }
 
 bool MeasureUnit::validateAndGet(StringPiece type, StringPiece subtype, MeasureUnit &result) {
-    // Find the type index using binary search
+    // Find the type and subtype indices using binary search
     int32_t typeIdx = binarySearch(gTypes, 0, UPRV_LENGTHOF(gTypes), type);
-    if (typeIdx == -1) {
-        return false;  // Type not found
-    }
+    int32_t subtypeIdx = typeIdx >= 0 ? binarySearch(typeIdx, subtype) : -1;
 
-    // Find the subtype within the type's range using binary search
-    int32_t subtypeIdx = binarySearch(typeIdx, subtype);
-    if (subtypeIdx == -1) {
-        return false;  // Subtype not found
+    if (typeIdx >= 0 && subtypeIdx < 0) {
+        // if we did find the type, but didn't find the subtype, that might be because the sybtype name
+        // is an alias-- try using MeasureUnit::forIdentifier(), which will resolve aliases
+        UErrorCode localStatus = U_ZERO_ERROR;
+        MeasureUnit tempUnit = MeasureUnit::forIdentifier(subtype, localStatus);
+        if (U_SUCCESS(localStatus)) {
+            subtypeIdx = tempUnit.fSubTypeId + gOffsets[tempUnit.fTypeId];
+        }
+    }
+    if (typeIdx < 0 || subtypeIdx < 0) {
+        return false;
     }
 
     // Create the MeasureUnit and return it

icu4c/source/i18n/number_skeletons.cpp

@@ -1078,13 +1078,6 @@ void blueprint_helpers::parseMeasureUnitOption(const StringSegment& segment, Mac
         return;
     }
 
-    UErrorCode localStatus = U_ZERO_ERROR;
-    unit = MeasureUnit::forIdentifier(subType.data(), localStatus);
-    if (U_SUCCESS(localStatus) && uprv_strcmp(type.data(), unit.getType()) == 0) {
-        macros.unit = unit;
-        return;
-    }
-
     status = U_NUMBER_SKELETON_SYNTAX_ERROR;
 }
 

icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java

@@ -560,22 +560,28 @@ class TestCase {
                 this.expectedResult = expectedResult;
             }
         }
-        TestCase[] testCases = new TestCase[] {
-            new TestCase("measure-unit/concentr-part-per-1e6", "3.14 ppm"),
-            new TestCase("measure-unit/concentr-part-per-million", "3.14 ppm"),
-            new TestCase("measure-unit/concentr-permillion", "3.14 ppm"),
-            new TestCase("measure-unit/concentr-milligram-ofglucose-per-deciliter", "3.14 mg/dL"),
-            new TestCase("measure-unit/concentr-milligram-per-deciliter", "3.14 mg/dL"),
-            new TestCase("measure-unit/mass-tonne", "3.14 t"),
-            new TestCase("measure-unit/mass-metric-ton", "3.14 t"),
-        };
+
+        TestCase[] testCases =
+            new TestCase[] {
+                new TestCase("measure-unit/concentr-part-per-1e6", "3.14 ppm"),
+                new TestCase("measure-unit/concentr-part-per-million", "3.14 ppm"),
+                new TestCase("measure-unit/concentr-permillion", "3.14 ppm"),
+                new TestCase("measure-unit/concentr-milligram-ofglucose-per-deciliter", "3.14 mg/dL"),
+                new TestCase("measure-unit/concentr-milligram-per-deciliter", "3.14 mg/dL"),
+                new TestCase("measure-unit/mass-tonne", "3.14 t"),
+                new TestCase("measure-unit/mass-metric-ton", "3.14 t"),
+            };
 
         for (TestCase testCase : testCases) {
             try {
-                LocalizedNumberFormatter nf = NumberFormatter.forSkeleton(testCase.skeleton).locale(Locale.US);
+                LocalizedNumberFormatter nf =
+                        NumberFormatter.forSkeleton(testCase.skeleton).locale(Locale.US);
                 String actualResult = nf.format(3.14).toString();
 
-                assertEquals("Wrong result for " + testCase.skeleton + ":", testCase.expectedResult, actualResult);
+                assertEquals(
+                        "Wrong result for " + testCase.skeleton + ":",
+                        testCase.expectedResult,
+                        actualResult);
             } catch (SkeletonSyntaxException e) {
                 fail(testCase.skeleton);
             }