remove apache license in jaxrs, update samples (#7553)

wing328 · web-flow · commit b7f5265ae544 · 2020-10-01T15:03:59.000+08:00
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/licenseInfo.mustache
@@ -8,16 +8,4 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/licenseInfo.mustache
@@ -8,16 +8,4 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java
@@ -34,6 +34,7 @@ public interface UserApi  {
      *
      */
     @POST
+    
     @ApiOperation(value = "Create user", tags={  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/FormatTest.java
@@ -251,7 +251,7 @@ public FormatTest string(String string) {
   */
   @JsonProperty("byte")
   @NotNull
- @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  public byte[] getByte() {
+  public byte[] getByte() {
     return _byte;
   }
 
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -35,7 +35,7 @@ public class AnotherFakeApiServiceImpl implements AnotherFakeApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/AnotherFakeApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -43,7 +43,7 @@ public class FakeApiServiceImpl implements FakeApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/FakeApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
@@ -35,7 +35,7 @@ public class FakeClassnameTags123ApiServiceImpl implements FakeClassnameTags123A
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/FakeClassnameTags123Api");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -8,7 +8,6 @@
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
 import java.util.Set;
-import org.openapitools.model.Tag;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -40,7 +39,7 @@ public class PetApiServiceImpl implements PetApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/PetApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -35,7 +35,7 @@ public class StoreApiServiceImpl implements StoreApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/StoreApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -35,7 +35,7 @@ public class UserApiServiceImpl implements UserApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/UserApi");
         } catch (CacheException e) {
             e.printStackTrace();

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public interface UserApi {`
`34`	`34`	`*`
`35`	`35`	`*/`
`36`	`36`	`@POST`
	`37`	`+`
`37`	`38`	`@ApiOperation(value = "Create user", tags={ })`
`38`	`39`	`@ApiResponses(value = {`
`39`	`40`	`@ApiResponse(code = 200, message = "successful operation") })`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ public FormatTest string(String string) {`
`251`	`251`	`*/`
`252`	`252`	`@JsonProperty("byte")`
`253`	`253`	`@NotNull`
`254`		`- @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==\|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() {`
	`254`	`+ public byte[] getByte() {`
`255`	`255`	`return _byte;`
`256`	`256`	`}`
`257`	`257`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class AnotherFakeApiServiceImpl implements AnotherFakeApi {`
`35`	`35`	`{`
`36`	`36`	`try {`
`37`	`37`	`File cacheFile = new File(System.getProperty("jaxrs.test.server.json",`
`38`		`- "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
	`38`	`+ "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
`39`	`39`	`cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/AnotherFakeApi");`
`40`	`40`	`} catch (CacheException e) {`
`41`	`41`	`e.printStackTrace();`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class FakeApiServiceImpl implements FakeApi {`
`43`	`43`	`{`
`44`	`44`	`try {`
`45`	`45`	`File cacheFile = new File(System.getProperty("jaxrs.test.server.json",`
`46`		`- "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
	`46`	`+ "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
`47`	`47`	`cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/FakeApi");`
`48`	`48`	`} catch (CacheException e) {`
`49`	`49`	`e.printStackTrace();`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class FakeClassnameTags123ApiServiceImpl implements FakeClassnameTags123A`
`35`	`35`	`{`
`36`	`36`	`try {`
`37`	`37`	`File cacheFile = new File(System.getProperty("jaxrs.test.server.json",`
`38`		`- "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
	`38`	`+ "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
`39`	`39`	`cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/FakeClassnameTags123Api");`
`40`	`40`	`} catch (CacheException e) {`
`41`	`41`	`e.printStackTrace();`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class StoreApiServiceImpl implements StoreApi {`
`35`	`35`	`{`
`36`	`36`	`try {`
`37`	`37`	`File cacheFile = new File(System.getProperty("jaxrs.test.server.json",`
`38`		`- "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
	`38`	`+ "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
`39`	`39`	`cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/StoreApi");`
`40`	`40`	`} catch (CacheException e) {`
`41`	`41`	`e.printStackTrace();`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class UserApiServiceImpl implements UserApi {`
`35`	`35`	`{`
`36`	`36`	`try {`
`37`	`37`	`File cacheFile = new File(System.getProperty("jaxrs.test.server.json",`
`38`		`- "/Users/par/git/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
	`38`	`+ "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));`
`39`	`39`	`cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/UserApi");`
`40`	`40`	`} catch (CacheException e) {`
`41`	`41`	`e.printStackTrace();`