Add Java 6's java.net.IDN.

harmony's tests and my code, though ICU4C does all the hard work.

I've added a test of my own to demonstrate some weird RI behavior (that I've
emulated in our implementation).

Bug: 2497395
Change-Id: I8146f72a8a3204449ee3d0d9065dadc1c1c77fcc

4 files changed, 110 insertions, 1 deletions

diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeIDN.java b/icu/src/main/java/com/ibm/icu4jni/text/NativeIDN.java
new file mode 100644
index 0000000..b973131
--- /dev/null
+++ b/icu/src/main/java/com/ibm/icu4jni/text/NativeIDN.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed 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 com.ibm.icu4jni.text;
+
+public class NativeIDN {
+    public static String toASCII(String s, int flags) {
+        return convert(s, flags, true);
+    }
+
+    public static String toUnicode(String s, int flags) {
+        try {
+            return convert(s, flags, false);
+        } catch (IllegalArgumentException ex) {
+            // The RI documentation explicitly states that this method can't fail.
+            // ICU4C disagrees, as does the RI in practice.
+            // The RI just returns the input string if it can't
+            return s;
+        }
+    }
+
+    private static String convert(String s, int flags, boolean toAscii) {
+        if (s == null) {
+            throw new NullPointerException();
+        }
+        return convertImpl(s, flags, toAscii);
+    }
+    private static native String convertImpl(String s, int flags, boolean toAscii);
+
+    private NativeIDN() {}
+}
diff --git a/icu/src/main/native/NativeIDN.cpp b/icu/src/main/native/NativeIDN.cpp
new file mode 100644
index 0000000..5ce3e94
--- /dev/null
+++ b/icu/src/main/native/NativeIDN.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed 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.
+ */
+
+#include "ErrorCode.h"
+#include "JNIHelp.h"
+#include "ScopedJavaUnicodeString.h"
+#include "unicode/uidna.h"
+
+static bool isLabelSeparator(const UChar ch) {
+    switch (ch) {
+    case 0x3002: // ideographic full stop
+    case 0xff0e: // fullwidth full stop
+    case 0xff61: // halfwidth ideographic full stop
+        return true;
+    default:
+        return false;
+    }
+}
+
+static jstring convertImpl(JNIEnv* env, jclass, jstring s, jint flags, jboolean toAscii) {
+    ScopedJavaUnicodeString sus(env, s);
+    const UChar* src = sus.unicodeString().getBuffer();
+    const size_t srcLength = sus.unicodeString().length();
+    UChar dst[256];
+    UErrorCode status = U_ZERO_ERROR;
+    int32_t resultLength = toAscii
+            ? uidna_IDNToASCII(src, srcLength, &dst[0], sizeof(dst), flags, NULL, &status)
+            : uidna_IDNToUnicode(src, srcLength, &dst[0], sizeof(dst), flags, NULL, &status);
+    if (U_FAILURE(status)) {
+        jniThrowException(env, "java/lang/IllegalArgumentException", u_errorName(status));
+        return NULL;
+    }
+    if (!toAscii) {
+        // ICU only translates separators to ASCII for toASCII.
+        // Java expects the translation for toUnicode too.
+        // We may as well do this here, while the string is still mutable.
+        for (size_t i = 0; i < resultLength; ++i) {
+            if (isLabelSeparator(dst[i])) {
+                dst[i] = '.';
+            }
+        }
+    }
+    return env->NewString(&dst[0], resultLength);
+}
+
+static JNINativeMethod gMethods[] = {
+    {"convertImpl", "(Ljava/lang/String;IZ)Ljava/lang/String;", (void*) convertImpl},
+};
+extern "C" int register_com_ibm_icu4jni_text_NativeIDN(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "com/ibm/icu4jni/text/NativeIDN", gMethods, NELEM(gMethods));
+}
diff --git a/icu/src/main/native/NativeNormalizer.cpp b/icu/src/main/native/NativeNormalizer.cpp
index b09b26e..0aa7d29 100644
--- a/icu/src/main/native/NativeNormalizer.cpp
+++ b/icu/src/main/native/NativeNormalizer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2010 The Android Open Source Project
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/icu/src/main/native/sub.mk b/icu/src/main/native/sub.mk
index b101531..f72db1b 100644
--- a/icu/src/main/native/sub.mk
+++ b/icu/src/main/native/sub.mk
@@ -9,6 +9,7 @@ LOCAL_SRC_FILES := \
 	NativeCollation.cpp \
 	NativeConverter.cpp \
 	NativeDecimalFormat.cpp \
+	NativeIDN.cpp \
 	NativeNormalizer.cpp \
 	NativeRegEx.cpp \
 	Resources.cpp \