From f15743348a07d000d02cdba258c0a89fa8bec64d Mon Sep 17 00:00:00 2001 From: Ivan Garcia Sainz-Aja Date: Tue, 31 Jan 2023 21:47:38 +0100 Subject: [PATCH] SDK: renaming java packages --- .github/workflows/build.yml | 2 +- .github/workflows/publish-maven-central.yml | 2 +- README.md | 28 +++++++-------- index.md | 16 ++++----- plugins/asyncapi-jsonschema2pojo/README.md | 4 +-- .../AsyncApiJsonSchema2PojoGenerator.java | 16 ++++----- .../AsyncApiJsonSchema2PojoPlugin.java | 10 +++--- .../plugins/JsonSchema2PojoConfiguration.java | 2 +- .../AsyncApiJsonSchema2PojoGeneratorTest.java | 12 +++---- .../asyncapi-spring-cloud-streams3/README.md | 8 ++--- .../SpringCloudStreams3AdaptersGenerator.java | 20 +++++------ .../SpringCloudStreams3AdaptersPlugin.java | 18 +++++----- .../plugins/SpringCloudStreams3Generator.java | 24 ++++++------- .../plugins/SpringCloudStreams3Plugin.java | 16 ++++----- .../SpringCloudStreams3TestsGenerator.java | 19 ++++------ .../SpringCloudStreams3TestsPlugin.java | 16 ++++----- .../adapters/imperative/Adapter.java.hbs | 0 .../adapters/imperative/Mapper.java.hbs | 0 .../common/Headers.hbs | 0 .../consumer/imperative/Consumer.java.hbs | 0 .../consumer/imperative/IService.java.hbs | 0 .../consumer/reactive/Consumer.java.hbs | 0 .../consumer/reactive/IService.java.hbs | 0 .../consumer/tests/BaseConsumerTest.java.hbs | 0 .../tests/imperative/ConsumerTest.java.hbs | 0 .../producer/IProducer.java.hbs | 0 .../producer/mocks/ProducerCaptor.java.hbs | 0 .../mocks/ProducerInMemoryContext.java.hbs | 0 .../producer/outbox/jdbc/Producer.java.hbs | 0 .../producer/outbox/mongodb/Producer.java.hbs | 0 .../producer/outbox/none/Producer.java.hbs | 0 .../producer/partials/runtime-headers.hbs | 0 .../producer/partials/tracing-id-supplier.hbs | 0 ...ingCloudStreams3AdaptersGeneratorTest.java | 16 ++++----- .../SpringCloudStreams3GeneratorTest.java | 32 ++++++++--------- ...SpringCloudStreams3TestsGeneratorTest.java | 12 +++---- plugins/java-to-jdl/README.md | 4 +-- .../plugins/JavaToJDLGenerator.java | 9 +++-- .../OpenAPIToJDL.jdl.hbs | 0 .../plugins/JavaToJDLGeneratorTest.java | 6 ++-- .../jdl-backend-application-default/README.md | 2 +- ...JDLBackendApplicationDefaultGenerator.java | 22 ++++++------ .../JDLBackendApplicationDefaultHelpers.java | 8 ++--- ...DLBackendApplicationDefaultJpaHelpers.java | 10 ++---- .../JDLBackendApplicationDefaultPlugin.java | 16 ++++----- .../adapters/web/mvc/EntityResource.java.hbs | 0 .../web/webflux/EntityResource.java.hbs | 0 .../java/core/domain/common/Enum.java.hbs | 0 .../main/java/core/domain/jpa/Entity.java.hbs | 0 .../core/domain/jpa/partials/ManyToMany.hbs | 0 .../core/domain/jpa/partials/ManyToOne.hbs | 0 .../core/domain/jpa/partials/OneToMany.hbs | 0 .../core/domain/jpa/partials/OneToOne.hbs | 0 .../core/domain/jpa/partials/id/default.hbs | 0 .../core/domain/jpa/partials/id/mariadb.hbs | 0 .../domain/jpa/partials/id/postgresql.hbs | 0 .../java/core/domain/mongodb/Entity.java.hbs | 0 .../domain/search/EntityDocument.java.hbs | 0 .../main/java/core/domain/vo/Entity.java.hbs | 0 .../jpa/imperative/ServiceImpl.java.hbs | 0 .../mappers/EntityMapper.java.hbs | 0 .../mongodb/imperative/ServiceImpl.java.hbs | 0 .../main/java/core/inbound/Service.java.hbs | 0 .../core/inbound/dtos/EntityCriteria.java.hbs | 0 .../core/inbound/dtos/EntityInput.java.hbs | 0 .../jpa/imperative/EntityRepository.java.hbs | 0 .../jpa/reactive/EntityRepository.java.hbs | 0 .../imperative/EntityRepository.java.hbs | 0 .../reactive/EntityRepository.java.hbs | 0 .../search/EntitySearchRepository.java.hbs | 0 .../java/infrastructure/package-info.java.hbs | 0 .../src/test/java/ArchitectureTest.java.hbs | 0 .../java/config/InMemoryTestsConfig.java.hbs | 0 .../InMemoryTestsManualContext.java.hbs | 0 .../jpa/imperative/ServiceTest.java.hbs | 0 .../mongodb/imperative/ServiceTest.java.hbs | 0 .../BaseRepositoryIntegrationTest.java.hbs | 0 .../EntityRepositoryIntegrationTest.java.hbs | 0 .../EntityRepositoryInMemory.java.hbs | 0 .../inmemory/InMemoryJpaRepository.java.hbs | 0 .../BaseRepositoryIntegrationTest.java.hbs | 0 .../EntityRepositoryIntegrationTest.java.hbs | 0 .../EntityRepositoryInMemory.java.hbs | 0 .../InMemoryMongodbRepository.java.hbs | 0 ...ApplicationJpaImperativeGeneratorTest.java | 25 ++++++------- ...plicationMongoImperativeGeneratorTest.java | 33 ++++++++--------- plugins/jdl-openapi-controllers/README.md | 4 +-- .../JDLOpenAPIControllersGenerator.java | 26 +++++++------- .../plugins/JDLOpenAPIControllersPlugin.java | 28 +++++++-------- .../main/java/web/mappers/BaseMapper.java.hbs | 0 .../web/mappers/ServiceDTOsMapper.java.hbs | 0 .../web/mvc/ServiceApiController.java.hbs | 0 .../web/webflux/ServiceApiController.java.hbs | 0 .../JDLOpenAPIControllersGeneratorTest.java | 22 ++++++------ plugins/jdl-to-asyncapi/README.md | 4 +-- .../plugins/JDLToAsyncAPIGenerator.java | 22 ++++++------ .../plugins/JDLToAsyncAPIPlugin.java | 16 ++++----- .../JDLToAsyncAPI.yml.hbs | 0 .../plugins/JDLToAsyncAPIGeneratorTest.java | 19 +++++----- plugins/jdl-to-openapi/README.md | 6 ++-- .../plugins/JDLToOpenAPIGenerator.java | 24 ++++++------- .../plugins/JDLToOpenAPIPlugin.java | 14 ++++---- .../plugins/OpenAPIToJDLGenerator.java | 20 +++++------ .../plugins/OpenAPIToJDLPlugin.java | 14 ++++---- .../JDLToOpenAPI.yml.hbs | 0 .../OpenAPIToJDL.jdl.hbs | 0 .../plugins/JDLToOpenAPIGeneratorTest.java | 15 ++++---- .../plugins/OpenAPIToJDLGeneratorTest.java | 13 ++++--- .../plugins/PactConsumerConfiguration.java | 18 +++++----- .../plugins/PactConsumerGenerator.java | 18 +++++----- .../plugins/PactConsumerGeneratorTest.java | 12 +++---- plugins/openapi-rest-assured/README.md | 4 +-- .../plugins/RestAssuredGenerator.java | 22 ++++++------ .../plugins/RestAssuredPlugin.java | 16 ++++----- .../ControllersTestSet.java.hbs | 0 .../RestAssuredGenerator/OperationIT.java.hbs | 0 .../RestAssuredGenerator/ServiceIT.java.hbs | 0 .../partials/Operation.java.hbs | 0 .../plugins/RestAssuredGeneratorTest.java | 26 +++++++------- .../openapi-spring-webtestclient/README.md | 6 ++-- .../plugins/SpringWebTestClientGenerator.java | 26 +++++++------- .../plugins/SpringWebTestClientPlugin.java | 17 +++++---- .../BaseWebTestClientTest.java.hbs | 0 .../BusinessFlowTest.java.hbs | 0 .../ControllersTestSet.java.hbs | 0 .../OperationIT.java.hbs | 0 .../ServiceIT.java.hbs | 0 .../partials/Operation.java.hbs | 0 .../partials/requestSetup.hbs | 0 .../partials/uriBuilder.hbs | 0 .../SpringWebTestClientGeneratorTest.java | 34 +++++++++--------- plugins/pom.xml | 2 +- zenwave-sdk-cli/pom.xml | 2 +- .../zenwave360/{generator => sdk}/Help.java | 18 +++++----- .../zenwave360/{generator => sdk}/Main.java | 2 +- .../{generator => sdk}/MainGenerator.java | 20 +++++------ .../zenwave360/{generator => sdk}/Plugin.java | 10 +++--- .../doc/DocumentedOption.java | 4 +-- .../doc/DocumentedPlugin.java | 4 +-- .../doc/PluginAnnotationProcessor.java | 4 +-- .../formatters/Formatter.java | 4 +-- .../formatters/JavaFormatter.java | 8 ++--- .../generators/AbstractAsyncapiGenerator.java | 14 ++++---- .../generators/AbstractJDLGenerator.java | 4 +-- .../generators/AbstractOpenAPIGenerator.java | 6 ++-- .../generators/Generator.java | 8 ++--- .../JDLEntitiesToAvroConverter.java | 8 ++--- .../JDLEntitiesToSchemasConverter.java | 8 ++--- .../options/CONVENTIONS.txt | 0 .../options/DatabaseType.java | 2 +- .../options/PersistenceType.java | 2 +- .../options/ProgrammingStyle.java | 2 +- .../options/WebFlavorType.java | 2 +- .../asyncapi/AsyncapiOperationType.java | 2 +- .../options/asyncapi/AsyncapiRoleType.java | 2 +- .../parsers/DefaultYamlParser.java | 6 ++-- .../parsers/GraphQLParser.java | 10 ++---- .../{generator => sdk}/parsers/JDLParser.java | 7 ++-- .../{generator => sdk}/parsers/Model.java | 3 +- .../{generator => sdk}/parsers/Parser.java | 2 +- .../plugins/ForkPlugin.java | 6 ++-- .../plugins/ForkPluginGenerator.java | 10 +++--- .../processors/AbstractBaseProcessor.java | 4 +-- .../processors/AsyncApiProcessor.java | 10 +++--- .../EnrichAsyncAPIWithJDLProcessor.java | 2 +- .../EnrichOpenAPIWithJDLProcessor.java | 6 ++-- .../EnrichSchemaWithJDLProcessor.java | 6 ++-- .../JDLDummyDataFromSchemasProcessor.java | 10 +++--- .../processors/JDLProcessor.java | 8 ++--- .../processors/OpenApiProcessor.java | 6 ++-- .../processors/Processor.java | 2 +- .../templating/CustomHandlebarsHelpers.java | 6 ++-- .../templating/HandlebarsEngine.java | 2 +- .../templating/OutputFormatType.java | 2 +- .../templating/TemplateEngine.java | 2 +- .../templating/TemplateInput.java | 2 +- .../templating/TemplateOutput.java | 2 +- ...ratedCollectionDeserializationHandler.java | 2 +- .../{generator => sdk}/utils/DataFaker.java | 2 +- .../{generator => sdk}/utils/JSONPath.java | 2 +- .../{generator => sdk}/utils/Lists.java | 2 +- .../{generator => sdk}/utils/Maps.java | 2 +- .../{generator => sdk}/utils/NamingUtils.java | 2 +- .../writers/TemplateFileWriter.java | 6 ++-- .../writers/TemplateStdoutWriter.java | 4 +-- .../writers/TemplateWriter.java | 4 +-- .../{generator => sdk}/help/detailed.hbs | 0 .../{generator => sdk}/help/help.hbs | 0 .../{generator => sdk}/help/list.hbs | 0 .../{generator => sdk}/help/markdown.hbs | 0 .../{generator => sdk}/HelpTest.java | 4 +-- .../{generator => sdk}/MainGeneratorTest.java | 26 +++++++------- .../{generator => sdk}/MainTest.java | 19 +++++----- .../{generator => sdk}/PluginTest.java | 4 +-- .../AbstractAsyncapiGeneratorTest.java | 22 ++++++------ .../generators/AbstractJDLGeneratorTest.java | 9 +++-- .../AbstractOpenAPIGeneratorTest.java | 13 ++++--- .../JDLEntitiesToAvroConverterTest.java | 13 ++++--- .../JDLEntitiesToSchemasConverterTest.java | 13 ++++--- .../parsers/DefaultYamlParserTest.java | 7 ++-- .../parsers/GraphQLParserTest.java | 7 ++-- .../parsers/JDLParserTest.java | 6 ++-- .../plugins/ForkPluginGeneratorTest.java | 10 +++--- .../plugins/NoOpGenerator.java | 8 ++--- .../plugins/NoOpPluginConfiguration.java | 12 +++---- .../processors/AsyncApiProcessorTest.java | 25 +++++++------ .../JDLDummyDataFromSchemasProcessorTest.java | 8 ++--- .../processors/JDLProcessorTest.java | 10 +++--- .../JDLWithOpenApiProcessorTest.java | 16 ++++----- .../processors/OpenApiProcessorTest.java | 11 +++--- .../templates/HandlebarsEngineTest.java | 14 ++++---- ...dCollectionDeserializationHandlerTest.java | 3 +- .../templating/handlebars-test.hbs | 2 +- .../{generator => sdk}/templating/partial.hbs | 0 .../{generator => sdk}/GeneratorMojo.java | 2 +- .../generator/jpa2jdl/package-info.java | 4 --- .../generator/mongodb2jdl/package-info.java | 4 --- .../jpa2jdl/AbstractAuditingEntity.java | 2 +- .../{generator => sdk}/jpa2jdl/Blog.java | 2 +- .../{generator => sdk}/jpa2jdl/Post.java | 2 +- .../{generator => sdk}/jpa2jdl/Product.java | 2 +- .../{generator => sdk}/jpa2jdl/Tag.java | 2 +- .../zenwave360/sdk/jpa2jdl/package-info.java | 4 +++ .../mongodb2jdl/AbstractAuditingEntity.java | 2 +- .../{generator => sdk}/mongodb2jdl/Blog.java | 2 +- .../{generator => sdk}/mongodb2jdl/Post.java | 2 +- .../{generator => sdk}/mongodb2jdl/Tag.java | 2 +- .../sdk/mongodb2jdl/package-info.java | 4 +++ .../testutils/MavenCompiler.java | 2 +- .../asyncapi/asyncapi-circular-refs.yml | 0 .../resources/asyncapi/asyncapi-commands.yml | 0 .../resources/asyncapi/asyncapi-events.yml | 2 +- .../resources/asyncapi/asyncapi-javaType.yml | 0 .../asyncapi/asyncapi-orders-relational.yml | 0 .../asyncapi/asyncapi-shoping-cart.yml | 0 .../asyncapi/avros/all_cart_entities.avsc | 0 .../asyncapi/json-schemas/asyncapi.yml | 0 .../json-schemas/flight-delayed-event.schema | 0 .../asyncapi/json-schemas/master-data.schema | 0 ...ation-subscriptions-message-envelop.schema | 0 ...-notification-batch-message-envelop.schema | 0 ...port-notification-eventdata-generic.schema | 0 ...nsport-notification-message-envelop.schema | 0 .../asyncapi/json-schemas/transport.schema | 0 .../truck-stop-delayed-event.schema | 0 .../resources/graphql/user-crud.graphql | 0 .../resources/jdl/21-points.jh | 0 .../resources/jdl/21-points.png | Bin .../resources/jdl/orders-model-eda-idl.jdl | 0 .../resources/jdl/orders-model-relational.jdl | 0 .../jdl/orders-model-semantic-annotations.jdl | 0 .../resources/jdl/orders-model.jdl | 0 .../resources/jdl/orders-model.png | Bin .../resources/jdl/petstore.jdl | 0 .../openapi/oas-controllers-with-no-jdl.yml | 0 .../openapi/openapi-orders-relational.yml | 0 .../resources/openapi/openapi-orders.yml | 0 .../resources/openapi/openapi-petstore.yml | 0 258 files changed, 689 insertions(+), 745 deletions(-) rename plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/{generator => sdk}/plugins/AsyncApiJsonSchema2PojoGenerator.java (94%) rename plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/{generator => sdk}/plugins/AsyncApiJsonSchema2PojoPlugin.java (68%) rename plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/{generator => sdk}/plugins/JsonSchema2PojoConfiguration.java (99%) rename plugins/asyncapi-jsonschema2pojo/src/test/java/io/zenwave360/{generator => sdk}/plugins/AsyncApiJsonSchema2PojoGeneratorTest.java (76%) rename plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3AdaptersGenerator.java (90%) rename plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3AdaptersPlugin.java (84%) rename plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3Generator.java (94%) rename plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3Plugin.java (61%) rename plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3TestsGenerator.java (83%) rename plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3TestsPlugin.java (64%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/adapters/imperative/Adapter.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/adapters/imperative/Mapper.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/common/Headers.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/consumer/imperative/Consumer.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/consumer/imperative/IService.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/consumer/reactive/Consumer.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/consumer/reactive/IService.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/consumer/tests/BaseConsumerTest.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/consumer/tests/imperative/ConsumerTest.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/producer/IProducer.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/producer/mocks/ProducerCaptor.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/producer/mocks/ProducerInMemoryContext.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/producer/outbox/jdbc/Producer.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/producer/outbox/mongodb/Producer.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/producer/outbox/none/Producer.java.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/producer/partials/runtime-headers.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringCloudStream3Generator/producer/partials/tracing-id-supplier.hbs (100%) rename plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3AdaptersGeneratorTest.java (87%) rename plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3GeneratorTest.java (89%) rename plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/{generator => sdk}/plugins/SpringCloudStreams3TestsGeneratorTest.java (82%) rename plugins/java-to-jdl/src/main/java/io/zenwave360/{generator => sdk}/plugins/JavaToJDLGenerator.java (98%) rename plugins/java-to-jdl/src/main/resources/io/zenwave360/{generator => sdk}/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs (100%) rename plugins/java-to-jdl/src/test/java/io/zenwave360/{generator => sdk}/plugins/JavaToJDLGeneratorTest.java (76%) rename plugins/jdl-backend-application-default/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLBackendApplicationDefaultGenerator.java (94%) rename plugins/jdl-backend-application-default/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLBackendApplicationDefaultHelpers.java (96%) rename plugins/jdl-backend-application-default/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLBackendApplicationDefaultJpaHelpers.java (70%) rename plugins/jdl-backend-application-default/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLBackendApplicationDefaultPlugin.java (64%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/mvc/EntityResource.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/webflux/EntityResource.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/common/Enum.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/Entity.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToMany.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToOne.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToMany.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToOne.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/default.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/mariadb.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/postgresql.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/mongodb/Entity.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/search/EntityDocument.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/domain/vo/Entity.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/jpa/imperative/ServiceImpl.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mappers/EntityMapper.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mongodb/imperative/ServiceImpl.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/Service.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityCriteria.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityInput.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/imperative/EntityRepository.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/reactive/EntityRepository.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/imperative/EntityRepository.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/reactive/EntityRepository.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/search/EntitySearchRepository.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/main/java/infrastructure/package-info.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/ArchitectureTest.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsConfig.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsManualContext.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/jpa/imperative/ServiceTest.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/mongodb/imperative/ServiceTest.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/BaseRepositoryIntegrationTest.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/EntityRepositoryIntegrationTest.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/EntityRepositoryInMemory.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/InMemoryJpaRepository.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/BaseRepositoryIntegrationTest.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/EntityRepositoryIntegrationTest.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/EntityRepositoryInMemory.java.hbs (100%) rename plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/InMemoryMongodbRepository.java.hbs (100%) rename plugins/jdl-backend-application-default/src/test/java/io/zenwave360/{generator => sdk}/plugins/JDLBackendApplicationJpaImperativeGeneratorTest.java (75%) rename plugins/jdl-backend-application-default/src/test/java/io/zenwave360/{generator => sdk}/plugins/JDLBackendApplicationMongoImperativeGeneratorTest.java (82%) rename plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLOpenAPIControllersGenerator.java (93%) rename plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLOpenAPIControllersPlugin.java (73%) rename plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/BaseMapper.java.hbs (100%) rename plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/ServiceDTOsMapper.java.hbs (100%) rename plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs (100%) rename plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/{generator => sdk}/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/webflux/ServiceApiController.java.hbs (100%) rename plugins/jdl-openapi-controllers/src/test/java/io/zenwave360/{generator => sdk}/plugins/JDLOpenAPIControllersGeneratorTest.java (88%) rename plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLToAsyncAPIGenerator.java (94%) rename plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLToAsyncAPIPlugin.java (64%) rename plugins/jdl-to-asyncapi/src/main/resources/io/zenwave360/{generator => sdk}/plugins/AsyncAPIToJDLGenerator/JDLToAsyncAPI.yml.hbs (100%) rename plugins/jdl-to-asyncapi/src/test/java/io/zenwave360/{generator => sdk}/plugins/JDLToAsyncAPIGeneratorTest.java (90%) rename plugins/jdl-to-openapi/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLToOpenAPIGenerator.java (90%) rename plugins/jdl-to-openapi/src/main/java/io/zenwave360/{generator => sdk}/plugins/JDLToOpenAPIPlugin.java (64%) rename plugins/jdl-to-openapi/src/main/java/io/zenwave360/{generator => sdk}/plugins/OpenAPIToJDLGenerator.java (91%) rename plugins/jdl-to-openapi/src/main/java/io/zenwave360/{generator => sdk}/plugins/OpenAPIToJDLPlugin.java (62%) rename plugins/jdl-to-openapi/src/main/resources/io/zenwave360/{generator => sdk}/plugins/OpenAPIToJDLGenerator/JDLToOpenAPI.yml.hbs (100%) rename plugins/jdl-to-openapi/src/main/resources/io/zenwave360/{generator => sdk}/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs (100%) rename plugins/jdl-to-openapi/src/test/java/io/zenwave360/{generator => sdk}/plugins/JDLToOpenAPIGeneratorTest.java (87%) rename plugins/jdl-to-openapi/src/test/java/io/zenwave360/{generator => sdk}/plugins/OpenAPIToJDLGeneratorTest.java (84%) rename plugins/openapi-rest-assured/src/main/java/io/zenwave360/{generator => sdk}/plugins/RestAssuredGenerator.java (91%) rename plugins/openapi-rest-assured/src/main/java/io/zenwave360/{generator => sdk}/plugins/RestAssuredPlugin.java (63%) rename plugins/openapi-rest-assured/src/main/resources/io/zenwave360/{generator => sdk}/plugins/RestAssuredGenerator/ControllersTestSet.java.hbs (100%) rename plugins/openapi-rest-assured/src/main/resources/io/zenwave360/{generator => sdk}/plugins/RestAssuredGenerator/OperationIT.java.hbs (100%) rename plugins/openapi-rest-assured/src/main/resources/io/zenwave360/{generator => sdk}/plugins/RestAssuredGenerator/ServiceIT.java.hbs (100%) rename plugins/openapi-rest-assured/src/main/resources/io/zenwave360/{generator => sdk}/plugins/RestAssuredGenerator/partials/Operation.java.hbs (100%) rename plugins/openapi-rest-assured/src/test/java/io/zenwave360/{generator => sdk}/plugins/RestAssuredGeneratorTest.java (88%) rename plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator.java (91%) rename plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientPlugin.java (71%) rename plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator/BaseWebTestClientTest.java.hbs (100%) rename plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator/BusinessFlowTest.java.hbs (100%) rename plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator/ControllersTestSet.java.hbs (100%) rename plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator/OperationIT.java.hbs (100%) rename plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator/ServiceIT.java.hbs (100%) rename plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator/partials/Operation.java.hbs (100%) rename plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator/partials/requestSetup.hbs (100%) rename plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGenerator/partials/uriBuilder.hbs (100%) rename plugins/openapi-spring-webtestclient/src/test/java/io/zenwave360/{generator => sdk}/plugins/SpringWebTestClientGeneratorTest.java (88%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/Help.java (91%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/Main.java (98%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/MainGenerator.java (82%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/Plugin.java (96%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/doc/DocumentedOption.java (75%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/doc/DocumentedPlugin.java (72%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/doc/PluginAnnotationProcessor.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/formatters/Formatter.java (56%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/formatters/JavaFormatter.java (91%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/generators/AbstractAsyncapiGenerator.java (94%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/generators/AbstractJDLGenerator.java (66%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/generators/AbstractOpenAPIGenerator.java (96%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/generators/Generator.java (87%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/generators/JDLEntitiesToAvroConverter.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/generators/JDLEntitiesToSchemasConverter.java (98%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/options/CONVENTIONS.txt (100%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/options/DatabaseType.java (59%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/options/PersistenceType.java (55%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/options/ProgrammingStyle.java (59%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/options/WebFlavorType.java (54%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/options/asyncapi/AsyncapiOperationType.java (55%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/options/asyncapi/AsyncapiRoleType.java (52%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/parsers/DefaultYamlParser.java (90%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/parsers/GraphQLParser.java (87%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/parsers/JDLParser.java (89%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/parsers/Model.java (90%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/parsers/Parser.java (95%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/plugins/ForkPlugin.java (67%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/plugins/ForkPluginGenerator.java (98%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/AbstractBaseProcessor.java (92%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/AsyncApiProcessor.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/EnrichAsyncAPIWithJDLProcessor.java (88%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/EnrichOpenAPIWithJDLProcessor.java (95%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/EnrichSchemaWithJDLProcessor.java (96%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/JDLDummyDataFromSchemasProcessor.java (94%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/JDLProcessor.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/OpenApiProcessor.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/processors/Processor.java (73%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/templating/CustomHandlebarsHelpers.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/templating/HandlebarsEngine.java (98%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/templating/OutputFormatType.java (58%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/templating/TemplateEngine.java (92%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/templating/TemplateInput.java (98%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/templating/TemplateOutput.java (95%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/utils/CommaSeparatedCollectionDeserializationHandler.java (98%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/utils/DataFaker.java (82%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/utils/JSONPath.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/utils/Lists.java (90%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/utils/Maps.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/utils/NamingUtils.java (97%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/writers/TemplateFileWriter.java (92%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/writers/TemplateStdoutWriter.java (88%) rename zenwave-sdk-cli/src/main/java/io/zenwave360/{generator => sdk}/writers/TemplateWriter.java (56%) rename zenwave-sdk-cli/src/main/resources/io/zenwave360/{generator => sdk}/help/detailed.hbs (100%) rename zenwave-sdk-cli/src/main/resources/io/zenwave360/{generator => sdk}/help/help.hbs (100%) rename zenwave-sdk-cli/src/main/resources/io/zenwave360/{generator => sdk}/help/list.hbs (100%) rename zenwave-sdk-cli/src/main/resources/io/zenwave360/{generator => sdk}/help/markdown.hbs (100%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/HelpTest.java (76%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/MainGeneratorTest.java (72%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/MainTest.java (75%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/PluginTest.java (94%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/generators/AbstractAsyncapiGeneratorTest.java (86%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/generators/AbstractJDLGeneratorTest.java (79%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/generators/AbstractOpenAPIGeneratorTest.java (86%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/generators/JDLEntitiesToAvroConverterTest.java (88%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/generators/JDLEntitiesToSchemasConverterTest.java (87%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/parsers/DefaultYamlParserTest.java (75%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/parsers/GraphQLParserTest.java (65%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/parsers/JDLParserTest.java (84%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/plugins/ForkPluginGeneratorTest.java (65%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/plugins/NoOpGenerator.java (74%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/plugins/NoOpPluginConfiguration.java (58%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/processors/AsyncApiProcessorTest.java (85%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/processors/JDLDummyDataFromSchemasProcessorTest.java (85%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/processors/JDLProcessorTest.java (81%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/processors/JDLWithOpenApiProcessorTest.java (82%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/processors/OpenApiProcessorTest.java (80%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/templates/HandlebarsEngineTest.java (81%) rename zenwave-sdk-cli/src/test/java/io/zenwave360/{generator => sdk}/utils/CommaSeparatedCollectionDeserializationHandlerTest.java (96%) rename zenwave-sdk-cli/src/test/resources/io/zenwave360/{generator => sdk}/templating/handlebars-test.hbs (93%) rename zenwave-sdk-cli/src/test/resources/io/zenwave360/{generator => sdk}/templating/partial.hbs (100%) rename zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/{generator => sdk}/GeneratorMojo.java (99%) delete mode 100644 zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/package-info.java delete mode 100644 zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/package-info.java rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/jpa2jdl/AbstractAuditingEntity.java (98%) rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/jpa2jdl/Blog.java (98%) rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/jpa2jdl/Post.java (99%) rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/jpa2jdl/Product.java (98%) rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/jpa2jdl/Tag.java (98%) create mode 100644 zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/package-info.java rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/mongodb2jdl/AbstractAuditingEntity.java (97%) rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/mongodb2jdl/Blog.java (98%) rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/mongodb2jdl/Post.java (98%) rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/mongodb2jdl/Tag.java (98%) create mode 100644 zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/package-info.java rename zenwave-sdk-test-resources/src/main/java/io/zenwave360/{generator => sdk}/testutils/MavenCompiler.java (96%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/asyncapi-circular-refs.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/asyncapi-commands.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/asyncapi-events.yml (99%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/asyncapi-javaType.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/asyncapi-orders-relational.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/asyncapi-shoping-cart.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/avros/all_cart_entities.avsc (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/asyncapi.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/flight-delayed-event.schema (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/master-data.schema (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/notification-subscriptions-message-envelop.schema (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/transport-notification-batch-message-envelop.schema (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/transport-notification-eventdata-generic.schema (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/transport-notification-message-envelop.schema (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/transport.schema (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/asyncapi/json-schemas/truck-stop-delayed-event.schema (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/graphql/user-crud.graphql (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/jdl/21-points.jh (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/jdl/21-points.png (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/jdl/orders-model-eda-idl.jdl (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/jdl/orders-model-relational.jdl (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/jdl/orders-model-semantic-annotations.jdl (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/jdl/orders-model.jdl (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/jdl/orders-model.png (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/jdl/petstore.jdl (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/openapi/oas-controllers-with-no-jdl.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/openapi/openapi-orders-relational.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/openapi/openapi-orders.yml (100%) rename zenwave-sdk-test-resources/src/main/resources/io/zenwave360/{generator => sdk}/resources/openapi/openapi-petstore.yml (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4826bfa3..514b6436 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: - name: Generate JaCoCo Badge id: jacoco - uses: cicirello/jacoco-badge-generator@v2 + uses: cicirello/jacoco-badge-sdk@v2 with: badges-directory: badges generate-branches-badge: true diff --git a/.github/workflows/publish-maven-central.yml b/.github/workflows/publish-maven-central.yml index af70ee9a..a0417dec 100644 --- a/.github/workflows/publish-maven-central.yml +++ b/.github/workflows/publish-maven-central.yml @@ -33,7 +33,7 @@ jobs: - name: Generate JaCoCo Badge id: jacoco - uses: cicirello/jacoco-badge-generator@v2 + uses: cicirello/jacoco-badge-sdk@v2 with: badges-directory: badges generate-branches-badge: true diff --git a/README.md b/README.md index 59b147dd..14c41b0e 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ If you plan to use **custom plugins** you will need to use the command in the fo ```shell jbang alias add --name=zw \ - -m=io.zenwave360.generator.Main \ + -m=io.zenwave360.sdk\ --repos=mavencentral,snapshots=https://s01.oss.sonatype.org/content/repositories/snapshots \ --deps=\ org.slf4j:slf4j-simple:1.7.36,\ @@ -149,15 +149,15 @@ $ jbang zw -h -f list INFO Reflections - Reflections took 428 ms to scan 44 urls, producing 2493 keys and 14406 values Available plugins: -jsonschema2pojo io.zenwave360.generator.plugins.AsyncApiJsonSchema2PojoPlugin: Generate Plain Old Java Objects from OpenAPI/AsyncAPI schemas or full JSON-Schema files -jdl-backend-application-default io.zenwave360.generator.plugins.JDLBackendApplicationDefaultPlugin: Generates a full backend application using a flexible hexagonal architecture -jdl-to-openapi io.zenwave360.generator.plugins.JDLToOpenAPIPlugin: Generates a full OpenAPI definitions for CRUD operations from JDL models -jdl-openapi-controllers io.zenwave360.generator.plugins.JDLOpenAPIControllersPlugin: Generates implementations based on JDL models and OpenAPI definitions SpringMVC generated OpenAPI interfaces. -openapi-to-jdl io.zenwave360.generator.plugins.OpenAPIToJDLPlugin: Generates JDL model from OpenAPI schemas -spring-cloud-streams3 io.zenwave360.generator.plugins.SpringCloudStreams3Plugin: Generates strongly typed SpringCloudStreams3 producer/consumer classes for AsyncAPI -fork-plugin io.zenwave360.generator.plugins.ForkPlugin: Creates a new standalone maven module cloning an existing plugin -spring-webtestclient io.zenwave360.generator.plugins.SpringWebTestClientPlugin: Generates spring WebTestClient tests from OpenAPI defined endpoints. -rest-assured io.zenwave360.generator.plugins.RestAssuredPlugin: Generates REST-assured tests from OpenAPI defined endpoints. +jsonschema2pojo io.zenwave360.sdkns.AsyncApiJsonSchema2PojoPlugin: Generate Plain Old Java Objects from OpenAPI/AsyncAPI schemas or full JSON-Schema files +jdl-backend-application-default io.zenwave360.sdkns.JDLBackendApplicationDefaultPlugin: Generates a full backend application using a flexible hexagonal architecture +jdl-to-openapi io.zenwave360.sdkns.JDLToOpenAPIPlugin: Generates a full OpenAPI definitions for CRUD operations from JDL models +jdl-openapi-controllers io.zenwave360.sdkns.JDLOpenAPIControllersPlugin: Generates implementations based on JDL models and OpenAPI definitions SpringMVC generated OpenAPI interfaces. +openapi-to-jdl io.zenwave360.sdkns.OpenAPIToJDLPlugin: Generates JDL model from OpenAPI schemas +spring-cloud-streams3 io.zenwave360.sdkns.SpringCloudStreams3Plugin: Generates strongly typed SpringCloudStreams3 producer/consumer classes for AsyncAPI +fork-plugin io.zenwave360.sdkns.ForkPlugin: Creates a new standalone maven module cloning an existing plugin +spring-webtestclient io.zenwave360.sdkns.SpringWebTestClientPlugin: Generates spring WebTestClient tests from OpenAPI defined endpoints. +rest-assured io.zenwave360.sdkns.RestAssuredPlugin: Generates REST-assured tests from OpenAPI defined endpoints. ``` NOTE: it will list any available plugin, standard or custom, inside any of these root java packages "io", "com" or "org". @@ -196,7 +196,7 @@ One promise of ZenWave Code Generator is to be easily extensible and adaptable t You can always fork an existing plugin with the following command: ```shell -jbang zw -p io.zenwave360.generator.plugins.ForkPlugin -h +jbang zw -p io.zenwave360.sdkns.ForkPlugin -h ``` | **Option** | **Description** | **Type** | **Default** | **Values** | @@ -209,10 +209,10 @@ jbang zw -p io.zenwave360.generator.plugins.ForkPlugin -h Example: ```shell -jbang zw -p io.zenwave360.generator.plugins.ForkPlugin \ +jbang zw -p io.zenwave360.sdkns.ForkPlugin \ targetFolder=target/forked-plugin \ - sourcePluginClassName=io.zenwave360.generator.plugins.JDLBackendApplicationDefaultPlugin \ - targetPluginClassName=com.myorganization.generator.JDLBackendApplicationDefaultPluginForked + sourcePluginClassName=io.zenwave360.sdkns.JDLBackendApplicationDefaultPlugin \ + targetPluginClassName=com.myorganization.sdk.JDLBackendApplicationDefaultPluginForked cd target/forked-plugin mvn clean install ``` diff --git a/index.md b/index.md index 2020f039..0c01a8cc 100644 --- a/index.md +++ b/index.md @@ -254,7 +254,7 @@ Default backend generator supports the following @annotations: ### Generate Backend Application ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLBackendApplicationDefaultPlugin \ +jbang zw -p io.zenwave360.sdkns.JDLBackendApplicationDefaultPlugin \ specFile=src/main/resources/model/orders-model.jdl \ basePackage=io.zenwave360.example \ persistence=mongodb \ @@ -329,7 +329,7 @@ Generate a baseline OpenAPI definition from JDL entities: - CRUD operations and Search for @aggregate entities ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLToOpenAPIPlugin \ +jbang zw -p io.zenwave360.sdkns.JDLToOpenAPIPlugin \ specFile=src/main/resources/model/orders-model.jdl \ targetFile=src/main/resources/model/openapi.yml ``` @@ -342,7 +342,7 @@ Generate AsyncAPI definition from JDL entities: - Messages and payloads for each entity Create/Update/Delete events (AVRO and AsyncAPI schema) ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLToAsyncAPIPlugin \ +jbang zw -p io.zenwave360.sdkns.JDLToAsyncAPIPlugin \ includeCommands=true \ specFile=src/main/resources/model/orders-model.jdl \ targetFile=src/main/resources/model/asyncapi.yml @@ -454,7 +454,7 @@ jbang zw -p io.zenwave360.generator.plugins.JDLToAsyncAPIPlugin \ You can generate SpringMVC controllers that implements the interfaces generated by the official OpenAPI generator. ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLOpenAPIControllersPlugin \ +jbang zw -p io.zenwave360.sdkns.JDLOpenAPIControllersPlugin \ specFile=src/main/resources/model/openapi.yml \ jdlFile=src/main/resources/model/orders-model.jdl \ basePackage=io.zenwave360.example \ @@ -482,7 +482,7 @@ src/main/java/io/zenwave360/example/adapters/web/mappers/CustomerOrderDTOsMapper Generates test for SpringMVC or Spring WebFlux using WebTestClient based on OpenAPI specification. ```shell -jbang zw -p io.zenwave360.generator.plugins.SpringWebTestClientPlugin \ +jbang zw -p io.zenwave360.sdkns.SpringWebTestClientPlugin \ specFile=src/main/resources/model/openapi.yml \ jdlFile=src/main/resources/model/orders-model.jdl \ targetFolder=src/test/java \ @@ -526,7 +526,7 @@ It requires access to your project classpath, so you can just paste the followin ```java String jdl = new JavaToJDLGenerator() - .withPackageName("io.zenwave360.generator.jpa2jdl") + .withPackageName("io.zenwave360.sdk.jpa2jdl") .withPersistenceType(JavaToJDLGenerator.PersistenceType.JPA) .generate(); System.out.println(jdl); @@ -534,7 +534,7 @@ System.out.println(jdl); ```java String jdl = new JavaToJDLGenerator() - .withPackageName("io.zenwave360.generator.mongodb2jdl") + .withPackageName("io.zenwave360.sdk.mongodb2jdl") .withPersistenceType(JavaToJDLGenerator.PersistenceType.MONGODB) .generate(); System.out.println(jdl); @@ -551,7 +551,7 @@ When your domain java code evolves you may want to regenerate entities back from Reverse engineer JDL entities from OpenAPI schemas: ```shell -jbang zw -p io.zenwave360.generator.plugins.OpenAPIToJDLPlugin \ +jbang zw -p io.zenwave360.sdkns.OpenAPIToJDLPlugin \ specFile=openapi.yml targetFolder=target/out targetFile=entities.jdl cat target/out/entities.jdl ``` diff --git a/plugins/asyncapi-jsonschema2pojo/README.md b/plugins/asyncapi-jsonschema2pojo/README.md index 47ab3fb1..f9dde1f2 100644 --- a/plugins/asyncapi-jsonschema2pojo/README.md +++ b/plugins/asyncapi-jsonschema2pojo/README.md @@ -7,7 +7,7 @@ Generate Plain Old Java Objects from OpenAPI/AsyncAPI schemas or full JSON-Schema files using https://www.jsonschema2pojo.org/ library. ```shell -jbang zw -p io.zenwave360.generator.plugins.AsyncApiJsonSchema2PojoPlugin \ +jbang zw -p io.zenwave360.sdkns.AsyncApiJsonSchema2PojoPlugin \ specFile=src/main/resources/model/asyncapi.yml \ modelPackage=io.zenwave360.example.core.domain.events \ jsonschema2pojo.includeTypeInfo=true \ @@ -34,7 +34,7 @@ jbang zw -p io.zenwave360.generator.plugins.AsyncApiJsonSchema2PojoPlugin \ ## Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.AsyncApiJsonSchema2PojoPlugin --help +jbang zw -p io.zenwave360.sdkns.AsyncApiJsonSchema2PojoPlugin --help ``` ## Maven Plugin Configuration (API-First) diff --git a/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoGenerator.java b/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoGenerator.java similarity index 94% rename from plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoGenerator.java rename to plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoGenerator.java index d2277f0d..c63745a6 100644 --- a/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoGenerator.java +++ b/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoGenerator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import static org.jsonschema2pojo.SourceType.JSONSCHEMA; import static org.jsonschema2pojo.SourceType.YAMLSCHEMA; @@ -34,13 +34,13 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.sun.codemodel.JCodeModel; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractAsyncapiGenerator; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.processors.AsyncApiProcessor; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractAsyncapiGenerator; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.processors.AsyncApiProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.NamingUtils; import io.zenwave360.jsonrefparser.$Ref; public class AsyncApiJsonSchema2PojoGenerator extends AbstractAsyncapiGenerator { diff --git a/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoPlugin.java b/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoPlugin.java similarity index 68% rename from plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoPlugin.java rename to plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoPlugin.java index ecf68dcf..7f2b8376 100644 --- a/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoPlugin.java +++ b/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoPlugin.java @@ -1,11 +1,11 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.Map; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.AsyncApiProcessor; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.AsyncApiProcessor; @DocumentedPlugin(value = "Generate Plain Old Java Objects from OpenAPI/AsyncAPI schemas or full JSON-Schema files", shortCode = "jsonschema2pojo") public class AsyncApiJsonSchema2PojoPlugin extends Plugin { diff --git a/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/JsonSchema2PojoConfiguration.java b/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/JsonSchema2PojoConfiguration.java similarity index 99% rename from plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/JsonSchema2PojoConfiguration.java rename to plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/JsonSchema2PojoConfiguration.java index 5fa79419..12409f34 100644 --- a/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/generator/plugins/JsonSchema2PojoConfiguration.java +++ b/plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/JsonSchema2PojoConfiguration.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; diff --git a/plugins/asyncapi-jsonschema2pojo/src/test/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoGeneratorTest.java b/plugins/asyncapi-jsonschema2pojo/src/test/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoGeneratorTest.java similarity index 76% rename from plugins/asyncapi-jsonschema2pojo/src/test/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoGeneratorTest.java rename to plugins/asyncapi-jsonschema2pojo/src/test/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoGeneratorTest.java index 4be6bf5b..9c850d49 100644 --- a/plugins/asyncapi-jsonschema2pojo/src/test/java/io/zenwave360/generator/plugins/AsyncApiJsonSchema2PojoGeneratorTest.java +++ b/plugins/asyncapi-jsonschema2pojo/src/test/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoGeneratorTest.java @@ -1,15 +1,15 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.io.File; import java.io.IOException; -import io.zenwave360.generator.Plugin; +import io.zenwave360.sdk.Plugin; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.MainGenerator; +import io.zenwave360.sdk.MainGenerator; public class AsyncApiJsonSchema2PojoGeneratorTest { @@ -21,7 +21,7 @@ public void setup() throws IOException { @Test public void test_generator_for_asyncapi_schemas() throws Exception { Plugin plugin = new AsyncApiJsonSchema2PojoPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml") .withTargetFolder("target/zenwave630") .withOption("modelPackage", "io.example.integration.test.with_schemas.model"); @@ -32,9 +32,9 @@ public void test_generator_for_asyncapi_schemas() throws Exception { @Test public void test_generator_for_json_schemas() throws Exception { - var url = getClass().getClassLoader().getResource("/io/zenwave360/generator/resources/asyncapi/json-schemas/asyncapi.yml"); + var url = getClass().getClassLoader().getResource("/io/zenwave360/sdk/resources/asyncapi/json-schemas/asyncapi.yml"); Plugin plugin = new AsyncApiJsonSchema2PojoPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/json-schemas/asyncapi.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/json-schemas/asyncapi.yml") .withTargetFolder("target/zenwave630"); new MainGenerator().generate(plugin); diff --git a/plugins/asyncapi-spring-cloud-streams3/README.md b/plugins/asyncapi-spring-cloud-streams3/README.md index 3c1f92ac..fff1607a 100644 --- a/plugins/asyncapi-spring-cloud-streams3/README.md +++ b/plugins/asyncapi-spring-cloud-streams3/README.md @@ -66,7 +66,7 @@ Use the table to understand which section of AsyncAPI (publish or subscribe) to ### Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.SpringCloudStreams3Plugin --help +jbang zw -p io.zenwave360.sdkns.SpringCloudStreams3Plugin --help ``` ### Options @@ -177,7 +177,7 @@ public class ProducerInMemoryContext { ```shell -jbang zw -p io.zenwave360.generator.plugins.SpringCloudStreams3TestsPlugin \ +jbang zw -p io.zenwave360.sdkns.SpringCloudStreams3TestsPlugin \ specFile=src/main/resources/model/asyncapi.yml \ role=provider \ style=imperative \ @@ -243,7 +243,7 @@ public class DoCustomerRequestConsumerServiceIT extends BaseConsumerTest { ```shell -jbang zw -p io.zenwave360.generator.plugins.SpringCloudStreams3AdaptersPlugin \ +jbang zw -p io.zenwave360.sdkns.SpringCloudStreams3AdaptersPlugin \ specFile=src/main/resources/model/asyncapi.yml \ jdlFile=src/main/resources/model/orders-model.jdl \ role=provider \ @@ -350,7 +350,7 @@ You can use ZenWave Maven Plugin to generate code as part of your build process: - + io.github.zenwave360.zenwave-sdk.plugins diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersGenerator.java b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersGenerator.java similarity index 90% rename from plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersGenerator.java rename to plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersGenerator.java index 7329a1a0..e248dc1a 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersGenerator.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersGenerator.java @@ -1,20 +1,20 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import static io.zenwave360.generator.templating.OutputFormatType.JAVA; +import static io.zenwave360.sdk.templating.OutputFormatType.JAVA; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.options.asyncapi.AsyncapiOperationType; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.Maps; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.options.ProgrammingStyle; +import io.zenwave360.sdk.options.asyncapi.AsyncapiOperationType; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.Maps; public class SpringCloudStreams3AdaptersGenerator extends SpringCloudStreams3Generator { diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersPlugin.java b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersPlugin.java similarity index 84% rename from plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersPlugin.java rename to plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersPlugin.java index e8725d3c..84202568 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersPlugin.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersPlugin.java @@ -1,17 +1,17 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.*; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; @DocumentedPlugin(value = "Generates tests for Spring Cloud Streams Consumers.", shortCode = "spring-cloud-streams3-adapters") public class SpringCloudStreams3AdaptersPlugin extends Plugin { diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3Generator.java b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3Generator.java similarity index 94% rename from plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3Generator.java rename to plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3Generator.java index 2fe4f3ef..91c3d80d 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3Generator.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3Generator.java @@ -1,18 +1,18 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.*; import java.util.stream.Collectors; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractAsyncapiGenerator; -import io.zenwave360.generator.options.asyncapi.AsyncapiOperationType; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.TemplateEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractAsyncapiGenerator; +import io.zenwave360.sdk.options.asyncapi.AsyncapiOperationType; +import io.zenwave360.sdk.options.ProgrammingStyle; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.TemplateEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -129,7 +129,7 @@ public enum TransactionalOutboxType { }); } - protected String templatesPath = "io/zenwave360/generator/plugins/SpringCloudStream3Generator"; + protected String templatesPath = "io/zenwave360/sdk/plugins/SpringCloudStream3Generator"; protected List producerTemplates = Arrays.asList( new TemplateInput(templatesPath + "/producer/IProducer.java", "src/main/java/{{asPackageFolder producerApiPackage}}/I{{apiClassName}}.java"), diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3Plugin.java b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3Plugin.java similarity index 61% rename from plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3Plugin.java rename to plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3Plugin.java index 94a67c0a..4d0e8a65 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3Plugin.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3Plugin.java @@ -1,12 +1,12 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.AsyncApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.AsyncApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; @DocumentedPlugin(value = "Generates strongly typed SpringCloudStreams3 producer/consumer classes for AsyncAPI", shortCode = "spring-cloud-streams3") public class SpringCloudStreams3Plugin extends Plugin { diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsGenerator.java b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsGenerator.java similarity index 83% rename from plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsGenerator.java rename to plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsGenerator.java index d09c2acf..b7c7f22e 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsGenerator.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsGenerator.java @@ -1,21 +1,14 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.*; -import java.util.stream.Collectors; -import io.zenwave360.generator.options.asyncapi.AsyncapiOperationType; -import io.zenwave360.generator.templating.*; -import org.apache.commons.lang3.StringUtils; +import io.zenwave360.sdk.options.asyncapi.AsyncapiOperationType; +import io.zenwave360.sdk.templating.*; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractAsyncapiGenerator; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.parsers.Model; -import static io.zenwave360.generator.plugins.SpringCloudStreams3Generator.getApiClassName; -import static io.zenwave360.generator.templating.OutputFormatType.JAVA; +import static io.zenwave360.sdk.templating.OutputFormatType.JAVA; public class SpringCloudStreams3TestsGenerator extends SpringCloudStreams3Generator { diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsPlugin.java b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsPlugin.java similarity index 64% rename from plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsPlugin.java rename to plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsPlugin.java index 000d1c7d..0c579e7d 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsPlugin.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/main/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsPlugin.java @@ -1,15 +1,15 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.AsyncApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.AsyncApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; @DocumentedPlugin(value = "Generates tests for Spring Cloud Streams Consumers.", shortCode = "spring-cloud-streams3-tests") public class SpringCloudStreams3TestsPlugin extends Plugin { diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/adapters/imperative/Adapter.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/adapters/imperative/Adapter.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/adapters/imperative/Adapter.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/adapters/imperative/Adapter.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/adapters/imperative/Mapper.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/adapters/imperative/Mapper.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/adapters/imperative/Mapper.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/adapters/imperative/Mapper.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/common/Headers.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/common/Headers.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/common/Headers.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/common/Headers.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/imperative/Consumer.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/imperative/Consumer.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/imperative/Consumer.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/imperative/Consumer.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/imperative/IService.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/imperative/IService.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/imperative/IService.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/imperative/IService.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/reactive/Consumer.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/reactive/Consumer.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/reactive/Consumer.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/reactive/Consumer.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/reactive/IService.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/reactive/IService.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/reactive/IService.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/reactive/IService.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/tests/BaseConsumerTest.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/tests/BaseConsumerTest.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/tests/BaseConsumerTest.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/tests/BaseConsumerTest.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/tests/imperative/ConsumerTest.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/tests/imperative/ConsumerTest.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/consumer/tests/imperative/ConsumerTest.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/consumer/tests/imperative/ConsumerTest.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/IProducer.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/IProducer.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/IProducer.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/IProducer.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/mocks/ProducerCaptor.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/mocks/ProducerCaptor.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/mocks/ProducerCaptor.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/mocks/ProducerCaptor.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/mocks/ProducerInMemoryContext.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/mocks/ProducerInMemoryContext.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/mocks/ProducerInMemoryContext.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/mocks/ProducerInMemoryContext.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/outbox/jdbc/Producer.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/outbox/jdbc/Producer.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/outbox/jdbc/Producer.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/outbox/jdbc/Producer.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/outbox/mongodb/Producer.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/outbox/mongodb/Producer.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/outbox/mongodb/Producer.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/outbox/mongodb/Producer.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/outbox/none/Producer.java.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/outbox/none/Producer.java.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/outbox/none/Producer.java.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/outbox/none/Producer.java.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/partials/runtime-headers.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/partials/runtime-headers.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/partials/runtime-headers.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/partials/runtime-headers.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/partials/tracing-id-supplier.hbs b/plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/partials/tracing-id-supplier.hbs similarity index 100% rename from plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/generator/plugins/SpringCloudStream3Generator/producer/partials/tracing-id-supplier.hbs rename to plugins/asyncapi-spring-cloud-streams3/src/main/resources/io/zenwave360/sdk/plugins/SpringCloudStream3Generator/producer/partials/tracing-id-supplier.hbs diff --git a/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersGeneratorTest.java b/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersGeneratorTest.java similarity index 87% rename from plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersGeneratorTest.java rename to plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersGeneratorTest.java index 3aaeab0b..b6ef2055 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3AdaptersGeneratorTest.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3AdaptersGeneratorTest.java @@ -1,13 +1,13 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.List; import org.junit.jupiter.api.*; -import io.zenwave360.generator.MainGenerator; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.options.asyncapi.AsyncapiRoleType; +import io.zenwave360.sdk.MainGenerator; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.options.ProgrammingStyle; +import io.zenwave360.sdk.options.asyncapi.AsyncapiRoleType; import nl.altindag.log.LogCaptor; public class SpringCloudStreams3AdaptersGeneratorTest { @@ -32,7 +32,7 @@ public static void tearDown() { @Test public void test_generate_imperative_adapters() throws Exception { Plugin plugin = new SpringCloudStreams3AdaptersPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiId", "orders") .withOption("basePackage", "io.example.integration.test") @@ -54,10 +54,10 @@ public void test_generate_imperative_adapters() throws Exception { @Test public void test_generate_imperative_adapters_with_jdl() throws Exception { Plugin plugin = new SpringCloudStreams3AdaptersPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-orders-relational.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-orders-relational.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiId", "provider") - .withOption("jdlFile", "classpath:io/zenwave360/generator/resources/jdl/orders-model-relational.jdl") + .withOption("jdlFile", "classpath:io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl") .withOption("basePackage", "io.example.orders.relational") .withOption("consumerApiPackage", "io.example.orders.provider.api") .withOption("modelPackage", "io.example.orders.relational.core.domain.model.events") diff --git a/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3GeneratorTest.java b/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3GeneratorTest.java similarity index 89% rename from plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3GeneratorTest.java rename to plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3GeneratorTest.java index 799cde2f..309187e7 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3GeneratorTest.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3GeneratorTest.java @@ -1,17 +1,17 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.List; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.options.asyncapi.AsyncapiRoleType; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.options.ProgrammingStyle; +import io.zenwave360.sdk.options.asyncapi.AsyncapiRoleType; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.MainGenerator; +import io.zenwave360.sdk.MainGenerator; import nl.altindag.log.LogCaptor; public class SpringCloudStreams3GeneratorTest { @@ -36,7 +36,7 @@ public static void tearDown() { @Test public void test_generator_provider_for_events() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.provider_for_events") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -53,7 +53,7 @@ public void test_generator_provider_for_events() throws Exception { @Test public void test_generator_provider_for_events_with_envelope() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.client_for_events_with_envelope") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -72,7 +72,7 @@ public void test_generator_provider_for_events_with_envelope() throws Exception @Test public void test_generator_provider_for_commands_imperative() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.provider_for_commands_imperative") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -88,7 +88,7 @@ public void test_generator_provider_for_commands_imperative() throws Exception { @Test public void test_generator_provider_for_commands_imperative_expose_message() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.provider_for_commands_imperative_expose_message") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -105,7 +105,7 @@ public void test_generator_provider_for_commands_imperative_expose_message() thr @Test public void test_generator_provider_for_commands_reactive() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.provider_for_commands_reactive") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -122,7 +122,7 @@ public void test_generator_provider_for_commands_reactive() throws Exception { @Test public void test_generator_provider_for_commands_reactive_expose_message() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.provider_for_commands_reactive_expose_message") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -140,7 +140,7 @@ public void test_generator_provider_for_commands_reactive_expose_message() throw @Test public void test_generator_client_for_commands() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.client_for_commands") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -156,7 +156,7 @@ public void test_generator_client_for_commands() throws Exception { @Test public void test_generator_client_for_events_imperative() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.client_for_events_imperative") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -173,7 +173,7 @@ public void test_generator_client_for_events_imperative() throws Exception { @Test public void test_generator_client_for_events_imperative_expose_message() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.client_for_events_imperative_expose_message") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -191,7 +191,7 @@ public void test_generator_client_for_events_imperative_expose_message() throws @Test public void test_generator_client_for_events_reactive() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.client_for_events_reactive") .withOption("modelPackage", "io.example.integration.test.api.model") @@ -208,7 +208,7 @@ public void test_generator_client_for_events_reactive() throws Exception { @Test public void test_generator_client_for_events_reactive_expose_message() throws Exception { Plugin plugin = new SpringCloudStreams3Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.api.client_for_events_reactive_expose_message") .withOption("modelPackage", "io.example.integration.test.api.model") diff --git a/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsGeneratorTest.java b/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsGeneratorTest.java similarity index 82% rename from plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsGeneratorTest.java rename to plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsGeneratorTest.java index 923bc307..d514f366 100644 --- a/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/generator/plugins/SpringCloudStreams3TestsGeneratorTest.java +++ b/plugins/asyncapi-spring-cloud-streams3/src/test/java/io/zenwave360/sdk/plugins/SpringCloudStreams3TestsGeneratorTest.java @@ -1,13 +1,13 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.List; import org.junit.jupiter.api.*; -import io.zenwave360.generator.MainGenerator; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.options.asyncapi.AsyncapiRoleType; +import io.zenwave360.sdk.MainGenerator; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.options.ProgrammingStyle; +import io.zenwave360.sdk.options.asyncapi.AsyncapiRoleType; import nl.altindag.log.LogCaptor; public class SpringCloudStreams3TestsGeneratorTest { @@ -32,7 +32,7 @@ public static void tearDown() { @Test public void test_generate_imperative_tests() throws Exception { Plugin plugin = new SpringCloudStreams3TestsPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml") .withTargetFolder("target/zenwave630/out") .withOption("apiPackage", "io.example.integration.test.consumer_tests_imperative") .withOption("modelPackage", "io.example.integration.test.api.model") diff --git a/plugins/java-to-jdl/README.md b/plugins/java-to-jdl/README.md index b78888e5..36347fdb 100644 --- a/plugins/java-to-jdl/README.md +++ b/plugins/java-to-jdl/README.md @@ -18,7 +18,7 @@ And then just paste the following code snippets on any test class or main method ```java String jdl = new JavaToJDLGenerator() - .withPackageName("io.zenwave360.generator.jpa2jdl") + .withPackageName("io.zenwave360.sdk.jpa2jdl") .withPersistenceType(JavaToJDLGenerator.PersistenceType.JPA) .generate(); System.out.println(jdl); @@ -26,7 +26,7 @@ System.out.println(jdl); ```java String jdl = new JavaToJDLGenerator() - .withPackageName("io.zenwave360.generator.mongodb2jdl") + .withPackageName("io.zenwave360.sdk.mongodb2jdl") .withPersistenceType(JavaToJDLGenerator.PersistenceType.MONGODB) .generate(); System.out.println(jdl); diff --git a/plugins/java-to-jdl/src/main/java/io/zenwave360/generator/plugins/JavaToJDLGenerator.java b/plugins/java-to-jdl/src/main/java/io/zenwave360/sdk/plugins/JavaToJDLGenerator.java similarity index 98% rename from plugins/java-to-jdl/src/main/java/io/zenwave360/generator/plugins/JavaToJDLGenerator.java rename to plugins/java-to-jdl/src/main/java/io/zenwave360/sdk/plugins/JavaToJDLGenerator.java index b41753b8..557f5102 100644 --- a/plugins/java-to-jdl/src/main/java/io/zenwave360/generator/plugins/JavaToJDLGenerator.java +++ b/plugins/java-to-jdl/src/main/java/io/zenwave360/sdk/plugins/JavaToJDLGenerator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.lang.annotation.Annotation; import java.lang.reflect.Array; @@ -16,7 +16,6 @@ import javax.persistence.OneToOne; import javax.persistence.Transient; -import io.zenwave360.generator.utils.NamingUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.reflections.Reflections; @@ -27,9 +26,9 @@ import org.springframework.data.mongodb.core.mapping.DBRef; import org.springframework.data.mongodb.core.mapping.Document; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.Generator; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.Generator; +import io.zenwave360.sdk.templating.TemplateOutput; public class JavaToJDLGenerator implements Generator { diff --git a/plugins/java-to-jdl/src/main/resources/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs b/plugins/java-to-jdl/src/main/resources/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs similarity index 100% rename from plugins/java-to-jdl/src/main/resources/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs rename to plugins/java-to-jdl/src/main/resources/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs diff --git a/plugins/java-to-jdl/src/test/java/io/zenwave360/generator/plugins/JavaToJDLGeneratorTest.java b/plugins/java-to-jdl/src/test/java/io/zenwave360/sdk/plugins/JavaToJDLGeneratorTest.java similarity index 76% rename from plugins/java-to-jdl/src/test/java/io/zenwave360/generator/plugins/JavaToJDLGeneratorTest.java rename to plugins/java-to-jdl/src/test/java/io/zenwave360/sdk/plugins/JavaToJDLGeneratorTest.java index 35c31bde..5551e73d 100644 --- a/plugins/java-to-jdl/src/test/java/io/zenwave360/generator/plugins/JavaToJDLGeneratorTest.java +++ b/plugins/java-to-jdl/src/test/java/io/zenwave360/sdk/plugins/JavaToJDLGeneratorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import org.junit.jupiter.api.Test; @@ -7,7 +7,7 @@ public class JavaToJDLGeneratorTest { @Test public void test_jpa_to_jdl() throws Exception { String jdl = new JavaToJDLGenerator() - .withPackageName("io.zenwave360.generator.jpa2jdl") + .withPackageName("io.zenwave360.sdk.jpa2jdl") .withPersistenceType(JavaToJDLGenerator.PersistenceType.JPA) .generate(); System.out.println(jdl); @@ -16,7 +16,7 @@ public void test_jpa_to_jdl() throws Exception { @Test public void test_mongodb_to_jdl() throws Exception { String jdl = new JavaToJDLGenerator() - .withPackageName("io.zenwave360.generator.mongodb2jdl") + .withPackageName("io.zenwave360.sdk.mongodb2jdl") .withPersistenceType(JavaToJDLGenerator.PersistenceType.MONGODB) .generate(); System.out.println(jdl); diff --git a/plugins/jdl-backend-application-default/README.md b/plugins/jdl-backend-application-default/README.md index 33db0e7c..38521654 100644 --- a/plugins/jdl-backend-application-default/README.md +++ b/plugins/jdl-backend-application-default/README.md @@ -55,5 +55,5 @@ This generator supports the following JDL extensions: ## Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLBackendApplicationDefaultPlugin --help +jbang zw -p io.zenwave360.sdkns.JDLBackendApplicationDefaultPlugin --help ``` diff --git a/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultGenerator.java b/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultGenerator.java similarity index 94% rename from plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultGenerator.java rename to plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultGenerator.java index 11e3dd13..5dfce14c 100644 --- a/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultGenerator.java +++ b/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultGenerator.java @@ -1,19 +1,19 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import static io.zenwave360.generator.templating.OutputFormatType.JAVA; +import static io.zenwave360.sdk.templating.OutputFormatType.JAVA; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractJDLGenerator; -import io.zenwave360.generator.options.PersistenceType; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.options.DatabaseType; -import io.zenwave360.generator.options.WebFlavorType; -import io.zenwave360.generator.templating.*; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractJDLGenerator; +import io.zenwave360.sdk.options.PersistenceType; +import io.zenwave360.sdk.options.ProgrammingStyle; +import io.zenwave360.sdk.options.DatabaseType; +import io.zenwave360.sdk.options.WebFlavorType; +import io.zenwave360.sdk.templating.*; +import io.zenwave360.sdk.utils.JSONPath; public class JDLBackendApplicationDefaultGenerator extends AbstractJDLGenerator { @@ -51,7 +51,7 @@ public JDLBackendApplicationDefaultGenerator withSourceProperty(String sourcePro handlebarsEngine.getHandlebars().registerHelpers(new JDLBackendApplicationDefaultJpaHelpers(this)); } - private String templatesFolder = "io/zenwave360/generator/plugins/JDLEntitiesGenerator/"; + private String templatesFolder = "io/zenwave360/sdk/plugins/JDLEntitiesGenerator/"; Object[] enumTemplate = {"src/main/java", "core/domain/common/Enum.java", "core/domain/{{enum.name}}.java", JAVA}; diff --git a/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultHelpers.java b/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultHelpers.java similarity index 96% rename from plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultHelpers.java rename to plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultHelpers.java index e6d63347..08e498e8 100644 --- a/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultHelpers.java +++ b/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultHelpers.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -8,9 +7,8 @@ import com.github.jknack.handlebars.Options; -import io.zenwave360.generator.options.PersistenceType; -import io.zenwave360.generator.utils.JSONPath; -import org.apache.commons.io.FilenameUtils; +import io.zenwave360.sdk.options.PersistenceType; +import io.zenwave360.sdk.utils.JSONPath; public class JDLBackendApplicationDefaultHelpers { diff --git a/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultJpaHelpers.java b/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultJpaHelpers.java similarity index 70% rename from plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultJpaHelpers.java rename to plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultJpaHelpers.java index 3e8f9860..96bfaece 100644 --- a/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultJpaHelpers.java +++ b/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultJpaHelpers.java @@ -1,14 +1,8 @@ -package io.zenwave360.generator.plugins; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +package io.zenwave360.sdk.plugins; import com.github.jknack.handlebars.Options; -import io.zenwave360.generator.options.PersistenceType; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.utils.JSONPath; public class JDLBackendApplicationDefaultJpaHelpers { diff --git a/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultPlugin.java b/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultPlugin.java similarity index 64% rename from plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultPlugin.java rename to plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultPlugin.java index c99a3a21..ba43d31a 100644 --- a/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/generator/plugins/JDLBackendApplicationDefaultPlugin.java +++ b/plugins/jdl-backend-application-default/src/main/java/io/zenwave360/sdk/plugins/JDLBackendApplicationDefaultPlugin.java @@ -1,12 +1,12 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; /** * This is the long description diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/mvc/EntityResource.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/mvc/EntityResource.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/mvc/EntityResource.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/mvc/EntityResource.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/webflux/EntityResource.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/webflux/EntityResource.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/webflux/EntityResource.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/adapters/web/webflux/EntityResource.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/common/Enum.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/common/Enum.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/common/Enum.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/common/Enum.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/Entity.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/Entity.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/Entity.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/Entity.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToMany.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToMany.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToMany.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToMany.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToOne.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToOne.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToOne.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/ManyToOne.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToMany.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToMany.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToMany.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToMany.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToOne.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToOne.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToOne.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/OneToOne.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/default.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/default.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/default.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/default.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/mariadb.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/mariadb.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/mariadb.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/mariadb.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/postgresql.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/postgresql.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/postgresql.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/jpa/partials/id/postgresql.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/mongodb/Entity.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/mongodb/Entity.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/mongodb/Entity.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/mongodb/Entity.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/search/EntityDocument.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/search/EntityDocument.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/search/EntityDocument.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/search/EntityDocument.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/vo/Entity.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/vo/Entity.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/domain/vo/Entity.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/domain/vo/Entity.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/jpa/imperative/ServiceImpl.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/jpa/imperative/ServiceImpl.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/jpa/imperative/ServiceImpl.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/jpa/imperative/ServiceImpl.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mappers/EntityMapper.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mappers/EntityMapper.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mappers/EntityMapper.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mappers/EntityMapper.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mongodb/imperative/ServiceImpl.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mongodb/imperative/ServiceImpl.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mongodb/imperative/ServiceImpl.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/implementation/mongodb/imperative/ServiceImpl.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/Service.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/Service.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/Service.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/Service.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityCriteria.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityCriteria.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityCriteria.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityCriteria.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityInput.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityInput.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityInput.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/inbound/dtos/EntityInput.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/imperative/EntityRepository.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/imperative/EntityRepository.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/imperative/EntityRepository.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/imperative/EntityRepository.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/reactive/EntityRepository.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/reactive/EntityRepository.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/reactive/EntityRepository.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/jpa/reactive/EntityRepository.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/imperative/EntityRepository.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/imperative/EntityRepository.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/imperative/EntityRepository.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/imperative/EntityRepository.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/reactive/EntityRepository.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/reactive/EntityRepository.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/reactive/EntityRepository.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/mongodb/reactive/EntityRepository.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/search/EntitySearchRepository.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/search/EntitySearchRepository.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/search/EntitySearchRepository.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/core/outbound/search/EntitySearchRepository.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/infrastructure/package-info.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/infrastructure/package-info.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/main/java/infrastructure/package-info.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/main/java/infrastructure/package-info.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/ArchitectureTest.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/ArchitectureTest.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/ArchitectureTest.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/ArchitectureTest.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsConfig.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsConfig.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsConfig.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsConfig.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsManualContext.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsManualContext.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsManualContext.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/config/InMemoryTestsManualContext.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/jpa/imperative/ServiceTest.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/jpa/imperative/ServiceTest.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/jpa/imperative/ServiceTest.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/jpa/imperative/ServiceTest.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/mongodb/imperative/ServiceTest.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/mongodb/imperative/ServiceTest.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/mongodb/imperative/ServiceTest.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/core/implementation/mongodb/imperative/ServiceTest.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/BaseRepositoryIntegrationTest.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/BaseRepositoryIntegrationTest.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/BaseRepositoryIntegrationTest.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/BaseRepositoryIntegrationTest.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/EntityRepositoryIntegrationTest.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/EntityRepositoryIntegrationTest.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/EntityRepositoryIntegrationTest.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/EntityRepositoryIntegrationTest.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/EntityRepositoryInMemory.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/EntityRepositoryInMemory.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/EntityRepositoryInMemory.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/EntityRepositoryInMemory.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/InMemoryJpaRepository.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/InMemoryJpaRepository.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/InMemoryJpaRepository.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/jpa/imperative/inmemory/InMemoryJpaRepository.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/BaseRepositoryIntegrationTest.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/BaseRepositoryIntegrationTest.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/BaseRepositoryIntegrationTest.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/BaseRepositoryIntegrationTest.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/EntityRepositoryIntegrationTest.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/EntityRepositoryIntegrationTest.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/EntityRepositoryIntegrationTest.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/EntityRepositoryIntegrationTest.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/EntityRepositoryInMemory.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/EntityRepositoryInMemory.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/EntityRepositoryInMemory.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/EntityRepositoryInMemory.java.hbs diff --git a/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/InMemoryMongodbRepository.java.hbs b/plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/InMemoryMongodbRepository.java.hbs similarity index 100% rename from plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/generator/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/InMemoryMongodbRepository.java.hbs rename to plugins/jdl-backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/JDLEntitiesGenerator/src/test/java/infrastructure/mongodb/imperative/inmemory/InMemoryMongodbRepository.java.hbs diff --git a/plugins/jdl-backend-application-default/src/test/java/io/zenwave360/generator/plugins/JDLBackendApplicationJpaImperativeGeneratorTest.java b/plugins/jdl-backend-application-default/src/test/java/io/zenwave360/sdk/plugins/JDLBackendApplicationJpaImperativeGeneratorTest.java similarity index 75% rename from plugins/jdl-backend-application-default/src/test/java/io/zenwave360/generator/plugins/JDLBackendApplicationJpaImperativeGeneratorTest.java rename to plugins/jdl-backend-application-default/src/test/java/io/zenwave360/sdk/plugins/JDLBackendApplicationJpaImperativeGeneratorTest.java index f9edc591..5a0abbbe 100644 --- a/plugins/jdl-backend-application-default/src/test/java/io/zenwave360/generator/plugins/JDLBackendApplicationJpaImperativeGeneratorTest.java +++ b/plugins/jdl-backend-application-default/src/test/java/io/zenwave360/sdk/plugins/JDLBackendApplicationJpaImperativeGeneratorTest.java @@ -1,23 +1,18 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import java.io.File; -import java.io.IOException; -import java.util.Collections; import java.util.List; import java.util.Map; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.options.DatabaseType; -import io.zenwave360.generator.testutils.MavenCompiler; -import org.apache.commons.io.FileUtils; -import org.apache.maven.shared.invoker.*; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.options.DatabaseType; +import io.zenwave360.sdk.testutils.MavenCompiler; import org.junit.jupiter.api.*; -import io.zenwave360.generator.MainGenerator; -import io.zenwave360.generator.options.PersistenceType; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; +import io.zenwave360.sdk.MainGenerator; +import io.zenwave360.sdk.options.PersistenceType; +import io.zenwave360.sdk.options.ProgrammingStyle; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; import nl.altindag.log.LogCaptor; public class JDLBackendApplicationJpaImperativeGeneratorTest { @@ -48,7 +43,7 @@ private Map loadJDLModelFromResource(String resource) throws Exc public void test_generator_hexagonal_jpa_imperative() throws Exception { String targetFolder = "target/test_generator_hexagonal_jpa_imperative"; Plugin plugin = new JDLBackendApplicationDefaultPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/jdl/orders-model-relational.jdl") + .withSpecFile("classpath:io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl") .withTargetFolder(targetFolder) .withOption("basePackage", "io.zenwave360.example") .withOption("persistence", PersistenceType.jpa) diff --git a/plugins/jdl-backend-application-default/src/test/java/io/zenwave360/generator/plugins/JDLBackendApplicationMongoImperativeGeneratorTest.java b/plugins/jdl-backend-application-default/src/test/java/io/zenwave360/sdk/plugins/JDLBackendApplicationMongoImperativeGeneratorTest.java similarity index 82% rename from plugins/jdl-backend-application-default/src/test/java/io/zenwave360/generator/plugins/JDLBackendApplicationMongoImperativeGeneratorTest.java rename to plugins/jdl-backend-application-default/src/test/java/io/zenwave360/sdk/plugins/JDLBackendApplicationMongoImperativeGeneratorTest.java index b68ab62c..0c293e4b 100644 --- a/plugins/jdl-backend-application-default/src/test/java/io/zenwave360/generator/plugins/JDLBackendApplicationMongoImperativeGeneratorTest.java +++ b/plugins/jdl-backend-application-default/src/test/java/io/zenwave360/sdk/plugins/JDLBackendApplicationMongoImperativeGeneratorTest.java @@ -1,24 +1,19 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import java.io.File; -import java.io.IOException; -import java.util.Collections; import java.util.List; import java.util.Map; -import io.zenwave360.generator.options.PersistenceType; -import io.zenwave360.generator.options.ProgrammingStyle; -import io.zenwave360.generator.testutils.MavenCompiler; -import org.apache.commons.io.FileUtils; -import org.apache.maven.shared.invoker.*; +import io.zenwave360.sdk.options.PersistenceType; +import io.zenwave360.sdk.options.ProgrammingStyle; +import io.zenwave360.sdk.testutils.MavenCompiler; import org.junit.jupiter.api.*; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.MainGenerator; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.MainGenerator; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; import nl.altindag.log.LogCaptor; public class JDLBackendApplicationMongoImperativeGeneratorTest { @@ -47,7 +42,7 @@ private Map loadJDLModelFromResource(String resource) throws Exc @Test public void test_entities() throws Exception { - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); JDLBackendApplicationDefaultGenerator generator = new JDLBackendApplicationDefaultGenerator(); List outputTemplates = generator.generate(model); @@ -63,7 +58,7 @@ public void test_entities() throws Exception { public void test_generator_hexagonal_mongodb_imperative() throws Exception { String targetFolder = "target/test_generator_hexagonal_mongodb_imperative"; Plugin plugin = new JDLBackendApplicationDefaultPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl") + .withSpecFile("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl") .withTargetFolder(targetFolder) .withOption("basePackage", "io.zenwave360.example") .withOption("persistence", PersistenceType.mongodb) @@ -84,7 +79,7 @@ public void test_generator_hexagonal_mongodb_imperative() throws Exception { public void test_generator_hexagonal_mongodb_imperative_registry() throws Exception { String targetFolder = "target/test_generator_hexagonal_mongodb_imperative_registry"; Plugin plugin = new JDLBackendApplicationDefaultPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl") + .withSpecFile("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl") .withTargetFolder(targetFolder) .withOption("basePackage", "io.zenwave360.example") .withOption("persistence", PersistenceType.mongodb) @@ -105,7 +100,7 @@ public void test_generator_hexagonal_mongodb_imperative_registry() throws Except public void test_generator_hexagonal_mongodb_imperative_registry_only_some_entities() throws Exception { String targetFolder = "target/test_generator_hexagonal_mongodb_imperative_registry_only_some_entities"; Plugin plugin = new JDLBackendApplicationDefaultPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl") + .withSpecFile("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl") .withTargetFolder(targetFolder) .withOption("basePackage", "io.zenwave360.example") .withOption("persistence", PersistenceType.mongodb) diff --git a/plugins/jdl-openapi-controllers/README.md b/plugins/jdl-openapi-controllers/README.md index 60d7b9d2..b0f3b347 100644 --- a/plugins/jdl-openapi-controllers/README.md +++ b/plugins/jdl-openapi-controllers/README.md @@ -6,7 +6,7 @@ Generates implementations based on JDL models and OpenAPI definitions SpringMVC After you have generated SpringMVC interfaces and DTOs with OpenAPI generator, you can use this command to generate implementations (skeletons) and mappers for those interfaces and dtos: ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLOpenAPIControllersPlugin \ +jbang zw -p io.zenwave360.sdkns.JDLOpenAPIControllersPlugin \ specFile=src/main/resources/model/openapi.yml \ jdlFile=src/main/resources/model/orders-model.jdl \ basePackage=io.zenwave360.example \ @@ -50,5 +50,5 @@ jbang zw -p io.zenwave360.generator.plugins.JDLOpenAPIControllersPlugin \ ## Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLOpenAPIControllersPlugin --help +jbang zw -p io.zenwave360.sdkns.JDLOpenAPIControllersPlugin --help ``` diff --git a/plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator.java b/plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator.java similarity index 93% rename from plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator.java rename to plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator.java index 059ec862..cfe67fa4 100644 --- a/plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator.java +++ b/plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator.java @@ -1,24 +1,24 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import static io.zenwave360.generator.templating.OutputFormatType.JAVA; +import static io.zenwave360.sdk.templating.OutputFormatType.JAVA; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import io.zenwave360.generator.options.ProgrammingStyle; +import io.zenwave360.sdk.options.ProgrammingStyle; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractOpenAPIGenerator; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.OutputFormatType; -import io.zenwave360.generator.templating.TemplateEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.Maps; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractOpenAPIGenerator; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.OutputFormatType; +import io.zenwave360.sdk.templating.TemplateEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.Maps; public class JDLOpenAPIControllersGenerator extends AbstractOpenAPIGenerator { @@ -54,7 +54,7 @@ public class JDLOpenAPIControllersGenerator extends AbstractOpenAPIGenerator { protected HandlebarsEngine handlebarsEngine = new HandlebarsEngine(); - protected String templatesFolder = "io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/"; + protected String templatesFolder = "io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/"; List templates = List.of( new Object[] {"src/main/java", "web/mappers/BaseMapper.java", "mappers/BaseMapper.java", JAVA}, diff --git a/plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersPlugin.java b/plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersPlugin.java similarity index 73% rename from plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersPlugin.java rename to plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersPlugin.java index b1a59925..3ed566f2 100644 --- a/plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersPlugin.java +++ b/plugins/jdl-openapi-controllers/src/main/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersPlugin.java @@ -1,25 +1,25 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import org.apache.commons.lang3.StringUtils; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.EnrichOpenAPIWithJDLProcessor; -import io.zenwave360.generator.processors.JDLDummyDataFromSchemasProcessor; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.EnrichOpenAPIWithJDLProcessor; +import io.zenwave360.sdk.processors.JDLDummyDataFromSchemasProcessor; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; /** * After you have generated SpringMVC interfaces and DTOs with OpenAPI generator, you can use this command to generate implementations (skeletons) and mappers for those interfaces and dtos: * * ```shell - * jbang zw -p io.zenwave360.generator.plugins.JDLOpenAPIControllersPlugin \ + * jbang zw -p io.zenwave360.sdk.plugins.JDLOpenAPIControllersPlugin \ * specFile=src/main/resources/model/openapi.yml \ * jdlFile=src/main/resources/model/orders-model.jdl \ * basePackage=io.zenwave360.example \ diff --git a/plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/BaseMapper.java.hbs b/plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/BaseMapper.java.hbs similarity index 100% rename from plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/BaseMapper.java.hbs rename to plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/BaseMapper.java.hbs diff --git a/plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/ServiceDTOsMapper.java.hbs b/plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/ServiceDTOsMapper.java.hbs similarity index 100% rename from plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/ServiceDTOsMapper.java.hbs rename to plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mappers/ServiceDTOsMapper.java.hbs diff --git a/plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs b/plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs similarity index 100% rename from plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs rename to plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs diff --git a/plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/webflux/ServiceApiController.java.hbs b/plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/webflux/ServiceApiController.java.hbs similarity index 100% rename from plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/generator/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/webflux/ServiceApiController.java.hbs rename to plugins/jdl-openapi-controllers/src/main/resources/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGenerator/src/main/java/web/webflux/ServiceApiController.java.hbs diff --git a/plugins/jdl-openapi-controllers/src/test/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersGeneratorTest.java b/plugins/jdl-openapi-controllers/src/test/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGeneratorTest.java similarity index 88% rename from plugins/jdl-openapi-controllers/src/test/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersGeneratorTest.java rename to plugins/jdl-openapi-controllers/src/test/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGeneratorTest.java index 68ac313e..5e038eb5 100644 --- a/plugins/jdl-openapi-controllers/src/test/java/io/zenwave360/generator/plugins/JDLOpenAPIControllersGeneratorTest.java +++ b/plugins/jdl-openapi-controllers/src/test/java/io/zenwave360/sdk/plugins/JDLOpenAPIControllersGeneratorTest.java @@ -1,12 +1,12 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.List; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.options.ProgrammingStyle; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.options.ProgrammingStyle; import org.junit.jupiter.api.*; -import io.zenwave360.generator.MainGenerator; +import io.zenwave360.sdk.MainGenerator; import nl.altindag.log.LogCaptor; public class JDLOpenAPIControllersGeneratorTest { @@ -31,8 +31,8 @@ public static void tearDown() { @Test public void test_generator_jdl_openapi_controllers() throws Exception { Plugin plugin = new JDLOpenAPIControllersPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml") - .withOption("jdlFile", "classpath:io/zenwave360/generator/resources/jdl/petstore.jdl") + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml") + .withOption("jdlFile", "classpath:io/zenwave360/sdk/resources/jdl/petstore.jdl") .withOption("basePackage", "io.zenwave360.example") .withOption("openApiApiPackage", "io.zenwave360.example.web.api") .withOption("openApiModelPackage", "io.zenwave360.example.web.api.model") @@ -52,8 +52,8 @@ public void test_generator_jdl_openapi_controllers() throws Exception { @Disabled public void test_generator_jdl_openapi_controllers_registry() throws Exception { Plugin plugin = new JDLOpenAPIControllersPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/openapi-orders.yml") - .withOption("jdlFile", "classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl") + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/openapi-orders.yml") + .withOption("jdlFile", "classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl") .withOption("basePackage", "io.zenwave360.example") .withOption("openApiApiPackage", "io.zenwave360.example.adapters.web") .withOption("openApiModelPackage", "io.zenwave360.example.adapters.web.model") @@ -73,8 +73,8 @@ public void test_generator_jdl_openapi_controllers_registry() throws Exception { @Disabled public void test_generator_jdl_openapi_controllers_relational() throws Exception { Plugin plugin = new JDLOpenAPIControllersPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/openapi-orders-relational.yml") - .withOption("jdlFile", "classpath:io/zenwave360/generator/resources/jdl/orders-model-relational.jdl") + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/openapi-orders-relational.yml") + .withOption("jdlFile", "classpath:io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl") .withOption("basePackage", "io.zenwave360.example") .withOption("openApiApiPackage", "io.zenwave360.example.adapters.web") .withOption("openApiModelPackage", "io.zenwave360.example.adapters.web.model") @@ -95,7 +95,7 @@ public void test_generator_jdl_openapi_controllers_relational() throws Exception // @Disabled public void test_generator_jdl_openapi_controllers_registry_no_jdl() throws Exception { Plugin plugin = new JDLOpenAPIControllersPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml") // .withOption("jdlFile", "../../examples/spring-boot-mongo-elasticsearch/src/main/resources/model/orders-model.jdl") .withOption("basePackage", "io.zenwave360.example") .withOption("controllersPackage", "io.zenwave360.example.nojdl.adapters.web") diff --git a/plugins/jdl-to-asyncapi/README.md b/plugins/jdl-to-asyncapi/README.md index 1f79e129..9d1c2249 100644 --- a/plugins/jdl-to-asyncapi/README.md +++ b/plugins/jdl-to-asyncapi/README.md @@ -24,7 +24,7 @@ entity Customer { Then run: ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLToAsyncAPIPlugin \ +jbang zw -p io.zenwave360.sdkns.JDLToAsyncAPIPlugin \ includeCommands=true \ specFile=src/main/resources/model/orders-model.jdl \ idType=integer \ @@ -63,5 +63,5 @@ jbang zw -p io.zenwave360.generator.plugins.JDLToAsyncAPIPlugin \ ## Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLToAsyncAPIPlugin --help +jbang zw -p io.zenwave360.sdkns.JDLToAsyncAPIPlugin --help ``` diff --git a/plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/generator/plugins/JDLToAsyncAPIGenerator.java b/plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIGenerator.java similarity index 94% rename from plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/generator/plugins/JDLToAsyncAPIGenerator.java rename to plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIGenerator.java index d256246e..65ded57c 100644 --- a/plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/generator/plugins/JDLToAsyncAPIGenerator.java +++ b/plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIGenerator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.io.File; import java.util.ArrayList; @@ -13,15 +13,15 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractJDLGenerator; -import io.zenwave360.generator.generators.JDLEntitiesToAvroConverter; -import io.zenwave360.generator.generators.JDLEntitiesToSchemasConverter; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.OutputFormatType; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractJDLGenerator; +import io.zenwave360.sdk.generators.JDLEntitiesToAvroConverter; +import io.zenwave360.sdk.generators.JDLEntitiesToSchemasConverter; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.OutputFormatType; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; public class JDLToAsyncAPIGenerator extends AbstractJDLGenerator { @@ -86,7 +86,7 @@ public JDLToAsyncAPIGenerator withSourceProperty(String sourceProperty) { private HandlebarsEngine handlebarsEngine = new HandlebarsEngine(); - private final TemplateInput jdlToAsyncAPITemplate = new TemplateInput("io/zenwave360/generator/plugins/AsyncAPIToJDLGenerator/JDLToAsyncAPI.yml", "{{targetFile}}").withMimeType(OutputFormatType.YAML); + private final TemplateInput jdlToAsyncAPITemplate = new TemplateInput("io/zenwave360/sdk/plugins/AsyncAPIToJDLGenerator/JDLToAsyncAPI.yml", "{{targetFile}}").withMimeType(OutputFormatType.YAML); protected Map getJDLModel(Map contextModel) { return (Map) contextModel.get(sourceProperty); diff --git a/plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/generator/plugins/JDLToAsyncAPIPlugin.java b/plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIPlugin.java similarity index 64% rename from plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/generator/plugins/JDLToAsyncAPIPlugin.java rename to plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIPlugin.java index 2e95f53b..d1099d31 100644 --- a/plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/generator/plugins/JDLToAsyncAPIPlugin.java +++ b/plugins/jdl-to-asyncapi/src/main/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIPlugin.java @@ -1,14 +1,14 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.Map; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; @DocumentedPlugin(value = "Generates a full AsyncAPI definitions for CRUD operations from JDL models", shortCode = "jdl-to-asyncapi") public class JDLToAsyncAPIPlugin extends Plugin { diff --git a/plugins/jdl-to-asyncapi/src/main/resources/io/zenwave360/generator/plugins/AsyncAPIToJDLGenerator/JDLToAsyncAPI.yml.hbs b/plugins/jdl-to-asyncapi/src/main/resources/io/zenwave360/sdk/plugins/AsyncAPIToJDLGenerator/JDLToAsyncAPI.yml.hbs similarity index 100% rename from plugins/jdl-to-asyncapi/src/main/resources/io/zenwave360/generator/plugins/AsyncAPIToJDLGenerator/JDLToAsyncAPI.yml.hbs rename to plugins/jdl-to-asyncapi/src/main/resources/io/zenwave360/sdk/plugins/AsyncAPIToJDLGenerator/JDLToAsyncAPI.yml.hbs diff --git a/plugins/jdl-to-asyncapi/src/test/java/io/zenwave360/generator/plugins/JDLToAsyncAPIGeneratorTest.java b/plugins/jdl-to-asyncapi/src/test/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIGeneratorTest.java similarity index 90% rename from plugins/jdl-to-asyncapi/src/test/java/io/zenwave360/generator/plugins/JDLToAsyncAPIGeneratorTest.java rename to plugins/jdl-to-asyncapi/src/test/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIGeneratorTest.java index 8f9da91c..2e5ede86 100644 --- a/plugins/jdl-to-asyncapi/src/test/java/io/zenwave360/generator/plugins/JDLToAsyncAPIGeneratorTest.java +++ b/plugins/jdl-to-asyncapi/src/test/java/io/zenwave360/sdk/plugins/JDLToAsyncAPIGeneratorTest.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import java.io.File; import java.util.List; import java.util.Map; @@ -10,10 +9,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; public class JDLToAsyncAPIGeneratorTest { @@ -26,7 +25,7 @@ private Map loadJDLModelFromResource(String resource) throws Exc @Test public void test_jdl_to_asyncapi() throws Exception { - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); JDLToAsyncAPIGenerator generator = new JDLToAsyncAPIGenerator(); generator.includeCommands = true; generator.annotations = List.of("aggregate"); @@ -51,7 +50,7 @@ public void test_jdl_to_asyncapi() throws Exception { @Test public void test_jdl_to_asyncapi_with_avro() throws Exception { - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); JDLToAsyncAPIGenerator generator = new JDLToAsyncAPIGenerator(); generator.schemaFormat = JDLToAsyncAPIGenerator.SchemaFormat.avro; generator.includeCommands = true; @@ -67,7 +66,7 @@ public void test_jdl_to_asyncapi_with_avro() throws Exception { @Test public void test_jdl_to_asyncapi_state_transfer_style() throws Exception { - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); JDLToAsyncAPIGenerator generator = new JDLToAsyncAPIGenerator(); generator.includeCommands = true; generator.payloadStyle = JDLToAsyncAPIGenerator.PayloadStyle.stateTransfer; @@ -91,7 +90,7 @@ public void test_jdl_to_asyncapi_state_transfer_style() throws Exception { @Test public void test_jdl_to_asyncapi_with_avro_state_transfer_style() throws Exception { - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); JDLToAsyncAPIGenerator generator = new JDLToAsyncAPIGenerator(); generator.schemaFormat = JDLToAsyncAPIGenerator.SchemaFormat.avro; generator.includeCommands = true; diff --git a/plugins/jdl-to-openapi/README.md b/plugins/jdl-to-openapi/README.md index 3d1b90db..c8f3dd4d 100644 --- a/plugins/jdl-to-openapi/README.md +++ b/plugins/jdl-to-openapi/README.md @@ -7,7 +7,7 @@ Generate OpenAPI definition from JDL entities: - CRUD operations for entities ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLToOpenAPIPlugin \ +jbang zw -p io.zenwave360.sdkns.JDLToOpenAPIPlugin \ specFile=src/main/resources/model/orders-model.jdl \ idType=integer \ idTypeFormat=int64 \ @@ -36,7 +36,7 @@ jbang zw -p io.zenwave360.generator.plugins.JDLToOpenAPIPlugin \ ## Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.JDLToOpenAPIPlugin --help +jbang zw -p io.zenwave360.sdkns.JDLToOpenAPIPlugin --help ``` # OpenAPI To JDL @@ -58,5 +58,5 @@ Generates JDL model from OpenAPI schemas ## Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.OpenAPIToJDLPlugin --help +jbang zw -p io.zenwave360.sdkns.OpenAPIToJDLPlugin --help ``` diff --git a/plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/JDLToOpenAPIGenerator.java b/plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/JDLToOpenAPIGenerator.java similarity index 90% rename from plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/JDLToOpenAPIGenerator.java rename to plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/JDLToOpenAPIGenerator.java index 2d381074..9bc9a10c 100644 --- a/plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/JDLToOpenAPIGenerator.java +++ b/plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/JDLToOpenAPIGenerator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.ArrayList; import java.util.HashMap; @@ -11,16 +11,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractJDLGenerator; -import io.zenwave360.generator.generators.JDLEntitiesToSchemasConverter; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.OutputFormatType; -import io.zenwave360.generator.templating.TemplateEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.Maps; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractJDLGenerator; +import io.zenwave360.sdk.generators.JDLEntitiesToSchemasConverter; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.OutputFormatType; +import io.zenwave360.sdk.templating.TemplateEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.Maps; public class JDLToOpenAPIGenerator extends AbstractJDLGenerator { @@ -63,7 +63,7 @@ public JDLToOpenAPIGenerator withSourceProperty(String sourceProperty) { private HandlebarsEngine handlebarsEngine = new HandlebarsEngine(); - private final TemplateInput jdlToOpenAPITemplate = new TemplateInput("io/zenwave360/generator/plugins/OpenAPIToJDLGenerator/JDLToOpenAPI.yml", "{{targetFile}}").withMimeType(OutputFormatType.YAML); + private final TemplateInput jdlToOpenAPITemplate = new TemplateInput("io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator/JDLToOpenAPI.yml", "{{targetFile}}").withMimeType(OutputFormatType.YAML); protected Map getJDLModel(Map contextModel) { return (Map) contextModel.get(sourceProperty); diff --git a/plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/JDLToOpenAPIPlugin.java b/plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/JDLToOpenAPIPlugin.java similarity index 64% rename from plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/JDLToOpenAPIPlugin.java rename to plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/JDLToOpenAPIPlugin.java index 4ef293ec..32f3a985 100644 --- a/plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/JDLToOpenAPIPlugin.java +++ b/plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/JDLToOpenAPIPlugin.java @@ -1,11 +1,11 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; @DocumentedPlugin(value = "Generates a full OpenAPI definitions for CRUD operations from JDL models", shortCode = "jdl-to-openapi") public class JDLToOpenAPIPlugin extends Plugin { diff --git a/plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator.java b/plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator.java similarity index 91% rename from plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator.java rename to plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator.java index 15e33934..1f78dd9b 100644 --- a/plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator.java +++ b/plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import static org.apache.commons.lang3.StringUtils.capitalize; @@ -7,14 +7,14 @@ import java.util.List; import java.util.Map; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractJDLGenerator; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.OutputFormatType; -import io.zenwave360.generator.templating.TemplateEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractJDLGenerator; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.OutputFormatType; +import io.zenwave360.sdk.templating.TemplateEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; public class OpenAPIToJDLGenerator extends AbstractJDLGenerator { @@ -36,7 +36,7 @@ public OpenAPIToJDLGenerator withSourceProperty(String sourceProperty) { private HandlebarsEngine handlebarsEngine = new HandlebarsEngine(); - private final TemplateInput openAPIToJDLTemplate = new TemplateInput("io/zenwave360/generator/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl", "{{targetFile}}").withMimeType(OutputFormatType.JDL); + private final TemplateInput openAPIToJDLTemplate = new TemplateInput("io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl", "{{targetFile}}").withMimeType(OutputFormatType.JDL); protected Map getOpenAPIModel(Map contextModel) { return (Map) contextModel.get(sourceProperty); diff --git a/plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/OpenAPIToJDLPlugin.java b/plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/OpenAPIToJDLPlugin.java similarity index 62% rename from plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/OpenAPIToJDLPlugin.java rename to plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/OpenAPIToJDLPlugin.java index f66f810a..9116f568 100644 --- a/plugins/jdl-to-openapi/src/main/java/io/zenwave360/generator/plugins/OpenAPIToJDLPlugin.java +++ b/plugins/jdl-to-openapi/src/main/java/io/zenwave360/sdk/plugins/OpenAPIToJDLPlugin.java @@ -1,11 +1,11 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; @DocumentedPlugin(value = "Generates JDL model from OpenAPI schemas", shortCode = "openapi-to-jdl") public class OpenAPIToJDLPlugin extends Plugin { diff --git a/plugins/jdl-to-openapi/src/main/resources/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator/JDLToOpenAPI.yml.hbs b/plugins/jdl-to-openapi/src/main/resources/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator/JDLToOpenAPI.yml.hbs similarity index 100% rename from plugins/jdl-to-openapi/src/main/resources/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator/JDLToOpenAPI.yml.hbs rename to plugins/jdl-to-openapi/src/main/resources/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator/JDLToOpenAPI.yml.hbs diff --git a/plugins/jdl-to-openapi/src/main/resources/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs b/plugins/jdl-to-openapi/src/main/resources/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs similarity index 100% rename from plugins/jdl-to-openapi/src/main/resources/io/zenwave360/generator/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs rename to plugins/jdl-to-openapi/src/main/resources/io/zenwave360/sdk/plugins/OpenAPIToJDLGenerator/OpenAPIToJDL.jdl.hbs diff --git a/plugins/jdl-to-openapi/src/test/java/io/zenwave360/generator/plugins/JDLToOpenAPIGeneratorTest.java b/plugins/jdl-to-openapi/src/test/java/io/zenwave360/sdk/plugins/JDLToOpenAPIGeneratorTest.java similarity index 87% rename from plugins/jdl-to-openapi/src/test/java/io/zenwave360/generator/plugins/JDLToOpenAPIGeneratorTest.java rename to plugins/jdl-to-openapi/src/test/java/io/zenwave360/sdk/plugins/JDLToOpenAPIGeneratorTest.java index 5363eb74..696a5d7b 100644 --- a/plugins/jdl-to-openapi/src/test/java/io/zenwave360/generator/plugins/JDLToOpenAPIGeneratorTest.java +++ b/plugins/jdl-to-openapi/src/test/java/io/zenwave360/sdk/plugins/JDLToOpenAPIGeneratorTest.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import java.io.File; import java.util.List; import java.util.Map; @@ -10,10 +9,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.JSONPath; public class JDLToOpenAPIGeneratorTest { @@ -26,7 +25,7 @@ private Map loadJDLModelFromResource(String resource) throws Exc @Test public void test_jdl_to_openapi() throws Exception { - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); JDLToOpenAPIGenerator generator = new JDLToOpenAPIGenerator(); List outputTemplates = generator.generate(model); @@ -43,7 +42,7 @@ public void test_jdl_to_openapi() throws Exception { @Test public void test_jdl_to_openapi_integer_id() throws Exception { - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model-relational.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl"); JDLToOpenAPIGenerator generator = new JDLToOpenAPIGenerator(); generator.idType = "integer"; generator.idTypeFormat = "int64"; diff --git a/plugins/jdl-to-openapi/src/test/java/io/zenwave360/generator/plugins/OpenAPIToJDLGeneratorTest.java b/plugins/jdl-to-openapi/src/test/java/io/zenwave360/sdk/plugins/OpenAPIToJDLGeneratorTest.java similarity index 84% rename from plugins/jdl-to-openapi/src/test/java/io/zenwave360/generator/plugins/OpenAPIToJDLGeneratorTest.java rename to plugins/jdl-to-openapi/src/test/java/io/zenwave360/sdk/plugins/OpenAPIToJDLGeneratorTest.java index b7cd8461..26a62ef0 100644 --- a/plugins/jdl-to-openapi/src/test/java/io/zenwave360/generator/plugins/OpenAPIToJDLGeneratorTest.java +++ b/plugins/jdl-to-openapi/src/test/java/io/zenwave360/sdk/plugins/OpenAPIToJDLGeneratorTest.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import java.io.File; import java.net.URI; import java.util.List; import java.util.Map; @@ -11,9 +10,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; public class OpenAPIToJDLGeneratorTest { @@ -26,7 +25,7 @@ private Map loadApiModelFromResource(String resource) throws Exc @Test public void test_jdl_to_openapi_with_relationships() throws Exception { - Map model = loadApiModelFromResource("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml"); + Map model = loadApiModelFromResource("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml"); OpenAPIToJDLGenerator generator = new OpenAPIToJDLGenerator(); generator.useRelationships = true; @@ -40,7 +39,7 @@ public void test_jdl_to_openapi_with_relationships() throws Exception { @Test public void test_jdl_to_openapi_with_embedded() throws Exception { - Map model = loadApiModelFromResource("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml"); + Map model = loadApiModelFromResource("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml"); OpenAPIToJDLGenerator generator = new OpenAPIToJDLGenerator(); generator.useRelationships = false; diff --git a/plugins/openapi-pact-consumer/src/main/java/io/zenwave360/generator/plugins/PactConsumerConfiguration.java b/plugins/openapi-pact-consumer/src/main/java/io/zenwave360/generator/plugins/PactConsumerConfiguration.java index 047daf16..29622188 100644 --- a/plugins/openapi-pact-consumer/src/main/java/io/zenwave360/generator/plugins/PactConsumerConfiguration.java +++ b/plugins/openapi-pact-consumer/src/main/java/io/zenwave360/generator/plugins/PactConsumerConfiguration.java @@ -1,15 +1,15 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Configuration; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Configuration; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; /** - * jbang zw -p io.zenwave360.generator.plugins.PactConsumerConfiguration \ + * jbang zw -p io.zenwave360.sdk.plugins.PactConsumerConfiguration \ * specFile=src/main/resources/model/openapi.yml \ * targetFolder=src/test/java \ * testsPackage=io.zenwave360.example.tests.contract \ diff --git a/plugins/openapi-pact-consumer/src/main/java/io/zenwave360/generator/plugins/PactConsumerGenerator.java b/plugins/openapi-pact-consumer/src/main/java/io/zenwave360/generator/plugins/PactConsumerGenerator.java index 7cf8dcc0..478b0a5a 100644 --- a/plugins/openapi-pact-consumer/src/main/java/io/zenwave360/generator/plugins/PactConsumerGenerator.java +++ b/plugins/openapi-pact-consumer/src/main/java/io/zenwave360/generator/plugins/PactConsumerGenerator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.ArrayList; import java.util.HashMap; @@ -8,13 +8,13 @@ import org.apache.commons.lang3.StringUtils; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractOpenAPIGenerator; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.TemplateEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractOpenAPIGenerator; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.TemplateEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; public class PactConsumerGenerator extends AbstractOpenAPIGenerator { @@ -40,7 +40,7 @@ public PactConsumerGenerator withSourceProperty(String sourceProperty) { private HandlebarsEngine handlebarsEngine = new HandlebarsEngine(); - private String prefix = "io/zenwave360/generator/plugins/PactConsumerGenerator/"; + private String prefix = "io/zenwave360/sdk/plugins/PactConsumerGenerator/"; private final TemplateInput partialTemplate = new TemplateInput(prefix + "partials/Operation.java", "{{asPackageFolder testsPackage}}/{{asJavaTypeName operationId}}ConsumerContractTest.java"); private final TemplateInput operationTestTemplate = new TemplateInput(prefix + "ConsumerContractTest.java", "{{asPackageFolder testsPackage}}/{{asJavaTypeName operationId}}ConsumerContractTest.java"); diff --git a/plugins/openapi-pact-consumer/src/test/java/io/zenwave360/generator/plugins/PactConsumerGeneratorTest.java b/plugins/openapi-pact-consumer/src/test/java/io/zenwave360/generator/plugins/PactConsumerGeneratorTest.java index 7cc64d54..d8a74c98 100644 --- a/plugins/openapi-pact-consumer/src/test/java/io/zenwave360/generator/plugins/PactConsumerGeneratorTest.java +++ b/plugins/openapi-pact-consumer/src/test/java/io/zenwave360/generator/plugins/PactConsumerGeneratorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.net.URI; import java.util.List; @@ -7,9 +7,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; public class PactConsumerGeneratorTest { @@ -20,7 +20,7 @@ private Map loadApiModelFromResource(String resource) throws Exc @Test public void test_output_partial_one_operation() throws Exception { - Map model = loadApiModelFromResource("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml"); + Map model = loadApiModelFromResource("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml"); PactConsumerGenerator generator = new PactConsumerGenerator(); generator.groupBy = PactConsumerGenerator.GroupByType.partial; generator.basePackage = "io.example"; @@ -35,7 +35,7 @@ public void test_output_partial_one_operation() throws Exception { @Test public void test_output_by_operation() throws Exception { - Map model = loadApiModelFromResource("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml"); + Map model = loadApiModelFromResource("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml"); PactConsumerGenerator generator = new PactConsumerGenerator(); generator.groupBy = PactConsumerGenerator.GroupByType.operation; generator.basePackage = "io.example"; diff --git a/plugins/openapi-rest-assured/README.md b/plugins/openapi-rest-assured/README.md index 7af1e6f7..e153fc45 100644 --- a/plugins/openapi-rest-assured/README.md +++ b/plugins/openapi-rest-assured/README.md @@ -4,7 +4,7 @@ Generates REST-Assured tests based on OpenAPI specification. ```shell -jbang zw -p io.zenwave360.generator.plugins.RestAssuredPlugin \ +jbang zw -p io.zenwave360.sdkns.RestAssuredPlugin \ specFile=src/main/resources/model/openapi.yml \ targetFolder=src/test/java \ testsPackage=io.zenwave360.example.adapters.web.tests.restassured \ @@ -38,5 +38,5 @@ jbang zw -p io.zenwave360.generator.plugins.RestAssuredPlugin \ ## Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.RestAssuredPlugin --help +jbang zw -p io.zenwave360.sdkns.RestAssuredPlugin --help ``` diff --git a/plugins/openapi-rest-assured/src/main/java/io/zenwave360/generator/plugins/RestAssuredGenerator.java b/plugins/openapi-rest-assured/src/main/java/io/zenwave360/sdk/plugins/RestAssuredGenerator.java similarity index 91% rename from plugins/openapi-rest-assured/src/main/java/io/zenwave360/generator/plugins/RestAssuredGenerator.java rename to plugins/openapi-rest-assured/src/main/java/io/zenwave360/sdk/plugins/RestAssuredGenerator.java index fb5093e0..b554d954 100644 --- a/plugins/openapi-rest-assured/src/main/java/io/zenwave360/generator/plugins/RestAssuredGenerator.java +++ b/plugins/openapi-rest-assured/src/main/java/io/zenwave360/sdk/plugins/RestAssuredGenerator.java @@ -1,19 +1,19 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.*; import java.util.stream.Collectors; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.NamingUtils; import org.apache.commons.lang3.StringUtils; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractOpenAPIGenerator; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.TemplateEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractOpenAPIGenerator; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.TemplateEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; public class RestAssuredGenerator extends AbstractOpenAPIGenerator { @@ -39,7 +39,7 @@ public RestAssuredGenerator withSourceProperty(String sourceProperty) { private HandlebarsEngine handlebarsEngine = new HandlebarsEngine(); - private String prefix = "io/zenwave360/generator/plugins/RestAssuredGenerator/"; + private String prefix = "io/zenwave360/sdk/plugins/RestAssuredGenerator/"; private final TemplateInput partialTemplate = new TemplateInput(prefix + "partials/Operation.java", "{{asPackageFolder testsPackage}}/Operation.java"); private final TemplateInput testSetTemplate = new TemplateInput(prefix + "ControllersTestSet.java", "{{asPackageFolder testsPackage}}/ControllersTestSet.java"); private final TemplateInput serviceTestTemplate = new TemplateInput(prefix + "ServiceIT.java", "{{asPackageFolder testsPackage}}/{{serviceName}}{{testSuffix}}.java"); diff --git a/plugins/openapi-rest-assured/src/main/java/io/zenwave360/generator/plugins/RestAssuredPlugin.java b/plugins/openapi-rest-assured/src/main/java/io/zenwave360/sdk/plugins/RestAssuredPlugin.java similarity index 63% rename from plugins/openapi-rest-assured/src/main/java/io/zenwave360/generator/plugins/RestAssuredPlugin.java rename to plugins/openapi-rest-assured/src/main/java/io/zenwave360/sdk/plugins/RestAssuredPlugin.java index 94992b5a..1e4e1595 100644 --- a/plugins/openapi-rest-assured/src/main/java/io/zenwave360/generator/plugins/RestAssuredPlugin.java +++ b/plugins/openapi-rest-assured/src/main/java/io/zenwave360/sdk/plugins/RestAssuredPlugin.java @@ -1,12 +1,12 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.formatters.JavaFormatter; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; @DocumentedPlugin(value = "Generates REST-Assured tests based on OpenAPI specification.", shortCode = "rest-assured") public class RestAssuredPlugin extends Plugin { diff --git a/plugins/openapi-rest-assured/src/main/resources/io/zenwave360/generator/plugins/RestAssuredGenerator/ControllersTestSet.java.hbs b/plugins/openapi-rest-assured/src/main/resources/io/zenwave360/sdk/plugins/RestAssuredGenerator/ControllersTestSet.java.hbs similarity index 100% rename from plugins/openapi-rest-assured/src/main/resources/io/zenwave360/generator/plugins/RestAssuredGenerator/ControllersTestSet.java.hbs rename to plugins/openapi-rest-assured/src/main/resources/io/zenwave360/sdk/plugins/RestAssuredGenerator/ControllersTestSet.java.hbs diff --git a/plugins/openapi-rest-assured/src/main/resources/io/zenwave360/generator/plugins/RestAssuredGenerator/OperationIT.java.hbs b/plugins/openapi-rest-assured/src/main/resources/io/zenwave360/sdk/plugins/RestAssuredGenerator/OperationIT.java.hbs similarity index 100% rename from plugins/openapi-rest-assured/src/main/resources/io/zenwave360/generator/plugins/RestAssuredGenerator/OperationIT.java.hbs rename to plugins/openapi-rest-assured/src/main/resources/io/zenwave360/sdk/plugins/RestAssuredGenerator/OperationIT.java.hbs diff --git a/plugins/openapi-rest-assured/src/main/resources/io/zenwave360/generator/plugins/RestAssuredGenerator/ServiceIT.java.hbs b/plugins/openapi-rest-assured/src/main/resources/io/zenwave360/sdk/plugins/RestAssuredGenerator/ServiceIT.java.hbs similarity index 100% rename from plugins/openapi-rest-assured/src/main/resources/io/zenwave360/generator/plugins/RestAssuredGenerator/ServiceIT.java.hbs rename to plugins/openapi-rest-assured/src/main/resources/io/zenwave360/sdk/plugins/RestAssuredGenerator/ServiceIT.java.hbs diff --git a/plugins/openapi-rest-assured/src/main/resources/io/zenwave360/generator/plugins/RestAssuredGenerator/partials/Operation.java.hbs b/plugins/openapi-rest-assured/src/main/resources/io/zenwave360/sdk/plugins/RestAssuredGenerator/partials/Operation.java.hbs similarity index 100% rename from plugins/openapi-rest-assured/src/main/resources/io/zenwave360/generator/plugins/RestAssuredGenerator/partials/Operation.java.hbs rename to plugins/openapi-rest-assured/src/main/resources/io/zenwave360/sdk/plugins/RestAssuredGenerator/partials/Operation.java.hbs diff --git a/plugins/openapi-rest-assured/src/test/java/io/zenwave360/generator/plugins/RestAssuredGeneratorTest.java b/plugins/openapi-rest-assured/src/test/java/io/zenwave360/sdk/plugins/RestAssuredGeneratorTest.java similarity index 88% rename from plugins/openapi-rest-assured/src/test/java/io/zenwave360/generator/plugins/RestAssuredGeneratorTest.java rename to plugins/openapi-rest-assured/src/test/java/io/zenwave360/sdk/plugins/RestAssuredGeneratorTest.java index 785a75b1..4e10961b 100644 --- a/plugins/openapi-rest-assured/src/test/java/io/zenwave360/generator/plugins/RestAssuredGeneratorTest.java +++ b/plugins/openapi-rest-assured/src/test/java/io/zenwave360/sdk/plugins/RestAssuredGeneratorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.io.File; import java.net.URI; @@ -6,21 +6,21 @@ import java.util.List; import java.util.Map; -import io.zenwave360.generator.MainGenerator; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.testutils.MavenCompiler; -import io.zenwave360.generator.writers.TemplateWriter; +import io.zenwave360.sdk.MainGenerator; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.testutils.MavenCompiler; +import io.zenwave360.sdk.writers.TemplateWriter; import org.junit.jupiter.api.Assertions; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; public class RestAssuredGeneratorTest { - private static final String OPENAPI_RESOURCES = "../../../../zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/"; + private static final String OPENAPI_RESOURCES = "../../../../zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/"; private Map loadApiModelFromResource(String resource) throws Exception { Map model = new DefaultYamlParser().withSpecFile(URI.create(resource)).parse(); @@ -35,7 +35,7 @@ private Map loadApiModelFromResource(String resource) throws Exc }) public void test_output_partial_one_operation(String openapi, String operationId) throws Exception { Plugin plugin = new RestAssuredPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withOption("groupBy", RestAssuredGenerator.GroupByType.partial) .withOption("testsPackage", "io.example.controller.tests") .withOption("openApiApiPackage", "io.example.api") @@ -59,7 +59,7 @@ public void test_output_partial_one_operation(String openapi, String operationId public void test_output_by_one_service(String openapi, String operationId, String controllers) throws Exception { String targetFolder = "target/test_output_by_one_service_" + openapi.replaceAll("\\.", "_"); Plugin plugin = new RestAssuredPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withTargetFolder(targetFolder + "/src/test/java") .withOption("groupBy", RestAssuredGenerator.GroupByType.service) .withOption("testsPackage", "io.example.controller.tests") @@ -87,7 +87,7 @@ public void test_output_by_one_service(String openapi, String operationId, Strin public void test_output_by_service(String openapi, String controllers) throws Exception { String targetFolder = "target/test_output_by_service_" + openapi.replaceAll("\\.", "_"); Plugin plugin = new RestAssuredPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withTargetFolder(targetFolder + "/src/test/java") .withOption("groupBy", RestAssuredGenerator.GroupByType.service) .withOption("testsPackage", "io.example.controller.tests") @@ -114,7 +114,7 @@ public void test_output_by_service(String openapi, String controllers) throws Ex public void test_output_by_operation(String openapi, String controllers) throws Exception { String targetFolder = "target/test_output_by_operation_" + openapi.replaceAll("\\.", "_"); Plugin plugin = new RestAssuredPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withTargetFolder(targetFolder + "/src/test/java") .withOption("groupBy", RestAssuredGenerator.GroupByType.operation) .withOption("testsPackage", "io.example.controller.tests") diff --git a/plugins/openapi-spring-webtestclient/README.md b/plugins/openapi-spring-webtestclient/README.md index b690ed0b..7303e427 100644 --- a/plugins/openapi-spring-webtestclient/README.md +++ b/plugins/openapi-spring-webtestclient/README.md @@ -4,7 +4,7 @@ Generates test for SpringMVC or Spring WebFlux using WebTestClient based on OpenAPI specification. ```shell -jbang zw -p io.zenwave360.generator.plugins.SpringWebTestClientPlugin \ +jbang zw -p io.zenwave360.sdkns.SpringWebTestClientPlugin \ specFile=src/main/resources/model/openapi.yml \ targetFolder=src/test/java \ testsPackage=io.zenwave360.example.adapters.web.tests \ @@ -15,7 +15,7 @@ jbang zw -p io.zenwave360.generator.plugins.SpringWebTestClientPlugin \ ``` ```shell -jbang zw -p io.zenwave360.generator.plugins.SpringWebTestClientPlugin \ +jbang zw -p io.zenwave360.sdkns.SpringWebTestClientPlugin \ specFile=src/main/resources/model/openapi.yml \ targetFolder=src/test/java \ testsPackage=io.zenwave360.example.adapters.web.tests \ @@ -54,5 +54,5 @@ jbang zw -p io.zenwave360.generator.plugins.SpringWebTestClientPlugin \ ## Getting Help ```shell -jbang zw -p io.zenwave360.generator.plugins.SpringWebTestClientPlugin --help +jbang zw -p io.zenwave360.sdkns.SpringWebTestClientPlugin --help ``` diff --git a/plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/generator/plugins/SpringWebTestClientGenerator.java b/plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator.java similarity index 91% rename from plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/generator/plugins/SpringWebTestClientGenerator.java rename to plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator.java index ce1a2cc0..d7dca895 100644 --- a/plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/generator/plugins/SpringWebTestClientGenerator.java +++ b/plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator.java @@ -1,22 +1,22 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.*; import java.util.stream.Collectors; -import io.zenwave360.generator.options.WebFlavorType; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.options.WebFlavorType; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.NamingUtils; import org.apache.commons.lang3.StringUtils; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.AbstractOpenAPIGenerator; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.TemplateEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.AbstractOpenAPIGenerator; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.TemplateEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; -import static io.zenwave360.generator.templating.OutputFormatType.JAVA; +import static io.zenwave360.sdk.templating.OutputFormatType.JAVA; public class SpringWebTestClientGenerator extends AbstractOpenAPIGenerator { @@ -57,7 +57,7 @@ public SpringWebTestClientGenerator withSourceProperty(String sourceProperty) { private HandlebarsEngine handlebarsEngine = new HandlebarsEngine(); - private String prefix = "io/zenwave360/generator/plugins/SpringWebTestClientGenerator/"; + private String prefix = "io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/"; private final TemplateInput partialTemplate = new TemplateInput(prefix + "partials/Operation.java", "{{asPackageFolder testsPackage}}/Operation.java"); // private final TemplateInput testSetTemplate = new TemplateInput(prefix + "ControllersTestSet.java", "{{asPackageFolder testsPackage}}/ControllersTestSet.java").withMimeType(JAVA); diff --git a/plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/generator/plugins/SpringWebTestClientPlugin.java b/plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/sdk/plugins/SpringWebTestClientPlugin.java similarity index 71% rename from plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/generator/plugins/SpringWebTestClientPlugin.java rename to plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/sdk/plugins/SpringWebTestClientPlugin.java index 8173ac91..5bc74c8a 100644 --- a/plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/generator/plugins/SpringWebTestClientPlugin.java +++ b/plugins/openapi-spring-webtestclient/src/main/java/io/zenwave360/sdk/plugins/SpringWebTestClientPlugin.java @@ -1,16 +1,15 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.formatters.JavaFormatter; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static io.zenwave360.generator.plugins.SpringWebTestClientGenerator.GroupByType.businessFlow; +import static io.zenwave360.sdk.plugins.SpringWebTestClientGenerator.GroupByType.businessFlow; @DocumentedPlugin(value = "Generates test for SpringMVC or Spring WebFlux using WebTestClient based on OpenAPI specification.", shortCode = "spring-webtestclient") public class SpringWebTestClientPlugin extends Plugin { diff --git a/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/BaseWebTestClientTest.java.hbs b/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/BaseWebTestClientTest.java.hbs similarity index 100% rename from plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/BaseWebTestClientTest.java.hbs rename to plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/BaseWebTestClientTest.java.hbs diff --git a/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/BusinessFlowTest.java.hbs b/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/BusinessFlowTest.java.hbs similarity index 100% rename from plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/BusinessFlowTest.java.hbs rename to plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/BusinessFlowTest.java.hbs diff --git a/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/ControllersTestSet.java.hbs b/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/ControllersTestSet.java.hbs similarity index 100% rename from plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/ControllersTestSet.java.hbs rename to plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/ControllersTestSet.java.hbs diff --git a/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/OperationIT.java.hbs b/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/OperationIT.java.hbs similarity index 100% rename from plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/OperationIT.java.hbs rename to plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/OperationIT.java.hbs diff --git a/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/ServiceIT.java.hbs b/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/ServiceIT.java.hbs similarity index 100% rename from plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/ServiceIT.java.hbs rename to plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/ServiceIT.java.hbs diff --git a/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/partials/Operation.java.hbs b/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/partials/Operation.java.hbs similarity index 100% rename from plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/partials/Operation.java.hbs rename to plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/partials/Operation.java.hbs diff --git a/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/partials/requestSetup.hbs b/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/partials/requestSetup.hbs similarity index 100% rename from plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/partials/requestSetup.hbs rename to plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/partials/requestSetup.hbs diff --git a/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/partials/uriBuilder.hbs b/plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/partials/uriBuilder.hbs similarity index 100% rename from plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/generator/plugins/SpringWebTestClientGenerator/partials/uriBuilder.hbs rename to plugins/openapi-spring-webtestclient/src/main/resources/io/zenwave360/sdk/plugins/SpringWebTestClientGenerator/partials/uriBuilder.hbs diff --git a/plugins/openapi-spring-webtestclient/src/test/java/io/zenwave360/generator/plugins/SpringWebTestClientGeneratorTest.java b/plugins/openapi-spring-webtestclient/src/test/java/io/zenwave360/sdk/plugins/SpringWebTestClientGeneratorTest.java similarity index 88% rename from plugins/openapi-spring-webtestclient/src/test/java/io/zenwave360/generator/plugins/SpringWebTestClientGeneratorTest.java rename to plugins/openapi-spring-webtestclient/src/test/java/io/zenwave360/sdk/plugins/SpringWebTestClientGeneratorTest.java index 3e17b887..e7043259 100644 --- a/plugins/openapi-spring-webtestclient/src/test/java/io/zenwave360/generator/plugins/SpringWebTestClientGeneratorTest.java +++ b/plugins/openapi-spring-webtestclient/src/test/java/io/zenwave360/sdk/plugins/SpringWebTestClientGeneratorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.io.File; import java.net.URI; @@ -6,25 +6,25 @@ import java.util.List; import java.util.Map; -import io.zenwave360.generator.MainGenerator; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.testutils.MavenCompiler; -import io.zenwave360.generator.writers.TemplateFileWriter; -import io.zenwave360.generator.writers.TemplateStdoutWriter; -import io.zenwave360.generator.writers.TemplateWriter; +import io.zenwave360.sdk.MainGenerator; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.testutils.MavenCompiler; +import io.zenwave360.sdk.writers.TemplateFileWriter; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.writers.TemplateWriter; import org.junit.jupiter.api.Assertions; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import static io.zenwave360.generator.utils.NamingUtils.camelCase; +import static io.zenwave360.sdk.utils.NamingUtils.camelCase; public class SpringWebTestClientGeneratorTest { - private static final String OPENAPI_RESOURCES = "../../../../zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/"; + private static final String OPENAPI_RESOURCES = "../../../../zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/"; private Map loadApiModelFromResource(String resource) throws Exception { Map model = new DefaultYamlParser().withSpecFile(URI.create(resource)).parse(); @@ -39,7 +39,7 @@ private Map loadApiModelFromResource(String resource) throws Exc }) public void test_output_partial_one_operation(String openapi, String operationId) throws Exception { Plugin plugin = new SpringWebTestClientPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withOption("groupBy", SpringWebTestClientGenerator.GroupByType.partial) .withOption("transactional", false) .withOption("testsPackage", "io.example.controller.tests") @@ -64,7 +64,7 @@ public void test_output_partial_one_operation(String openapi, String operationId public void test_output_business_flow(String openapi, String operationIds) throws Exception { String targetFolder = "target/test_output_business_flow_" + openapi.replaceAll("\\.", "_"); Plugin plugin = new SpringWebTestClientPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withTargetFolder(targetFolder + "/src/test/java") .withOption("groupBy", SpringWebTestClientGenerator.GroupByType.businessFlow) .withOption("businessFlowTestName", camelCase(operationIds.replaceAll(",", "_"))) @@ -97,7 +97,7 @@ public void test_output_business_flow(String openapi, String operationIds) throw public void test_output_by_one_service(String openapi, String operationId, String controllers) throws Exception { String targetFolder = "target/test_output_by_one_service_" + openapi.replaceAll("\\.", "_"); Plugin plugin = new SpringWebTestClientPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withTargetFolder(targetFolder + "/src/test/java") .withOption("groupBy", SpringWebTestClientGenerator.GroupByType.service) .withOption("transactional", false) @@ -126,7 +126,7 @@ public void test_output_by_one_service(String openapi, String operationId, Strin public void test_output_by_service(String openapi, String controllers) throws Exception { String targetFolder = "target/test_output_by_service_" + openapi.replaceAll("\\.", "_"); Plugin plugin = new SpringWebTestClientPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withTargetFolder(targetFolder + "/src/test/java") .withOption("groupBy", SpringWebTestClientGenerator.GroupByType.service) .withOption("transactional", false) @@ -154,7 +154,7 @@ public void test_output_by_service(String openapi, String controllers) throws Ex public void test_output_by_operation(String openapi, String controllers) throws Exception { String targetFolder = "target/test_output_by_operation_" + openapi.replaceAll("\\.", "_"); Plugin plugin = new SpringWebTestClientPlugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/openapi/" + openapi) + .withSpecFile("classpath:io/zenwave360/sdk/resources/openapi/" + openapi) .withTargetFolder(targetFolder + "/src/test/java") .withOption("groupBy", SpringWebTestClientGenerator.GroupByType.operation) .withOption("transactional", false) diff --git a/plugins/pom.xml b/plugins/pom.xml index 4ad74246..b69d6b55 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -32,7 +32,7 @@ - io.zenwave360.generator.doc.PluginAnnotationProcessor + io.zenwave360.sdk.doc.PluginAnnotationProcessor true diff --git a/zenwave-sdk-cli/pom.xml b/zenwave-sdk-cli/pom.xml index 2191ae4e..3ad8dbe1 100644 --- a/zenwave-sdk-cli/pom.xml +++ b/zenwave-sdk-cli/pom.xml @@ -86,7 +86,7 @@ - io.zenwave360.generator.Main + io.zenwave360.sdk.Main diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Help.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Help.java similarity index 91% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Help.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Help.java index 58bbaaac..698b022c 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Help.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Help.java @@ -1,6 +1,6 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; -import static io.zenwave360.generator.MainGenerator.applyConfiguration; +import static io.zenwave360.sdk.MainGenerator.applyConfiguration; import static java.lang.reflect.Modifier.isPublic; import static java.lang.reflect.Modifier.isStatic; @@ -18,12 +18,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.generators.Generator; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.utils.Maps; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.generators.Generator; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.utils.Maps; public class Help { @@ -126,7 +126,7 @@ public String help(Plugin plugin, Format format) { throw new RuntimeException(e); } } - String template = "io/zenwave360/generator/help/" + format.toString(); + String template = "io/zenwave360/sdk/help/" + format.toString(); return handlebarsEngine.processTemplate(model, new TemplateInput().withTemplateLocation(template).withTargetFile("")).get(0).getContent(); } diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Main.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Main.java similarity index 98% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Main.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Main.java index 97d2e9dd..e8bc6365 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Main.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Main.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; import java.util.HashMap; import java.util.Map; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/MainGenerator.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/MainGenerator.java similarity index 82% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/MainGenerator.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/MainGenerator.java index 94abd822..e6fb7018 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/MainGenerator.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/MainGenerator.java @@ -1,26 +1,22 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler; -import io.zenwave360.generator.utils.CommaSeparatedCollectionDeserializationHandler; +import io.zenwave360.sdk.utils.CommaSeparatedCollectionDeserializationHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.zenwave360.generator.formatters.Formatter; -import io.zenwave360.generator.generators.Generator; -import io.zenwave360.generator.parsers.Parser; -import io.zenwave360.generator.processors.Processor; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.writers.TemplateWriter; +import io.zenwave360.sdk.formatters.Formatter; +import io.zenwave360.sdk.generators.Generator; +import io.zenwave360.sdk.parsers.Parser; +import io.zenwave360.sdk.processors.Processor; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.writers.TemplateWriter; public class MainGenerator { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Plugin.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Plugin.java similarity index 96% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Plugin.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Plugin.java index ae7bbe5a..db6ee559 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/Plugin.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/Plugin.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; import java.util.ArrayList; import java.util.Arrays; @@ -11,9 +11,9 @@ import org.apache.commons.lang3.reflect.FieldUtils; import org.reflections.Reflections; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.utils.NamingUtils; public class Plugin { @@ -34,7 +34,7 @@ public static Plugin of(String pluginConfigAsString) throws Exception { return (Plugin) Plugin.class.getClassLoader().loadClass(pluginConfigAsString).getDeclaredConstructor().newInstance(); } String simpleClassName = NamingUtils.asJavaTypeName(pluginConfigAsString); - var allConfigClasses = new Reflections("io.zenwave360.generator.plugins").getSubTypesOf(Plugin.class); + var allConfigClasses = new Reflections("io.zenwave360.sdk.plugins").getSubTypesOf(Plugin.class); Optional> pluginClass = allConfigClasses.stream().filter(c -> matchesClassName(c, pluginConfigAsString, simpleClassName)).findFirst(); if (pluginClass.isPresent()) { return pluginClass.get().getDeclaredConstructor().newInstance(); diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/DocumentedOption.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/DocumentedOption.java similarity index 75% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/DocumentedOption.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/DocumentedOption.java index a87fadfb..84b78c9f 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/DocumentedOption.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/DocumentedOption.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.doc; +package io.zenwave360.sdk.doc; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** - * Documents {@link io.zenwave360.generator.generators.Generator} options, used for building help and documentation messages. + * Documents {@link io.zenwave360.sdk.generators.Generator} options, used for building help and documentation messages. */ @Documented @Target({FIELD, METHOD}) diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/DocumentedPlugin.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/DocumentedPlugin.java similarity index 72% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/DocumentedPlugin.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/DocumentedPlugin.java index 4cb42a4b..b949a0ac 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/DocumentedPlugin.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/DocumentedPlugin.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.doc; +package io.zenwave360.sdk.doc; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** - * Documents {@link io.zenwave360.generator.generators.Generator} options, used for building help and documentation messages. + * Documents {@link io.zenwave360.sdk.generators.Generator} options, used for building help and documentation messages. */ @Documented @Target({TYPE}) diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/PluginAnnotationProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/PluginAnnotationProcessor.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/PluginAnnotationProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/PluginAnnotationProcessor.java index 81dc6871..37649f9a 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/doc/PluginAnnotationProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/doc/PluginAnnotationProcessor.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.doc; +package io.zenwave360.sdk.doc; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -18,7 +18,7 @@ import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.reflect.MethodUtils; -@SupportedAnnotationTypes({"io.zenwave360.generator.doc.DocumentedPlugin"}) +@SupportedAnnotationTypes({"io.zenwave360.sdk.doc.DocumentedPlugin"}) public final class PluginAnnotationProcessor extends AbstractProcessor { private Elements elementUtils; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/formatters/Formatter.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/Formatter.java similarity index 56% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/formatters/Formatter.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/Formatter.java index 833c6dc4..bb517e9b 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/formatters/Formatter.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/Formatter.java @@ -1,8 +1,8 @@ -package io.zenwave360.generator.formatters; +package io.zenwave360.sdk.formatters; import java.util.List; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.templating.TemplateOutput; public interface Formatter { List format(List templateOutputList); diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/formatters/JavaFormatter.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/JavaFormatter.java similarity index 91% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/formatters/JavaFormatter.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/JavaFormatter.java index 03581f54..11413dc6 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/formatters/JavaFormatter.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/formatters/JavaFormatter.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.formatters; +package io.zenwave360.sdk.formatters; import java.util.List; import java.util.stream.Collectors; @@ -9,9 +9,9 @@ import com.google.googlejavaformat.java.FormatterException; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.templating.OutputFormatType; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.templating.OutputFormatType; +import io.zenwave360.sdk.templating.TemplateOutput; public class JavaFormatter implements Formatter { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractAsyncapiGenerator.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractAsyncapiGenerator.java similarity index 94% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractAsyncapiGenerator.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractAsyncapiGenerator.java index 0ab3da66..2bc8c417 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractAsyncapiGenerator.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractAsyncapiGenerator.java @@ -1,16 +1,14 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; import java.util.*; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.utils.JSONPath; import org.apache.commons.lang3.ObjectUtils; -import com.jayway.jsonpath.JsonPath; - -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.options.asyncapi.AsyncapiOperationType; -import io.zenwave360.generator.options.asyncapi.AsyncapiRoleType; -import io.zenwave360.generator.parsers.Model; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.options.asyncapi.AsyncapiOperationType; +import io.zenwave360.sdk.options.asyncapi.AsyncapiRoleType; +import io.zenwave360.sdk.parsers.Model; public abstract class AbstractAsyncapiGenerator implements Generator { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractJDLGenerator.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractJDLGenerator.java similarity index 66% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractJDLGenerator.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractJDLGenerator.java index 578022fb..5ac2d76d 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractJDLGenerator.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractJDLGenerator.java @@ -1,6 +1,6 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; -import io.zenwave360.generator.doc.DocumentedOption; +import io.zenwave360.sdk.doc.DocumentedOption; public abstract class AbstractJDLGenerator implements Generator { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractOpenAPIGenerator.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractOpenAPIGenerator.java similarity index 96% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractOpenAPIGenerator.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractOpenAPIGenerator.java index 7aefdd3f..1a3dd9cc 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/AbstractOpenAPIGenerator.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/AbstractOpenAPIGenerator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; import java.util.ArrayList; import java.util.Arrays; @@ -10,8 +10,8 @@ import com.jayway.jsonpath.JsonPath; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.parsers.Model; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.parsers.Model; public abstract class AbstractOpenAPIGenerator implements Generator { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/Generator.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/Generator.java similarity index 87% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/Generator.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/Generator.java index b42649cb..c0c90c76 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/Generator.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/Generator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; import static java.lang.reflect.Modifier.isStatic; import static org.apache.commons.lang3.reflect.FieldUtils.getAllFields; @@ -9,9 +9,9 @@ import java.util.List; import java.util.Map; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.TemplateEngine; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.TemplateEngine; +import io.zenwave360.sdk.templating.TemplateOutput; public interface Generator { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/JDLEntitiesToAvroConverter.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/JDLEntitiesToAvroConverter.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/JDLEntitiesToAvroConverter.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/JDLEntitiesToAvroConverter.java index d285b931..e775cc60 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/JDLEntitiesToAvroConverter.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/JDLEntitiesToAvroConverter.java @@ -1,10 +1,10 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; import java.util.*; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.Lists; -import io.zenwave360.generator.utils.Maps; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.Lists; +import io.zenwave360.sdk.utils.Maps; public class JDLEntitiesToAvroConverter { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/JDLEntitiesToSchemasConverter.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/JDLEntitiesToSchemasConverter.java similarity index 98% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/JDLEntitiesToSchemasConverter.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/JDLEntitiesToSchemasConverter.java index 8419eaf9..0e907e01 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/generators/JDLEntitiesToSchemasConverter.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/JDLEntitiesToSchemasConverter.java @@ -1,10 +1,10 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; import java.util.*; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.Lists; -import io.zenwave360.generator.utils.Maps; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.Lists; +import io.zenwave360.sdk.utils.Maps; public class JDLEntitiesToSchemasConverter { private static final List blobTypes = List.of("Blob", "AnyBlob", "ImageBlob"); diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/CONVENTIONS.txt b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/CONVENTIONS.txt similarity index 100% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/CONVENTIONS.txt rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/CONVENTIONS.txt diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/DatabaseType.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/DatabaseType.java similarity index 59% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/DatabaseType.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/DatabaseType.java index 9f410a73..7fe46ec2 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/DatabaseType.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/DatabaseType.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.options; +package io.zenwave360.sdk.options; public enum DatabaseType { postgresql, diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/PersistenceType.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/PersistenceType.java similarity index 55% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/PersistenceType.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/PersistenceType.java index eada7f55..cb974259 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/PersistenceType.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/PersistenceType.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.options; +package io.zenwave360.sdk.options; public enum PersistenceType { mongodb, jpa; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/ProgrammingStyle.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/ProgrammingStyle.java similarity index 59% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/ProgrammingStyle.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/ProgrammingStyle.java index b5c27d10..10f59805 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/ProgrammingStyle.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/ProgrammingStyle.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.options; +package io.zenwave360.sdk.options; public enum ProgrammingStyle { imperative, reactive; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/WebFlavorType.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/WebFlavorType.java similarity index 54% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/WebFlavorType.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/WebFlavorType.java index 40551e70..eda2b6f3 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/WebFlavorType.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/WebFlavorType.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.options; +package io.zenwave360.sdk.options; public enum WebFlavorType { mvc, webflux; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/asyncapi/AsyncapiOperationType.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/asyncapi/AsyncapiOperationType.java similarity index 55% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/asyncapi/AsyncapiOperationType.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/asyncapi/AsyncapiOperationType.java index 5dc18f80..d4d73904 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/asyncapi/AsyncapiOperationType.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/asyncapi/AsyncapiOperationType.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.options.asyncapi; +package io.zenwave360.sdk.options.asyncapi; public enum AsyncapiOperationType { publish, subscribe diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/asyncapi/AsyncapiRoleType.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/asyncapi/AsyncapiRoleType.java similarity index 52% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/asyncapi/AsyncapiRoleType.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/asyncapi/AsyncapiRoleType.java index e06d9c08..1c6a4748 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/options/asyncapi/AsyncapiRoleType.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/options/asyncapi/AsyncapiRoleType.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.options.asyncapi; +package io.zenwave360.sdk.options.asyncapi; public enum AsyncapiRoleType { provider, client diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/DefaultYamlParser.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/DefaultYamlParser.java similarity index 90% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/DefaultYamlParser.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/DefaultYamlParser.java index f4449274..4aa013cc 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/DefaultYamlParser.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/DefaultYamlParser.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.parsers; +package io.zenwave360.sdk.parsers; import static io.zenwave360.jsonrefparser.$RefParserOptions.OnCircular.SKIP; @@ -8,12 +8,12 @@ import java.util.LinkedHashMap; import java.util.Map; -import io.zenwave360.generator.doc.DocumentedOption; +import io.zenwave360.sdk.doc.DocumentedOption; import io.zenwave360.jsonrefparser.$RefParser; import io.zenwave360.jsonrefparser.$RefParserOptions; import io.zenwave360.jsonrefparser.$RefParserOptions.OnMissing; -public class DefaultYamlParser implements io.zenwave360.generator.parsers.Parser { +public class DefaultYamlParser implements io.zenwave360.sdk.parsers.Parser { @DocumentedOption(description = "API Specification File") public URI specFile; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/GraphQLParser.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/GraphQLParser.java similarity index 87% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/GraphQLParser.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/GraphQLParser.java index 20b5151d..deb0f63d 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/GraphQLParser.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/GraphQLParser.java @@ -1,16 +1,12 @@ -package io.zenwave360.generator.parsers; +package io.zenwave360.sdk.parsers; import java.io.IOException; import java.net.URI; -import java.util.List; import java.util.Map; -import java.util.Optional; -import graphql.language.*; import graphql.schema.idl.SchemaParser; -import graphql.schema.idl.TypeDefinitionRegistry; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.utils.Maps; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.utils.Maps; public class GraphQLParser implements Parser { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/JDLParser.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/JDLParser.java similarity index 89% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/JDLParser.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/JDLParser.java index 04c8db0c..3cd7f940 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/JDLParser.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/JDLParser.java @@ -1,16 +1,13 @@ -package io.zenwave360.generator.parsers; +package io.zenwave360.sdk.parsers; import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; -import io.zenwave360.generator.doc.DocumentedOption; +import io.zenwave360.sdk.doc.DocumentedOption; public class JDLParser implements Parser { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/Model.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/Model.java similarity index 90% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/Model.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/Model.java index c051c01e..816e0375 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/Model.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/Model.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.parsers; +package io.zenwave360.sdk.parsers; -import java.io.File; import java.net.URI; import java.util.AbstractMap; import java.util.Map; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/Parser.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/Parser.java similarity index 95% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/Parser.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/Parser.java index cf2dd4b7..88955696 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/parsers/Parser.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/parsers/Parser.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.parsers; +package io.zenwave360.sdk.parsers; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/plugins/ForkPlugin.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/plugins/ForkPlugin.java similarity index 67% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/plugins/ForkPlugin.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/plugins/ForkPlugin.java index 5e1b7355..080a58ea 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/plugins/ForkPlugin.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/plugins/ForkPlugin.java @@ -1,7 +1,7 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedPlugin; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedPlugin; @DocumentedPlugin(value = "Creates a new standalone maven module cloning an existing plugin", shortCode = "fork-plugin", description = "${javadoc}") public class ForkPlugin extends Plugin { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/plugins/ForkPluginGenerator.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/plugins/ForkPluginGenerator.java similarity index 98% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/plugins/ForkPluginGenerator.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/plugins/ForkPluginGenerator.java index 8ce36d79..a6110bfe 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/plugins/ForkPluginGenerator.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/plugins/ForkPluginGenerator.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.io.File; import java.io.FileInputStream; @@ -25,10 +25,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.Generator; -import io.zenwave360.generator.templating.TemplateOutput; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.Generator; +import io.zenwave360.sdk.templating.TemplateOutput; +import io.zenwave360.sdk.utils.NamingUtils; public class ForkPluginGenerator implements Generator { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/AbstractBaseProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/AbstractBaseProcessor.java similarity index 92% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/AbstractBaseProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/AbstractBaseProcessor.java index f3c11968..69a3b355 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/AbstractBaseProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/AbstractBaseProcessor.java @@ -1,9 +1,9 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.util.List; import java.util.Map; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.utils.NamingUtils; public abstract class AbstractBaseProcessor implements Processor { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/AsyncApiProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/AsyncApiProcessor.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/AsyncApiProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/AsyncApiProcessor.java index cd05ae8f..5af4d96f 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/AsyncApiProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/AsyncApiProcessor.java @@ -1,13 +1,13 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.util.*; import com.jayway.jsonpath.JsonPath; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.Maps; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.Maps; public class AsyncApiProcessor extends AbstractBaseProcessor implements Processor { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichAsyncAPIWithJDLProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichAsyncAPIWithJDLProcessor.java similarity index 88% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichAsyncAPIWithJDLProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichAsyncAPIWithJDLProcessor.java index fda8ebc6..f90faec7 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichAsyncAPIWithJDLProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichAsyncAPIWithJDLProcessor.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.util.Map; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichOpenAPIWithJDLProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichOpenAPIWithJDLProcessor.java similarity index 95% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichOpenAPIWithJDLProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichOpenAPIWithJDLProcessor.java index 5be06d5a..82ce2336 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichOpenAPIWithJDLProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichOpenAPIWithJDLProcessor.java @@ -1,7 +1,7 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.utils.JSONPath; import java.util.List; import java.util.Map; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichSchemaWithJDLProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichSchemaWithJDLProcessor.java similarity index 96% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichSchemaWithJDLProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichSchemaWithJDLProcessor.java index 2fc575de..f7619b07 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/EnrichSchemaWithJDLProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/EnrichSchemaWithJDLProcessor.java @@ -1,11 +1,11 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.util.*; import org.apache.commons.lang3.StringUtils; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.utils.JSONPath; /** * diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/JDLDummyDataFromSchemasProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/JDLDummyDataFromSchemasProcessor.java similarity index 94% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/JDLDummyDataFromSchemasProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/JDLDummyDataFromSchemasProcessor.java index bd2bafc3..6cc2d532 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/JDLDummyDataFromSchemasProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/JDLDummyDataFromSchemasProcessor.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.util.ArrayList; import java.util.HashMap; @@ -7,10 +7,10 @@ import org.apache.commons.lang3.ObjectUtils; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.Maps; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.Maps; +import io.zenwave360.sdk.utils.NamingUtils; public class JDLDummyDataFromSchemasProcessor extends AbstractBaseProcessor { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/JDLProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/JDLProcessor.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/JDLProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/JDLProcessor.java index b55e7e1b..0424c513 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/JDLProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/JDLProcessor.java @@ -1,13 +1,13 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import io.zenwave360.generator.utils.JSONPath; -import io.zenwave360.generator.utils.Maps; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.utils.JSONPath; +import io.zenwave360.sdk.utils.Maps; +import io.zenwave360.sdk.utils.NamingUtils; import org.apache.commons.lang3.StringUtils; public class JDLProcessor extends AbstractBaseProcessor { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/OpenApiProcessor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/OpenApiProcessor.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/OpenApiProcessor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/OpenApiProcessor.java index e756fe88..9ff7d1b5 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/OpenApiProcessor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/OpenApiProcessor.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.util.ArrayList; import java.util.Collections; @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.utils.JSONPath; import io.zenwave360.jsonrefparser.$Ref; public class OpenApiProcessor extends AbstractBaseProcessor implements Processor { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/Processor.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/Processor.java similarity index 73% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/Processor.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/Processor.java index e46c26bd..cc76dd4e 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/processors/Processor.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/processors/Processor.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.util.Map; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/CustomHandlebarsHelpers.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/CustomHandlebarsHelpers.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/CustomHandlebarsHelpers.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/CustomHandlebarsHelpers.java index 6570ed9a..8b8d2677 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/CustomHandlebarsHelpers.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/CustomHandlebarsHelpers.java @@ -1,16 +1,16 @@ -package io.zenwave360.generator.templating; +package io.zenwave360.sdk.templating; import java.io.IOException; import java.util.*; import java.util.stream.Collectors; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.utils.JSONPath; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import com.github.jknack.handlebars.Options; -import io.zenwave360.generator.utils.NamingUtils; +import io.zenwave360.sdk.utils.NamingUtils; public class CustomHandlebarsHelpers { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/HandlebarsEngine.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/HandlebarsEngine.java similarity index 98% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/HandlebarsEngine.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/HandlebarsEngine.java index 65e7c924..3704ec3f 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/HandlebarsEngine.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/HandlebarsEngine.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.templating; +package io.zenwave360.sdk.templating; import java.io.IOException; import java.util.ArrayList; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/OutputFormatType.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/OutputFormatType.java similarity index 58% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/OutputFormatType.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/OutputFormatType.java index 8a53fcdc..a3f045f7 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/OutputFormatType.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/OutputFormatType.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.templating; +package io.zenwave360.sdk.templating; public enum OutputFormatType { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateEngine.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateEngine.java similarity index 92% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateEngine.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateEngine.java index 670365a7..6951b46b 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateEngine.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateEngine.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.templating; +package io.zenwave360.sdk.templating; import java.io.IOException; import java.util.List; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateInput.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateInput.java similarity index 98% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateInput.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateInput.java index 736b5c96..7d06edd0 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateInput.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateInput.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.templating; +package io.zenwave360.sdk.templating; import java.util.Map; import java.util.function.Function; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateOutput.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateOutput.java similarity index 95% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateOutput.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateOutput.java index 9786c069..1fe5f219 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/templating/TemplateOutput.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/TemplateOutput.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.templating; +package io.zenwave360.sdk.templating; public class TemplateOutput { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/CommaSeparatedCollectionDeserializationHandler.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/CommaSeparatedCollectionDeserializationHandler.java similarity index 98% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/CommaSeparatedCollectionDeserializationHandler.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/CommaSeparatedCollectionDeserializationHandler.java index 43ff3010..3a4228ea 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/CommaSeparatedCollectionDeserializationHandler.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/CommaSeparatedCollectionDeserializationHandler.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.utils; +package io.zenwave360.sdk.utils; import java.io.IOException; import java.lang.reflect.Array; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/DataFaker.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/DataFaker.java similarity index 82% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/DataFaker.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/DataFaker.java index 6427a5cb..8dc3d490 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/DataFaker.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/DataFaker.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.utils; +package io.zenwave360.sdk.utils; public class DataFaker { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/JSONPath.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/JSONPath.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/JSONPath.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/JSONPath.java index 70ade1b3..e72e712f 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/JSONPath.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/JSONPath.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.utils; +package io.zenwave360.sdk.utils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/Lists.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/Lists.java similarity index 90% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/Lists.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/Lists.java index 74ccf876..c1d9382e 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/Lists.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/Lists.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.utils; +package io.zenwave360.sdk.utils; import java.util.ArrayList; import java.util.Collection; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/Maps.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/Maps.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/Maps.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/Maps.java index 5118912d..7780d9c6 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/Maps.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/Maps.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.utils; +package io.zenwave360.sdk.utils; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/NamingUtils.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/NamingUtils.java similarity index 97% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/NamingUtils.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/NamingUtils.java index 5df20060..fdc8c086 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/utils/NamingUtils.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/utils/NamingUtils.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.utils; +package io.zenwave360.sdk.utils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.StringUtils; diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateFileWriter.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateFileWriter.java similarity index 92% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateFileWriter.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateFileWriter.java index c6bb8496..ce946c25 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateFileWriter.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateFileWriter.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.writers; +package io.zenwave360.sdk.writers; import java.io.File; import java.io.IOException; @@ -11,8 +11,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.templating.TemplateOutput; public class TemplateFileWriter implements TemplateWriter { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateStdoutWriter.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateStdoutWriter.java similarity index 88% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateStdoutWriter.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateStdoutWriter.java index f037799a..d854e666 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateStdoutWriter.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateStdoutWriter.java @@ -1,11 +1,11 @@ -package io.zenwave360.generator.writers; +package io.zenwave360.sdk.writers; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.templating.TemplateOutput; public class TemplateStdoutWriter implements TemplateWriter { diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateWriter.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateWriter.java similarity index 56% rename from zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateWriter.java rename to zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateWriter.java index d372b83a..32e4d4af 100644 --- a/zenwave-sdk-cli/src/main/java/io/zenwave360/generator/writers/TemplateWriter.java +++ b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/writers/TemplateWriter.java @@ -1,8 +1,8 @@ -package io.zenwave360.generator.writers; +package io.zenwave360.sdk.writers; import java.util.List; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.templating.TemplateOutput; public interface TemplateWriter { diff --git a/zenwave-sdk-cli/src/main/resources/io/zenwave360/generator/help/detailed.hbs b/zenwave-sdk-cli/src/main/resources/io/zenwave360/sdk/help/detailed.hbs similarity index 100% rename from zenwave-sdk-cli/src/main/resources/io/zenwave360/generator/help/detailed.hbs rename to zenwave-sdk-cli/src/main/resources/io/zenwave360/sdk/help/detailed.hbs diff --git a/zenwave-sdk-cli/src/main/resources/io/zenwave360/generator/help/help.hbs b/zenwave-sdk-cli/src/main/resources/io/zenwave360/sdk/help/help.hbs similarity index 100% rename from zenwave-sdk-cli/src/main/resources/io/zenwave360/generator/help/help.hbs rename to zenwave-sdk-cli/src/main/resources/io/zenwave360/sdk/help/help.hbs diff --git a/zenwave-sdk-cli/src/main/resources/io/zenwave360/generator/help/list.hbs b/zenwave-sdk-cli/src/main/resources/io/zenwave360/sdk/help/list.hbs similarity index 100% rename from zenwave-sdk-cli/src/main/resources/io/zenwave360/generator/help/list.hbs rename to zenwave-sdk-cli/src/main/resources/io/zenwave360/sdk/help/list.hbs diff --git a/zenwave-sdk-cli/src/main/resources/io/zenwave360/generator/help/markdown.hbs b/zenwave-sdk-cli/src/main/resources/io/zenwave360/sdk/help/markdown.hbs similarity index 100% rename from zenwave-sdk-cli/src/main/resources/io/zenwave360/generator/help/markdown.hbs rename to zenwave-sdk-cli/src/main/resources/io/zenwave360/sdk/help/markdown.hbs diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/HelpTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/HelpTest.java similarity index 76% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/HelpTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/HelpTest.java index 5a55e910..3af7079c 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/HelpTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/HelpTest.java @@ -1,8 +1,8 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.plugins.NoOpPluginConfiguration; +import io.zenwave360.sdk.plugins.NoOpPluginConfiguration; public class HelpTest { diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/MainGeneratorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/MainGeneratorTest.java similarity index 72% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/MainGeneratorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/MainGeneratorTest.java index 57b59754..111ba660 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/MainGeneratorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/MainGeneratorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; import java.util.Map; @@ -7,12 +7,12 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.plugins.NoOpGenerator; -import io.zenwave360.generator.processors.AsyncApiProcessor; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.plugins.NoOpGenerator; +import io.zenwave360.sdk.processors.AsyncApiProcessor; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; import nl.altindag.log.LogCaptor; public class MainGeneratorTest { @@ -36,9 +36,9 @@ public static void tearDown() { @Test public void testGenerator() throws Exception { - // File file = new File(getClass().getClassLoader().getResource("io/zenwave360/generator/parsers/asyncapi-circular-refs.yml").toURI()); + // File file = new File(getClass().getClassLoader().getResource("io/zenwave360/sdk/parsers/asyncapi-circular-refs.yml").toURI()); Plugin plugin = new Plugin() - .withSpecFile("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml") + .withSpecFile("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml") .withTargetFolder("target/zenwave630/out") .withChain(DefaultYamlParser.class, AsyncApiProcessor.class, NoOpGenerator.class, TemplateFileWriter.class); @@ -49,12 +49,12 @@ public void testGenerator() throws Exception { @Test public void testGeneratorWithMultipleFiles() throws Exception { - // File file = new File(getClass().getClassLoader().getResource("io/zenwave360/generator/parsers/asyncapi-circular-refs.yml").toURI()); + // File file = new File(getClass().getClassLoader().getResource("io/zenwave360/sdk/parsers/asyncapi-circular-refs.yml").toURI()); Plugin plugin = new Plugin() .withTargetFolder("target/zenwave630/out") - .withOption("0.specFile", "classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml") - .withOption("1.specFile", "classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml") - .withOption("2.specFile", "classpath:io/zenwave360/generator/resources/jdl/21-points.jh") + .withOption("0.specFile", "classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml") + .withOption("1.specFile", "classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml") + .withOption("2.specFile", "classpath:io/zenwave360/sdk/resources/jdl/21-points.jh") .withOption("0.targetProperty", "asyncapi") .withOption("1.targetProperty", "openapi") .withOption("2.targetProperty", "jdl") diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/MainTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/MainTest.java similarity index 75% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/MainTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/MainTest.java index 5c7c448d..ddf18de9 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/MainTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/MainTest.java @@ -1,17 +1,16 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; import java.util.List; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.plugins.NoOpGenerator; -import io.zenwave360.generator.processors.AsyncApiProcessor; -import io.zenwave360.generator.writers.TemplateFileWriter; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.plugins.NoOpGenerator; +import io.zenwave360.sdk.processors.AsyncApiProcessor; +import io.zenwave360.sdk.writers.TemplateFileWriter; public class MainTest { @@ -22,7 +21,7 @@ public void testMain() { Main.main( "-c", StringUtils.join(processors, ","), - "specFile=classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml", + "specFile=classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml", "targetFolder=target/zenwave/out", "inner.specFile=target/zenwave/out", "inner.targetFolder=target/zenwave/out"); @@ -35,8 +34,8 @@ public void testMainWithMultipleSpecFiles() { Main.main( "-c", StringUtils.join(processors, ","), - "0.specFile=classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml", - "2.specFile=classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml", + "0.specFile=classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml", + "2.specFile=classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml", "0.targetProperty=asyncapi1", "1.targetProperty=asyncapi1", "2.targetProperty=asyncapi2", @@ -58,7 +57,7 @@ public void testMain_with_array_options() { Main.main( "-c", StringUtils.join(processors, ","), - "specFile=classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml", + "specFile=classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml", "targetFolder=target/zenwave/out", "inner.specFile=target/zenwave/out", "inner.targetFolder=target/zenwave/out", diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/PluginTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/PluginTest.java similarity index 94% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/PluginTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/PluginTest.java index 77dac170..b1032406 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/PluginTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/PluginTest.java @@ -1,9 +1,9 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.plugins.NoOpPluginConfiguration; +import io.zenwave360.sdk.plugins.NoOpPluginConfiguration; public class PluginTest { diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractAsyncapiGeneratorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractAsyncapiGeneratorTest.java similarity index 86% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractAsyncapiGeneratorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractAsyncapiGeneratorTest.java index 8191c27c..0ccc5811 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractAsyncapiGeneratorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractAsyncapiGeneratorTest.java @@ -1,20 +1,20 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; import java.net.URI; import java.util.Arrays; import java.util.List; import java.util.Map; -import io.zenwave360.generator.generators.AbstractAsyncapiGenerator.OperationRoleType; -import io.zenwave360.generator.options.asyncapi.AsyncapiOperationType; -import io.zenwave360.generator.options.asyncapi.AsyncapiRoleType; +import io.zenwave360.sdk.generators.AbstractAsyncapiGenerator.OperationRoleType; +import io.zenwave360.sdk.options.asyncapi.AsyncapiOperationType; +import io.zenwave360.sdk.options.asyncapi.AsyncapiRoleType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.processors.AsyncApiProcessor; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.processors.AsyncApiProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; public class AbstractAsyncapiGeneratorTest { @@ -48,7 +48,7 @@ public void testOperationRoleType() { @Test public void test_filter_operations_for_provider_nobindings() throws Exception { - Model model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml"); + Model model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml"); AbstractAsyncapiGenerator asyncapiGenerator = newAbstractAsyncapiGenerator(); asyncapiGenerator.role = AsyncapiRoleType.provider; Map>> consumerOperations = asyncapiGenerator.getSubscribeOperationsGroupedByTag(model); @@ -60,7 +60,7 @@ public void test_filter_operations_for_provider_nobindings() throws Exception { @Test public void test_filter_operations_for_provider_with_matching_bindings() throws Exception { - Model model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml"); + Model model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml"); AbstractAsyncapiGenerator asyncapiGenerator = newAbstractAsyncapiGenerator(); asyncapiGenerator.role = AsyncapiRoleType.provider; asyncapiGenerator.bindingTypes = Arrays.asList("kafka"); @@ -72,7 +72,7 @@ public void test_filter_operations_for_provider_with_matching_bindings() throws @Test public void test_filter_operations_for_provider_with_no_matching_bindings() throws Exception { - Model model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml"); + Model model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml"); AbstractAsyncapiGenerator asyncapiGenerator = newAbstractAsyncapiGenerator(); asyncapiGenerator.role = AsyncapiRoleType.provider; asyncapiGenerator.bindingTypes = Arrays.asList("nomatchingbinding"); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractJDLGeneratorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractJDLGeneratorTest.java similarity index 79% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractJDLGeneratorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractJDLGeneratorTest.java index b949f294..bcce48a1 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractJDLGeneratorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractJDLGeneratorTest.java @@ -1,13 +1,12 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; -import java.io.File; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.templating.TemplateOutput; public class AbstractJDLGeneratorTest { @@ -27,7 +26,7 @@ public List generate(Map apiModel) { @Test public void test_todo() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/jdl/21-points.jh"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/21-points.jh"); AbstractJDLGenerator jdlGenerator = newAbstractJDLGenerator(); List generated = jdlGenerator.generate(model); } diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractOpenAPIGeneratorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractOpenAPIGeneratorTest.java similarity index 86% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractOpenAPIGeneratorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractOpenAPIGeneratorTest.java index e791ff6f..0ffe788e 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/AbstractOpenAPIGeneratorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/AbstractOpenAPIGeneratorTest.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; -import java.io.File; import java.net.URI; import java.util.List; import java.util.Map; @@ -8,10 +7,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.processors.OpenApiProcessor; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.processors.OpenApiProcessor; +import io.zenwave360.sdk.templating.TemplateOutput; public class AbstractOpenAPIGeneratorTest { @@ -31,7 +30,7 @@ public List generate(Map apiModel) { @Test public void test_filter_operations_by_tag_and_verb() throws Exception { - Model model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml"); + Model model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml"); AbstractOpenAPIGenerator openapiGenerator = newAbstractAsyncapiGenerator(); Map>> allOperations = openapiGenerator.getOperationsGroupedByTag(model); Map>> getOperations = openapiGenerator.getOperationsGroupedByTag(model, AbstractOpenAPIGenerator.OperationType.GET); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/JDLEntitiesToAvroConverterTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/JDLEntitiesToAvroConverterTest.java similarity index 88% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/JDLEntitiesToAvroConverterTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/JDLEntitiesToAvroConverterTest.java index f74e8e32..7cd50277 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/JDLEntitiesToAvroConverterTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/JDLEntitiesToAvroConverterTest.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; -import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -10,9 +9,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.utils.JSONPath; public class JDLEntitiesToAvroConverterTest { @@ -24,7 +23,7 @@ private Map loadJDLModelFromResource(String resource) throws Exc @Test public void testConvertEntityToSchema() throws Exception { JDLEntitiesToAvroConverter converter = new JDLEntitiesToAvroConverter().withIdType("string").withNamespace("io.example"); - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); List entities = JSONPath.get(model, "entities[*]"); List enums = JSONPath.get(model, "enums.enums[*]"); List entitiesAndEnums = new ArrayList<>(); @@ -50,7 +49,7 @@ public void testConvertEntityToSchema() throws Exception { @Test public void testConvertEntityToSchemaRelational() throws Exception { JDLEntitiesToAvroConverter converter = new JDLEntitiesToAvroConverter().withIdType("string").withNamespace("io.example"); - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model-relational.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl"); List entities = JSONPath.get(model, "entities[*]"); List enums = JSONPath.get(model, "enums.enums[*]"); List entitiesAndEnums = new ArrayList<>(); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/JDLEntitiesToSchemasConverterTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/JDLEntitiesToSchemasConverterTest.java similarity index 87% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/JDLEntitiesToSchemasConverterTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/JDLEntitiesToSchemasConverterTest.java index 44e05c0c..76755036 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/generators/JDLEntitiesToSchemasConverterTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/generators/JDLEntitiesToSchemasConverterTest.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.generators; +package io.zenwave360.sdk.generators; -import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -10,9 +9,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.processors.JDLProcessor; +import io.zenwave360.sdk.utils.JSONPath; public class JDLEntitiesToSchemasConverterTest { @@ -24,7 +23,7 @@ private Map loadJDLModelFromResource(String resource) throws Exc @Test public void testConvertEntityToSchema() throws Exception { JDLEntitiesToSchemasConverter converter = new JDLEntitiesToSchemasConverter().withIdType("string"); - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); List entities = JSONPath.get(model, "entities[*]"); List enums = JSONPath.get(model, "enums.enums[*]"); List entitiesAndEnums = new ArrayList<>(); @@ -46,7 +45,7 @@ public void testConvertEntityToSchema() throws Exception { @Test public void testConvertEntityToSchemaRelational() throws Exception { JDLEntitiesToSchemasConverter converter = new JDLEntitiesToSchemasConverter().withIdType("string"); - Map model = loadJDLModelFromResource("classpath:io/zenwave360/generator/resources/jdl/orders-model-relational.jdl"); + Map model = loadJDLModelFromResource("classpath:io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl"); List entities = JSONPath.get(model, "entities[*]"); List enums = JSONPath.get(model, "enums.enums[*]"); List entitiesAndEnums = new ArrayList<>(); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/DefaultYamlParserTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/DefaultYamlParserTest.java similarity index 75% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/DefaultYamlParserTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/DefaultYamlParserTest.java index d6f9a117..25a1a70e 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/DefaultYamlParserTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/DefaultYamlParserTest.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.parsers; +package io.zenwave360.sdk.parsers; -import java.io.File; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -8,14 +7,14 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.utils.JSONPath; public class DefaultYamlParserTest { @Test public void testParseYml() throws URISyntaxException, IOException { String targetProperty = "_api"; - String resource = "classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml"; + String resource = "classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml"; DefaultYamlParser parser = new DefaultYamlParser().withSpecFile(URI.create(resource)).withTargetProperty(targetProperty); Model model = (Model) parser.parse().get(targetProperty); Assertions.assertNotNull(model); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/GraphQLParserTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/GraphQLParserTest.java similarity index 65% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/GraphQLParserTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/GraphQLParserTest.java index cc361a8b..0710de9f 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/GraphQLParserTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/GraphQLParserTest.java @@ -1,7 +1,6 @@ -package io.zenwave360.generator.parsers; +package io.zenwave360.sdk.parsers; -import graphql.schema.idl.SchemaParser; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.utils.JSONPath; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -13,7 +12,7 @@ public class GraphQLParserTest { @Test public void testParseGraphQL() throws IOException { GraphQLParser parser = new GraphQLParser(); - parser.specFile = URI.create("classpath:io/zenwave360/generator/resources/graphql/user-crud.graphql"); + parser.specFile = URI.create("classpath:io/zenwave360/sdk/resources/graphql/user-crud.graphql"); var graphql = parser.parse(); System.out.println(graphql); Assertions.assertNotNull(JSONPath.get(graphql, "$.graphql.types.Student")); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/JDLParserTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/JDLParserTest.java similarity index 84% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/JDLParserTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/JDLParserTest.java index 3c197896..2308ca06 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/parsers/JDLParserTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/parsers/JDLParserTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.parsers; +package io.zenwave360.sdk.parsers; import java.io.File; import java.io.IOException; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.utils.JSONPath; public class JDLParserTest { @@ -19,7 +19,7 @@ private File getClasspathResourceAsFile(String resource) throws URISyntaxExcepti @Test public void testParseJDL() throws URISyntaxException, IOException { String targetProperty = "_jdl"; - JDLParser parser = new JDLParser().withSpecFile("classpath:io/zenwave360/generator/resources/jdl/21-points.jh").withTargetProperty(targetProperty); + JDLParser parser = new JDLParser().withSpecFile("classpath:io/zenwave360/sdk/resources/jdl/21-points.jh").withTargetProperty(targetProperty); long startTime = System.currentTimeMillis(); Map model = (Map) parser.parse().get(targetProperty); System.out.println("JDLParser load time: " + (System.currentTimeMillis() - startTime)); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/ForkPluginGeneratorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/ForkPluginGeneratorTest.java similarity index 65% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/ForkPluginGeneratorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/ForkPluginGeneratorTest.java index 196ce44b..307ea8ea 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/ForkPluginGeneratorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/ForkPluginGeneratorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.net.MalformedURLException; import java.net.URL; @@ -13,8 +13,8 @@ public class ForkPluginGeneratorTest { public void testFork_JDLApplicationDefault() throws MalformedURLException { ForkPluginGenerator plugin = new ForkPluginGenerator(); plugin.downloadURL = new URL("https://github.com/ZenWave360/zenwave-sdk/archive/refs/heads/main.zip"); - plugin.sourcePluginClassName = "io.zenwave360.generator.plugins.JDLBackendApplicationDefaultPlugin"; - plugin.targetPluginClassName = "io.zenwave360.generator.plugins.forked.JDLBackendApplicationDefaultPluginForked"; + plugin.sourcePluginClassName = "io.zenwave360.sdk.plugins.JDLBackendApplicationDefaultPlugin"; + plugin.targetPluginClassName = "io.zenwave360.sdk.plugins.forked.JDLBackendApplicationDefaultPluginForked"; plugin.targetFolder = "target/forked" + System.currentTimeMillis(); plugin.generate(null); } @@ -23,8 +23,8 @@ public void testFork_JDLApplicationDefault() throws MalformedURLException { public void testFork_JDLApplicationDefault_SamePackage() throws MalformedURLException { ForkPluginGenerator plugin = new ForkPluginGenerator(); plugin.downloadURL = new URL("https://github.com/ZenWave360/zenwave-sdk/archive/refs/heads/main.zip"); - plugin.sourcePluginClassName = "io.zenwave360.generator.plugins.JDLBackendApplicationDefaultPlugin"; - plugin.targetPluginClassName = "io.zenwave360.generator.plugins.JDLBackendApplicationDefaultPluginForked"; + plugin.sourcePluginClassName = "io.zenwave360.sdk.plugins.JDLBackendApplicationDefaultPlugin"; + plugin.targetPluginClassName = "io.zenwave360.sdk.plugins.JDLBackendApplicationDefaultPluginForked"; plugin.targetFolder = "target/forked" + System.currentTimeMillis(); plugin.generate(null); } diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/NoOpGenerator.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/NoOpGenerator.java similarity index 74% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/NoOpGenerator.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/NoOpGenerator.java index 3137a2ea..2e02601e 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/NoOpGenerator.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/NoOpGenerator.java @@ -1,12 +1,12 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.generators.Generator; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.generators.Generator; +import io.zenwave360.sdk.templating.TemplateOutput; public class NoOpGenerator implements Generator { diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/NoOpPluginConfiguration.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/NoOpPluginConfiguration.java similarity index 58% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/NoOpPluginConfiguration.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/NoOpPluginConfiguration.java index ba1b7520..5387222d 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/plugins/NoOpPluginConfiguration.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/plugins/NoOpPluginConfiguration.java @@ -1,10 +1,10 @@ -package io.zenwave360.generator.plugins; +package io.zenwave360.sdk.plugins; -import io.zenwave360.generator.Plugin; -import io.zenwave360.generator.doc.DocumentedOption; -import io.zenwave360.generator.doc.DocumentedPlugin; -import io.zenwave360.generator.generators.AbstractOpenAPIGenerator; -import io.zenwave360.generator.writers.TemplateStdoutWriter; +import io.zenwave360.sdk.Plugin; +import io.zenwave360.sdk.doc.DocumentedOption; +import io.zenwave360.sdk.doc.DocumentedPlugin; +import io.zenwave360.sdk.generators.AbstractOpenAPIGenerator; +import io.zenwave360.sdk.writers.TemplateStdoutWriter; @DocumentedPlugin(value = "'no operation' plugin description", shortCode = "no-op") public class NoOpPluginConfiguration extends Plugin { diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/AsyncApiProcessorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/AsyncApiProcessorTest.java similarity index 85% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/AsyncApiProcessorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/AsyncApiProcessorTest.java index c2e36f0b..37df7399 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/AsyncApiProcessorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/AsyncApiProcessorTest.java @@ -1,8 +1,7 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; -import static io.zenwave360.generator.utils.JSONPath.get; +import static io.zenwave360.sdk.utils.JSONPath.get; -import java.io.File; import java.net.URI; import java.util.List; import java.util.Map; @@ -13,8 +12,8 @@ import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.Option; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.parsers.Model; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.parsers.Model; public class AsyncApiProcessorTest { @@ -27,7 +26,7 @@ private Map loadAsyncapiModelFromResource(String resource) throw @Test public void testProcessAsyncApiChannelName() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml"); AsyncApiProcessor processor = new AsyncApiProcessor(); Model processed = (Model) processor.process(model).get(targetProperty); String channelName = get(processed, "$.channels.createProductNotification.subscribe.x--channel"); @@ -36,7 +35,7 @@ public void testProcessAsyncApiChannelName() throws Exception { @Test public void testProcessAsyncApiOperationType() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml"); AsyncApiProcessor processor = new AsyncApiProcessor(); Model processed = (Model) processor.process(model).get(targetProperty); String operationType = get(processed, "$.channels.createProductNotification.subscribe.x--operationType"); @@ -45,7 +44,7 @@ public void testProcessAsyncApiOperationType() throws Exception { @Test public void testProcessAsyncApiTraits() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-shoping-cart.yml"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-shoping-cart.yml"); String headers = get(model.get(targetProperty), "$.components.messages.LinesRemoved.headers"); Assertions.assertEquals(null, headers); @@ -58,7 +57,7 @@ public void testProcessAsyncApiTraits() throws Exception { @Test public void testProcessAsyncApiMergeTraits() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-shoping-cart.yml"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-shoping-cart.yml"); Object headers = get(model.get(targetProperty), "$.components.messages.LinesAdded.headers"); Assertions.assertNotNull(get(headers, "$.properties.some-header.type")); @@ -73,7 +72,7 @@ public void testProcessAsyncApiMergeTraits() throws Exception { @Test public void testCollectMessagesOneOf() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-shoping-cart.yml"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-shoping-cart.yml"); AsyncApiProcessor processor = new AsyncApiProcessor(); Model processed = (Model) processor.process(model).get(targetProperty); @@ -84,7 +83,7 @@ public void testCollectMessagesOneOf() throws Exception { @Test public void testCollectMessagesSingleMessage() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml"); AsyncApiProcessor processor = new AsyncApiProcessor(); Model processed = (Model) processor.process(model).get(targetProperty); @@ -95,7 +94,7 @@ public void testCollectMessagesSingleMessage() throws Exception { @Test public void testCalculateMessagesParamTypeForAvros() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-shoping-cart.yml"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-shoping-cart.yml"); AsyncApiProcessor processor = new AsyncApiProcessor(); Model processed = (Model) processor.process(model).get(targetProperty); @@ -105,7 +104,7 @@ public void testCalculateMessagesParamTypeForAvros() throws Exception { @Test public void testCalculateMessagesParamTypeForAsyncAPISchema() throws Exception { - Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/generator/resources/asyncapi/asyncapi-javaType.yml"); + Map model = loadAsyncapiModelFromResource("classpath:io/zenwave360/sdk/resources/asyncapi/asyncapi-javaType.yml"); AsyncApiProcessor processor = new AsyncApiProcessor(); Model processed = (Model) processor.process(model).get(targetProperty); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLDummyDataFromSchemasProcessorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLDummyDataFromSchemasProcessorTest.java similarity index 85% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLDummyDataFromSchemasProcessorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLDummyDataFromSchemasProcessorTest.java index 1d048928..2ae9b370 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLDummyDataFromSchemasProcessorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLDummyDataFromSchemasProcessorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.net.URI; import java.util.HashMap; @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.utils.JSONPath; public class JDLDummyDataFromSchemasProcessorTest { @@ -19,7 +19,7 @@ private Map loadOpenApi(String resource) throws Exception { @Test public void testProcessJDLWithOpenAPI() throws Exception { - var openapiModel = loadOpenApi("classpath:io/zenwave360/generator/resources/openapi/oas-controllers-with-no-jdl.yml"); + var openapiModel = loadOpenApi("classpath:io/zenwave360/sdk/resources/openapi/oas-controllers-with-no-jdl.yml"); var model = new HashMap(); model.putAll(openapiModel); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLProcessorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLProcessorTest.java similarity index 81% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLProcessorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLProcessorTest.java index e08a5bf0..ce6888c4 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLProcessorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLProcessorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.io.IOException; import java.util.List; @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.utils.JSONPath; public class JDLProcessorTest { @@ -23,7 +23,7 @@ private boolean containsEntity(List entities, String entityName) { @Test public void testProcessJDL_WithSemanticAnnotations() throws Exception { - var model = loadJDL("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + var model = loadJDL("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); List entitiesWithCriteria = JSONPath.get(model, "$..[?(@.options.searchCriteriaObject)]"); Assertions.assertFalse(entitiesWithCriteria.isEmpty()); Assertions.assertEquals(2, entitiesWithCriteria.size()); @@ -33,7 +33,7 @@ public void testProcessJDL_WithSemanticAnnotations() throws Exception { @Test public void testProcessJDL_Relational() throws Exception { - var model = loadJDL("classpath:io/zenwave360/generator/resources/jdl/orders-model-relational.jdl"); + var model = loadJDL("classpath:io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl"); List entitiesWithCriteria = JSONPath.get(model, "$..[?(@.options.searchCriteriaObject)]"); Assertions.assertFalse(entitiesWithCriteria.isEmpty()); Assertions.assertEquals(2, entitiesWithCriteria.size()); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLWithOpenApiProcessorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLWithOpenApiProcessorTest.java similarity index 82% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLWithOpenApiProcessorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLWithOpenApiProcessorTest.java index 733912fe..d4723427 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/JDLWithOpenApiProcessorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/JDLWithOpenApiProcessorTest.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; import java.io.File; import java.io.IOException; @@ -10,9 +10,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.parsers.JDLParser; +import io.zenwave360.sdk.utils.JSONPath; public class JDLWithOpenApiProcessorTest { @@ -34,8 +34,8 @@ private Map loadJDL(String resource) throws IOException { @Test public void testProcessJDLWithOpenAPI() throws Exception { - var openapiModel = loadOpenApi("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml"); - var jdlModel = loadJDL("classpath:io/zenwave360/generator/resources/jdl/petstore.jdl"); + var openapiModel = loadOpenApi("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml"); + var jdlModel = loadJDL("classpath:io/zenwave360/sdk/resources/jdl/petstore.jdl"); var model = new HashMap(); model.putAll(openapiModel); model.putAll(jdlModel); @@ -50,8 +50,8 @@ public void testProcessJDLWithOpenAPI() throws Exception { @Test // @Disabled public void testProcessJDLWithOpenAPI_registry() throws Exception { - var openapiModel = loadOpenApi("classpath:io/zenwave360/generator/resources/openapi/openapi-orders.yml"); - var jdlModel = loadJDL("classpath:io/zenwave360/generator/resources/jdl/orders-model.jdl"); + var openapiModel = loadOpenApi("classpath:io/zenwave360/sdk/resources/openapi/openapi-orders.yml"); + var jdlModel = loadJDL("classpath:io/zenwave360/sdk/resources/jdl/orders-model.jdl"); var model = new HashMap(); model.putAll(openapiModel); model.putAll(jdlModel); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/OpenApiProcessorTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/OpenApiProcessorTest.java similarity index 80% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/OpenApiProcessorTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/OpenApiProcessorTest.java index 1a5f05b9..d69b91f5 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/processors/OpenApiProcessorTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/processors/OpenApiProcessorTest.java @@ -1,6 +1,5 @@ -package io.zenwave360.generator.processors; +package io.zenwave360.sdk.processors; -import java.io.File; import java.net.URI; import java.util.List; import java.util.Map; @@ -11,9 +10,9 @@ import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.Option; -import io.zenwave360.generator.parsers.DefaultYamlParser; -import io.zenwave360.generator.parsers.Model; -import io.zenwave360.generator.utils.JSONPath; +import io.zenwave360.sdk.parsers.DefaultYamlParser; +import io.zenwave360.sdk.parsers.Model; +import io.zenwave360.sdk.utils.JSONPath; public class OpenApiProcessorTest { @@ -25,7 +24,7 @@ private Map loadOpenAPIModelFromResource(String resource) throws @Test public void testProcessOpenAPI() throws Exception { - Map model = loadOpenAPIModelFromResource("classpath:io/zenwave360/generator/resources/openapi/openapi-petstore.yml"); + Map model = loadOpenAPIModelFromResource("classpath:io/zenwave360/sdk/resources/openapi/openapi-petstore.yml"); OpenApiProcessor processor = new OpenApiProcessor();; Model processed = (Model) processor.process(model).get("api"); List httpVerbs = JSONPath.get(processed, "$.paths..x--httpVerb"); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/templates/HandlebarsEngineTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/templates/HandlebarsEngineTest.java similarity index 81% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/templates/HandlebarsEngineTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/templates/HandlebarsEngineTest.java index b8b58baa..9b4a6bff 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/templates/HandlebarsEngineTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/templates/HandlebarsEngineTest.java @@ -1,18 +1,16 @@ -package io.zenwave360.generator.templates; +package io.zenwave360.sdk.templates; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; -import io.zenwave360.generator.parsers.JDLParser; -import io.zenwave360.generator.processors.JDLProcessor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.zenwave360.generator.templating.HandlebarsEngine; -import io.zenwave360.generator.templating.TemplateInput; -import io.zenwave360.generator.templating.TemplateOutput; +import io.zenwave360.sdk.templating.HandlebarsEngine; +import io.zenwave360.sdk.templating.TemplateInput; +import io.zenwave360.sdk.templating.TemplateOutput; public class HandlebarsEngineTest { @@ -26,7 +24,7 @@ public void testHandlebarsEngine() throws IOException { model.put("nullValue", null); model.put("name", "nameFromParent"); model.put("entities", Map.of("entity1", Map.of("name", "entity1"), "entity2", Map.of("name", "entity2"))); - TemplateOutput templateOutput = handlebarsEngine.processTemplate(model, new TemplateInput("io/zenwave360/generator/templating/handlebars-test", "").withSkipOverwrite(true)).get(0); + TemplateOutput templateOutput = handlebarsEngine.processTemplate(model, new TemplateInput("io/zenwave360/sdk/templating/handlebars-test", "").withSkipOverwrite(true)).get(0); System.out.println(templateOutput.getContent()); Assertions.assertTrue(templateOutput.getContent().contains("This is the assigned value")); @@ -35,7 +33,7 @@ public void testHandlebarsEngine() throws IOException { Assertions.assertTrue(templateOutput.getContent().contains("asInstanceName tratraTratra")); Assertions.assertTrue(templateOutput.getContent().contains("asJavaTypeName TratraTratra")); Assertions.assertTrue(templateOutput.getContent().contains("kebabCase some-camel-case-with-spaces")); - Assertions.assertTrue(templateOutput.getContent().contains("asPackageFolder io/zenwave360/generator/templating")); + Assertions.assertTrue(templateOutput.getContent().contains("asPackageFolder io/zenwave360/sdk/templating")); Assertions.assertTrue(templateOutput.getContent().contains("Prefix2Suffix")); Assertions.assertTrue(templateOutput.getContent().contains("Inside if 1")); Assertions.assertTrue(templateOutput.getContent().contains("Inside else 2")); diff --git a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/utils/CommaSeparatedCollectionDeserializationHandlerTest.java b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/utils/CommaSeparatedCollectionDeserializationHandlerTest.java similarity index 96% rename from zenwave-sdk-cli/src/test/java/io/zenwave360/generator/utils/CommaSeparatedCollectionDeserializationHandlerTest.java rename to zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/utils/CommaSeparatedCollectionDeserializationHandlerTest.java index 939f5033..62e11f96 100644 --- a/zenwave-sdk-cli/src/test/java/io/zenwave360/generator/utils/CommaSeparatedCollectionDeserializationHandlerTest.java +++ b/zenwave-sdk-cli/src/test/java/io/zenwave360/sdk/utils/CommaSeparatedCollectionDeserializationHandlerTest.java @@ -1,9 +1,8 @@ -package io.zenwave360.generator.utils; +package io.zenwave360.sdk.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.cfg.HandlerInstantiator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/zenwave-sdk-cli/src/test/resources/io/zenwave360/generator/templating/handlebars-test.hbs b/zenwave-sdk-cli/src/test/resources/io/zenwave360/sdk/templating/handlebars-test.hbs similarity index 93% rename from zenwave-sdk-cli/src/test/resources/io/zenwave360/generator/templating/handlebars-test.hbs rename to zenwave-sdk-cli/src/test/resources/io/zenwave360/sdk/templating/handlebars-test.hbs index 6e8f80f3..81cc9a80 100644 --- a/zenwave-sdk-cli/src/test/resources/io/zenwave360/generator/templating/handlebars-test.hbs +++ b/zenwave-sdk-cli/src/test/resources/io/zenwave360/sdk/templating/handlebars-test.hbs @@ -6,7 +6,7 @@ List size is {{size list}} asInstanceName {{asInstanceName "tratra-tratra"}} asJavaTypeName {{asJavaTypeName "tratra-tratra"}} kebabCase {{kebabCase "Some Camel Case with Spaces"}} -asPackageFolder {{asPackageFolder "io.zenwave360.generator.templating"}} +asPackageFolder {{asPackageFolder "io.zenwave360.sdk.templating"}} {{#joinWithTemplate theList}} Prefix{{.}}Suffix {{/joinWithTemplate}} diff --git a/zenwave-sdk-cli/src/test/resources/io/zenwave360/generator/templating/partial.hbs b/zenwave-sdk-cli/src/test/resources/io/zenwave360/sdk/templating/partial.hbs similarity index 100% rename from zenwave-sdk-cli/src/test/resources/io/zenwave360/generator/templating/partial.hbs rename to zenwave-sdk-cli/src/test/resources/io/zenwave360/sdk/templating/partial.hbs diff --git a/zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/generator/GeneratorMojo.java b/zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/sdk/GeneratorMojo.java similarity index 99% rename from zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/generator/GeneratorMojo.java rename to zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/sdk/GeneratorMojo.java index 35978ae4..9545a13c 100644 --- a/zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/generator/GeneratorMojo.java +++ b/zenwave-sdk-maven-plugin/src/main/java/io/zenwave360/sdk/GeneratorMojo.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator; +package io.zenwave360.sdk; import java.io.File; import java.net.URL; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/package-info.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/package-info.java deleted file mode 100644 index 27242ac8..00000000 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * JPA domain objects. - */ -package io.zenwave360.generator.jpa2jdl; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/package-info.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/package-info.java deleted file mode 100644 index 2f2e44b2..00000000 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * JPA domain objects. - */ -package io.zenwave360.generator.mongodb2jdl; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/AbstractAuditingEntity.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/AbstractAuditingEntity.java similarity index 98% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/AbstractAuditingEntity.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/AbstractAuditingEntity.java index 49701f2d..7ca5dccf 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/AbstractAuditingEntity.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/AbstractAuditingEntity.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.jpa2jdl; +package io.zenwave360.sdk.jpa2jdl; import java.io.Serializable; import java.time.Instant; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Blog.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Blog.java similarity index 98% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Blog.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Blog.java index 94cabcbe..ee455fa1 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Blog.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Blog.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.jpa2jdl; +package io.zenwave360.sdk.jpa2jdl; import java.io.Serializable; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Post.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Post.java similarity index 99% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Post.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Post.java index 1633d0dc..ee4754de 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Post.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Post.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.jpa2jdl; +package io.zenwave360.sdk.jpa2jdl; import java.io.Serializable; import java.time.Instant; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Product.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Product.java similarity index 98% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Product.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Product.java index 41d499ca..1c2008b0 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Product.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Product.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.jpa2jdl; +package io.zenwave360.sdk.jpa2jdl; import java.io.Serializable; import java.math.BigDecimal; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Tag.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Tag.java similarity index 98% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Tag.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Tag.java index fa43f192..1455f7de 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/jpa2jdl/Tag.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/Tag.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.jpa2jdl; +package io.zenwave360.sdk.jpa2jdl; import java.io.Serializable; import java.util.HashSet; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/package-info.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/package-info.java new file mode 100644 index 00000000..d634e7d1 --- /dev/null +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/jpa2jdl/package-info.java @@ -0,0 +1,4 @@ +/** + * JPA domain objects. + */ +package io.zenwave360.sdk.jpa2jdl; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/AbstractAuditingEntity.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/AbstractAuditingEntity.java similarity index 97% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/AbstractAuditingEntity.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/AbstractAuditingEntity.java index b4309136..499164c4 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/AbstractAuditingEntity.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/AbstractAuditingEntity.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.mongodb2jdl; +package io.zenwave360.sdk.mongodb2jdl; import java.io.Serializable; import java.time.Instant; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Blog.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Blog.java similarity index 98% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Blog.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Blog.java index 53c7fad5..c212a53a 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Blog.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Blog.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.mongodb2jdl; +package io.zenwave360.sdk.mongodb2jdl; import java.io.Serializable; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Post.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Post.java similarity index 98% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Post.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Post.java index 3a035265..65c12466 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Post.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Post.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.mongodb2jdl; +package io.zenwave360.sdk.mongodb2jdl; import java.io.Serializable; import java.time.Instant; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Tag.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Tag.java similarity index 98% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Tag.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Tag.java index 03972e86..a78bd92e 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/mongodb2jdl/Tag.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/Tag.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.mongodb2jdl; +package io.zenwave360.sdk.mongodb2jdl; import java.io.Serializable; import java.util.HashSet; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/package-info.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/package-info.java new file mode 100644 index 00000000..fe3c02bb --- /dev/null +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/mongodb2jdl/package-info.java @@ -0,0 +1,4 @@ +/** + * JPA domain objects. + */ +package io.zenwave360.sdk.mongodb2jdl; diff --git a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/testutils/MavenCompiler.java b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/testutils/MavenCompiler.java similarity index 96% rename from zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/testutils/MavenCompiler.java rename to zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/testutils/MavenCompiler.java index c90cce37..b650c4dc 100644 --- a/zenwave-sdk-test-resources/src/main/java/io/zenwave360/generator/testutils/MavenCompiler.java +++ b/zenwave-sdk-test-resources/src/main/java/io/zenwave360/sdk/testutils/MavenCompiler.java @@ -1,4 +1,4 @@ -package io.zenwave360.generator.testutils; +package io.zenwave360.sdk.testutils; import org.apache.commons.io.FileUtils; import org.apache.maven.shared.invoker.*; diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-circular-refs.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-circular-refs.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-commands.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-commands.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml similarity index 99% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml index 2132ef4d..04aad0fe 100644 --- a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-events.yml +++ b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-events.yml @@ -10,7 +10,7 @@ channels: publish: summary: On new Product (Async Event) operationId: onProductCreated - x-envelope-java-type: io.zenwave360.generator.plugins.envelope.Envelope + x-envelope-java-type: io.zenwave360.sdk.plugins.envelope.Envelope message: $ref: "#/components/messages/createProductMsg" bindings: diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-javaType.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-javaType.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-javaType.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-javaType.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-orders-relational.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-orders-relational.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-orders-relational.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-orders-relational.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-shoping-cart.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-shoping-cart.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/asyncapi-shoping-cart.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/asyncapi-shoping-cart.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/avros/all_cart_entities.avsc b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/avros/all_cart_entities.avsc similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/avros/all_cart_entities.avsc rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/avros/all_cart_entities.avsc diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/asyncapi.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/asyncapi.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/asyncapi.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/asyncapi.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/flight-delayed-event.schema b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/flight-delayed-event.schema similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/flight-delayed-event.schema rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/flight-delayed-event.schema diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/master-data.schema b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/master-data.schema similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/master-data.schema rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/master-data.schema diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/notification-subscriptions-message-envelop.schema b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/notification-subscriptions-message-envelop.schema similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/notification-subscriptions-message-envelop.schema rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/notification-subscriptions-message-envelop.schema diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/transport-notification-batch-message-envelop.schema b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/transport-notification-batch-message-envelop.schema similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/transport-notification-batch-message-envelop.schema rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/transport-notification-batch-message-envelop.schema diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/transport-notification-eventdata-generic.schema b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/transport-notification-eventdata-generic.schema similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/transport-notification-eventdata-generic.schema rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/transport-notification-eventdata-generic.schema diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/transport-notification-message-envelop.schema b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/transport-notification-message-envelop.schema similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/transport-notification-message-envelop.schema rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/transport-notification-message-envelop.schema diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/transport.schema b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/transport.schema similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/transport.schema rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/transport.schema diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/truck-stop-delayed-event.schema b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/truck-stop-delayed-event.schema similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/asyncapi/json-schemas/truck-stop-delayed-event.schema rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/asyncapi/json-schemas/truck-stop-delayed-event.schema diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/graphql/user-crud.graphql b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/graphql/user-crud.graphql similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/graphql/user-crud.graphql rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/graphql/user-crud.graphql diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/21-points.jh b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/21-points.jh similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/21-points.jh rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/21-points.jh diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/21-points.png b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/21-points.png similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/21-points.png rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/21-points.png diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model-eda-idl.jdl b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model-eda-idl.jdl similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model-eda-idl.jdl rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model-eda-idl.jdl diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model-relational.jdl b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model-relational.jdl rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model-relational.jdl diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model-semantic-annotations.jdl b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model-semantic-annotations.jdl similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model-semantic-annotations.jdl rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model-semantic-annotations.jdl diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model.jdl b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model.jdl similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model.jdl rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model.jdl diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model.png b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model.png similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/orders-model.png rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/orders-model.png diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/petstore.jdl b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/petstore.jdl similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/jdl/petstore.jdl rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/jdl/petstore.jdl diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/oas-controllers-with-no-jdl.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/oas-controllers-with-no-jdl.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/oas-controllers-with-no-jdl.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/oas-controllers-with-no-jdl.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/openapi-orders-relational.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/openapi-orders-relational.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/openapi-orders-relational.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/openapi-orders-relational.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/openapi-orders.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/openapi-orders.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/openapi-orders.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/openapi-orders.yml diff --git a/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/openapi-petstore.yml b/zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/openapi-petstore.yml similarity index 100% rename from zenwave-sdk-test-resources/src/main/resources/io/zenwave360/generator/resources/openapi/openapi-petstore.yml rename to zenwave-sdk-test-resources/src/main/resources/io/zenwave360/sdk/resources/openapi/openapi-petstore.yml