Skip to content

Commit

Permalink
Merge pull request #8894 from swagger-api/samples-update-rebase
Browse files Browse the repository at this point in the history 
Samples update and fixes
  • Loading branch information
@frantuma
frantuma authored Nov 13, 2018
2 parents 9409f83 + dd6076b commit d9c4e01
Show file tree
Hide file tree
Showing 1,164 changed files with 28,390 additions and 11,524 deletions.
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Swagger Code Generator

[![Build Status](https://img.shields.io/jenkins/s/https/jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-core-master-java-8.svg)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-core-master-java-8)

- Master (2.4.0): [![Build Status](https://img.shields.io/travis/swagger-api/swagger-codegen/master.svg?label=Petstore%20Integration%20Test)](https://travis-ci.org/swagger-api/swagger-codegen)
[![Run Status](https://img.shields.io/shippable/5782588a3be4f4faa56c5bea.svg?label=Mustache%20Template%20Test)](https://app.shippable.com/projects/5782588a3be4f4faa56c5bea)
[![Windows Test](https://ci.appveyor.com/api/projects/status/github/swagger-api/swagger-codegen?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/swagger-codegen-wh2wu)
[![Java Test](https://circleci.com/gh/swagger-api/swagger-codegen.svg?style=shield)](https://circleci.com/gh/swagger-api/swagger-codegen)
[![Java Test](https://img.shields.io/jenkins/s/https/jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master.svg)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master)
[![Windows Test](https://ci.appveyor.com/api/projects/status/github/swagger-api/swagger-codegen?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/swaggerhub-bot/swagger-codegen)
- 3.0.0: [![Build Status](https://img.shields.io/travis/swagger-api/swagger-codegen/3.0.0.svg?label=Petstore%20Integration%20Test)](https://travis-ci.org/swagger-api/swagger-codegen)
[![Run Status](https://img.shields.io/shippable/5782588a3be4f4faa56c5bea/3.0.0.svg?label=Mustache%20Template%20Test)](https://app.shippable.com/projects/5782588a3be4f4faa56c5bea)
[![Windows Test](https://ci.appveyor.com/api/projects/status/github/swagger-api/swagger-codegen?branch=3.0.0&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/swagger-codegen-wh2wu)
[![Java Test](https://circleci.com/gh/swagger-api/swagger-codegen/tree/3.0.0.svg?style=shield)](https://circleci.com/gh/swagger-api/swagger-codegen)
[![Java Test](https://img.shields.io/jenkins/s/https/jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-3.svg)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-3)
[![Windows Test](https://ci.appveyor.com/api/projects/status/github/swagger-api/swagger-codegen?branch=3.0.0&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/swaggerhub-bot/swagger-codegen)


[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.swagger/swagger-codegen-project/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/io.swagger/swagger-codegen-project)
Expand Down
2 changes: 1 addition & 1 deletion bin/run-all-petstore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# execute the script and check the result (exit code) to see if
# there's any error

echo "IMPORTANT: this script should be run by the CI (e.g. Shippable) only. There's no need to run this script to update Petstore samples for all generators."
echo "IMPORTANT: this script should be run by the CI (e.g. Jenkins) only. There's no need to run this script to update Petstore samples for all generators."
echo "Please press CTRL+C to stop or the script will continue in 10 seconds."

sleep 10
Expand Down
6 changes: 5 additions & 1 deletion bin/scala-lagom-server-petstore.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ fi

# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala-lagom-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scala-lagom-server -o samples/server/petstore/scala-lagom-server"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala-lagom-server -i modules/swagger-codegen/src/test/resources/2_0/petstore-nocurr.yaml -l scala-lagom-server -o samples/server/petstore/scala-lagom-server"

rm -rf samples/server/petstore/scala-lagom-server/src/main/scala/io
rm -rf samples/server/petstore/scala-lagom-server/project
rm -rf samples/server/petstore/scala-lagom-server/build.sbt

java $JAVA_OPTS -jar $executable $ags
3 changes: 3 additions & 0 deletions bin/spring-mvc-petstore-j8-async-server.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ fi
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json -DhideGenerationTimestamp=true,java8=true,async=true"

rm -rf samples/server/petstore/spring-mvc-j8-async/src/main
rm -rf samples/server/petstore/spring-mvc-j8-async/src/test/java/io
find samples/server/petstore/spring-mvc-j8-async -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
java $JAVA_OPTS -jar $executable $ags
3 changes: 3 additions & 0 deletions bin/spring-mvc-petstore-j8-localdatetime.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ fi
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -c bin/spring-mvc-petstore-j8-localdatetime.json -o samples/server/petstore/spring-mvc-j8-localdatetime -DhideGenerationTimestamp=true"

rm -rf samples/server/petstore/spring-mvc-j8-localdatetime/src/main
rm -rf samples/server/petstore/spring-mvc-j8-localdatetime/src/test/java/io
find samples/server/petstore/spring-mvc-j8-localdatetime -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
java $JAVA_OPTS -jar $executable $ags
3 changes: 3 additions & 0 deletions bin/spring-mvc-petstore-server.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ fi
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -c bin/spring-mvc-petstore-server.json -o samples/server/petstore/spring-mvc -DhideGenerationTimestamp=true"

rm -rf samples/server/petstore/spring-mvc/src/main
rm -rf samples/server/petstore/spring-mvc-j8-localdatetime/src/test/java/io
find samples/server/petstore/spring-mvc -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
java $JAVA_OPTS -jar $executable $ags
4 changes: 3 additions & 1 deletion bin/springboot-petstore-server-beanvalidation.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ fi

# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-beanvalidation -c bin/springboot-petstore-server-beanvalidation.json -DhideGenerationTimestamp=true"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot-beanvalidation -c bin/springboot-petstore-server-beanvalidation.json -DhideGenerationTimestamp=true -DapiTests=false"

echo "Removing files and folders under samples/server/petstore/springboot-beanvalidation/src/main"
rm -rf samples/server/petstore/springboot-beanvalidation/src/main
rm -rf samples/server/petstore/springboot-beanvalidation/src/test/java/io

find samples/server/petstore/springboot-beanvalidation -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
java $JAVA_OPTS -jar $executable $ags
4 changes: 3 additions & 1 deletion bin/springboot-petstore-server-implicitHeaders.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ fi

# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -c bin/springboot-petstore-server-implicitHeaders.json -o samples/server/petstore/springboot-implicitHeaders -DhideGenerationTimestamp=true"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -c bin/springboot-petstore-server-implicitHeaders.json -o samples/server/petstore/springboot-implicitHeaders -DhideGenerationTimestamp=true -DapiTests=false"

echo "Removing files and folders under samples/server/petstore/springboot-implicitHeaders/src/main"
rm -rf samples/server/petstore/springboot-implicitHeaders/src/main
rm -rf samples/server/petstore/springboot-implicitHeaders/src/test/java/io

find samples/server/petstore/springboot-implicitHeaders -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
java $JAVA_OPTS -jar $executable $ags
4 changes: 3 additions & 1 deletion bin/springboot-petstore-server-useOptional.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ fi

# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -c bin/springboot-petstore-server-useOptional.json -o samples/server/petstore/springboot-useoptional -DhideGenerationTimestamp=true"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -c bin/springboot-petstore-server-useOptional.json -o samples/server/petstore/springboot-useoptional -DhideGenerationTimestamp=true -DapiTests=false"

echo "Removing files and folders under samples/server/petstore/springboot-useoptional/src/main"
rm -rf samples/server/petstore/springboot-useoptional/src/main
rm -rf samples/server/petstore/springboot-useoptional/src/test/java/io

find samples/server/petstore/springboot-useoptional -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
java $JAVA_OPTS -jar $executable $ags
3 changes: 2 additions & 1 deletion bin/springboot-petstore-server.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ fi

# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot -DhideGenerationTimestamp=true"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpring -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples/server/petstore/springboot -DhideGenerationTimestamp=true -DapiTests=false"

echo "Removing files and folders under samples/server/petstore/springboot/src/main"
rm -rf samples/server/petstore/springboot/src/main
rm -rf samples/server/petstore/springboot/src/test/java/io
find samples/server/petstore/springboot -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
java $JAVA_OPTS -jar $executable $ags
2 changes: 1 addition & 1 deletion bin/windows/python2-flask-petstore.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ If Not Exist %executable% (
)

REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l python-flask -o samples\server\petstore\flaskConnexion-python2 -c bin\supportPython2.json -D service
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-flask.yaml -l python-flask -o samples\server\petstore\flaskConnexion-python2 -c bin\supportPython2.json -D service

java %JAVA_OPTS% -jar %executable% %ags%
2 changes: 1 addition & 1 deletion bin/windows/python3-flask-petstore.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ If Not Exist %executable% (
)

REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l python-flask -o samples\server\petstore\flaskConnexion -D service
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-flask.yaml -l python-flask -o samples\server\petstore\flaskConnexion -D service

java %JAVA_OPTS% -jar %executable% %ags%
2 changes: 1 addition & 1 deletion bin/windows/scala-lagom-petstore.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ If Not Exist %executable% (
)

REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l scala-lagom-server -o samples\server\petstore\scala-lagom-server
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-nocurr.yaml -l scala-lagom-server -o samples\server\petstore\scala-lagom-server

java %JAVA_OPTS% -jar %executable% %ags%
2 changes: 1 addition & 1 deletion bin/windows/springboot-petstore-server.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ If Not Exist %executable% (
)

REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples\server\petstore\springboot -DhideGenerationTimestamp=true
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples\server\petstore\springboot -DhideGenerationTimestamp=true -DapiTests=false

java %JAVA_OPTS% -jar %executable% %ags%
4 changes: 4 additions & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,10 @@ public void setParameterExampleValue(CodegenParameter p) {
example = "new File(\"" + escapeText(example) + "\")";
} else if ("Date".equals(type)) {
example = "new Date()";
} else if ("LocalDate".equals(type)) {
example = "LocalDate.now()";
} else if ("OffsetDateTime".equals(type)) {
example = "OffsetDateTime.now()";
} else if (!languageSpecificPrimitives.contains(type)) {
// type is a model class, e.g. User
example = "new " + type + "()";
Expand Down
2 changes: 0 additions & 2 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import org.apache.commons.lang3.StringUtils;

import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;

public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig {
public static final String PACKAGE_URL = "packageUrl";
public static final String DEFAULT_LIBRARY = "urllib3";
Expand Down
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/Java/JSON.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.format.DateTimeFormatter;
{{/threetenbp}}

{{#parent.length}}
{{#models.0}}
import {{modelPackage}}.*;
{{/parent.length}}
{{/models.0}}
import okio.ByteString;

import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/JSON.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.format.DateTimeFormatter;
{{/threetenbp}}

{{#parent.length}}
{{#models.0}}
import {{modelPackage}}.*;
{{/parent.length}}
{{/models.0}}

import java.io.IOException;
import java.io.StringReader;
Expand Down
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/api_test.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder;
import org.testng.annotations.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
* Test class to verify that GET endpoints on generated project are reached.
*/
Expand All @@ -21,7 +21,7 @@ public class {{classname}}ControllerIT {
final String requestURL = "http://localhost:8002{{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}{{testPath}}{{#hasQueryParams}}?{{/hasQueryParams}}{{#queryParams}}{{paramName}}={{testExample}}{{#hasMore}}&{{/hasMore}}{{/queryParams}}";
final HttpClient client = HttpClientBuilder.create().build();
final HttpResponse response = client.execute(new HttpGet(requestURL));
assertEquals(response.getStatusLine().getStatusCode(), 501);
assertTrue((response.getStatusLine().getStatusCode() == 415) || (response.getStatusLine().getStatusCode() == 501));
}
{{/vendorExtensions.x-is-get-method}}
{{/operation}}
Expand Down
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/akka-scala/enumsSerializers.mustache
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{>licenseInfo}}
package {{apiPackage}}

{{#models.length}}
{{#models.0}}
import {{modelPackage}}._
{{/models.length}}
{{/models.0}}
import org.json4s._
import scala.reflect.ClassTag

Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/akka-scala/model.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ case class {{classname}} (
{{#description}}
/* {{{description}}} */
{{/description}}
{{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
{{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}
{{/vars}}
) extends ApiModel

Expand Down
Loading

0 comments on commit d9c4e01

Please sign in to comment.