Merge pull request #7939 from jmini/issue52_b

 [3.0.0] Update 'java' examples (2)

Author: HugoMario

bin/java-petstore-jersey2-java6.sh

@@ -31,5 +31,4 @@ ags="$@ generate --artifact-id swagger-petstore-jersey2-java6 -i modules/swagger
 echo "Removing files and folders under samples/client/petstore/java/jersey2/src/main"
 rm -rf samples/client/petstore/java/jersey2-java6/src/main
 find samples/client/petstore/java/jersey2-java6 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
-# TODO: uncomment the java commmand when the issue with this script is fixed, see https://github.com/swagger-api/swagger-codegen-generators/issues/52
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/java-petstore-okhttp-gson-parcelable.sh

@@ -30,5 +30,4 @@ ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with
 
 rm -rf samples/client/petstore/java/okhttp-gson-parcelableModel/src/main
 find samples/client/petstore/java/okhttp-gson-parcelableModel -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
-# TODO: uncomment the java commmand when the issue with this script is fixed, see https://github.com/swagger-api/swagger-codegen-generators/issues/52
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/java-petstore-okhttp-gson.sh

@@ -30,5 +30,4 @@ ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with
 
 rm -rf samples/client/petstore/java/okhttp-gson/src/main
 find samples/client/petstore/java/okhttp-gson -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
-# TODO: uncomment the java commmand when the issue with this script is fixed, see https://github.com/swagger-api/swagger-codegen-generators/issues/52
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+3.0.0-SNAPSHOT

samples/client/petstore/java/jersey2-java6/README.md

@@ -69,11 +69,16 @@ import java.util.*;
 public class AnotherFakeApiExample {
 
     public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
 
+        
+
         AnotherFakeApi apiInstance = new AnotherFakeApi();
-        Client body = new Client(); // Client | client model
+        
+        Client client = ; // Client | client model
+        
         try {
-            Client result = apiInstance.testSpecialTags(body);
+            Client result = apiInstance.testSpecialTags(client);
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
@@ -127,14 +132,15 @@ Class | Method | HTTP request | Description
 
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [Animal](docs/Animal.md)
- - [AnimalFarm](docs/AnimalFarm.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
  - [Capitalization](docs/Capitalization.md)
+ - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
+ - [Dog](docs/Dog.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
@@ -155,8 +161,6 @@ Class | Method | HTTP request | Description
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
  - [User](docs/User.md)
- - [Cat](docs/Cat.md)
- - [Dog](docs/Dog.md)
 
 
 ## Documentation for Authorization
@@ -168,24 +172,37 @@ Authentication schemes defined for the API:
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
+
+
+
 ### api_key_query
 
 - **Type**: API key
 - **API key parameter name**: api_key_query
 - **Location**: URL query string
 
+
+
+
 ### http_basic_test
 
+
 - **Type**: HTTP basic authentication
 
+
+
 ### petstore_auth
 
+
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
 - **Scopes**: 
-  - write:pets: modify pets in your account
-  - read:pets: read your pets
+  - : 
+
+
+
 
 
 ## Recommendation

samples/client/petstore/java/jersey2-java6/build.gradle

@@ -32,8 +32,11 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 25
         }
         compileOptions {
+            
+            
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
+            
         }
 
         // Rename the aar correctly
@@ -77,8 +80,11 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven'
+    
+    
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
+    
 
     install {
         repositories.mavenInstaller {
@@ -95,9 +101,11 @@ if(hasProperty('target') && target == 'android') {
 ext {
     swagger_annotations_version = "1.5.15"
     jackson_version = "2.8.9"
-    jersey_version = "2.6"
+    jersey_version = "2.25.1"
+    
     commons_io_version=2.5
     commons_lang3_version=3.6
+    
     junit_version = "4.12"
 }
 
@@ -109,9 +117,17 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    
+    
+    
     compile "commons-io:commons-io:$commons_io_version"
     compile "org.apache.commons:commons-lang3:$commons_lang3_version"
+    
+    
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version",
+    
+    
     compile "com.brsanthu:migbase64:2.2"
+    
     testCompile "junit:junit:$junit_version"
 }

samples/client/petstore/java/jersey2-java6/build.sbt

@@ -10,16 +10,24 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.15",
-      "org.glassfish.jersey.core" % "jersey-client" % "2.6",
-      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6",
-      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6",
+      "org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
+      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
+      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.6.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.4" % "compile",
+      
+      
+      
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
+      
+      
       "com.brsanthu" % "migbase64" % "2.2",
+      
+      
       "org.apache.commons" % "commons-lang3" % "3.6",
       "commons-io" % "commons-io" % "2.5",
+      
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

samples/client/petstore/java/jersey2-java6/docs/AdditionalPropertiesClass.md

@@ -9,3 +9,4 @@ Name | Type | Description | Notes
 
 
 
+

samples/client/petstore/java/jersey2-java6/docs/Animal.md

@@ -9,3 +9,4 @@ Name | Type | Description | Notes
 
 
 
+