Merge branch 'develop_2.0' into library-template-jersey2

Conflicts:
	modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache

modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache

@@ -38,6 +38,7 @@ import {{invokerPackage}}.auth.HttpBasicAuth;
 import {{invokerPackage}}.auth.ApiKeyAuth;
 import {{invokerPackage}}.auth.OAuth;
 
+{{>generatedAnnotation}}
 public class ApiClient {
   private Map<String, Client> hostMap = new HashMap<String, Client>();
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();

modules/swagger-codegen/src/main/resources/Java/Configuration.mustache

@@ -1,5 +1,6 @@
 package {{invokerPackage}};
 
+{{>generatedAnnotation}}
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 

modules/swagger-codegen/src/main/resources/Java/JSON.mustache

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.datatype.joda.*;
 
 import java.io.IOException;
 
+{{>generatedAnnotation}}
 public class JSON {
   private ObjectMapper mapper;
 

modules/swagger-codegen/src/main/resources/Java/Pair.mustache

@@ -1,5 +1,6 @@
 package {{invokerPackage}};
 
+{{>generatedAnnotation}}
 public class Pair {
     private String name = "";
     private String value = "";

modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache

@@ -1,5 +1,6 @@
 package {{invokerPackage}};
 
+{{>generatedAnnotation}}
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

modules/swagger-codegen/src/main/resources/Java/TypeRef.mustache

@@ -3,6 +3,7 @@ package {{invokerPackage}};
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
+{{>generatedAnnotation}}
 public class TypeRef<T> {
     private final Type type;
 

modules/swagger-codegen/src/main/resources/Java/api.mustache

@@ -17,6 +17,7 @@ import java.io.File;
 import java.util.Map;
 import java.util.HashMap;
 
+{{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}} {
   private ApiClient {{localVariablePrefix}}apiClient;

modules/swagger-codegen/src/main/resources/Java/apiException.mustache

@@ -3,6 +3,7 @@ package {{invokerPackage}};
 import java.util.Map;
 import java.util.List;
 
+{{>generatedAnnotation}}
 public class ApiException extends Exception {
   private int code = 0;
   private String message = null;

modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache

@@ -5,6 +5,7 @@ import {{invokerPackage}}.Pair;
 import java.util.Map;
 import java.util.List;
 
+{{>generatedAnnotation}}
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;

modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache

@@ -5,6 +5,7 @@ import {{invokerPackage}}.Pair;
 import java.util.Map;
 import java.util.List;
 
+{{>generatedAnnotation}}
 public interface Authentication {
   /** Apply authentication settings to header and query params. */
   void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);

modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache

@@ -8,6 +8,7 @@ import java.util.List;
 import java.io.UnsupportedEncodingException;
 import javax.xml.bind.DatatypeConverter;
 
+{{>generatedAnnotation}}
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;

modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache

@@ -5,6 +5,7 @@ import {{invokerPackage}}.Pair;
 import java.util.Map;
 import java.util.List;
 
+{{>generatedAnnotation}}
 public class OAuth implements Authentication {
   @Override
   public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {

modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache

@@ -0,0 +1 @@
+@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")

modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache

@@ -43,6 +43,7 @@ import {{invokerPackage}}.auth.HttpBasicAuth;
 import {{invokerPackage}}.auth.ApiKeyAuth;
 import {{invokerPackage}}.auth.OAuth;
 
+{{>generatedAnnotation}}
 public class ApiClient {
   private Map<String, Client> hostMap = new HashMap<String, Client>();
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();

modules/swagger-codegen/src/main/resources/Java/model.mustache

@@ -12,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * {{description}}
  **/{{/description}}
 @ApiModel(description = "{{{description}}}")
+{{>generatedAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
   {{#vars}}{{#isEnum}}
   public enum {{datatypeWithEnum}} {