Rename default package for spring generator (#221)

bin/spring-all-pestore.sh

@@ -1,12 +1,18 @@
 #!/bin/sh
 
+# Generate clients:
 ./bin/spring-cloud-feign-petstore.sh
+./bin/spring-stubs.sh
+
+# Generate spring-mvc servers:
+./bin/spring-mvc-petstore-server.sh
+./bin/spring-mvc-petstore-j8-async-server.sh
+./bin/spring-mvc-petstore-j8-localdatetime.sh
+
+# Generate springboot servers:
 ./bin/spring-delegate.sh
 ./bin/spring-delegate-j8.sh
-./bin/spring-stubs.sh
-./bin/spring-mvc-petstore-j8-async-server.sh
 ./bin/springboot-petstore-server.sh
-./bin/spring-mvc-petstore-server.sh
 ./bin/springboot-petstore-server-beanvalidation.sh
 ./bin/springboot-petstore-server-implicitHeaders.sh
 ./bin/springboot-petstore-server-useOptional.sh

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java

@@ -3,17 +3,33 @@ package org.openapitools.codegen.languages;
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
 
-import org.openapitools.codegen.*;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.CodegenResponse;
+import org.openapitools.codegen.CodegenSecurity;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.languages.features.BeanValidationFeatures;
 import org.openapitools.codegen.languages.features.OptionalFeatures;
 import org.openapitools.codegen.utils.URLPathUtils;
-import io.swagger.v3.oas.models.*;
 
-import java.net.URL;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
-import java.util.*;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 
 public class SpringCodegen extends AbstractJavaCodegen
@@ -35,8 +51,8 @@ public class SpringCodegen extends AbstractJavaCodegen
     public static final String SWAGGER_DOCKET_CONFIG = "swaggerDocketConfig";
 
     protected String title = "OpenAPI Spring";
-    protected String configPackage = "io.swagger.configuration";
-    protected String basePackage = "io.swagger";
+    protected String configPackage = "org.openapitools.configuration";
+    protected String basePackage = "org.openapitools";
     protected boolean interfaceOnly = false;
     protected boolean delegatePattern = false;
     protected boolean delegateMethod = false;
@@ -55,9 +71,9 @@ public class SpringCodegen extends AbstractJavaCodegen
         outputFolder = "generated-code/javaSpring";
         apiTestTemplateFiles.clear(); // TODO: add test template
         embeddedTemplateDir = templateDir = "JavaSpring";
-        apiPackage = "io.swagger.api";
-        modelPackage = "io.swagger.model";
-        invokerPackage = "io.swagger.api";
+        apiPackage = "org.openapitools.api";
+        modelPackage = "org.openapitools.model";
+        invokerPackage = "org.openapitools.api";
         artifactId = "openapi-spring";
 
         additionalProperties.put(CONFIG_PACKAGE, configPackage);

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
-import io.swagger.model.ModelApiResponse;
-import io.swagger.model.Pet;
+import org.openapitools.model.ModelApiResponse;
+import org.openapitools.model.Pet;
 import org.springframework.core.io.Resource;
 import io.swagger.annotations.*;
 import org.springframework.http.ResponseEntity;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApiClient.java

@@ -1,7 +1,7 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
-import io.swagger.configuration.ClientConfiguration;
+import org.openapitools.configuration.ClientConfiguration;
 
 @FeignClient(name="${swaggerPetstore.name:swaggerPetstore}", url="${swaggerPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface PetApiClient extends PetApi {

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
 import java.util.Map;
-import io.swagger.model.Order;
+import org.openapitools.model.Order;
 import io.swagger.annotations.*;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApiClient.java

@@ -1,7 +1,7 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
-import io.swagger.configuration.ClientConfiguration;
+import org.openapitools.configuration.ClientConfiguration;
 
 @FeignClient(name="${swaggerPetstore.name:swaggerPetstore}", url="${swaggerPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface StoreApiClient extends StoreApi {

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
 import java.util.List;
-import io.swagger.model.User;
+import org.openapitools.model.User;
 import io.swagger.annotations.*;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApiClient.java

@@ -1,7 +1,7 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
-import io.swagger.configuration.ClientConfiguration;
+import org.openapitools.configuration.ClientConfiguration;
 
 @FeignClient(name="${swaggerPetstore.name:swaggerPetstore}", url="${swaggerPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface UserApiClient extends UserApi {

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientConfiguration.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import feign.Logger;
 import feign.auth.BasicAuthRequestInterceptor;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/CustomInstantDeserializer.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonTokenId;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/JacksonConfiguration.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Category;
-import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.Category;
+import org.openapitools.model.Tag;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-cloud/src/test/java/io/swagger/Application.java

@@ -1,20 +0,0 @@
-package io.swagger;
-
-import feign.Logger;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
-
-@SpringBootApplication
-@EnableFeignClients
-public class Application {
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(Application.class).run(args);
-    }
-
-    @Bean
-    Logger.Level feignLoggerLevel() {
-        return Logger.Level.FULL;
-    }
-}

samples/client/petstore/spring-cloud/src/test/java/io/swagger/TestUtils.java

@@ -1,17 +0,0 @@
-package io.swagger;
-
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class TestUtils {
-    private static final AtomicLong atomicId = createAtomicId();
-
-    public static long nextId() {
-        return atomicId.getAndIncrement();
-    }
-
-    private static AtomicLong createAtomicId() {
-        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
-        return new AtomicLong((long) baseId);
-    }
-}

samples/client/petstore/spring-cloud/src/test/java/io/swagger/api/PetApiTest.java

@@ -1,190 +0,0 @@
-package io.swagger.api;
-
-import com.netflix.hystrix.exception.HystrixRuntimeException;
-import io.swagger.Application;
-import io.swagger.TestUtils;
-import io.swagger.model.Category;
-import io.swagger.model.Pet;
-import io.swagger.model.Tag;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-public class PetApiTest {
-
-    @Autowired
-    private PetApiClient client;
-
-    @Test
-    public void testCreateAndGetPet() {
-        Pet pet = createRandomPet();
-        client.addPet(pet).execute();
-        Pet fetched = client.getPetById(pet.getId()).execute().getBody();
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        client.updatePet(pet).execute();
-
-        Pet fetched = client.getPetById(pet.getId()).execute().getBody();
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Ignore
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        client.updatePet(pet).execute();
-
-        List<Pet> pets = client.findPetsByStatus(Collections.singletonList("available")).execute().getBody();
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-    }
-
-    @Ignore
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        client.updatePet(pet).execute();
-
-        List<Pet> pets = client.findPetsByTags(Collections.singletonList("friendly")).execute().getBody();
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        client.addPet(pet).execute();
-
-        Pet fetched = client.getPetById(pet.getId()).execute().getBody();
-
-        client.updatePetWithForm(fetched.getId(), "furt", null).execute();
-        Pet updated = client.getPetById(fetched.getId()).execute().getBody();
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        client.addPet(pet).execute();
-
-        Pet fetched = client.getPetById(pet.getId()).execute().getBody();
-        client.deletePet(fetched.getId(), null).execute();
-
-        try {
-            client.getPetById(fetched.getId()).execute();
-            fail("expected an error");
-        } catch (HystrixRuntimeException e) {
-            assertTrue(e.getCause().getMessage().startsWith("status 404 "));
-        }
-    }
-
-    @Ignore("Multipart form is not supported by spring-cloud yet.")
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        client.addPet(pet).execute();
-
-        MockMultipartFile filePart = new MockMultipartFile("file", "bar".getBytes());
-        client.uploadFile(pet.getId(), "a test file", filePart).execute();
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2");
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-
-}

samples/client/petstore/spring-cloud/src/test/java/io/swagger/api/StoreApiTest.java

@@ -1,73 +0,0 @@
-package io.swagger.api;
-
-import com.netflix.hystrix.exception.HystrixRuntimeException;
-import io.swagger.Application;
-import io.swagger.TestUtils;
-import io.swagger.model.Order;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.threeten.bp.OffsetDateTime;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-public class StoreApiTest {
-
-    @Autowired
-    private StoreApiClient client;
-
-    @Test
-    public void testGetInventory() {
-        Map<String, Integer> inventory = client.getInventory().execute().getBody();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    @Test
-    public void testPlaceOrder() {
-        Order order = createOrder();
-        client.placeOrder(order).execute();
-
-        Order fetched = client.getOrderById(order.getId()).execute().getBody();
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-        assertEquals(order.getShipDate().toInstant(), fetched.getShipDate().toInstant());
-    }
-
-    @Test
-    public void testDeleteOrder() {
-        Order order = createOrder();
-        client.placeOrder(order).execute();
-
-        Order fetched = client.getOrderById(order.getId()).execute().getBody();
-        assertEquals(fetched.getId(), order.getId());
-
-        client.deleteOrder(String.valueOf(order.getId())).execute();
-
-        try {
-            client.getOrderById(order.getId()).execute();
-            fail("expected an error");
-        } catch (HystrixRuntimeException e) {
-            assertTrue(e.getCause().getMessage().startsWith("status 404 "));
-        }
-    }
-
-    private Order createOrder() {
-        return new Order()
-                .id(TestUtils.nextId())
-                .petId(200L)
-                .quantity(13)
-                //Ensure 3 fractional digits because of a bug in the petstore server
-                .shipDate(OffsetDateTime.now().withNano(123000000))
-                .status(Order.StatusEnum.PLACED)
-                .complete(true);
-    }
-
-}

samples/client/petstore/spring-cloud/src/test/java/io/swagger/api/UserApiTest.java

@@ -1,88 +0,0 @@
-package io.swagger.api;
-
-import io.swagger.Application;
-import io.swagger.TestUtils;
-import io.swagger.model.User;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-public class UserApiTest {
-
-    @Autowired
-    private UserApiClient client;
-
-    @Test
-    public void testCreateUser() {
-        User user = createUser();
-
-        client.createUser(user).execute();
-
-        User fetched = client.getUserByName(user.getUsername()).execute().getBody();
-        assertEquals(user.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        client.createUsersWithArrayInput(Arrays.asList(user1, user2)).execute();
-
-        User fetched = client.getUserByName(user1.getUsername()).execute().getBody();
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        client.createUsersWithListInput(Arrays.asList(user1, user2)).execute();
-
-        User fetched = client.getUserByName(user1.getUsername()).execute().getBody();
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testLoginUser() {
-        User user = createUser();
-        client.createUser(user).execute();
-
-        String token = client.loginUser(user.getUsername(), user.getPassword()).execute().getBody();
-        assertTrue(token.startsWith("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() {
-        client.logoutUser().execute();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred");
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-
-}

samples/client/petstore/spring-cloud/src/test/resources/application.yml

@@ -1,11 +0,0 @@
-spring:
-    application:
-        name: petstore-test
-    jackson:
-      serialization.WRITE_DATES_AS_TIMESTAMPS: false
-
-hystrix.command.default.execution.timeout.enabled: false
-
-logging.level.io.swagger.api: DEBUG
-
-feign.hystrix.enabled: true

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
-import io.swagger.model.ModelApiResponse;
-import io.swagger.model.Pet;
+import org.openapitools.model.ModelApiResponse;
+import org.openapitools.model.Pet;
 import org.springframework.core.io.Resource;
 import io.swagger.annotations.*;
 import org.springframework.http.ResponseEntity;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
 import java.util.Map;
-import io.swagger.model.Order;
+import org.openapitools.model.Order;
 import io.swagger.annotations.*;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
 import java.util.List;
-import io.swagger.model.User;
+import org.openapitools.model.User;
 import io.swagger.annotations.*;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/configuration/CustomInstantDeserializer.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonTokenId;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/configuration/JacksonConfiguration.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Category;
-import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.Category;
+import org.openapitools.model.Tag;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/.openapi-generator-ignore

@@ -1,11 +1,11 @@
-# Swagger Codegen Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ApiResponse.java

@@ -1,84 +0,0 @@
-package io.swagger.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import io.swagger.annotations.*;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
-
-@ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
-public class ApiResponse  {
-  
-  private Integer code = null;
-  private String type = null;
-  private String message = null;
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  @JsonProperty("code")
-  public Integer getCode() {
-    return code;
-  }
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  @JsonProperty("type")
-  public String getType() {
-    return type;
-  }
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  @JsonProperty("message")
-  public String getMessage() {
-    return message;
-  }
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ApiResponse apiResponse = (ApiResponse) o;
-    return Objects.equals(code, apiResponse.code) &&
-        Objects.equals(type, apiResponse.type) &&
-        Objects.equals(message, apiResponse.message);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, type, message);
-  }
-
-  @Override
-  public String toString()  {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ApiResponse {\n");
-    
-    sb.append("  code: ").append(code).append("\n");
-    sb.append("  type: ").append(type).append("\n");
-    sb.append("  message: ").append(message).append("\n");
-    sb.append("}\n");
-    return sb.toString();
-  }
-}

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -3,9 +3,9 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
-import io.swagger.model.Client;
+import org.openapitools.model.Client;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApiController.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Controller;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/ApiException.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 
 public class ApiException extends Exception{

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/ApiOriginFilter.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import java.io.IOException;
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/ApiResponseMessage.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import javax.xml.bind.annotation.XmlTransient;
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java

@@ -3,16 +3,16 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
 import java.math.BigDecimal;
-import io.swagger.model.Client;
+import org.openapitools.model.Client;
 import java.time.LocalDate;
 import java.util.Map;
 import java.time.OffsetDateTime;
-import io.swagger.model.OuterComposite;
+import org.openapitools.model.OuterComposite;
 import org.springframework.core.io.Resource;
-import io.swagger.model.User;
+import org.openapitools.model.User;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApiController.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Controller;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -3,9 +3,9 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
-import io.swagger.model.Client;
+import org.openapitools.model.Client;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Controller;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/NotFoundException.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 
 public class NotFoundException extends ApiException {

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
-import io.swagger.model.ModelApiResponse;
-import io.swagger.model.Pet;
+import org.openapitools.model.ModelApiResponse;
+import org.openapitools.model.Pet;
 import org.springframework.core.io.Resource;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApiController.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Controller;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
 import java.util.Map;
-import io.swagger.model.Order;
+import org.openapitools.model.Order;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApiController.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Controller;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java

@@ -3,10 +3,10 @@
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
-package io.swagger.api;
+package org.openapitools.api;
 
 import java.util.List;
-import io.swagger.model.User;
+import org.openapitools.model.User;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApiController.java

@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Controller;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/RFC3339DateFormat.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
 import com.fasterxml.jackson.databind.util.ISO8601Utils;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/SwaggerDocumentationConfig.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,7 +30,7 @@ public class SwaggerDocumentationConfig {
     public Docket customImplementation(){
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()
-                    .apis(RequestHandlerSelectors.basePackage("io.swagger.api"))
+                    .apis(RequestHandlerSelectors.basePackage("org.openapitools.api"))
                     .build()
                 .directModelSubstitute(java.time.LocalDate.class, java.sql.Date.class)
                 .directModelSubstitute(java.time.OffsetDateTime.class, java.util.Date.class)

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/SwaggerUiConfiguration.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -19,7 +19,7 @@ import java.util.List;
 
 
 @Configuration
-@ComponentScan(basePackages = "io.swagger.api")
+@ComponentScan(basePackages = "org.openapitools.api")
 @EnableWebMvc
 @EnableSwagger2 //Loads the spring beans required by the framework
 @PropertySource("classpath:swagger.properties")

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebApplication.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java

@@ -1,4 +1,4 @@
-package io.swagger.configuration;
+package org.openapitools.configuration;
 
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AnimalFarm.java

@@ -1,9 +1,9 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
-import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.Animal;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java

@@ -1,13 +1,13 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.ReadOnlyFirst;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java

@@ -1,11 +1,11 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Animal;
+import org.openapitools.model.Animal;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java

@@ -1,11 +1,11 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Animal;
+import org.openapitools.model.Animal;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumClass.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.OuterEnum;
+import org.openapitools.model.OuterEnum;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -1,16 +1,16 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Animal;
 import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.openapitools.model.Animal;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterBoolean.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import org.springframework.validation.annotation.Validated;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterEnum.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterNumber.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import org.springframework.validation.annotation.Validated;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterString.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import org.springframework.validation.annotation.Validated;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Category;
-import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.Category;
+import org.openapitools.model.Tag;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/spring-mvc-j8-async/src/main/resources/application.properties

@@ -1,5 +0,0 @@
-springfox.documentation.swagger.v2.path=/api-docs
-server.contextPath=/v2
-server.port=80
-spring.jackson.date-format=io.swagger.RFC3339DateFormat
-spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false

samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator-ignore

@@ -1,11 +1,11 @@
-# Swagger Codegen Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):

samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION

@@ -1 +1 @@
-2.4.0-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml

@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
-    <artifactId>swagger-spring-mvc-j8-localdatetime</artifactId>
+    <groupId>org.openapitools</groupId>
+    <artifactId>spring-mvc-j8-localdatetime</artifactId>
     <packaging>jar</packaging>
-    <name>swagger-spring-mvc-j8-localdatetime</name>
+    <name>spring-mvc-j8-localdatetime</name>
     <version>1.0.0</version>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>

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

@@ -1,253 +0,0 @@
-package io.swagger.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.OuterEnum;
-import org.springframework.validation.annotation.Validated;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * EnumTest
- */
-@Validated
-
-public class EnumTest   {
-  /**
-   * Gets or Sets enumString
-   */
-  public enum EnumStringEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringEnum(String value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringEnum fromValue(String text) {
-      for (EnumStringEnum b : EnumStringEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
-          return b;
-        }
-      }
-      return null;
-    }
-  }
-
-  @JsonProperty("enum_string")
-  private EnumStringEnum enumString = null;
-
-  /**
-   * Gets or Sets enumInteger
-   */
-  public enum EnumIntegerEnum {
-    NUMBER_1(1),
-    
-    NUMBER_MINUS_1(-1);
-
-    private Integer value;
-
-    EnumIntegerEnum(Integer value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumIntegerEnum fromValue(String text) {
-      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
-          return b;
-        }
-      }
-      return null;
-    }
-  }
-
-  @JsonProperty("enum_integer")
-  private EnumIntegerEnum enumInteger = null;
-
-  /**
-   * Gets or Sets enumNumber
-   */
-  public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(1.1),
-    
-    NUMBER_MINUS_1_DOT_2(-1.2);
-
-    private Double value;
-
-    EnumNumberEnum(Double value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumNumberEnum fromValue(String text) {
-      for (EnumNumberEnum b : EnumNumberEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
-          return b;
-        }
-      }
-      return null;
-    }
-  }
-
-  @JsonProperty("enum_number")
-  private EnumNumberEnum enumNumber = null;
-
-  @JsonProperty("outerEnum")
-  private OuterEnum outerEnum = null;
-
-  public EnumTest enumString(EnumStringEnum enumString) {
-    this.enumString = enumString;
-    return this;
-  }
-
-  /**
-   * Get enumString
-   * @return enumString
-  **/
-  @ApiModelProperty(value = "")
-
-
-  public EnumStringEnum getEnumString() {
-    return enumString;
-  }
-
-  public void setEnumString(EnumStringEnum enumString) {
-    this.enumString = enumString;
-  }
-
-  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
-    this.enumInteger = enumInteger;
-    return this;
-  }
-
-  /**
-   * Get enumInteger
-   * @return enumInteger
-  **/
-  @ApiModelProperty(value = "")
-
-
-  public EnumIntegerEnum getEnumInteger() {
-    return enumInteger;
-  }
-
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
-    this.enumInteger = enumInteger;
-  }
-
-  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
-    this.enumNumber = enumNumber;
-    return this;
-  }
-
-  /**
-   * Get enumNumber
-   * @return enumNumber
-  **/
-  @ApiModelProperty(value = "")
-
-
-  public EnumNumberEnum getEnumNumber() {
-    return enumNumber;
-  }
-
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
-    this.enumNumber = enumNumber;
-  }
-
-  public EnumTest outerEnum(OuterEnum outerEnum) {
-    this.outerEnum = outerEnum;
-    return this;
-  }
-
-  /**
-   * Get outerEnum
-   * @return outerEnum
-  **/
-  @ApiModelProperty(value = "")
-
-  @Valid
-
-  public OuterEnum getOuterEnum() {
-    return outerEnum;
-  }
-
-  public void setOuterEnum(OuterEnum outerEnum) {
-    this.outerEnum = outerEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumTest enumTest = (EnumTest) o;
-    return Objects.equals(this.enumString, enumTest.enumString) &&
-        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);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumTest {\n");
-    
-    sb.append("    enumString: ").append(toIndentedString(enumString)).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");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-

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

@@ -1,106 +0,0 @@
-package io.swagger.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * Model for testing model name starting with number
- */
-@ApiModel(description = "Model for testing model name starting with number")
-@Validated
-
-public class Model200Response   {
-  @JsonProperty("name")
-  private Integer name = null;
-
-  @JsonProperty("class")
-  private String propertyClass = null;
-
-  public Model200Response name(Integer name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(value = "")
-
-
-  public Integer getName() {
-    return name;
-  }
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-  public Model200Response propertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-  /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @ApiModelProperty(value = "")
-
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Model200Response _200Response = (Model200Response) o;
-    return Objects.equals(this.name, _200Response.name) &&
-        Objects.equals(this.propertyClass, _200Response.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, propertyClass);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Model200Response {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-

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

@@ -1,157 +0,0 @@
-package io.swagger.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.validation.annotation.Validated;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * Model for testing model name same as property name
- */
-@ApiModel(description = "Model for testing model name same as property name")
-@Validated
-
-public class Name   {
-  @JsonProperty("name")
-  private Integer name = null;
-
-  @JsonProperty("snake_case")
-  private Integer snakeCase = null;
-
-  @JsonProperty("property")
-  private String property = null;
-
-  @JsonProperty("123Number")
-  private Integer _123Number = null;
-
-  public Name name(Integer name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
-  public Integer getName() {
-    return name;
-  }
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-  public Name snakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-    return this;
-  }
-
-  /**
-   * Get snakeCase
-   * @return snakeCase
-  **/
-  @ApiModelProperty(readOnly = true, value = "")
-
-
-  public Integer getSnakeCase() {
-    return snakeCase;
-  }
-
-  public void setSnakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-  }
-
-  public Name property(String property) {
-    this.property = property;
-    return this;
-  }
-
-  /**
-   * Get property
-   * @return property
-  **/
-  @ApiModelProperty(value = "")
-
-
-  public String getProperty() {
-    return property;
-  }
-
-  public void setProperty(String property) {
-    this.property = property;
-  }
-
-  public Name _123Number(Integer _123Number) {
-    this._123Number = _123Number;
-    return this;
-  }
-
-  /**
-   * Get _123Number
-   * @return _123Number
-  **/
-  @ApiModelProperty(readOnly = true, value = "")
-
-
-  public Integer get123Number() {
-    return _123Number;
-  }
-
-  public void set123Number(Integer _123Number) {
-    this._123Number = _123Number;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Name name = (Name) o;
-    return Objects.equals(this.name, name.name) &&
-        Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property) &&
-        Objects.equals(this._123Number, name._123Number);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123Number);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Name {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
-    sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123Number: ").append(toIndentedString(_123Number)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-