From 65883a5d8508f1d1802601b0d7fb831cfd1dd951 Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 24 Mar 2015 21:16:00 +0800 Subject: [PATCH 1/2] Set default User-Agent for Java and Android clients --- .../src/main/resources/Java/apiInvoker.mustache | 3 +++ .../src/main/resources/android-java/apiInvoker.mustache | 3 +++ .../src/main/java/io/swagger/client/ApiInvoker.java | 3 +++ .../java/src/main/java/io/swagger/client/ApiInvoker.java | 3 +++ 4 files changed, 12 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache index eff710a044..d676dc8def 100644 --- a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache @@ -53,6 +53,9 @@ public class ApiInvoker { // Use UTC as the default time zone. DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); + + // Set the default User-Agent header. + INSTANCE.addDefaultHeader("User-Agent", "Java-Swagger"); } public static Date parseDateTime(String str) { diff --git a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache index 8b31abd48a..491fbf6525 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache @@ -82,6 +82,9 @@ public class ApiInvoker { // Use UTC as the default time zone. DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); + + // Set the default User-Agent header. + INSTANCE.addDefaultHeader("User-Agent", "Android-Java-Swagger"); } public static Date parseDateTime(String str) { diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java index 9eb217fe73..671399cd00 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java @@ -82,6 +82,9 @@ public class ApiInvoker { // Use UTC as the default time zone. DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); + + // Set the default User-Agent header. + INSTANCE.addDefaultHeader("User-Agent", "Android-Java-Swagger"); } public static Date parseDateTime(String str) { diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java index f3b3466dbd..94d64f6963 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java @@ -53,6 +53,9 @@ public class ApiInvoker { // Use UTC as the default time zone. DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); + + // Set the default User-Agent header. + INSTANCE.addDefaultHeader("User-Agent", "Java-Swagger"); } public static Date parseDateTime(String str) { From 90db8e2147330c509266f8954559f38f7c68e980 Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 24 Mar 2015 23:00:15 +0800 Subject: [PATCH 2/2] Add setUserAgent method to Java and Android clients --- .../src/main/resources/Java/apiInvoker.mustache | 8 ++++++-- .../src/main/resources/android-java/apiInvoker.mustache | 8 ++++++-- .../src/main/java/io/swagger/client/ApiInvoker.java | 8 ++++++-- .../java/src/main/java/io/swagger/client/ApiInvoker.java | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache index d676dc8def..28c27b3d16 100644 --- a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache @@ -54,8 +54,12 @@ public class ApiInvoker { DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); - // Set the default User-Agent header. - INSTANCE.addDefaultHeader("User-Agent", "Java-Swagger"); + // Set default User-Agent. + setUserAgent("Java-Swagger"); + } + + public static void setUserAgent(String userAgent) { + INSTANCE.addDefaultHeader("User-Agent", userAgent); } public static Date parseDateTime(String str) { diff --git a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache index 491fbf6525..4c0aa2d3ed 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache @@ -83,8 +83,12 @@ public class ApiInvoker { DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); - // Set the default User-Agent header. - INSTANCE.addDefaultHeader("User-Agent", "Android-Java-Swagger"); + // Set default User-Agent. + setUserAgent("Android-Java-Swagger"); + } + + public static void setUserAgent(String userAgent) { + INSTANCE.addDefaultHeader("User-Agent", userAgent); } public static Date parseDateTime(String str) { diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java index 671399cd00..1c9980e9a2 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java @@ -83,8 +83,12 @@ public class ApiInvoker { DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); - // Set the default User-Agent header. - INSTANCE.addDefaultHeader("User-Agent", "Android-Java-Swagger"); + // Set default User-Agent. + setUserAgent("Android-Java-Swagger"); + } + + public static void setUserAgent(String userAgent) { + INSTANCE.addDefaultHeader("User-Agent", userAgent); } public static Date parseDateTime(String str) { diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java index 94d64f6963..231bff1e53 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java @@ -54,8 +54,12 @@ public class ApiInvoker { DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); - // Set the default User-Agent header. - INSTANCE.addDefaultHeader("User-Agent", "Java-Swagger"); + // Set default User-Agent. + setUserAgent("Java-Swagger"); + } + + public static void setUserAgent(String userAgent) { + INSTANCE.addDefaultHeader("User-Agent", userAgent); } public static Date parseDateTime(String str) {