swagger-api · fehguy · Nov 11, 2016
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -10,15 +10,14 @@
 import io.swagger.util.Json;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.util.*;
 
-import org.apache.commons.lang3.StringUtils;
-
 public class DefaultGenerator extends AbstractGenerator implements Generator {
     protected Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
 
@@ -630,19 +629,6 @@ public Reader getTemplate(String name) {
                 }
                 files.add(ignoreFile);
             }
-
-            // Add default LICENSE (Apache-2.0) for all generators
-            final String apache2License = "LICENSE";
-            String licenseFileNameTarget = config.outputFolder() + File.separator + apache2License;
-            File licenseFile = new File(licenseFileNameTarget);
-            String licenseFileNameSource = File.separator + config.getCommonTemplateDir() + File.separator + apache2License;
-            String licenseFileContents = readResourceContents(licenseFileNameSource);
-            try {
-                writeToFile(licenseFileNameTarget, licenseFileContents);
-            } catch (IOException e) {
-                throw new RuntimeException("Could not generate LICENSE file '" + apache2License + "'", e);
-            }
-            files.add(licenseFile);
         }
         config.processSwagger(swagger);
         return files;

diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
@@ -1,4 +1,3 @@
-{{>licenseInfo}}
 package {{invokerPackage}};
 
 import com.fasterxml.jackson.annotation.*;

diff --git a/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
@@ -1,5 +1,3 @@
-{{>licenseInfo}}
-
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/Pair.mustache b/modules/swagger-codegen/src/main/resources/Java/Pair.mustache
@@ -1,5 +1,3 @@
-{{>licenseInfo}}
-
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/RFC3339DateFormat.mustache b/modules/swagger-codegen/src/main/resources/Java/RFC3339DateFormat.mustache
@@ -1,4 +1,3 @@
-{{>licenseInfo}}
 package {{invokerPackage}};
 
 import com.fasterxml.jackson.databind.util.ISO8601DateFormat;

diff --git a/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache b/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache
@@ -1,5 +1,3 @@
-{{>licenseInfo}}
-
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}

diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache
@@ -1,4 +1,3 @@
-{{>licenseInfo}}
 package {{package}};
 
 import com.sun.jersey.api.client.GenericType;

diff --git a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
@@ -1,5 +1,3 @@
-{{>licenseInfo}}
-
 package {{invokerPackage}};
 
 import java.util.Map;

diff --git a/modules/swagger-codegen/src/main/resources/Java/api_test.mustache b/modules/swagger-codegen/src/main/resources/Java/api_test.mustache
@@ -1,5 +1,3 @@
-{{>licenseInfo}}
-
 package {{package}};
 
 import {{invokerPackage}}.ApiException;

diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}}.auth;
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}}.auth;
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}}.auth;
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}}.auth;
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/OAuthFlow.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuthFlow.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}}.auth;
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}};
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}};
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}};
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}};
 

diff --git a/...wagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache b/...wagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}};
 

diff --git a/...agger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache b/...agger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}};
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{package}};
 

diff --git a/...swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache b/...swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
@@ -1,4 +1,4 @@
-{{>licenseInfo}}
+
 
 package {{invokerPackage}}.auth;
 

diff --git a/modules/swagger-codegen/src/main/resources/Java/licenseInfo.mustache b/modules/swagger-codegen/src/main/resources/Java/licenseInfo.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Java/model.mustache b/modules/swagger-codegen/src/main/resources/Java/model.mustache
@@ -1,5 +1,3 @@
-{{>licenseInfo}}
-
 package {{package}};
 
 {{^supportJava6}}

diff --git a/modules/swagger-codegen/src/main/resources/_common/LICENSE b/modules/swagger-codegen/src/main/resources/_common/LICENSE
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		{{>licenseInfo}}


		package {{invokerPackage}}.auth;

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		{{>licenseInfo}}


		package {{invokerPackage}};

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		{{>licenseInfo}}


		package {{package}};

Expand Down