diff --git a/.github/ISSUE_TEMPLATE/2-feature.md b/.github/ISSUE_TEMPLATE/2-feature.md index 956e2f8..90bec3d 100644 --- a/.github/ISSUE_TEMPLATE/2-feature.md +++ b/.github/ISSUE_TEMPLATE/2-feature.md @@ -7,7 +7,7 @@ labels: "type: feature" -- [ ] I'd be willing to implement this feature ([contributing guide](https://github.com/BlackBeltTechnology/judo-psm-generator-jackson/blob/develop/CONTRIBUTING.adoc)) +- [ ] I'd be willing to implement this feature ([contributing guide](https://github.com/BlackBeltTechnology/judo-psm-generator-jaxrs/blob/develop/CONTRIBUTING.adoc)) ## Description diff --git a/.github/ISSUE_TEMPLATE/3-documentation.md b/.github/ISSUE_TEMPLATE/3-documentation.md index 030411a..ff99560 100644 --- a/.github/ISSUE_TEMPLATE/3-documentation.md +++ b/.github/ISSUE_TEMPLATE/3-documentation.md @@ -15,7 +15,7 @@ labels: "type: docs" ### Is there a specific documentation page you are reporting? diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index fe5b86f..de8357f 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,7 +2,7 @@ blank_issues_enabled: false contact_links: - name: Read the community guidelines about: "Please make sure you have read the submission guidelines before posting an issue" - url: https://github.com/BlackBeltTechnology/judo-psm-generator-jackson/blob/develop/CONTRIBUTING.adoc#-submitting-an-issue + url: https://github.com/BlackBeltTechnology/judo-psm-generator-jaxrs/blob/develop/CONTRIBUTING.adoc#-submitting-an-issue - name: Want to start a discussion? about: "Want to start a thread to discuss an idea? Use the discussions feature provided by GitHub." url: https://github.com/BlackBeltTechnology/judo-community/discussions diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77d2c71..d9166d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,7 +128,7 @@ jobs: continue-on-error: true run: |- ./mvnw -B -Dstyle.color=always \ - -Dsonar.projectKey=judo-psm-generator-jackson \ + -Dsonar.projectKey=judo-psm-generator-jaxrs \ -Dsonar.host.url=https://sonar.judo.technology \ -Dsonar.login=${{ secrets.JUDO_SONAR_TOKEN }} \ sonar:sonar diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index a962ede..aa2af56 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -31,7 +31,7 @@ We will be insisting on a minimal reproduction in order to save maintainers' tim bugs. We understand that sometimes it might be hard to extract essentials bits of code from a larger codebase, but we really need to isolate the problem before we can fix it. -You can file new issues by filling out our https://github.com/BlackBeltTechnology/judo-psm-generator-jackson/issues/new/choose[issue form]. +You can file new issues by filling out our https://github.com/BlackBeltTechnology/judo-psm-generator-jaxrs/issues/new/choose[issue form]. ### Submitting a PR diff --git a/README.adoc b/README.adoc index 09dff42..a8fc804 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ -# judo-psm-generator-jackson +# judo-psm-generator-jaxrs -PSM based JUDO Jackson REST Java generator +PSM based JUDO Jakarta RESTful Web Services Java generator It can be used as: @@ -10,19 +10,19 @@ It can be used as: xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 hu.blackbelt.judo.archetype - judo-psm-generator-jackson-example + judo-psm-generator-jaxrs-example ${revision} pom - JUDO PSM Generator Jackson REST test - JUDO PSM Jackson REST Generator Example. + JUDO PSM Generator Jakarta RESTful Web Services test + JUDO PSM Jakarta RESTful Web Services Generator Example. 1.0.0-SNAPSHOT 3.9.4 1.0.0 - 1.0.0 + 1.0.0 1.1.0 @@ -44,13 +44,13 @@ It can be used as: ${basedir}/src/main/resources - hu.blackbelt.judo.psm.generator.jackson.PsmModelHelper + hu.blackbelt.judo.psm.generator.jaxrs.PsmModelHelper - psm-jackson + psm-jaxrs mvn:your.psm.model.group.id:your.psm.model.artifact.id:your.psm.model.version!model-name-in-jar.model - ${basedir}/target/generated-test-classes/psm/jackson + ${basedir}/target/generated-test-classes/psm/jaxrs diff --git a/judo-psm-generator-jackson-api/.settings/org.eclipse.jdt.core.prefs b/judo-psm-generator-jaxrs-api/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from judo-psm-generator-jackson-api/.settings/org.eclipse.jdt.core.prefs rename to judo-psm-generator-jaxrs-api/.settings/org.eclipse.jdt.core.prefs diff --git a/judo-psm-generator-jackson-api/LICENSE.txt b/judo-psm-generator-jaxrs-api/LICENSE.txt similarity index 100% rename from judo-psm-generator-jackson-api/LICENSE.txt rename to judo-psm-generator-jaxrs-api/LICENSE.txt diff --git a/judo-psm-generator-jackson-api/pom.xml b/judo-psm-generator-jaxrs-api/pom.xml similarity index 61% rename from judo-psm-generator-jackson-api/pom.xml rename to judo-psm-generator-jaxrs-api/pom.xml index 80306b3..646d2fb 100644 --- a/judo-psm-generator-jackson-api/pom.xml +++ b/judo-psm-generator-jaxrs-api/pom.xml @@ -4,14 +4,14 @@ 4.0.0 hu.blackbelt.judo.generator - judo-psm-generator-jackson + judo-psm-generator-jaxrs ${revision} - judo-psm-generator-jackson-api + judo-psm-generator-jaxrs-api bundle - JUDO PSM Generator Jackson REST API - JUDO PSM Jackson REST Generator API, helpers and templates + JUDO PSM Generator Jakarta RESTful Web Services API + JUDO PSM Jakarta RESTful Web Services Generator API, helpers and templates diff --git a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaApiHelper.java b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaApiHelper.java similarity index 94% rename from judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaApiHelper.java rename to judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaApiHelper.java index 13d1e51..eb8e095 100644 --- a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaApiHelper.java +++ b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaApiHelper.java @@ -1,8 +1,8 @@ -package hu.blackbelt.judo.psm.generator.jackson.api; +package hu.blackbelt.judo.psm.generator.jaxrs.api; /*- * #%L - * JUDO PSM Generator Jackson REST API + * JUDO PSM Generator Jakarta RESTful Web Services API * %% * Copyright (C) 2018 - 2023 BlackBelt Technology * %% @@ -39,8 +39,8 @@ import java.util.*; import java.util.stream.Collectors; -import static hu.blackbelt.judo.psm.generator.jackson.api.JavaNamespaceHelper.*; -import static hu.blackbelt.judo.psm.generator.jackson.api.ModelHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.JavaNamespaceHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.ModelHelper.*; @TemplateHelper public class JavaApiHelper extends StaticMethodValueResolver { diff --git a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaNamespaceHelper.java b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaNamespaceHelper.java similarity index 97% rename from judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaNamespaceHelper.java rename to judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaNamespaceHelper.java index 400e239..17454bc 100644 --- a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaNamespaceHelper.java +++ b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaNamespaceHelper.java @@ -1,8 +1,8 @@ -package hu.blackbelt.judo.psm.generator.jackson.api; +package hu.blackbelt.judo.psm.generator.jaxrs.api; /*- * #%L - * JUDO PSM Generator Jackson REST API + * JUDO PSM Generator Jakarta RESTful Web Services API * %% * Copyright (C) 2018 - 2023 BlackBelt Technology * %% @@ -39,7 +39,7 @@ import java.util.stream.Collectors; import static com.github.jknack.handlebars.internal.lang3.StringUtils.capitalize; -import static hu.blackbelt.judo.psm.generator.jackson.api.ObjectTypeHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.ObjectTypeHelper.*; @TemplateHelper public class JavaNamespaceHelper extends StaticMethodValueResolver { diff --git a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ModelHelper.java b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ModelHelper.java similarity index 96% rename from judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ModelHelper.java rename to judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ModelHelper.java index 47e406b..074b61e 100644 --- a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ModelHelper.java +++ b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ModelHelper.java @@ -1,8 +1,8 @@ -package hu.blackbelt.judo.psm.generator.jackson.api; +package hu.blackbelt.judo.psm.generator.jaxrs.api; /*- * #%L - * JUDO PSM Generator Jackson REST API + * JUDO PSM Generator Jakarta RESTful Web Services API * %% * Copyright (C) 2018 - 2023 BlackBelt Technology * %% @@ -44,7 +44,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static hu.blackbelt.judo.psm.generator.jackson.api.JavaNamespaceHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.JavaNamespaceHelper.*; @TemplateHelper public class ModelHelper extends StaticMethodValueResolver { diff --git a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ObjectTypeHelper.java b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ObjectTypeHelper.java similarity index 92% rename from judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ObjectTypeHelper.java rename to judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ObjectTypeHelper.java index 3afddaf..4b806f6 100644 --- a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ObjectTypeHelper.java +++ b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/ObjectTypeHelper.java @@ -1,4 +1,4 @@ -package hu.blackbelt.judo.psm.generator.jackson.api; +package hu.blackbelt.judo.psm.generator.jaxrs.api; /*- * #%L @@ -33,8 +33,8 @@ import java.util.Set; import java.util.stream.Collectors; -import static hu.blackbelt.judo.psm.generator.jackson.api.ModelHelper.getSpecifiedContainer; -import static hu.blackbelt.judo.psm.generator.jackson.api.ModelHelper.modelWrapper; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.ModelHelper.getSpecifiedContainer; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.ModelHelper.modelWrapper; @TemplateHelper diff --git a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/OperationHelper.java b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/OperationHelper.java similarity index 96% rename from judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/OperationHelper.java rename to judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/OperationHelper.java index 1c94f11..8f6ceed 100644 --- a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/OperationHelper.java +++ b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/OperationHelper.java @@ -1,4 +1,4 @@ -package hu.blackbelt.judo.psm.generator.jackson.api; +package hu.blackbelt.judo.psm.generator.jaxrs.api; /*- * #%L @@ -31,9 +31,9 @@ import hu.blackbelt.judo.meta.psm.service.*; import hu.blackbelt.judo.meta.psm.type.Cardinality; -import static hu.blackbelt.judo.psm.generator.jackson.api.JavaNamespaceHelper.*; -import static hu.blackbelt.judo.psm.generator.jackson.api.ObjectTypeHelper.getEntity; -import static hu.blackbelt.judo.psm.generator.jackson.api.ObjectTypeHelper.isEntity; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.JavaNamespaceHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.ObjectTypeHelper.getEntity; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.ObjectTypeHelper.isEntity; @TemplateHelper diff --git a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/StoredVariableHelper.java b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/StoredVariableHelper.java similarity index 94% rename from judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/StoredVariableHelper.java rename to judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/StoredVariableHelper.java index 82c4c5c..d18224a 100644 --- a/judo-psm-generator-jackson-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/StoredVariableHelper.java +++ b/judo-psm-generator-jaxrs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/StoredVariableHelper.java @@ -1,8 +1,8 @@ -package hu.blackbelt.judo.psm.generator.jackson.api; +package hu.blackbelt.judo.psm.generator.jaxrs.api; /*- * #%L - * JUDO PSM Generator Jackson REST API + * JUDO PSM Generator Jakarta RESTful Web Services API * %% * Copyright (C) 2018 - 2023 BlackBelt Technology * %% diff --git a/judo-psm-generator-jackson-api/src/main/resources/psm-jackson.yaml b/judo-psm-generator-jaxrs-api/src/main/resources/psm-jaxrs.yaml similarity index 100% rename from judo-psm-generator-jackson-api/src/main/resources/psm-jackson.yaml rename to judo-psm-generator-jaxrs-api/src/main/resources/psm-jaxrs.yaml diff --git a/judo-psm-generator-jackson-api/src/main/resources/rest/api/application.config.java.hbs b/judo-psm-generator-jaxrs-api/src/main/resources/rest/api/application.config.java.hbs similarity index 100% rename from judo-psm-generator-jackson-api/src/main/resources/rest/api/application.config.java.hbs rename to judo-psm-generator-jaxrs-api/src/main/resources/rest/api/application.config.java.hbs diff --git a/judo-psm-generator-jackson-api/src/main/resources/rest/api/rest.service.java.hbs b/judo-psm-generator-jaxrs-api/src/main/resources/rest/api/rest.service.java.hbs similarity index 100% rename from judo-psm-generator-jackson-api/src/main/resources/rest/api/rest.service.java.hbs rename to judo-psm-generator-jaxrs-api/src/main/resources/rest/api/rest.service.java.hbs diff --git a/judo-psm-generator-jackson-common/.settings/org.eclipse.jdt.core.prefs b/judo-psm-generator-jaxrs-common/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from judo-psm-generator-jackson-common/.settings/org.eclipse.jdt.core.prefs rename to judo-psm-generator-jaxrs-common/.settings/org.eclipse.jdt.core.prefs diff --git a/judo-psm-generator-jackson-common/LICENSE.txt b/judo-psm-generator-jaxrs-common/LICENSE.txt similarity index 100% rename from judo-psm-generator-jackson-common/LICENSE.txt rename to judo-psm-generator-jaxrs-common/LICENSE.txt diff --git a/judo-psm-generator-jackson-common/pom.xml b/judo-psm-generator-jaxrs-common/pom.xml similarity index 60% rename from judo-psm-generator-jackson-common/pom.xml rename to judo-psm-generator-jaxrs-common/pom.xml index 8ac51fc..d956c0e 100644 --- a/judo-psm-generator-jackson-common/pom.xml +++ b/judo-psm-generator-jaxrs-common/pom.xml @@ -4,14 +4,14 @@ 4.0.0 hu.blackbelt.judo.generator - judo-psm-generator-jackson + judo-psm-generator-jaxrs ${revision} - judo-psm-generator-jackson-common + judo-psm-generator-jaxrs-common bundle - JUDO PSM Generator Jackson REST Common templates - JUDO PSM Jackson REST Generator common templates + JUDO PSM Generator Jakarta RESTful Web Services Common templates + JUDO PSM Jakarta RESTful Web Services Generator common templates diff --git a/judo-psm-generator-jackson-common/src/main/resources/fragment.header.hbs b/judo-psm-generator-jaxrs-common/src/main/resources/fragment.header.hbs similarity index 100% rename from judo-psm-generator-jackson-common/src/main/resources/fragment.header.hbs rename to judo-psm-generator-jaxrs-common/src/main/resources/fragment.header.hbs diff --git a/judo-psm-generator-jackson-common/src/main/resources/psm-jackson.yaml b/judo-psm-generator-jaxrs-common/src/main/resources/psm-jaxrs.yaml similarity index 100% rename from judo-psm-generator-jackson-common/src/main/resources/psm-jackson.yaml rename to judo-psm-generator-jaxrs-common/src/main/resources/psm-jaxrs.yaml diff --git a/judo-psm-generator-jackson-impl/.settings/org.eclipse.jdt.core.prefs b/judo-psm-generator-jaxrs-impl/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from judo-psm-generator-jackson-impl/.settings/org.eclipse.jdt.core.prefs rename to judo-psm-generator-jaxrs-impl/.settings/org.eclipse.jdt.core.prefs diff --git a/judo-psm-generator-jackson-impl/LICENSE.txt b/judo-psm-generator-jaxrs-impl/LICENSE.txt similarity index 100% rename from judo-psm-generator-jackson-impl/LICENSE.txt rename to judo-psm-generator-jaxrs-impl/LICENSE.txt diff --git a/judo-psm-generator-jackson-impl/pom.xml b/judo-psm-generator-jaxrs-impl/pom.xml similarity index 61% rename from judo-psm-generator-jackson-impl/pom.xml rename to judo-psm-generator-jaxrs-impl/pom.xml index 84da566..395e872 100644 --- a/judo-psm-generator-jackson-impl/pom.xml +++ b/judo-psm-generator-jaxrs-impl/pom.xml @@ -4,20 +4,20 @@ 4.0.0 hu.blackbelt.judo.generator - judo-psm-generator-jackson + judo-psm-generator-jaxrs ${revision} - judo-psm-generator-jackson-impl + judo-psm-generator-jaxrs-impl bundle - JUDO PSM Generator Jackson REST Implementation - JUDO PSM Jackson REST Generator Implementation, helpers and templates + JUDO PSM Generator Jakarta RESTful Web Services Implementation + JUDO PSM Jakarta RESTful Web Services Generator Implementation, helpers and templates hu.blackbelt.judo.generator - judo-psm-generator-jackson-api + judo-psm-generator-jaxrs-api diff --git a/judo-psm-generator-jackson-impl/src/main/java/hu/blackbelt/judo/psm/generator/jackson/impl/JavaImplHelper.java b/judo-psm-generator-jaxrs-impl/src/main/java/hu/blackbelt/judo/psm/generator/jackson/impl/JavaImplHelper.java similarity index 92% rename from judo-psm-generator-jackson-impl/src/main/java/hu/blackbelt/judo/psm/generator/jackson/impl/JavaImplHelper.java rename to judo-psm-generator-jaxrs-impl/src/main/java/hu/blackbelt/judo/psm/generator/jackson/impl/JavaImplHelper.java index c1350f0..444d907 100644 --- a/judo-psm-generator-jackson-impl/src/main/java/hu/blackbelt/judo/psm/generator/jackson/impl/JavaImplHelper.java +++ b/judo-psm-generator-jaxrs-impl/src/main/java/hu/blackbelt/judo/psm/generator/jackson/impl/JavaImplHelper.java @@ -1,8 +1,8 @@ -package hu.blackbelt.judo.psm.generator.jackson.impl; +package hu.blackbelt.judo.psm.generator.jaxrs.impl; /*- * #%L - * JUDO PSM Generator Jackson REST Implementation + * JUDO PSM Generator Jakarta RESTful Web Services Implementation * %% * Copyright (C) 2018 - 2023 BlackBelt Technology * %% @@ -30,8 +30,8 @@ import hu.blackbelt.judo.meta.psm.service.TransferObjectRelation; import hu.blackbelt.judo.meta.psm.service.TransferObjectType; -import static hu.blackbelt.judo.psm.generator.jackson.api.JavaApiHelper.*; -import static hu.blackbelt.judo.psm.generator.jackson.api.JavaNamespaceHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.JavaApiHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.JavaNamespaceHelper.*; @TemplateHelper public class JavaImplHelper extends StaticMethodValueResolver { diff --git a/judo-psm-generator-jackson-impl/src/main/resources/psm-jackson.yaml b/judo-psm-generator-jaxrs-impl/src/main/resources/psm-jaxrs.yaml similarity index 100% rename from judo-psm-generator-jackson-impl/src/main/resources/psm-jackson.yaml rename to judo-psm-generator-jaxrs-impl/src/main/resources/psm-jaxrs.yaml diff --git a/judo-psm-generator-jackson-impl/src/main/resources/rest/impl/application.config.impl.java.hbs b/judo-psm-generator-jaxrs-impl/src/main/resources/rest/impl/application.config.impl.java.hbs similarity index 100% rename from judo-psm-generator-jackson-impl/src/main/resources/rest/impl/application.config.impl.java.hbs rename to judo-psm-generator-jaxrs-impl/src/main/resources/rest/impl/application.config.impl.java.hbs diff --git a/judo-psm-generator-jackson-impl/src/main/resources/rest/impl/rest.service.impl.java.hbs b/judo-psm-generator-jaxrs-impl/src/main/resources/rest/impl/rest.service.impl.java.hbs similarity index 100% rename from judo-psm-generator-jackson-impl/src/main/resources/rest/impl/rest.service.impl.java.hbs rename to judo-psm-generator-jaxrs-impl/src/main/resources/rest/impl/rest.service.impl.java.hbs diff --git a/judo-psm-generator-jackson-osgi/.settings/org.eclipse.jdt.core.prefs b/judo-psm-generator-jaxrs-osgi/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from judo-psm-generator-jackson-osgi/.settings/org.eclipse.jdt.core.prefs rename to judo-psm-generator-jaxrs-osgi/.settings/org.eclipse.jdt.core.prefs diff --git a/judo-psm-generator-jackson-osgi/LICENSE.txt b/judo-psm-generator-jaxrs-osgi/LICENSE.txt similarity index 100% rename from judo-psm-generator-jackson-osgi/LICENSE.txt rename to judo-psm-generator-jaxrs-osgi/LICENSE.txt diff --git a/judo-psm-generator-jackson-osgi/pom.xml b/judo-psm-generator-jaxrs-osgi/pom.xml similarity index 61% rename from judo-psm-generator-jackson-osgi/pom.xml rename to judo-psm-generator-jaxrs-osgi/pom.xml index ae79304..632d144 100644 --- a/judo-psm-generator-jackson-osgi/pom.xml +++ b/judo-psm-generator-jaxrs-osgi/pom.xml @@ -4,24 +4,24 @@ 4.0.0 hu.blackbelt.judo.generator - judo-psm-generator-jackson + judo-psm-generator-jaxrs ${revision} - judo-psm-generator-jackson-osgi + judo-psm-generator-jaxrs-osgi bundle - JUDO PSM Generator Jackson REST OSGI - JUDO PSM Jackson REST Generator OSGi descriptor, helpers and templates + JUDO PSM Generator Jakarta RESTful Web Services OSGI + JUDO PSM Jakarta RESTful Web Services Generator OSGi descriptor, helpers and templates hu.blackbelt.judo.generator - judo-psm-generator-jackson-api + judo-psm-generator-jaxrs-api hu.blackbelt.judo.generator - judo-psm-generator-jackson-impl + judo-psm-generator-jaxrs-impl diff --git a/judo-psm-generator-jackson-osgi/src/main/java/hu/blackbelt/judo/psm/generator/jackson/osgi/JavaOsgiHelper.java b/judo-psm-generator-jaxrs-osgi/src/main/java/hu/blackbelt/judo/psm/generator/jackson/osgi/JavaOsgiHelper.java similarity index 92% rename from judo-psm-generator-jackson-osgi/src/main/java/hu/blackbelt/judo/psm/generator/jackson/osgi/JavaOsgiHelper.java rename to judo-psm-generator-jaxrs-osgi/src/main/java/hu/blackbelt/judo/psm/generator/jackson/osgi/JavaOsgiHelper.java index b2e4eec..8244211 100644 --- a/judo-psm-generator-jackson-osgi/src/main/java/hu/blackbelt/judo/psm/generator/jackson/osgi/JavaOsgiHelper.java +++ b/judo-psm-generator-jaxrs-osgi/src/main/java/hu/blackbelt/judo/psm/generator/jackson/osgi/JavaOsgiHelper.java @@ -1,8 +1,8 @@ -package hu.blackbelt.judo.psm.generator.jackson.osgi; +package hu.blackbelt.judo.psm.generator.jaxrs.osgi; /*- * #%L - * JUDO PSM Generator Jackson REST Implementation + * JUDO PSM Generator Jakarta RESTful Web Services Implementation * %% * Copyright (C) 2018 - 2023 BlackBelt Technology * %% @@ -31,8 +31,8 @@ import hu.blackbelt.judo.meta.psm.service.TransferObjectType; import hu.blackbelt.judo.meta.psm.service.TransferOperation; -import static hu.blackbelt.judo.psm.generator.jackson.api.JavaApiHelper.*; -import static hu.blackbelt.judo.psm.generator.jackson.api.JavaNamespaceHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.JavaApiHelper.*; +import static hu.blackbelt.judo.psm.generator.jaxrs.api.JavaNamespaceHelper.*; @TemplateHelper public class JavaOsgiHelper extends StaticMethodValueResolver { diff --git a/judo-psm-generator-jackson-osgi/src/main/resources/psm-jackson.yaml b/judo-psm-generator-jaxrs-osgi/src/main/resources/psm-jaxrs.yaml similarity index 100% rename from judo-psm-generator-jackson-osgi/src/main/resources/psm-jackson.yaml rename to judo-psm-generator-jaxrs-osgi/src/main/resources/psm-jaxrs.yaml diff --git a/judo-psm-generator-jackson-osgi/src/main/resources/rest/osgi/application.config.osgi.java.hbs b/judo-psm-generator-jaxrs-osgi/src/main/resources/rest/osgi/application.config.osgi.java.hbs similarity index 100% rename from judo-psm-generator-jackson-osgi/src/main/resources/rest/osgi/application.config.osgi.java.hbs rename to judo-psm-generator-jaxrs-osgi/src/main/resources/rest/osgi/application.config.osgi.java.hbs diff --git a/judo-psm-generator-jackson-osgi/src/main/resources/rest/osgi/rest.service.osgi.java.hbs b/judo-psm-generator-jaxrs-osgi/src/main/resources/rest/osgi/rest.service.osgi.java.hbs similarity index 100% rename from judo-psm-generator-jackson-osgi/src/main/resources/rest/osgi/rest.service.osgi.java.hbs rename to judo-psm-generator-jaxrs-osgi/src/main/resources/rest/osgi/rest.service.osgi.java.hbs diff --git a/judo-psm-generator-jackson-test/.settings/org.eclipse.jdt.core.prefs b/judo-psm-generator-jaxrs-test/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from judo-psm-generator-jackson-test/.settings/org.eclipse.jdt.core.prefs rename to judo-psm-generator-jaxrs-test/.settings/org.eclipse.jdt.core.prefs diff --git a/judo-psm-generator-jackson-test/LICENSE.txt b/judo-psm-generator-jaxrs-test/LICENSE.txt similarity index 100% rename from judo-psm-generator-jackson-test/LICENSE.txt rename to judo-psm-generator-jaxrs-test/LICENSE.txt diff --git a/judo-psm-generator-jackson-test/pom.xml b/judo-psm-generator-jaxrs-test/pom.xml similarity index 86% rename from judo-psm-generator-jackson-test/pom.xml rename to judo-psm-generator-jaxrs-test/pom.xml index 99d7c13..a0dbda4 100644 --- a/judo-psm-generator-jackson-test/pom.xml +++ b/judo-psm-generator-jaxrs-test/pom.xml @@ -4,36 +4,36 @@ 4.0.0 hu.blackbelt.judo.generator - judo-psm-generator-jackson + judo-psm-generator-jaxrs ${revision} - judo-psm-generator-jackson-test + judo-psm-generator-jaxrs-test bundle - JUDO PSM Generator Jackson REST Test - JUDO PSM Jackson REST Generator test + JUDO PSM Generator Jakarta RESTful Web Services Test + JUDO PSM Jakarta RESTful Web Services Generator test hu.blackbelt.judo.generator - judo-psm-generator-jackson-common + judo-psm-generator-jaxrs-common hu.blackbelt.judo.generator - judo-psm-generator-jackson-api + judo-psm-generator-jaxrs-api hu.blackbelt.judo.generator - judo-psm-generator-jackson-impl + judo-psm-generator-jaxrs-impl hu.blackbelt.judo.generator - judo-psm-generator-jackson-osgi + judo-psm-generator-jaxrs-osgi @@ -108,22 +108,22 @@ judo-psm-generator-maven-plugin - mvn:hu.blackbelt.judo.generator:judo-psm-generator-jackson-common:${project.version} - mvn:hu.blackbelt.judo.generator:judo-psm-generator-jackson-api:${project.version} - mvn:hu.blackbelt.judo.generator:judo-psm-generator-jackson-impl:${project.version} - mvn:hu.blackbelt.judo.generator:judo-psm-generator-jackson-osgi:${project.version} + mvn:hu.blackbelt.judo.generator:judo-psm-generator-jaxrs-common:${project.version} + mvn:hu.blackbelt.judo.generator:judo-psm-generator-jaxrs-api:${project.version} + mvn:hu.blackbelt.judo.generator:judo-psm-generator-jaxrs-impl:${project.version} + mvn:hu.blackbelt.judo.generator:judo-psm-generator-jaxrs-osgi:${project.version} - psm-jackson - hu.blackbelt.judo.psm.generator.jackson.api.StoredVariableHelper + psm-jaxrs + hu.blackbelt.judo.psm.generator.jaxrs.api.StoredVariableHelper hu.blackbelt.judo.generator.commons, - hu.blackbelt.judo.psm.generator.jackson + hu.blackbelt.judo.psm.generator.jaxrs true - hu.blackbelt.judo.psm.generator.jackson.test.api - hu.blackbelt.judo.psm.generator.jackson.test.impl - hu.blackbelt.judo.psm.generator.jackson.test.osgi + hu.blackbelt.judo.psm.generator.jaxrs.test.api + hu.blackbelt.judo.psm.generator.jaxrs.test.impl + hu.blackbelt.judo.psm.generator.jaxrs.test.osgi true true @@ -153,7 +153,7 @@ mvn:hu.blackbelt.judo.meta:hu.blackbelt.judo.meta.psm.model.northwind:${judo-meta-psm-version}!northwind-psm.model - ${basedir}/target/generated-sources/psm/jackson/northwind + ${basedir}/target/generated-sources/psm/jaxrs/northwind @@ -167,7 +167,7 @@ ${basedir}/src/test/resources/model/northwind-psm.model - ${basedir}/target/generated-sources/psm/jackson/Northwind-Esm + ${basedir}/target/generated-sources/psm/jaxrs/Northwind-Esm @@ -181,7 +181,7 @@ ${basedir}/src/test/resources/model/BinaryTypeTest-psm.model - ${basedir}/target/generated-sources/psm/jackson/BinaryTypeTest + ${basedir}/target/generated-sources/psm/jaxrs/BinaryTypeTest @@ -195,7 +195,7 @@ ${basedir}/src/test/resources/model/ParameterizedQueryTest-psm.model - ${basedir}/target/generated-sources/psm/jackson/ParameterizedQueryTest + ${basedir}/target/generated-sources/psm/jaxrs/ParameterizedQueryTest @@ -209,7 +209,7 @@ ${basedir}/src/test/resources/model/FormsTest-psm.model - ${basedir}/target/generated-sources/psm/jackson/FormsTest + ${basedir}/target/generated-sources/psm/jaxrs/FormsTest @@ -223,7 +223,7 @@ ${basedir}/src/test/resources/model/CardsAndLabelsTest-psm.model - ${basedir}/target/generated-sources/psm/jackson/CardsAndLabelsTest + ${basedir}/target/generated-sources/psm/jaxrs/CardsAndLabelsTest @@ -237,7 +237,7 @@ ${basedir}/src/test/resources/model/ActionGroupTest-psm.model - ${basedir}/target/generated-sources/psm/jackson/ActionGroupTest + ${basedir}/target/generated-sources/psm/jaxrs/ActionGroupTest @@ -251,7 +251,7 @@ ${basedir}/src/test/resources/model/ApplicationSelectionTest-psm.model - ${basedir}/target/generated-sources/psm/jackson/ApplicationSelectionTest + ${basedir}/target/generated-sources/psm/jaxrs/ApplicationSelectionTest @@ -290,14 +290,14 @@ - ${basedir}/target/generated-sources/psm/jackson/Northwind-Esm - ${basedir}/target/generated-sources/psm/jackson/Northwind - ${basedir}/target/generated-sources/psm/jackson/BinaryTypeTest - ${basedir}/target/generated-sources/psm/jackson/ParameterizedQueryTest - ${basedir}/target/generated-sources/psm/jackson/FormsTest - ${basedir}/target/generated-sources/psm/jackson/CardsAndLabelsTest - ${basedir}/target/generated-sources/psm/jackson/ActionGroupTest - ${basedir}/target/generated-sources/psm/jackson/ApplicationSelectionTest + ${basedir}/target/generated-sources/psm/jaxrs/Northwind-Esm + ${basedir}/target/generated-sources/psm/jaxrs/Northwind + ${basedir}/target/generated-sources/psm/jaxrs/BinaryTypeTest + ${basedir}/target/generated-sources/psm/jaxrs/ParameterizedQueryTest + ${basedir}/target/generated-sources/psm/jaxrs/FormsTest + ${basedir}/target/generated-sources/psm/jaxrs/CardsAndLabelsTest + ${basedir}/target/generated-sources/psm/jaxrs/ActionGroupTest + ${basedir}/target/generated-sources/psm/jaxrs/ApplicationSelectionTest diff --git a/judo-psm-generator-jackson-test/src/test/resources/model/ActionGroupTest-psm.model b/judo-psm-generator-jaxrs-test/src/test/resources/model/ActionGroupTest-psm.model similarity index 100% rename from judo-psm-generator-jackson-test/src/test/resources/model/ActionGroupTest-psm.model rename to judo-psm-generator-jaxrs-test/src/test/resources/model/ActionGroupTest-psm.model diff --git a/judo-psm-generator-jackson-test/src/test/resources/model/ApplicationSelectionTest-psm.model b/judo-psm-generator-jaxrs-test/src/test/resources/model/ApplicationSelectionTest-psm.model similarity index 100% rename from judo-psm-generator-jackson-test/src/test/resources/model/ApplicationSelectionTest-psm.model rename to judo-psm-generator-jaxrs-test/src/test/resources/model/ApplicationSelectionTest-psm.model diff --git a/judo-psm-generator-jackson-test/src/test/resources/model/BinaryTypeTest-psm.model b/judo-psm-generator-jaxrs-test/src/test/resources/model/BinaryTypeTest-psm.model similarity index 100% rename from judo-psm-generator-jackson-test/src/test/resources/model/BinaryTypeTest-psm.model rename to judo-psm-generator-jaxrs-test/src/test/resources/model/BinaryTypeTest-psm.model diff --git a/judo-psm-generator-jackson-test/src/test/resources/model/CardsAndLabelsTest-psm.model b/judo-psm-generator-jaxrs-test/src/test/resources/model/CardsAndLabelsTest-psm.model similarity index 100% rename from judo-psm-generator-jackson-test/src/test/resources/model/CardsAndLabelsTest-psm.model rename to judo-psm-generator-jaxrs-test/src/test/resources/model/CardsAndLabelsTest-psm.model diff --git a/judo-psm-generator-jackson-test/src/test/resources/model/FormsTest-psm.model b/judo-psm-generator-jaxrs-test/src/test/resources/model/FormsTest-psm.model similarity index 100% rename from judo-psm-generator-jackson-test/src/test/resources/model/FormsTest-psm.model rename to judo-psm-generator-jaxrs-test/src/test/resources/model/FormsTest-psm.model diff --git a/judo-psm-generator-jackson-test/src/test/resources/model/ParameterizedQueryTest-psm.model b/judo-psm-generator-jaxrs-test/src/test/resources/model/ParameterizedQueryTest-psm.model similarity index 100% rename from judo-psm-generator-jackson-test/src/test/resources/model/ParameterizedQueryTest-psm.model rename to judo-psm-generator-jaxrs-test/src/test/resources/model/ParameterizedQueryTest-psm.model diff --git a/judo-psm-generator-jackson-test/src/test/resources/model/northwind-psm.model b/judo-psm-generator-jaxrs-test/src/test/resources/model/northwind-psm.model similarity index 100% rename from judo-psm-generator-jackson-test/src/test/resources/model/northwind-psm.model rename to judo-psm-generator-jaxrs-test/src/test/resources/model/northwind-psm.model diff --git a/pom.xml b/pom.xml index a3f5cc9..0308bdf 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ 4.0.0 hu.blackbelt.judo.generator - judo-psm-generator-jackson + judo-psm-generator-jaxrs ${revision} pom - JUDO PSM Generator Jackson REST - JUDO PSM Jackson REST Generator helpers and templates + JUDO PSM Generator Jakarta RESTful Web Services + JUDO PSM Jakarta RESTful Web Services Generator helpers and templates @@ -31,8 +31,8 @@ 1.0.0-SNAPSHOT 3.9.4 - judo-psm-generator-jackson - BlackBeltTechnology/judo-psm-generator-jackson + judo-psm-generator-jaxrs + BlackBeltTechnology/judo-psm-generator-jaxrs UTF-8 ${maven.build.timestamp} @@ -160,31 +160,31 @@ hu.blackbelt.judo.generator - judo-psm-generator-jackson-common + judo-psm-generator-jaxrs-common ${project.version} hu.blackbelt.judo.generator - judo-psm-generator-jackson-api + judo-psm-generator-jaxrs-api ${project.version} hu.blackbelt.judo.generator - judo-psm-generator-jackson-impl + judo-psm-generator-jaxrs-impl ${project.version} hu.blackbelt.judo.generator - judo-psm-generator-jackson-osgi + judo-psm-generator-jaxrs-osgi ${project.version} hu.blackbelt.judo.generator - judo-psm-generator-jackson-test + judo-psm-generator-jaxrs-test ${project.version} @@ -373,7 +373,7 @@ target/classes - hu.blackbelt.judo.psm.generator.jackson + hu.blackbelt.judo.psm.generator.jaxrs @@ -416,11 +416,11 @@ - judo-psm-generator-jackson-common - judo-psm-generator-jackson-api - judo-psm-generator-jackson-impl - judo-psm-generator-jackson-osgi - judo-psm-generator-jackson-test + judo-psm-generator-jaxrs-common + judo-psm-generator-jaxrs-api + judo-psm-generator-jaxrs-impl + judo-psm-generator-jaxrs-osgi + judo-psm-generator-jaxrs-test