Fix encoding error

.github/workflows/maven.yml

@@ -0,0 +1,25 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

pom.xml

@@ -13,11 +13,12 @@
     <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <jackson.version>2.9.10.7</jackson.version>
+    <jackson.version>2.10.5</jackson.version>
     <apache.commons-lang.version>3.8.1</apache.commons-lang.version>
-    <apache.commons-collections.version>4.2</apache.commons-collections.version>
-    <apache.commons-io.version>2.7</apache.commons-io.version>
-    <remark.version>1.1.0</remark.version>
+    <apache.commons-collections4.version>4.4</apache.commons-collections4.version>
+    <apache.commons-io.version>2.10.0</apache.commons-io.version>
+    <apache.commons-text.version>1.9</apache.commons-text.version>
+    <remark.version>1.2.0</remark.version>
   </properties>
 
   <build>
@@ -104,13 +105,18 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
-      <version>${apache.commons-collections.version}</version>
+      <version>${apache.commons-collections4.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>${apache.commons-io.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+      <version>${apache.commons-text.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -122,7 +128,7 @@
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.overzealous</groupId>
+      <groupId>com.kotcrab.remark</groupId>
       <artifactId>remark</artifactId>
       <version>${remark.version}</version>
     </dependency>

src/main/java/com/microsoft/model/ExceptionItem.java

@@ -1,13 +1,15 @@
 package com.microsoft.model;
 
+import org.apache.commons.text.StringEscapeUtils;
+
 public class ExceptionItem {
 
     private final String type;
     private final String description;
 
     public ExceptionItem(String type, String description) {
         this.type = type;
-        this.description = description;
+        this.description = StringEscapeUtils.unescapeJava(description);
     }
 
     public String getType() {

src/main/java/com/microsoft/model/MetadataFileItem.java

@@ -9,6 +9,7 @@
 import java.util.List;
 
 import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 @JsonPropertyOrder({"uid", "id", "parent", "children", "href", "langs", "isExternal", "name", "nameWithType",
         "fullName", "overload", "overridden", "type", "package", "summary", "syntax", "inheritance", "implements", "exceptions",
@@ -158,7 +159,7 @@ public String getSummary() {
     }
 
     public void setSummary(String summary) {
-        this.summary = summary;
+        this.summary = StringEscapeUtils.unescapeJava(summary);
     }
 
     public Syntax getSyntax() {

src/main/java/com/microsoft/model/MethodParameter.java

@@ -1,5 +1,7 @@
 package com.microsoft.model;
 
+import org.apache.commons.text.StringEscapeUtils;
+
 public class MethodParameter {
 
     private final String id;
@@ -25,6 +27,6 @@ public String getDescription() {
     }
 
     public void setDescription(String description) {
-        this.description = description;
+        this.description = StringEscapeUtils.unescapeJava(description);
     }
 }

src/main/java/com/microsoft/model/Return.java

@@ -1,6 +1,7 @@
 package com.microsoft.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.text.StringEscapeUtils;
 
 public class Return {
 
@@ -27,6 +28,6 @@ public String getReturnDescription() {
     }
 
     public void setReturnDescription(String returnDescription) {
-        this.returnDescription = returnDescription;
+        this.returnDescription = StringEscapeUtils.unescapeJava(returnDescription);
     }
 }

src/main/java/com/microsoft/model/SpecViewModel.java

@@ -10,7 +10,6 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 @JsonPropertyOrder({"uid", "name", "fullName", "isExternal"})
-
 public class SpecViewModel {
 
     private String uid;

src/main/java/com/microsoft/util/FileUtil.java

@@ -2,6 +2,7 @@
 
 import com.microsoft.model.YmlFile;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -16,7 +17,7 @@ public static void dumpToFile(String content, String fileName) {
         try {
             Path path = Paths.get(fileName);
             Files.createDirectories(path.getParent());
-            Files.write(path, content.getBytes());
+            Files.write(path, content.getBytes(Charset.forName("UTF-8")));
         } catch (IOException ioe) {
             throw new RuntimeException("Error during dump to file", ioe);
         }

src/test/java/com/microsoft/samples/noneascii/Offer.java

@@ -0,0 +1,38 @@
+package com.microsoft.samples.noneascii;
+
+/**
+ * 代表客户可用的产品形式
+ */
+public class Offer {
+    /**
+     * 初始化Offer类的新实例。
+     */
+    public Offer() {
+    }
+
+    /**
+     * 获取或设置合作伙伴要求的资格，以便为客户购买优惠。
+     */
+    private String[] __ResellerQualifications;
+
+    public String[] getResellerQualifications() {
+        return __ResellerQualifications;
+    }
+
+    public void setResellerQualifications(String[] value) {
+        __ResellerQualifications = value;
+    }
+
+    /**
+     * 获取或设置客户要求合作伙伴为客户购买的资格。
+     */
+    private String[] __ReselleeQualifications;
+
+    public String[] getReselleeQualifications() {
+        return __ReselleeQualifications;
+    }
+
+    public void setReselleeQualifications(String[] value) {
+        __ReselleeQualifications = value;
+    }
+}

src/test/resources/expected-generated-files/com.microsoft.samples.noneascii.Offer.yml

@@ -0,0 +1,188 @@
+### YamlMime:ManagedReference
+items:
+- uid: "com.microsoft.samples.noneascii.Offer"
+  id: "Offer"
+  parent: "com.microsoft.samples.noneascii"
+  children:
+  - "com.microsoft.samples.noneascii.Offer.Offer()"
+  - "com.microsoft.samples.noneascii.Offer.getReselleeQualifications()"
+  - "com.microsoft.samples.noneascii.Offer.getResellerQualifications()"
+  - "com.microsoft.samples.noneascii.Offer.setReselleeQualifications(java.lang.String[])"
+  - "com.microsoft.samples.noneascii.Offer.setResellerQualifications(java.lang.String[])"
+  langs:
+  - "java"
+  name: "Offer"
+  nameWithType: "Offer"
+  fullName: "com.microsoft.samples.noneascii.Offer"
+  type: "Class"
+  package: "com.microsoft.samples.noneascii"
+  summary: "代表客户可用的产品形式"
+  syntax:
+    content: "public class Offer"
+  inheritance:
+  - "java.lang.Object"
+  inheritedMembers:
+  - "java.lang.Object.clone()"
+  - "java.lang.Object.equals(java.lang.Object)"
+  - "java.lang.Object.finalize()"
+  - "java.lang.Object.getClass()"
+  - "java.lang.Object.hashCode()"
+  - "java.lang.Object.notify()"
+  - "java.lang.Object.notifyAll()"
+  - "java.lang.Object.toString()"
+  - "java.lang.Object.wait()"
+  - "java.lang.Object.wait(long)"
+  - "java.lang.Object.wait(long,int)"
+- uid: "com.microsoft.samples.noneascii.Offer.Offer()"
+  id: "Offer()"
+  parent: "com.microsoft.samples.noneascii.Offer"
+  langs:
+  - "java"
+  name: "Offer()"
+  nameWithType: "Offer.Offer()"
+  fullName: "com.microsoft.samples.noneascii.Offer.Offer()"
+  overload: "com.microsoft.samples.noneascii.Offer.Offer*"
+  type: "Constructor"
+  package: "com.microsoft.samples.noneascii"
+  summary: "初始化Offer类的新实例。"
+  syntax:
+    content: "public Offer()"
+- uid: "com.microsoft.samples.noneascii.Offer.getReselleeQualifications()"
+  id: "getReselleeQualifications()"
+  parent: "com.microsoft.samples.noneascii.Offer"
+  langs:
+  - "java"
+  name: "getReselleeQualifications()"
+  nameWithType: "Offer.getReselleeQualifications()"
+  fullName: "com.microsoft.samples.noneascii.Offer.getReselleeQualifications()"
+  overload: "com.microsoft.samples.noneascii.Offer.getReselleeQualifications*"
+  type: "Method"
+  package: "com.microsoft.samples.noneascii"
+  syntax:
+    content: "public String[] getReselleeQualifications()"
+    return:
+      type: "java.lang.String[]"
+- uid: "com.microsoft.samples.noneascii.Offer.getResellerQualifications()"
+  id: "getResellerQualifications()"
+  parent: "com.microsoft.samples.noneascii.Offer"
+  langs:
+  - "java"
+  name: "getResellerQualifications()"
+  nameWithType: "Offer.getResellerQualifications()"
+  fullName: "com.microsoft.samples.noneascii.Offer.getResellerQualifications()"
+  overload: "com.microsoft.samples.noneascii.Offer.getResellerQualifications*"
+  type: "Method"
+  package: "com.microsoft.samples.noneascii"
+  syntax:
+    content: "public String[] getResellerQualifications()"
+    return:
+      type: "java.lang.String[]"
+- uid: "com.microsoft.samples.noneascii.Offer.setReselleeQualifications(java.lang.String[])"
+  id: "setReselleeQualifications(java.lang.String[])"
+  parent: "com.microsoft.samples.noneascii.Offer"
+  langs:
+  - "java"
+  name: "setReselleeQualifications(String[] value)"
+  nameWithType: "Offer.setReselleeQualifications(String[] value)"
+  fullName: "com.microsoft.samples.noneascii.Offer.setReselleeQualifications(String[] value)"
+  overload: "com.microsoft.samples.noneascii.Offer.setReselleeQualifications*"
+  type: "Method"
+  package: "com.microsoft.samples.noneascii"
+  syntax:
+    content: "public void setReselleeQualifications(String[] value)"
+    parameters:
+    - id: "value"
+      type: "java.lang.String[]"
+- uid: "com.microsoft.samples.noneascii.Offer.setResellerQualifications(java.lang.String[])"
+  id: "setResellerQualifications(java.lang.String[])"
+  parent: "com.microsoft.samples.noneascii.Offer"
+  langs:
+  - "java"
+  name: "setResellerQualifications(String[] value)"
+  nameWithType: "Offer.setResellerQualifications(String[] value)"
+  fullName: "com.microsoft.samples.noneascii.Offer.setResellerQualifications(String[] value)"
+  overload: "com.microsoft.samples.noneascii.Offer.setResellerQualifications*"
+  type: "Method"
+  package: "com.microsoft.samples.noneascii"
+  syntax:
+    content: "public void setResellerQualifications(String[] value)"
+    parameters:
+    - id: "value"
+      type: "java.lang.String[]"
+references:
+- uid: "com.microsoft.samples.noneascii.Offer.Offer*"
+  name: "Offer"
+  nameWithType: "Offer.Offer"
+  fullName: "com.microsoft.samples.noneascii.Offer.Offer"
+  package: "com.microsoft.samples.noneascii"
+- uid: "java.lang.String[]"
+  spec.java:
+  - uid: "java.lang.String"
+    name: "String"
+    fullName: "java.lang.String"
+  - name: "[]"
+    fullName: "[]"
+- uid: "com.microsoft.samples.noneascii.Offer.getResellerQualifications*"
+  name: "getResellerQualifications"
+  nameWithType: "Offer.getResellerQualifications"
+  fullName: "com.microsoft.samples.noneascii.Offer.getResellerQualifications"
+  package: "com.microsoft.samples.noneascii"
+- uid: "com.microsoft.samples.noneascii.Offer.setResellerQualifications*"
+  name: "setResellerQualifications"
+  nameWithType: "Offer.setResellerQualifications"
+  fullName: "com.microsoft.samples.noneascii.Offer.setResellerQualifications"
+  package: "com.microsoft.samples.noneascii"
+- uid: "com.microsoft.samples.noneascii.Offer.getReselleeQualifications*"
+  name: "getReselleeQualifications"
+  nameWithType: "Offer.getReselleeQualifications"
+  fullName: "com.microsoft.samples.noneascii.Offer.getReselleeQualifications"
+  package: "com.microsoft.samples.noneascii"
+- uid: "com.microsoft.samples.noneascii.Offer.setReselleeQualifications*"
+  name: "setReselleeQualifications"
+  nameWithType: "Offer.setReselleeQualifications"
+  fullName: "com.microsoft.samples.noneascii.Offer.setReselleeQualifications"
+  package: "com.microsoft.samples.noneascii"
+- uid: "java.lang.Object.notify()"
+  name: "Object.notify()"
+  nameWithType: "Object.notify()"
+  fullName: "java.lang.Object.notify()"
+- uid: "java.lang.Object.wait()"
+  name: "Object.wait()"
+  nameWithType: "Object.wait()"
+  fullName: "java.lang.Object.wait()"
+- uid: "java.lang.Object.finalize()"
+  name: "Object.finalize()"
+  nameWithType: "Object.finalize()"
+  fullName: "java.lang.Object.finalize()"
+- uid: "java.lang.Object.clone()"
+  name: "Object.clone()"
+  nameWithType: "Object.clone()"
+  fullName: "java.lang.Object.clone()"
+- uid: "java.lang.Object.notifyAll()"
+  name: "Object.notifyAll()"
+  nameWithType: "Object.notifyAll()"
+  fullName: "java.lang.Object.notifyAll()"
+- uid: "java.lang.Object.equals(java.lang.Object)"
+  name: "Object.equals(Object)"
+  nameWithType: "Object.equals(Object)"
+  fullName: "java.lang.Object.equals(java.lang.Object)"
+- uid: "java.lang.Object.getClass()"
+  name: "Object.getClass()"
+  nameWithType: "Object.getClass()"
+  fullName: "java.lang.Object.getClass()"
+- uid: "java.lang.Object.wait(long)"
+  name: "Object.wait(long)"
+  nameWithType: "Object.wait(long)"
+  fullName: "java.lang.Object.wait(long)"
+- uid: "java.lang.Object.hashCode()"
+  name: "Object.hashCode()"
+  nameWithType: "Object.hashCode()"
+  fullName: "java.lang.Object.hashCode()"
+- uid: "java.lang.Object.wait(long,int)"
+  name: "Object.wait(long,int)"
+  nameWithType: "Object.wait(long,int)"
+  fullName: "java.lang.Object.wait(long,int)"
+- uid: "java.lang.Object.toString()"
+  name: "Object.toString()"
+  nameWithType: "Object.toString()"
+  fullName: "java.lang.Object.toString()"