chore: fix bug in java href generation

googleapis · Aug 18, 2021 · 84b5ad9 · 84b5ad9
1 parent be788c8
commit 84b5ad9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/build/YmlFilesBuilder.java b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/build/YmlFilesBuilder.java
@@ -269,7 +269,7 @@ protected String getJavaReferenceHref(String uid) {
         }
         //  example1 uid: "java.lang.Object.equals(java.lang.Object)"
         //  example2 uid: "java.lang.Object"
-        String endURL = uid;
+        String endURL = uid.replaceAll("<T>", "");
 
         Pattern argPattern = Pattern.compile(".*\\(.*\\).*");
         if (argPattern.matcher(endURL).find()) {

diff --git a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/build/YmlFilesBuilderTest.java b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/build/YmlFilesBuilderTest.java
@@ -197,9 +197,9 @@ public void getJavaReferenceHref(){
         String result8 = ymlFilesBuilder.getJavaReferenceHref("java.io.InputStream");
         String result9 = ymlFilesBuilder.getJavaReferenceHref("java.lang.Enum.hashCode()");
         String result10 = ymlFilesBuilder.getJavaReferenceHref("java.nio.ByteBuffer");
-        String result11 = ymlFilesBuilder.getJavaReferenceHref("");
-        String result12 = ymlFilesBuilder.getJavaReferenceHref(null);
-
+        String result11 = ymlFilesBuilder.getJavaReferenceHref("java.lang.Enum.<T>valueOf(java.lang.Class<T>,java.lang.String)");
+        String result12 = ymlFilesBuilder.getJavaReferenceHref("");
+        String result13 = ymlFilesBuilder.getJavaReferenceHref(null);
 
         String baseURL = "https://docs.oracle.com/javase/8/docs/api/";
 
@@ -213,7 +213,8 @@ public void getJavaReferenceHref(){
         assertEquals(baseURL + "java/io/InputStream.html", result8);
         assertEquals(baseURL + "java/lang/Enum.html#hashCode--", result9);
         assertEquals(baseURL + "java/nio/ByteBuffer.html", result10);
-        assertEquals(baseURL, result11);
+        assertEquals(baseURL + "java/lang/Enum.html#valueOf-java.lang.Class-java.lang.String-", result11);
         assertEquals(baseURL, result12);
+        assertEquals(baseURL, result13);
     }
 }
diff --git a/...xpected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml b/...xpected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml
@@ -294,7 +294,7 @@ references:
   nameWithType: "Enum.name()"
   fullName: "java.lang.Enum.name()"
 - uid: "java.lang.Enum.<T>valueOf(java.lang.Class<T>,java.lang.String)"
-  href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#<T>valueOf-java.lang.Class<T>-java.lang.String-"
+  href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#valueOf-java.lang.Class-java.lang.String-"
   name: "Enum.<T>valueOf(Class<T>,String)"
   nameWithType: "Enum.<T>valueOf(Class<T>,String)"
   fullName: "java.lang.Enum.<T>valueOf(java.lang.Class<T>,java.lang.String)"

diff --git a/.../src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Display.yml b/.../src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Display.yml
@@ -68,7 +68,7 @@ references:
   nameWithType: "R"
   fullName: "R"
 - uid: "java.util.List<com.microsoft.samples.subpackage.Person<T>>"
-  href: "https://docs.oracle.com/javase/8/docs/api/java/util/List<com/microsoft/samples/subpackage/Person<T>>.html"
+  href: "https://docs.oracle.com/javase/8/docs/api/java/util/List<com/microsoft/samples/subpackage/Person>.html"
   name: "List<Person<T>>"
   nameWithType: "List<Person<T>>"
   fullName: "java.util.List<com.microsoft.samples.subpackage.Person<T>>"

diff --git a/...ted-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml b/...ted-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml
@@ -191,7 +191,7 @@ references:
   nameWithType: "Enum.name()"
   fullName: "java.lang.Enum.name()"
 - uid: "java.lang.Enum.<T>valueOf(java.lang.Class<T>,java.lang.String)"
-  href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#<T>valueOf-java.lang.Class<T>-java.lang.String-"
+  href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#valueOf-java.lang.Class-java.lang.String-"
   name: "Enum.<T>valueOf(Class<T>,String)"
   nameWithType: "Enum.<T>valueOf(Class<T>,String)"
   fullName: "java.lang.Enum.<T>valueOf(java.lang.Class<T>,java.lang.String)"