fixes #4 update petstore with the new generator

Author: stevehu

openapi/petstore/build.gradle.kts

@@ -1,7 +1,7 @@
 
 plugins {
     application
-    kotlin("jvm") version "1.3.21"
+    kotlin("jvm") version "1.3.50"
     // https://github.com/ben-manes/gradle-versions-plugin
     id("com.github.ben-manes.versions") version "0.20.0"
     // https://github.com/johnrengelman/shadow

openapi/petstore/build.sh

@@ -20,7 +20,9 @@ showHelp() {
 
 build() {
     echo "Building ..."
-    mvn clean install
+    
+    ./gradlew clean build
+    
     echo "Successfully built!"
 }
 
@@ -35,7 +37,7 @@ cleanup() {
 publish() {
     echo "Building Docker image with version $VERSION"
     docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true
-    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Redhat . --no-cache=true
+    docker build -t $IMAGE_NAME:$VERSION-redhat -f ./docker/Dockerfile-Slim . --no-cache=true
     echo "Images built with version $VERSION"
     echo "Pushing image to DockerHub"
     docker push $IMAGE_NAME

openapi/petstore/docker/Dockerfile

@@ -1,5 +1,33 @@
 
-FROM openjdk:8-jre-alpine
-#EXPOSE 8443
-ADD /build/libs/petstore.jar server.jar
-CMD ["/bin/sh","-c","java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]
+FROM azul/zulu-openjdk-alpine:11 as packager
+
+RUN { \
+        java --version ; \
+        echo "jlink version:" && \
+        $JAVA_HOME/bin/jlink --version ; \
+    }
+
+ENV JAVA_MINIMAL=/opt/jre
+
+# build modules distribution
+RUN $JAVA_HOME/bin/jlink \
+    --verbose \
+    --add-modules \
+        java.base,java.sql,java.naming,java.desktop,java.xml,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.unsupported,java.management,java.security.jgss,java.net.http  \
+    --compress 2 \
+    --strip-debug \
+    --no-header-files \
+    --no-man-pages \
+    --output "$JAVA_MINIMAL"
+
+# Second stage, add only our minimal "JRE" distr and our app
+FROM alpine
+
+ENV JAVA_MINIMAL=/opt/jre
+ENV PATH="$PATH:$JAVA_MINIMAL/bin"
+
+COPY --from=packager "$JAVA_MINIMAL" "$JAVA_MINIMAL"
+
+COPY /build/libs/petstore.jar server.jar
+
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]

openapi/petstore/docker/Dockerfile-Redhat

@@ -0,0 +1,6 @@
+
+FROM openjdk:11.0.3-slim
+
+COPY /build/libs/petstore.jar server.jar
+
+CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -jar /server.jar"]

openapi/petstore/docker/Dockerfile-Slim

@@ -1,8 +1,8 @@
 
 # Versions of Frequently used Libraries
 kafkaVersion=2.0.0
-light4jVersion=1.6.5-SNAPSHOT
-jacksonVersion=2.10.4
+light4jVersion=2.0.24-SNAPSHOT
+jacksonVersion=2.12.1
 undertowVersion=2.1.3.Final
 logbackVersion=1.2.3
 jsonSchemaValidatorVersion=1.0.29

openapi/petstore/gradle.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.2-20190201174223+0000-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

openapi/petstore/gradle/wrapper/gradle-wrapper.properties

@@ -8,6 +8,7 @@ class PetsPostHandler : LightHttpHandler {
 
     @Throws(Exception::class)
     override fun handleRequest(exchange: HttpServerExchange) {
-        exchange.endExchange()
+        exchange.responseHeaders.add(HttpString("Content-Type"), "application/json")
+        exchange.responseSender.send("{}")
     }
 }

openapi/petstore/src/main/kotlin/com/networknt/petstore/handler/PetsPostHandler.kt

@@ -1,8 +1,8 @@
 package com.networknt.petstore.model;
 data class Error (
-        val message: String,
+        val code: Integer,
 
 
-        val code: Int
+        val message: String
 )
 

openapi/petstore/src/main/kotlin/com/networknt/petstore/model/Error.kt

@@ -1,8 +1,8 @@
 package com.networknt.petstore.model;
 data class Pet (
-        val name: String,
+        val id: java.lang.Long,
 
-        val id: Long,
+        val name: String,
 
 
         val tag: String