Add ./bin/spring-mvc-petstore-j8-localdatetime.sh to spring-all-petstore.sh

Author: Daan Kerkhofs

bin/spring-all-pestore.sh

@@ -5,6 +5,7 @@
 ./bin/spring-delegate-j8.sh
 ./bin/spring-stubs.sh
 ./bin/spring-mvc-petstore-j8-async-server.sh
+./bin/spring-mvc-petstore-j8-localdatetime.sh
 ./bin/springboot-petstore-server.sh
 ./bin/spring-mvc-petstore-server.sh
 ./bin/springboot-petstore-server-beanvalidation.sh

samples/client/petstore/spring-stubs/pom.xml

@@ -9,12 +9,12 @@
         <java.version>1.7</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <springfox-version>2.6.1</springfox-version>
+        <springfox-version>2.7.0</springfox-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.7.RELEASE</version>
+        <version>1.5.9.RELEASE</version>
     </parent>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
@@ -27,7 +27,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--SpringFox dependencies -->
         <dependency>
@@ -42,19 +41,14 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
+            <groupId>com.github.joschi.jackson</groupId>
+            <artifactId>jackson-datatype-threetenbp</artifactId>
+            <version>2.6.4</version>
         </dependency>
+    <!-- Bean Validation API support -->
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
         </dependency>
-    <!-- Bean Validation API support -->
-    <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
-        <scope>provided</scope>
-    </dependency>
     </dependencies>
 </project>

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/AnotherFakeApi.java

@@ -30,6 +30,7 @@
 import java.util.Optional;
 
 @Api(value = "another-fake", description = "the another-fake API")
+@RequestMapping(value = "/v2")
 public interface AnotherFakeApi {
 
     Logger log = LoggerFactory.getLogger(AnotherFakeApi.class);

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApi.java

@@ -10,6 +10,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import io.swagger.model.OuterComposite;
+import io.swagger.model.User;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
@@ -34,6 +35,7 @@
 import java.util.Optional;
 
 @Api(value = "fake", description = "the fake API")
+@RequestMapping(value = "/v2")
 public interface FakeApi {
 
     Logger log = LoggerFactory.getLogger(FakeApi.class);
@@ -138,6 +140,21 @@ default ResponseEntity<String> fakeOuterStringSerialize(@ApiParam(value = "Input
     }
 
 
+    @ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Success") })
+    @RequestMapping(value = "/fake/body-with-query-params",
+        consumes = { "application/json" },
+        method = RequestMethod.PUT)
+    default ResponseEntity<Void> testBodyWithQueryParams(@ApiParam(value = "" ,required=true )  @Valid @RequestBody User body,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query) {
+        if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
+        } else {
+            log.warn("ObjectMapper or HttpServletRequest not configured in default FakeApi interface so no example is generated");
+        }
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+    }
+
+
     @ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApi.java

@@ -30,6 +30,7 @@
 import java.util.Optional;
 
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
+@RequestMapping(value = "/v2")
 public interface FakeClassnameTestApi {
 
     Logger log = LoggerFactory.getLogger(FakeClassnameTestApi.class);
@@ -46,7 +47,7 @@ default Optional<String> getAcceptHeader() {
         return getRequest().map(r -> r.getHeader("Accept"));
     }
 
-    @ApiOperation(value = "To test class name in snake case", nickname = "testClassname", notes = "", response = Client.class, authorizations = {
+    @ApiOperation(value = "To test class name in snake case", nickname = "testClassname", notes = "To test class name in snake case", response = Client.class, authorizations = {
         @Authorization(value = "api_key_query")
     }, tags={ "fake_classname_tags 123#$%^", })
     @ApiResponses(value = { 

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/PetApi.java

@@ -32,6 +32,7 @@
 import java.util.Optional;
 
 @Api(value = "pet", description = "the pet API")
+@RequestMapping(value = "/v2")
 public interface PetApi {
 
     Logger log = LoggerFactory.getLogger(PetApi.class);

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/StoreApi.java

@@ -31,6 +31,7 @@
 import java.util.Optional;
 
 @Api(value = "store", description = "the store API")
+@RequestMapping(value = "/v2")
 public interface StoreApi {
 
     Logger log = LoggerFactory.getLogger(StoreApi.class);

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApi.java

@@ -31,6 +31,7 @@
 import java.util.Optional;
 
 @Api(value = "user", description = "the user API")
+@RequestMapping(value = "/v2")
 public interface UserApi {
 
     Logger log = LoggerFactory.getLogger(UserApi.class);
@@ -116,7 +117,7 @@ default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs t
     @RequestMapping(value = "/user/{username}",
         produces = { "application/xml", "application/json" }, 
         method = RequestMethod.GET)
-    default ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true) @PathVariable("username") String username) {
+    default ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathVariable("username") String username) {
         if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
             if (getAcceptHeader().get().contains("application/xml")) {
                 try {

samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/model/EnumTest.java

@@ -53,6 +53,42 @@ public static EnumStringEnum fromValue(String text) {
   @JsonProperty("enum_string")
   private EnumStringEnum enumString = null;
 
+  /**
+   * Gets or Sets enumStringRequired
+   */
+  public enum EnumStringRequiredEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringRequiredEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringRequiredEnum fromValue(String text) {
+      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  @JsonProperty("enum_string_required")
+  private EnumStringRequiredEnum enumStringRequired = null;
+
   /**
    * Gets or Sets enumInteger
    */
@@ -144,6 +180,27 @@ public void setEnumString(EnumStringEnum enumString) {
     this.enumString = enumString;
   }
 
+  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+    return this;
+  }
+
+  /**
+   * Get enumStringRequired
+   * @return enumStringRequired
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @NotNull
+
+
+  public EnumStringRequiredEnum getEnumStringRequired() {
+    return enumStringRequired;
+  }
+
+  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+  }
+
   public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
     return this;
@@ -216,14 +273,15 @@ public boolean equals(java.lang.Object o) {
     }
     EnumTest enumTest = (EnumTest) o;
     return Objects.equals(this.enumString, enumTest.enumString) &&
+        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
         Objects.equals(this.enumInteger, enumTest.enumInteger) &&
         Objects.equals(this.enumNumber, enumTest.enumNumber) &&
         Objects.equals(this.outerEnum, enumTest.outerEnum);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(enumString, enumInteger, enumNumber, outerEnum);
+    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
   }
 
   @Override
@@ -232,6 +290,7 @@ public String toString() {
     sb.append("class EnumTest {\n");
 
     sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
+    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
     sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
     sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
     sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");