Forbiddenapis check and fix (#672)

* Added forbiddenapis check and fixed the findings in the normal code * Fixed forbiddenapi findings in java templates and samples. * Generated all samples for Java.
OpenAPITools · Aug 22, 2018 · 9bc335b · 9bc335b
1 parent 227f277
commit 9bc335b
Show file tree

Hide file tree

Showing 126 changed files with 709 additions and 546 deletions.
diff --git a/CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java
@@ -28,7 +28,7 @@ public void testParseAndFormatDate() {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";

diff --git a/CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java
@@ -28,7 +28,7 @@ public void testParseAndFormatDate() {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";

diff --git a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/JSONTest.java b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/JSONTest.java
@@ -12,6 +12,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 import java.util.TimeZone;
 
 import okio.ByteString;
@@ -46,7 +47,7 @@ public void testSqlDateTypeAdapter() {
         assertEquals(json.deserialize("\"2015-11-07T03:49:09.356" + getCurrentTimezoneOffset() + "\"", java.sql.Date.class).toString(), date.toString());
 
         // custom date format: without day
-        DateFormat format = new SimpleDateFormat("yyyy-MM");
+        DateFormat format = new SimpleDateFormat("yyyy-MM", Locale.ROOT);
         apiClient.setSqlDateFormat(format);
         String dateStr = "\"2015-11\"";
         assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09Z\"", java.sql.Date.class)));
@@ -79,7 +80,7 @@ public void testDateTypeAdapter() {
         assertEquals(utcDate, json.serialize(date));
 
         // custom datetime format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
 
@@ -190,10 +191,10 @@ public void testByteArrayTypeAdapterDeserialization() {
     public static String getCurrentTimezoneOffset() {
 
         TimeZone tz = TimeZone.getDefault();
-        Calendar cal = GregorianCalendar.getInstance(tz);
+        Calendar cal = GregorianCalendar.getInstance(tz, Locale.ROOT);
         int offsetInMillis = tz.getOffset(cal.getTimeInMillis());
 
-        String offset = String.format("%02d:%02d", Math.abs(offsetInMillis / 3600000), Math.abs((offsetInMillis / 60000) % 60));
+        String offset = String.format(Locale.ROOT,"%02d:%02d", Math.abs(offsetInMillis / 3600000), Math.abs((offsetInMillis / 60000) % 60));
         offset = (offsetInMillis >= 0 ? "+" : "-") + offset;
 
         return offset;

diff --git a/CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java
@@ -34,7 +34,7 @@ public void testParseAndFormatDate() {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";

diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
@@ -24,6 +24,8 @@
 import io.airlift.airline.ParseOptionMissingValueException;
 import org.openapitools.codegen.cmd.*;
 
+import java.util.Locale;
+
 /**
  * User: lanwen Date: 24.03.15 Time: 17:56
  * <p>
@@ -40,6 +42,7 @@ public static void main(String[] args) {
                 Cli.<Runnable>builder("openapi-generator-cli")
                         .withDescription(
                                 String.format(
+                                        Locale.ROOT,
                                         "OpenAPI generator CLI (version %s).",
                                         version))
                         .withDefaultCommand(ListGenerators.class)
@@ -69,10 +72,10 @@ public static void main(String[] args) {
                 System.exit(1);
             }
         } catch (ParseArgumentsUnexpectedException e) {
-            System.err.printf("[error] %s%n%nSee 'openapi-generator-cli help' for usage.%n", e.getMessage());
+            System.err.printf(Locale.ROOT,"[error] %s%n%nSee 'openapi-generator-cli help' for usage.%n", e.getMessage());
             System.exit(1);
         } catch (ParseOptionMissingException | ParseOptionMissingValueException e) {
-            System.err.printf("[error] %s%n", e.getMessage());
+            System.err.printf(Locale.ROOT,"[error] %s%n", e.getMessage());
             System.exit(1);
         }
     }

diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Langs.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Langs.java
@@ -21,6 +21,8 @@
 import io.airlift.airline.Command;
 import org.openapitools.codegen.CodegenConfig;
 
+import java.util.Locale;
+
 import static ch.lambdaj.Lambda.on;
 import static ch.lambdaj.collection.LambdaCollections.with;
 import static java.util.ServiceLoader.load;
@@ -34,6 +36,6 @@ public class Langs implements Runnable {
     public void run() {
         LambdaIterable<String> langs =
                 with(load(CodegenConfig.class)).extract(on(CodegenConfig.class).getName());
-        System.out.printf("Available languages (generators): %s%n", langs);
+        System.out.printf(Locale.ROOT, "Available languages (generators): %s%n", langs);
     }
 }
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
@@ -9,6 +9,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 // NOTE: List can later have subcommands such as list languages, list types, list frameworks, etc.
 @Command(name = "list", description = "Lists the available generators")
@@ -53,6 +54,6 @@ public void run() {
             }
         }
 
-        System.out.printf("%s%n", sb.toString());
+        System.out.printf(Locale.ROOT,"%s%n", sb.toString());
     }
 }
diff --git a/...api-generator-online/src/main/java/org/openapitools/codegen/online/service/Generator.java b/...api-generator-online/src/main/java/org/openapitools/codegen/online/service/Generator.java
@@ -19,11 +19,16 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.parser.OpenAPIParser;
+import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.parser.core.models.ParseOptions;
-import org.openapitools.codegen.*;
 import io.swagger.v3.parser.core.models.AuthorizationValue;
-import io.swagger.v3.core.util.Json;
+import io.swagger.v3.parser.core.models.ParseOptions;
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.ClientOptInput;
+import org.openapitools.codegen.ClientOpts;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConfigLoader;
+import org.openapitools.codegen.DefaultGenerator;
 import org.openapitools.codegen.online.model.GeneratorInput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class Generator {
@@ -44,7 +50,7 @@ public static Map<String, CliOption> getOptions(String language) {
         try {
             config = CodegenConfigLoader.forName(language);
         } catch (Exception e) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, String.format("Unsupported target %s supplied. %s",
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, String.format(Locale.ROOT,"Unsupported target %s supplied. %s",
                     language, e));
         }
         Map<String, CliOption> map = new LinkedHashMap<>();
@@ -77,7 +83,7 @@ public static String generateServer(String language, GeneratorInput opts) {
     }
 
     private static String generate(String language, GeneratorInput opts, Type type) {
-        LOGGER.debug(String.format("generate %s for %s", type.getTypeName(), language));
+        LOGGER.debug(String.format(Locale.ROOT,"generate %s for %s", type.getTypeName(), language));
         if (opts == null) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "No options were supplied");
         }

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -76,7 +77,7 @@ public class CodegenModel {
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", name, classname);
+        return String.format(Locale.ROOT, "%s(%s)", name, classname);
     }
 
     @Override

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -196,7 +197,7 @@ public boolean isRestfulCreate() {
      * @return true if act as Restful update method, false otherwise
      */
     public boolean isRestfulUpdate() {
-        return Arrays.asList("PUT", "PATCH").contains(httpMethod.toUpperCase()) && isMemberPath();
+        return Arrays.asList("PUT", "PATCH").contains(httpMethod.toUpperCase(Locale.ROOT)) && isMemberPath();
     }
 
     /**
@@ -205,7 +206,7 @@ public boolean isRestfulUpdate() {
      * @return true request method is PUT, PATCH or POST; false otherwise
      */
     public boolean isBodyAllowed() {
-        return Arrays.asList("PUT", "PATCH", "POST").contains(httpMethod.toUpperCase());
+        return Arrays.asList("PUT", "PATCH", "POST").contains(httpMethod.toUpperCase(Locale.ROOT));
     }
 
     /**
@@ -232,7 +233,7 @@ public boolean isRestful() {
      * @return the substring
      */
     private String pathWithoutBaseName() {
-        return baseName != null ? path.replace("/" + baseName.toLowerCase(), "") : path;
+        return baseName != null ? path.replace("/" + baseName.toLowerCase(Locale.ROOT), "") : path;
     }
 
     /**
@@ -248,7 +249,7 @@ private boolean isMemberPath() {
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", baseName, path);
+        return String.format(Locale.ROOT, "%s(%s)", baseName, path);
     }
 
     @Override

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class CodegenResponse {
@@ -47,7 +48,7 @@ public boolean isWildcard() {
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", code, containerType);
+        return String.format(Locale.ROOT, "%s(%s)", code, containerType);
     }
 
     @Override

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java
@@ -21,6 +21,7 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class CodegenSecurity {
@@ -38,7 +39,7 @@ public class CodegenSecurity {
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", name, type);
+        return String.format(Locale.ROOT, "%s(%s)", name, type);
     }
 
     @Override

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenType.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenType.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public enum CodegenType {
@@ -30,7 +31,7 @@ public enum CodegenType {
 
     @JsonCreator
     public static CodegenType forValue(String value) {
-        return names.get(value.toLowerCase());
+        return names.get(value.toLowerCase(Locale.ROOT));
     }
 
     @JsonValue
@@ -50,4 +51,4 @@ public String toValue() {
         names.put("documentation", DOCUMENTATION);
         names.put("other", OTHER);
     }
-}
+}