From 3a6446d62597689921e09d41deaaa0c44b639a34 Mon Sep 17 00:00:00 2001 From: Jimmy Praet Date: Tue, 21 Apr 2026 17:29:35 +0200 Subject: [PATCH 1/2] Fix split packages in java ee / jakarta ee modules Split into ee.core, ee.client and ee.server packages --- .../github/belgif/rest/problem/FrontendImpl.java | 4 ++-- .../belgif/rest/problem/LocalDateConverter.java | 2 +- .../github/belgif/rest/problem/FrontendImpl.java | 4 ++-- .../belgif/rest/problem/LocalDateConverter.java | 2 +- .../problem/quarkus/it/LocalDateConverter.java | 2 +- .../ClientProblemObjectMapperContextResolver.java | 4 ++-- .../jaxrs}/ProblemClientBuilder.java | 2 +- .../jaxrs}/ProblemClientBuilderProducer.java | 2 +- .../jaxrs}/ProblemClientResponseFilter.java | 8 ++++---- .../jaxrs}/ProblemResponseExceptionMapper.java | 4 ++-- .../jaxrs}/ProblemRestClientListener.java | 6 +++--- .../client => client/jaxrs}/ProblemSupport.java | 6 +++--- .../client => client/jaxrs}/ProblemWrapper.java | 2 +- .../resteasy}/ResteasyProblemSupport.java | 14 +++++++------- ...microprofile.rest.client.spi.RestClientListener | 2 +- ...ientProblemObjectMapperContextResolverTest.java | 7 ++++--- .../jaxrs}/ProblemClientBuilderProducerTest.java | 2 +- .../jaxrs}/ProblemClientBuilderTest.java | 4 ++-- .../jaxrs}/ProblemClientResponseFilterTest.java | 6 +++--- .../jaxrs}/ProblemResponseExceptionMapperTest.java | 4 ++-- .../jaxrs}/ProblemRestClientListenerTest.java | 4 ++-- .../jaxrs}/ProblemSupportTest.java | 6 +++--- .../jaxrs}/ProblemWrapperTest.java | 2 +- .../resteasy}/ResteasyProblemSupportTest.java | 10 +++++----- .../problem/ee/{ => core}/CdiProblemModule.java | 2 +- .../ee/{ => core}/CdiProblemTypeRegistry.java | 2 +- .../problem/ee/{ => core}/jaxrs/JaxRsUtil.java | 2 +- .../ee/{ => core}/jaxrs/ProblemConfigurator.java | 2 +- .../ee/{ => core}/jaxrs/ProblemMediaType.java | 2 +- .../ee/{ => core}/jaxrs/ProblemObjectMapper.java | 4 ++-- .../jaxrs/ProblemObjectMapperContextResolver.java | 2 +- .../rest/problem/ee/{ => core}/util/Platform.java | 2 +- .../services/javax.enterprise.inject.spi.Extension | 2 +- .../ee/{ => core}/CdiProblemModuleTest.java | 4 ++-- .../ee/{ => core}/CdiProblemTypeRegistryTest.java | 2 +- .../problem/ee/{ => core}/jaxrs/JaxRsUtilTest.java | 2 +- .../{ => core}/jaxrs/ProblemConfiguratorTest.java | 2 +- .../ee/{ => core}/jaxrs/ProblemMediaTypeTest.java | 2 +- .../ProblemObjectMapperContextResolverTest.java | 7 ++++--- .../problem/ee/{ => core}/util/PlatformTest.java | 2 +- .../internal/ConstraintViolationUtil.java | 2 +- .../internal/ParameterSourceMapper.java | 2 +- .../jaxrs/AbstractInputParamConverterProvider.java | 4 ++-- .../jaxrs/AbstractUnwrappingExceptionMapper.java | 5 +++-- .../jaxrs/BadRequestExceptionMapper.java | 3 ++- .../jaxrs/ConstraintViolationExceptionMapper.java | 5 +++-- .../{ => server}/jaxrs/DefaultExceptionMapper.java | 3 ++- .../ee/{ => server}/jaxrs/EJBExceptionMapper.java | 2 +- .../jaxrs/JacksonJsonMappingExceptionMapper.java | 3 ++- .../jaxrs/JacksonJsonParseExceptionMapper.java | 3 ++- .../JacksonMismatchedInputExceptionMapper.java | 2 +- .../jaxrs/JaxRsParameterNameProvider.java | 2 +- .../jaxrs/NotFoundExceptionMapper.java | 3 ++- .../{ => server}/jaxrs/ProblemExceptionMapper.java | 3 ++- .../jaxrs/WebApplicationExceptionMapper.java | 2 +- .../jaxrs/i18n/I18NAcceptLanguageFilter.java | 2 +- .../jaxrs/i18n/ThreadLocalLocaleResolver.java | 2 +- ....github.belgif.rest.problem.i18n.LocaleResolver | 2 +- .../src/main/resources/META-INF/validation.xml | 2 +- .../internal/ConstraintViolationUtilTest.java | 2 +- .../AbstractInputParamConverterProviderTest.java | 2 +- .../jaxrs/BadRequestExceptionMapperTest.java | 2 +- .../ConstraintViolationExceptionMapperTest.java | 2 +- .../jaxrs/DefaultExceptionMapperTest.java | 2 +- .../{ => server}/jaxrs/EJBExceptionMapperTest.java | 2 +- .../JacksonJsonMappingExceptionMapperTest.java | 4 ++-- .../jaxrs/JacksonJsonParseExceptionMapperTest.java | 2 +- .../JacksonMismatchedInputExceptionMapperTest.java | 2 +- .../jaxrs/JaxRsParameterNameProviderTest.java | 2 +- .../jaxrs/NotFoundExceptionMapperTest.java | 2 +- .../jaxrs/ProblemExceptionMapperTest.java | 2 +- .../jaxrs/WebApplicationExceptionMapperTest.java | 2 +- .../jaxrs/i18n/I18NAcceptLanguageFilterTest.java | 2 +- .../jaxrs/i18n/ThreadLocalLocaleResolverTest.java | 2 +- .../client/ProblemExtensionClientProcessor.java | 6 +++--- .../ProblemExtensionClientProcessorTest.java | 6 +++--- belgif-rest-problem-quarkus-core/pom.xml | 6 +++--- .../core/ProblemObjectMapperCustomizer.java | 2 +- .../core/ProblemObjectMapperCustomizerTest.java | 4 ++-- belgif-rest-problem-quarkus-server/pom.xml | 4 ++-- .../quarkus/server/i18n/QuarkusLocaleResolver.java | 3 ++- src/main/asciidoc/index.adoc | 2 +- src/main/asciidoc/release-notes.adoc | 5 +++++ 83 files changed, 144 insertions(+), 128 deletions(-) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ClientProblemObjectMapperContextResolver.java (86%) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemClientBuilder.java (98%) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemClientBuilderProducer.java (91%) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemClientResponseFilter.java (90%) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemResponseExceptionMapper.java (90%) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemRestClientListener.java (82%) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemSupport.java (95%) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemWrapper.java (93%) rename belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/{resteasy/client => client/resteasy}/ResteasyProblemSupport.java (82%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ClientProblemObjectMapperContextResolverTest.java (85%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemClientBuilderProducerTest.java (93%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemClientBuilderTest.java (98%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemClientResponseFilterTest.java (96%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemResponseExceptionMapperTest.java (94%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemRestClientListenerTest.java (94%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemSupportTest.java (98%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{jaxrs/client => client/jaxrs}/ProblemWrapperTest.java (90%) rename belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/{resteasy/client => client/resteasy}/ResteasyProblemSupportTest.java (92%) rename belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/{ => core}/CdiProblemModule.java (90%) rename belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/{ => core}/CdiProblemTypeRegistry.java (97%) rename belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/JaxRsUtil.java (98%) rename belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/ProblemConfigurator.java (96%) rename belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/ProblemMediaType.java (94%) rename belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/ProblemObjectMapper.java (75%) rename belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/ProblemObjectMapperContextResolver.java (90%) rename belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/{ => core}/util/Platform.java (91%) rename belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/{ => core}/CdiProblemModuleTest.java (94%) rename belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/{ => core}/CdiProblemTypeRegistryTest.java (97%) rename belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/JaxRsUtilTest.java (99%) rename belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/ProblemConfiguratorTest.java (99%) rename belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/ProblemMediaTypeTest.java (96%) rename belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/{ => core}/jaxrs/ProblemObjectMapperContextResolverTest.java (85%) rename belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/{ => core}/util/PlatformTest.java (85%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/internal/ConstraintViolationUtil.java (98%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/internal/ParameterSourceMapper.java (97%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/AbstractInputParamConverterProvider.java (94%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/AbstractUnwrappingExceptionMapper.java (89%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/BadRequestExceptionMapper.java (83%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/ConstraintViolationExceptionMapper.java (86%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/DefaultExceptionMapper.java (86%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/EJBExceptionMapper.java (95%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/JacksonJsonMappingExceptionMapper.java (88%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/JacksonJsonParseExceptionMapper.java (88%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/JacksonMismatchedInputExceptionMapper.java (94%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/JaxRsParameterNameProvider.java (97%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/NotFoundExceptionMapper.java (83%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/ProblemExceptionMapper.java (78%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/WebApplicationExceptionMapper.java (97%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/i18n/I18NAcceptLanguageFilter.java (94%) rename belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/i18n/ThreadLocalLocaleResolver.java (94%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/internal/ConstraintViolationUtilTest.java (99%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/AbstractInputParamConverterProviderTest.java (97%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/BadRequestExceptionMapperTest.java (98%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/ConstraintViolationExceptionMapperTest.java (97%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/DefaultExceptionMapperTest.java (93%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/EJBExceptionMapperTest.java (94%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/JacksonJsonMappingExceptionMapperTest.java (94%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/JacksonJsonParseExceptionMapperTest.java (95%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/JacksonMismatchedInputExceptionMapperTest.java (96%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/JaxRsParameterNameProviderTest.java (97%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/NotFoundExceptionMapperTest.java (98%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/ProblemExceptionMapperTest.java (90%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/WebApplicationExceptionMapperTest.java (96%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/i18n/I18NAcceptLanguageFilterTest.java (97%) rename belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/{ => server}/jaxrs/i18n/ThreadLocalLocaleResolverTest.java (94%) diff --git a/belgif-rest-problem-it/belgif-rest-problem-jakarta-ee-it/src/main/java/io/github/belgif/rest/problem/FrontendImpl.java b/belgif-rest-problem-it/belgif-rest-problem-jakarta-ee-it/src/main/java/io/github/belgif/rest/problem/FrontendImpl.java index edae5a3a..22fdc3ee 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-jakarta-ee-it/src/main/java/io/github/belgif/rest/problem/FrontendImpl.java +++ b/belgif-rest-problem-it/belgif-rest-problem-jakarta-ee-it/src/main/java/io/github/belgif/rest/problem/FrontendImpl.java @@ -23,8 +23,8 @@ import io.github.belgif.rest.problem.api.Input; import io.github.belgif.rest.problem.api.Problem; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemSupport; -import io.github.belgif.rest.problem.ee.resteasy.client.ResteasyProblemSupport; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemSupport; +import io.github.belgif.rest.problem.ee.client.resteasy.ResteasyProblemSupport; import io.github.belgif.rest.problem.i18n.I18N; import io.github.belgif.rest.problem.it.model.Bean; import io.github.belgif.rest.problem.it.model.ChildModel; diff --git a/belgif-rest-problem-it/belgif-rest-problem-jakarta-ee-it/src/main/java/io/github/belgif/rest/problem/LocalDateConverter.java b/belgif-rest-problem-it/belgif-rest-problem-jakarta-ee-it/src/main/java/io/github/belgif/rest/problem/LocalDateConverter.java index a2475209..ca9a72da 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-jakarta-ee-it/src/main/java/io/github/belgif/rest/problem/LocalDateConverter.java +++ b/belgif-rest-problem-it/belgif-rest-problem-jakarta-ee-it/src/main/java/io/github/belgif/rest/problem/LocalDateConverter.java @@ -10,7 +10,7 @@ import jakarta.ws.rs.ext.Provider; import io.github.belgif.rest.problem.api.InEnum; -import io.github.belgif.rest.problem.ee.jaxrs.AbstractInputParamConverterProvider; +import io.github.belgif.rest.problem.ee.server.jaxrs.AbstractInputParamConverterProvider; @Provider public class LocalDateConverter extends AbstractInputParamConverterProvider { diff --git a/belgif-rest-problem-it/belgif-rest-problem-java-ee-it/src/main/java/io/github/belgif/rest/problem/FrontendImpl.java b/belgif-rest-problem-it/belgif-rest-problem-java-ee-it/src/main/java/io/github/belgif/rest/problem/FrontendImpl.java index 97e45ed4..fb151b98 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-java-ee-it/src/main/java/io/github/belgif/rest/problem/FrontendImpl.java +++ b/belgif-rest-problem-it/belgif-rest-problem-java-ee-it/src/main/java/io/github/belgif/rest/problem/FrontendImpl.java @@ -23,8 +23,8 @@ import io.github.belgif.rest.problem.api.Input; import io.github.belgif.rest.problem.api.Problem; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemSupport; -import io.github.belgif.rest.problem.ee.resteasy.client.ResteasyProblemSupport; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemSupport; +import io.github.belgif.rest.problem.ee.client.resteasy.ResteasyProblemSupport; import io.github.belgif.rest.problem.i18n.I18N; import io.github.belgif.rest.problem.it.model.Bean; import io.github.belgif.rest.problem.it.model.ChildModel; diff --git a/belgif-rest-problem-it/belgif-rest-problem-java-ee-it/src/main/java/io/github/belgif/rest/problem/LocalDateConverter.java b/belgif-rest-problem-it/belgif-rest-problem-java-ee-it/src/main/java/io/github/belgif/rest/problem/LocalDateConverter.java index edbc79b0..dafb618e 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-java-ee-it/src/main/java/io/github/belgif/rest/problem/LocalDateConverter.java +++ b/belgif-rest-problem-it/belgif-rest-problem-java-ee-it/src/main/java/io/github/belgif/rest/problem/LocalDateConverter.java @@ -10,7 +10,7 @@ import javax.ws.rs.ext.Provider; import io.github.belgif.rest.problem.api.InEnum; -import io.github.belgif.rest.problem.ee.jaxrs.AbstractInputParamConverterProvider; +import io.github.belgif.rest.problem.ee.server.jaxrs.AbstractInputParamConverterProvider; @Provider public class LocalDateConverter extends AbstractInputParamConverterProvider { diff --git a/belgif-rest-problem-it/belgif-rest-problem-quarkus-it/src/main/java/io/github/belgif/rest/problem/quarkus/it/LocalDateConverter.java b/belgif-rest-problem-it/belgif-rest-problem-quarkus-it/src/main/java/io/github/belgif/rest/problem/quarkus/it/LocalDateConverter.java index cf6344ae..3b56b2fe 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-quarkus-it/src/main/java/io/github/belgif/rest/problem/quarkus/it/LocalDateConverter.java +++ b/belgif-rest-problem-it/belgif-rest-problem-quarkus-it/src/main/java/io/github/belgif/rest/problem/quarkus/it/LocalDateConverter.java @@ -11,7 +11,7 @@ import io.github.belgif.rest.problem.BadRequestProblem; import io.github.belgif.rest.problem.api.InEnum; -import io.github.belgif.rest.problem.ee.jaxrs.AbstractInputParamConverterProvider; +import io.github.belgif.rest.problem.ee.server.jaxrs.AbstractInputParamConverterProvider; @Provider public class LocalDateConverter extends AbstractInputParamConverterProvider { diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ClientProblemObjectMapperContextResolver.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ClientProblemObjectMapperContextResolver.java similarity index 86% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ClientProblemObjectMapperContextResolver.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ClientProblemObjectMapperContextResolver.java index 09a8527d..f67ace1c 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ClientProblemObjectMapperContextResolver.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ClientProblemObjectMapperContextResolver.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import javax.annotation.Priority; import javax.ws.rs.Priorities; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.belgif.rest.problem.ee.jaxrs.ProblemObjectMapper; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemObjectMapper; /** * Separate client-side ObjectMapper ContextResolver. diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilder.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilder.java similarity index 98% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilder.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilder.java index 543baab4..d4093467 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilder.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilder.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import java.security.KeyStore; import java.util.Map; diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderProducer.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderProducer.java similarity index 91% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderProducer.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderProducer.java index b72b5658..2531b1b6 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderProducer.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderProducer.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientResponseFilter.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientResponseFilter.java similarity index 90% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientResponseFilter.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientResponseFilter.java index e5298db8..3915cfa5 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientResponseFilter.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientResponseFilter.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import java.io.IOException; @@ -19,9 +19,9 @@ import io.github.belgif.rest.problem.DefaultProblem; import io.github.belgif.rest.problem.api.Problem; -import io.github.belgif.rest.problem.ee.jaxrs.JaxRsUtil; -import io.github.belgif.rest.problem.ee.jaxrs.ProblemMediaType; -import io.github.belgif.rest.problem.ee.jaxrs.ProblemObjectMapper; +import io.github.belgif.rest.problem.ee.core.jaxrs.JaxRsUtil; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemObjectMapper; /** * JAX-RS ClientResponseFilter that converts problem response to a ProblemWrapper exception. diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemResponseExceptionMapper.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemResponseExceptionMapper.java similarity index 90% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemResponseExceptionMapper.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemResponseExceptionMapper.java index f10cf708..d2e811ba 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemResponseExceptionMapper.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemResponseExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -9,7 +9,7 @@ import io.github.belgif.rest.problem.DefaultProblem; import io.github.belgif.rest.problem.api.Problem; -import io.github.belgif.rest.problem.ee.jaxrs.ProblemMediaType; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; /** * Client-side problem mapper for MicroProfile REST Client. diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemRestClientListener.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemRestClientListener.java similarity index 82% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemRestClientListener.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemRestClientListener.java index 70b2c938..0dc37015 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemRestClientListener.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemRestClientListener.java @@ -1,10 +1,10 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.spi.RestClientListener; -import io.github.belgif.rest.problem.ee.jaxrs.JaxRsUtil; -import io.github.belgif.rest.problem.ee.util.Platform; +import io.github.belgif.rest.problem.ee.core.jaxrs.JaxRsUtil; +import io.github.belgif.rest.problem.ee.core.util.Platform; /** * Listener that enables problem support for MicroProfile REST Clients. diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemSupport.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemSupport.java similarity index 95% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemSupport.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemSupport.java index ac99f6d1..5dd2f4c2 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemSupport.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemSupport.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -15,8 +15,8 @@ import javax.ws.rs.client.Invocation; import javax.ws.rs.client.WebTarget; -import io.github.belgif.rest.problem.ee.jaxrs.JaxRsUtil; -import io.github.belgif.rest.problem.ee.util.Platform; +import io.github.belgif.rest.problem.ee.core.jaxrs.JaxRsUtil; +import io.github.belgif.rest.problem.ee.core.util.Platform; /** * Utility class for enabling problem support on JAX-RS Clients. diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemWrapper.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemWrapper.java similarity index 93% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemWrapper.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemWrapper.java index dbc05509..f7577a73 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemWrapper.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemWrapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import javax.ws.rs.client.ResponseProcessingException; diff --git a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/resteasy/client/ResteasyProblemSupport.java b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/resteasy/ResteasyProblemSupport.java similarity index 82% rename from belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/resteasy/client/ResteasyProblemSupport.java rename to belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/resteasy/ResteasyProblemSupport.java index bc2333e7..6747e901 100644 --- a/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/resteasy/client/ResteasyProblemSupport.java +++ b/belgif-rest-problem-java-ee-client/src/main/java/io/github/belgif/rest/problem/ee/client/resteasy/ResteasyProblemSupport.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.resteasy.client; +package io.github.belgif.rest.problem.ee.client.resteasy; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -7,12 +7,12 @@ import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; -import io.github.belgif.rest.problem.ee.jaxrs.JaxRsUtil; -import io.github.belgif.rest.problem.ee.jaxrs.client.ClientProblemObjectMapperContextResolver; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemClientResponseFilter; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemSupport; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemWrapper; -import io.github.belgif.rest.problem.ee.util.Platform; +import io.github.belgif.rest.problem.ee.client.jaxrs.ClientProblemObjectMapperContextResolver; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemClientResponseFilter; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemSupport; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemWrapper; +import io.github.belgif.rest.problem.ee.core.jaxrs.JaxRsUtil; +import io.github.belgif.rest.problem.ee.core.util.Platform; /** * Utility class for enabling problem support on RESTEasy Clients. diff --git a/belgif-rest-problem-java-ee-client/src/main/resources/META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener b/belgif-rest-problem-java-ee-client/src/main/resources/META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener index 45897995..3a9e8d92 100644 --- a/belgif-rest-problem-java-ee-client/src/main/resources/META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener +++ b/belgif-rest-problem-java-ee-client/src/main/resources/META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener @@ -1 +1 @@ -io.github.belgif.rest.problem.ee.jaxrs.client.ProblemRestClientListener \ No newline at end of file +io.github.belgif.rest.problem.ee.client.jaxrs.ProblemRestClientListener \ No newline at end of file diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ClientProblemObjectMapperContextResolverTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ClientProblemObjectMapperContextResolverTest.java similarity index 85% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ClientProblemObjectMapperContextResolverTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ClientProblemObjectMapperContextResolverTest.java index e8551b39..fb8ff64c 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ClientProblemObjectMapperContextResolverTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ClientProblemObjectMapperContextResolverTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.belgif.rest.problem.ee.CdiProblemTypeRegistry; +import io.github.belgif.rest.problem.ee.core.CdiProblemTypeRegistry; import io.github.belgif.rest.problem.registry.ProblemTypeRegistry; @ExtendWith(MockitoExtension.class) @@ -41,7 +41,8 @@ void mapper() { when(instance.get()).thenReturn(registry); when(registry.getProblemTypes()).thenReturn(new HashMap<>()); ObjectMapper mapper = new ClientProblemObjectMapperContextResolver().getContext(null); - assertThat(mapper.getRegisteredModuleIds()).contains("io.github.belgif.rest.problem.ee.CdiProblemModule"); + assertThat(mapper.getRegisteredModuleIds()) + .contains("io.github.belgif.rest.problem.ee.core.CdiProblemModule"); } } diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderProducerTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderProducerTest.java similarity index 93% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderProducerTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderProducerTest.java index f607f6d1..b53bd955 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderProducerTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderProducerTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderTest.java similarity index 98% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderTest.java index 37a9dca7..978c778e 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientBuilderTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientBuilderTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -23,7 +23,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemSupport.ClientInvocationHandler; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemSupport.ClientInvocationHandler; @ExtendWith(MockitoExtension.class) class ProblemClientBuilderTest { diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientResponseFilterTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientResponseFilterTest.java similarity index 96% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientResponseFilterTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientResponseFilterTest.java index 327ba5ca..d56cce6c 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemClientResponseFilterTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemClientResponseFilterTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -29,8 +29,8 @@ import io.github.belgif.rest.problem.BadRequestProblem; import io.github.belgif.rest.problem.DefaultProblem; import io.github.belgif.rest.problem.api.Problem; -import io.github.belgif.rest.problem.ee.jaxrs.JaxRsUtil; -import io.github.belgif.rest.problem.ee.jaxrs.ProblemMediaType; +import io.github.belgif.rest.problem.ee.core.jaxrs.JaxRsUtil; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; @ExtendWith(MockitoExtension.class) class ProblemClientResponseFilterTest { diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemResponseExceptionMapperTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemResponseExceptionMapperTest.java similarity index 94% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemResponseExceptionMapperTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemResponseExceptionMapperTest.java index 1df3b45d..4b4c42e2 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemResponseExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemResponseExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -16,7 +16,7 @@ import io.github.belgif.rest.problem.BadRequestProblem; import io.github.belgif.rest.problem.DefaultProblem; import io.github.belgif.rest.problem.api.Problem; -import io.github.belgif.rest.problem.ee.jaxrs.ProblemMediaType; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; @ExtendWith(MockitoExtension.class) class ProblemResponseExceptionMapperTest { diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemRestClientListenerTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemRestClientListenerTest.java similarity index 94% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemRestClientListenerTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemRestClientListenerTest.java index 7e7e3cd8..4571451c 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemRestClientListenerTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemRestClientListenerTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import static org.mockito.Mockito.*; @@ -11,7 +11,7 @@ import org.mockito.MockedStatic; import org.mockito.junit.jupiter.MockitoExtension; -import io.github.belgif.rest.problem.ee.util.Platform; +import io.github.belgif.rest.problem.ee.core.util.Platform; @ExtendWith(MockitoExtension.class) class ProblemRestClientListenerTest { diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemSupportTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemSupportTest.java similarity index 98% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemSupportTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemSupportTest.java index 392f8382..c1ef9e2a 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemSupportTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemSupportTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -22,8 +22,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import io.github.belgif.rest.problem.BadRequestProblem; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemSupport.ClientInvocationHandler; -import io.github.belgif.rest.problem.ee.util.Platform; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemSupport.ClientInvocationHandler; +import io.github.belgif.rest.problem.ee.core.util.Platform; @ExtendWith(MockitoExtension.class) class ProblemSupportTest { diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemWrapperTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemWrapperTest.java similarity index 90% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemWrapperTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemWrapperTest.java index 5897a231..8c14a6e5 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/client/ProblemWrapperTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/jaxrs/ProblemWrapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.client; +package io.github.belgif.rest.problem.ee.client.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/resteasy/client/ResteasyProblemSupportTest.java b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/resteasy/ResteasyProblemSupportTest.java similarity index 92% rename from belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/resteasy/client/ResteasyProblemSupportTest.java rename to belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/resteasy/ResteasyProblemSupportTest.java index cb6cb457..3ae2ef86 100644 --- a/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/resteasy/client/ResteasyProblemSupportTest.java +++ b/belgif-rest-problem-java-ee-client/src/test/java/io/github/belgif/rest/problem/ee/client/resteasy/ResteasyProblemSupportTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.resteasy.client; +package io.github.belgif.rest.problem.ee.client.resteasy; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -16,10 +16,10 @@ import org.mockito.junit.jupiter.MockitoExtension; import io.github.belgif.rest.problem.BadGatewayProblem; -import io.github.belgif.rest.problem.ee.jaxrs.client.ClientProblemObjectMapperContextResolver; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemClientResponseFilter; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemWrapper; -import io.github.belgif.rest.problem.ee.util.Platform; +import io.github.belgif.rest.problem.ee.client.jaxrs.ClientProblemObjectMapperContextResolver; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemClientResponseFilter; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemWrapper; +import io.github.belgif.rest.problem.ee.core.util.Platform; @ExtendWith(MockitoExtension.class) class ResteasyProblemSupportTest { diff --git a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/CdiProblemModule.java b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/CdiProblemModule.java similarity index 90% rename from belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/CdiProblemModule.java rename to belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/CdiProblemModule.java index e4d9f193..457a627c 100644 --- a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/CdiProblemModule.java +++ b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/CdiProblemModule.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee; +package io.github.belgif.rest.problem.ee.core; import javax.enterprise.inject.spi.CDI; diff --git a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/CdiProblemTypeRegistry.java b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/CdiProblemTypeRegistry.java similarity index 97% rename from belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/CdiProblemTypeRegistry.java rename to belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/CdiProblemTypeRegistry.java index c310f47c..2044ec81 100644 --- a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/CdiProblemTypeRegistry.java +++ b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/CdiProblemTypeRegistry.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee; +package io.github.belgif.rest.problem.ee.core; import java.util.Collections; import java.util.HashMap; diff --git a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsUtil.java b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/JaxRsUtil.java similarity index 98% rename from belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsUtil.java rename to belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/JaxRsUtil.java index b52babac..9372b54e 100644 --- a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsUtil.java +++ b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/JaxRsUtil.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import java.util.function.Supplier; diff --git a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemConfigurator.java b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemConfigurator.java similarity index 96% rename from belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemConfigurator.java rename to belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemConfigurator.java index 647aab50..9f87b6cf 100644 --- a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemConfigurator.java +++ b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemConfigurator.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import java.util.function.Consumer; diff --git a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemMediaType.java b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemMediaType.java similarity index 94% rename from belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemMediaType.java rename to belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemMediaType.java index 387942ed..be24865b 100644 --- a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemMediaType.java +++ b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemMediaType.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import java.util.Map; diff --git a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapper.java b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapper.java similarity index 75% rename from belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapper.java rename to belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapper.java index c0b1a463..9a54ffb6 100644 --- a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapper.java +++ b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapper.java @@ -1,8 +1,8 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.belgif.rest.problem.ee.CdiProblemModule; +import io.github.belgif.rest.problem.ee.core.CdiProblemModule; /** * ObjectMapper that registers the CdiProblemModule. diff --git a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapperContextResolver.java b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapperContextResolver.java similarity index 90% rename from belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapperContextResolver.java rename to belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapperContextResolver.java index c4795d46..a33ac375 100644 --- a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapperContextResolver.java +++ b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapperContextResolver.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import javax.annotation.Priority; import javax.ws.rs.Priorities; diff --git a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/util/Platform.java b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/util/Platform.java similarity index 91% rename from belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/util/Platform.java rename to belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/util/Platform.java index fc255c7d..2637a6a3 100644 --- a/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/util/Platform.java +++ b/belgif-rest-problem-java-ee-core/src/main/java/io/github/belgif/rest/problem/ee/core/util/Platform.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.util; +package io.github.belgif.rest.problem.ee.core.util; /** * Utility class to detect the runtime platform. diff --git a/belgif-rest-problem-java-ee-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/belgif-rest-problem-java-ee-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension index afc8523b..94fd96fa 100644 --- a/belgif-rest-problem-java-ee-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension +++ b/belgif-rest-problem-java-ee-core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension @@ -1 +1 @@ -io.github.belgif.rest.problem.ee.CdiProblemTypeRegistry \ No newline at end of file +io.github.belgif.rest.problem.ee.core.CdiProblemTypeRegistry \ No newline at end of file diff --git a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/CdiProblemModuleTest.java b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/CdiProblemModuleTest.java similarity index 94% rename from belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/CdiProblemModuleTest.java rename to belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/CdiProblemModuleTest.java index 0a38d244..f04577eb 100644 --- a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/CdiProblemModuleTest.java +++ b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/CdiProblemModuleTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee; +package io.github.belgif.rest.problem.ee.core; import static org.mockito.Mockito.*; @@ -37,7 +37,7 @@ void module() { when(registry.getProblemTypes()).thenReturn(new HashMap<>()); CdiProblemModule module = new CdiProblemModule(); Assertions.assertThat(module.getModuleName()) - .isEqualTo("io.github.belgif.rest.problem.ee.CdiProblemModule"); + .isEqualTo("io.github.belgif.rest.problem.ee.core.CdiProblemModule"); } } diff --git a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/CdiProblemTypeRegistryTest.java b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/CdiProblemTypeRegistryTest.java similarity index 97% rename from belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/CdiProblemTypeRegistryTest.java rename to belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/CdiProblemTypeRegistryTest.java index e3c8e90a..d098aec3 100644 --- a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/CdiProblemTypeRegistryTest.java +++ b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/CdiProblemTypeRegistryTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee; +package io.github.belgif.rest.problem.ee.core; import static org.mockito.Mockito.*; diff --git a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsUtilTest.java b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/JaxRsUtilTest.java similarity index 99% rename from belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsUtilTest.java rename to belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/JaxRsUtilTest.java index 4d9488e2..a8b15222 100644 --- a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsUtilTest.java +++ b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/JaxRsUtilTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemConfiguratorTest.java b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemConfiguratorTest.java similarity index 99% rename from belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemConfiguratorTest.java rename to belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemConfiguratorTest.java index 3c3c57d9..808830b5 100644 --- a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemConfiguratorTest.java +++ b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemConfiguratorTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemMediaTypeTest.java b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemMediaTypeTest.java similarity index 96% rename from belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemMediaTypeTest.java rename to belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemMediaTypeTest.java index 1499dc9b..cc691fdf 100644 --- a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemMediaTypeTest.java +++ b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemMediaTypeTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapperContextResolverTest.java b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapperContextResolverTest.java similarity index 85% rename from belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapperContextResolverTest.java rename to belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapperContextResolverTest.java index 06d507ee..d73c4b66 100644 --- a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapperContextResolverTest.java +++ b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapperContextResolverTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.core.jaxrs; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.belgif.rest.problem.ee.CdiProblemTypeRegistry; +import io.github.belgif.rest.problem.ee.core.CdiProblemTypeRegistry; import io.github.belgif.rest.problem.registry.ProblemTypeRegistry; @ExtendWith(MockitoExtension.class) @@ -41,7 +41,8 @@ void mapper() { when(instance.get()).thenReturn(registry); when(registry.getProblemTypes()).thenReturn(new HashMap<>()); ObjectMapper mapper = new ProblemObjectMapperContextResolver().getContext(null); - assertThat(mapper.getRegisteredModuleIds()).contains("io.github.belgif.rest.problem.ee.CdiProblemModule"); + assertThat(mapper.getRegisteredModuleIds()) + .contains("io.github.belgif.rest.problem.ee.core.CdiProblemModule"); } } diff --git a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/util/PlatformTest.java b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/util/PlatformTest.java similarity index 85% rename from belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/util/PlatformTest.java rename to belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/util/PlatformTest.java index 303ab622..0f1435d9 100644 --- a/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/util/PlatformTest.java +++ b/belgif-rest-problem-java-ee-core/src/test/java/io/github/belgif/rest/problem/ee/core/util/PlatformTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.util; +package io.github.belgif.rest.problem.ee.core.util; import static org.assertj.core.api.AssertionsForClassTypes.*; diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/internal/ConstraintViolationUtil.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/internal/ConstraintViolationUtil.java similarity index 98% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/internal/ConstraintViolationUtil.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/internal/ConstraintViolationUtil.java index 497f0dde..362eec01 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/internal/ConstraintViolationUtil.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/internal/ConstraintViolationUtil.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.internal; +package io.github.belgif.rest.problem.ee.server.internal; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/internal/ParameterSourceMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/internal/ParameterSourceMapper.java similarity index 97% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/internal/ParameterSourceMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/internal/ParameterSourceMapper.java index 4b1233ef..61c10bae 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/internal/ParameterSourceMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/internal/ParameterSourceMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.internal; +package io.github.belgif.rest.problem.ee.server.internal; import java.lang.annotation.Annotation; import java.util.Arrays; diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractInputParamConverterProvider.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractInputParamConverterProvider.java similarity index 94% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractInputParamConverterProvider.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractInputParamConverterProvider.java index 23a740bd..48fa03cc 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractInputParamConverterProvider.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractInputParamConverterProvider.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -8,7 +8,7 @@ import io.github.belgif.rest.problem.api.InEnum; import io.github.belgif.rest.problem.api.Input; -import io.github.belgif.rest.problem.ee.internal.ParameterSourceMapper; +import io.github.belgif.rest.problem.ee.server.internal.ParameterSourceMapper; /** * Abstract base class for input-aware ("in" and "name") ParamConverter. diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractUnwrappingExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractUnwrappingExceptionMapper.java similarity index 89% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractUnwrappingExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractUnwrappingExceptionMapper.java index bea399c5..c7e5ea13 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractUnwrappingExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractUnwrappingExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -9,7 +9,8 @@ import io.github.belgif.rest.problem.BadRequestProblem; import io.github.belgif.rest.problem.api.InputValidationIssue; -import io.github.belgif.rest.problem.ee.internal.ParameterSourceMapper; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; +import io.github.belgif.rest.problem.ee.server.internal.ParameterSourceMapper; /** * Abstract base class for unwrapping BadRequestProblem cause from WebApplicationExceptions. diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/BadRequestExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/BadRequestExceptionMapper.java similarity index 83% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/BadRequestExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/BadRequestExceptionMapper.java index 0d30c029..63aa9eac 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/BadRequestExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/BadRequestExceptionMapper.java @@ -1,10 +1,11 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ws.rs.BadRequestException; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; import io.github.belgif.rest.problem.BadRequestProblem; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; /** * Exception mapper for {@link javax.ws.rs.BadRequestException}, with special handling for unwrapping BadRequestProblem diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ConstraintViolationExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/ConstraintViolationExceptionMapper.java similarity index 86% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ConstraintViolationExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/ConstraintViolationExceptionMapper.java index c062142f..c7d7a72b 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ConstraintViolationExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/ConstraintViolationExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import java.util.stream.Collectors; @@ -9,7 +9,8 @@ import io.github.belgif.rest.problem.BadRequestProblem; import io.github.belgif.rest.problem.api.InputValidationIssue; -import io.github.belgif.rest.problem.ee.internal.ConstraintViolationUtil; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; +import io.github.belgif.rest.problem.ee.server.internal.ConstraintViolationUtil; /** * ExceptionMapper for mapping ConstraintViolationException to BadRequestProblem. diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/DefaultExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/DefaultExceptionMapper.java similarity index 86% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/DefaultExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/DefaultExceptionMapper.java index ce03af42..a61a5f0c 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/DefaultExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/DefaultExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; @@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; import io.github.belgif.rest.problem.InternalServerErrorProblem; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; /** * Default ExceptionMapper for mapping unhandled exceptions to InternalServerErrorProblem. diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/EJBExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/EJBExceptionMapper.java similarity index 95% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/EJBExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/EJBExceptionMapper.java index 72e8361f..ee9f7277 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/EJBExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/EJBExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ejb.EJBException; import javax.ws.rs.core.Response; diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonMappingExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonMappingExceptionMapper.java similarity index 88% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonMappingExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonMappingExceptionMapper.java index fb073fd0..59bf3711 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonMappingExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonMappingExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import io.github.belgif.rest.problem.BadRequestProblem; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; import io.github.belgif.rest.problem.internal.Jackson2Util; /** diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonParseExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonParseExceptionMapper.java similarity index 88% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonParseExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonParseExceptionMapper.java index fde69066..368a41f9 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonParseExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonParseExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; @@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.JsonParseException; import io.github.belgif.rest.problem.BadRequestProblem; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; import io.github.belgif.rest.problem.internal.Jackson2Util; /** diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonMismatchedInputExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonMismatchedInputExceptionMapper.java similarity index 94% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonMismatchedInputExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonMismatchedInputExceptionMapper.java index 71dc82f2..3ee00b75 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonMismatchedInputExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonMismatchedInputExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsParameterNameProvider.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JaxRsParameterNameProvider.java similarity index 97% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsParameterNameProvider.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JaxRsParameterNameProvider.java index 4d5084b2..1d3cd17c 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsParameterNameProvider.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/JaxRsParameterNameProvider.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/NotFoundExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/NotFoundExceptionMapper.java similarity index 83% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/NotFoundExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/NotFoundExceptionMapper.java index 3f214d3a..2cd81f2f 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/NotFoundExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/NotFoundExceptionMapper.java @@ -1,10 +1,11 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ws.rs.NotFoundException; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; import io.github.belgif.rest.problem.ResourceNotFoundProblem; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; /** * Exception mapper for {@link javax.ws.rs.NotFoundException}, with special handling for unwrapping BadRequestProblem diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/ProblemExceptionMapper.java similarity index 78% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/ProblemExceptionMapper.java index b26151df..b6579364 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/ProblemExceptionMapper.java @@ -1,10 +1,11 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; import io.github.belgif.rest.problem.api.Problem; +import io.github.belgif.rest.problem.ee.core.jaxrs.ProblemMediaType; /** * ExceptionMapper for {@link Problem}. diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/WebApplicationExceptionMapper.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/WebApplicationExceptionMapper.java similarity index 97% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/WebApplicationExceptionMapper.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/WebApplicationExceptionMapper.java index 8710f10d..5e0ba96a 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/WebApplicationExceptionMapper.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/WebApplicationExceptionMapper.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/I18NAcceptLanguageFilter.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/I18NAcceptLanguageFilter.java similarity index 94% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/I18NAcceptLanguageFilter.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/I18NAcceptLanguageFilter.java index 715297ee..5d98bd2d 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/I18NAcceptLanguageFilter.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/I18NAcceptLanguageFilter.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.i18n; +package io.github.belgif.rest.problem.ee.server.jaxrs.i18n; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; diff --git a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/ThreadLocalLocaleResolver.java b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/ThreadLocalLocaleResolver.java similarity index 94% rename from belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/ThreadLocalLocaleResolver.java rename to belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/ThreadLocalLocaleResolver.java index 8b38a4ec..7079d77c 100644 --- a/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/ThreadLocalLocaleResolver.java +++ b/belgif-rest-problem-java-ee-server/src/main/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/ThreadLocalLocaleResolver.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.i18n; +package io.github.belgif.rest.problem.ee.server.jaxrs.i18n; import java.util.Locale; diff --git a/belgif-rest-problem-java-ee-server/src/main/resources/META-INF/services/io.github.belgif.rest.problem.i18n.LocaleResolver b/belgif-rest-problem-java-ee-server/src/main/resources/META-INF/services/io.github.belgif.rest.problem.i18n.LocaleResolver index 759796f9..3a60452c 100644 --- a/belgif-rest-problem-java-ee-server/src/main/resources/META-INF/services/io.github.belgif.rest.problem.i18n.LocaleResolver +++ b/belgif-rest-problem-java-ee-server/src/main/resources/META-INF/services/io.github.belgif.rest.problem.i18n.LocaleResolver @@ -1 +1 @@ -io.github.belgif.rest.problem.ee.jaxrs.i18n.ThreadLocalLocaleResolver \ No newline at end of file +io.github.belgif.rest.problem.ee.server.jaxrs.i18n.ThreadLocalLocaleResolver \ No newline at end of file diff --git a/belgif-rest-problem-java-ee-server/src/main/resources/META-INF/validation.xml b/belgif-rest-problem-java-ee-server/src/main/resources/META-INF/validation.xml index 29f7f314..7fd5d96f 100644 --- a/belgif-rest-problem-java-ee-server/src/main/resources/META-INF/validation.xml +++ b/belgif-rest-problem-java-ee-server/src/main/resources/META-INF/validation.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/configuration http://xmlns.jcp.org/xml/ns/validation/configuration/validation-configuration-2.0.xsd" version="2.0"> - io.github.belgif.rest.problem.ee.jaxrs.JaxRsParameterNameProvider + io.github.belgif.rest.problem.ee.server.jaxrs.JaxRsParameterNameProvider diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/internal/ConstraintViolationUtilTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/internal/ConstraintViolationUtilTest.java similarity index 99% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/internal/ConstraintViolationUtilTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/internal/ConstraintViolationUtilTest.java index 249bf179..406a5368 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/internal/ConstraintViolationUtilTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/internal/ConstraintViolationUtilTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.internal; +package io.github.belgif.rest.problem.ee.server.internal; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractInputParamConverterProviderTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractInputParamConverterProviderTest.java similarity index 97% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractInputParamConverterProviderTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractInputParamConverterProviderTest.java index 996f8646..256fcb26 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/AbstractInputParamConverterProviderTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/AbstractInputParamConverterProviderTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/BadRequestExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/BadRequestExceptionMapperTest.java similarity index 98% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/BadRequestExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/BadRequestExceptionMapperTest.java index 400ce568..edb8d41d 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/BadRequestExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/BadRequestExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ConstraintViolationExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/ConstraintViolationExceptionMapperTest.java similarity index 97% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ConstraintViolationExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/ConstraintViolationExceptionMapperTest.java index d8ab8c0c..54cd236f 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ConstraintViolationExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/ConstraintViolationExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/DefaultExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/DefaultExceptionMapperTest.java similarity index 93% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/DefaultExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/DefaultExceptionMapperTest.java index fa40fe46..431cba7e 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/DefaultExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/DefaultExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/EJBExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/EJBExceptionMapperTest.java similarity index 94% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/EJBExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/EJBExceptionMapperTest.java index 996b719a..181e3231 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/EJBExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/EJBExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonMappingExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonMappingExceptionMapperTest.java similarity index 94% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonMappingExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonMappingExceptionMapperTest.java index 87b6f37f..e19dd1a1 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonMappingExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonMappingExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; @@ -42,7 +42,7 @@ enum Size { @Test void valueInstantiationExceptionToResponse() { ValueInstantiationException exception = ValueInstantiationException.from(null, - "Cannot construct instance of `io.github.belgif.rest.problem.ee.jaxrs.JacksonJsonMappingExceptionMapperTest.Size`, problem: Unexpected value 'XXL'", + "Cannot construct instance of `io.github.belgif.rest.problem.ee.core.jaxrs.JacksonJsonMappingExceptionMapperTest.Size`, problem: Unexpected value 'XXL'", SimpleType.constructUnsafe(Size.class)); exception.prependPath(new JsonMappingException.Reference(null, "id")); Response response = mapper.toResponse(exception); diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonParseExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonParseExceptionMapperTest.java similarity index 95% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonParseExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonParseExceptionMapperTest.java index ce2b7c74..425d64ad 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonJsonParseExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonJsonParseExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonMismatchedInputExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonMismatchedInputExceptionMapperTest.java similarity index 96% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonMismatchedInputExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonMismatchedInputExceptionMapperTest.java index 6b2235e1..337a820b 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JacksonMismatchedInputExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JacksonMismatchedInputExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsParameterNameProviderTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JaxRsParameterNameProviderTest.java similarity index 97% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsParameterNameProviderTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JaxRsParameterNameProviderTest.java index 784f0616..37fcc8df 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/JaxRsParameterNameProviderTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/JaxRsParameterNameProviderTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/NotFoundExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/NotFoundExceptionMapperTest.java similarity index 98% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/NotFoundExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/NotFoundExceptionMapperTest.java index 37078467..88084694 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/NotFoundExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/NotFoundExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/ProblemExceptionMapperTest.java similarity index 90% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/ProblemExceptionMapperTest.java index e886612e..b932e501 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/ProblemExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/ProblemExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/WebApplicationExceptionMapperTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/WebApplicationExceptionMapperTest.java similarity index 96% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/WebApplicationExceptionMapperTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/WebApplicationExceptionMapperTest.java index e0cbb71d..c78db739 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/WebApplicationExceptionMapperTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/WebApplicationExceptionMapperTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs; +package io.github.belgif.rest.problem.ee.server.jaxrs; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/I18NAcceptLanguageFilterTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/I18NAcceptLanguageFilterTest.java similarity index 97% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/I18NAcceptLanguageFilterTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/I18NAcceptLanguageFilterTest.java index 8f691534..14d129c5 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/I18NAcceptLanguageFilterTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/I18NAcceptLanguageFilterTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.i18n; +package io.github.belgif.rest.problem.ee.server.jaxrs.i18n; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/ThreadLocalLocaleResolverTest.java b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/ThreadLocalLocaleResolverTest.java similarity index 94% rename from belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/ThreadLocalLocaleResolverTest.java rename to belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/ThreadLocalLocaleResolverTest.java index e824eb0f..f3510b30 100644 --- a/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/jaxrs/i18n/ThreadLocalLocaleResolverTest.java +++ b/belgif-rest-problem-java-ee-server/src/test/java/io/github/belgif/rest/problem/ee/server/jaxrs/i18n/ThreadLocalLocaleResolverTest.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem.ee.jaxrs.i18n; +package io.github.belgif.rest.problem.ee.server.jaxrs.i18n; import static org.assertj.core.api.Assertions.*; diff --git a/belgif-rest-problem-quarkus-client-deployment/src/main/java/io/github/belgif/rest/problem/quarkus/deployment/client/ProblemExtensionClientProcessor.java b/belgif-rest-problem-quarkus-client-deployment/src/main/java/io/github/belgif/rest/problem/quarkus/deployment/client/ProblemExtensionClientProcessor.java index 63b6afc6..a08e0ef7 100644 --- a/belgif-rest-problem-quarkus-client-deployment/src/main/java/io/github/belgif/rest/problem/quarkus/deployment/client/ProblemExtensionClientProcessor.java +++ b/belgif-rest-problem-quarkus-client-deployment/src/main/java/io/github/belgif/rest/problem/quarkus/deployment/client/ProblemExtensionClientProcessor.java @@ -11,9 +11,9 @@ import org.eclipse.microprofile.rest.client.spi.RestClientListener; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemClientResponseFilter; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemResponseExceptionMapper; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemRestClientListener; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemClientResponseFilter; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemResponseExceptionMapper; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemRestClientListener; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem; diff --git a/belgif-rest-problem-quarkus-client-deployment/src/test/java/io/github/belgif/rest/problem/quarkus/deployment/client/ProblemExtensionClientProcessorTest.java b/belgif-rest-problem-quarkus-client-deployment/src/test/java/io/github/belgif/rest/problem/quarkus/deployment/client/ProblemExtensionClientProcessorTest.java index bbc21571..7218e924 100644 --- a/belgif-rest-problem-quarkus-client-deployment/src/test/java/io/github/belgif/rest/problem/quarkus/deployment/client/ProblemExtensionClientProcessorTest.java +++ b/belgif-rest-problem-quarkus-client-deployment/src/test/java/io/github/belgif/rest/problem/quarkus/deployment/client/ProblemExtensionClientProcessorTest.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemClientResponseFilter; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemResponseExceptionMapper; -import io.github.belgif.rest.problem.ee.jaxrs.client.ProblemRestClientListener; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemClientResponseFilter; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemResponseExceptionMapper; +import io.github.belgif.rest.problem.ee.client.jaxrs.ProblemRestClientListener; import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; diff --git a/belgif-rest-problem-quarkus-core/pom.xml b/belgif-rest-problem-quarkus-core/pom.xml index fcb73635..7d5bb929 100644 --- a/belgif-rest-problem-quarkus-core/pom.xml +++ b/belgif-rest-problem-quarkus-core/pom.xml @@ -104,9 +104,9 @@ META-INF/MANIFEST.MF, META-INF/services/jakarta.enterprise.inject.spi.Extension, - io/github/belgif/rest/problem/ee/jaxrs/ProblemConfigurator.class, - io/github/belgif/rest/problem/ee/jaxrs/ProblemObjectMapperContextResolver.class, - io/github/belgif/rest/problem/ee/registry/CdiProblemTypeRegistry.class + io/github/belgif/rest/problem/ee/core/jaxrs/ProblemConfigurator.class, + io/github/belgif/rest/problem/ee/core/jaxrs/ProblemObjectMapperContextResolver.class, + io/github/belgif/rest/problem/ee/core/registry/CdiProblemTypeRegistry.class diff --git a/belgif-rest-problem-quarkus-core/src/main/java/io/github/belgif/rest/problem/quarkus/core/ProblemObjectMapperCustomizer.java b/belgif-rest-problem-quarkus-core/src/main/java/io/github/belgif/rest/problem/quarkus/core/ProblemObjectMapperCustomizer.java index 90f85356..c9db9684 100644 --- a/belgif-rest-problem-quarkus-core/src/main/java/io/github/belgif/rest/problem/quarkus/core/ProblemObjectMapperCustomizer.java +++ b/belgif-rest-problem-quarkus-core/src/main/java/io/github/belgif/rest/problem/quarkus/core/ProblemObjectMapperCustomizer.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.belgif.rest.problem.ee.CdiProblemModule; +import io.github.belgif.rest.problem.ee.core.CdiProblemModule; import io.quarkus.jackson.ObjectMapperCustomizer; /** diff --git a/belgif-rest-problem-quarkus-core/src/test/java/io/github/belgif/rest/problem/quarkus/core/ProblemObjectMapperCustomizerTest.java b/belgif-rest-problem-quarkus-core/src/test/java/io/github/belgif/rest/problem/quarkus/core/ProblemObjectMapperCustomizerTest.java index 0f2ee8ed..e5fbdecc 100644 --- a/belgif-rest-problem-quarkus-core/src/test/java/io/github/belgif/rest/problem/quarkus/core/ProblemObjectMapperCustomizerTest.java +++ b/belgif-rest-problem-quarkus-core/src/test/java/io/github/belgif/rest/problem/quarkus/core/ProblemObjectMapperCustomizerTest.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.belgif.rest.problem.ee.CdiProblemTypeRegistry; +import io.github.belgif.rest.problem.ee.core.CdiProblemTypeRegistry; import io.github.belgif.rest.problem.registry.ProblemTypeRegistry; @ExtendWith(MockitoExtension.class) @@ -44,7 +44,7 @@ void customize() { when(registry.getProblemTypes()).thenReturn(new HashMap<>()); customizer.customize(objectMapper); assertThat(objectMapper.getRegisteredModuleIds()) - .containsExactly("io.github.belgif.rest.problem.ee.CdiProblemModule"); + .containsExactly("io.github.belgif.rest.problem.ee.core.CdiProblemModule"); } } diff --git a/belgif-rest-problem-quarkus-server/pom.xml b/belgif-rest-problem-quarkus-server/pom.xml index 6783a3fe..5569376a 100644 --- a/belgif-rest-problem-quarkus-server/pom.xml +++ b/belgif-rest-problem-quarkus-server/pom.xml @@ -105,8 +105,8 @@ META-INF/MANIFEST.MF, META-INF/services/io.github.belgif.rest.problem.i18n.LocaleResolver, - io/github/belgif/rest/problem/ee/jaxrs/EJBExceptionMapper.class, - io/github/belgif/rest/problem/ee/jaxrs/i18n/* + io/github/belgif/rest/problem/ee/server/jaxrs/EJBExceptionMapper.class, + io/github/belgif/rest/problem/ee/server/jaxrs/i18n/* diff --git a/belgif-rest-problem-quarkus-server/src/main/java/io/github/belgif/rest/problem/quarkus/server/i18n/QuarkusLocaleResolver.java b/belgif-rest-problem-quarkus-server/src/main/java/io/github/belgif/rest/problem/quarkus/server/i18n/QuarkusLocaleResolver.java index 21b78451..25fc4381 100644 --- a/belgif-rest-problem-quarkus-server/src/main/java/io/github/belgif/rest/problem/quarkus/server/i18n/QuarkusLocaleResolver.java +++ b/belgif-rest-problem-quarkus-server/src/main/java/io/github/belgif/rest/problem/quarkus/server/i18n/QuarkusLocaleResolver.java @@ -17,7 +17,8 @@ public class QuarkusLocaleResolver implements LocaleResolver { @Override public Locale getLocale() { // Workaround for https://github.com/belgif/rest-problem-java/issues/221 - // RequestScope is not active in io.github.belgif.rest.problem.ee.jaxrs.client.ProblemResponseExceptionMapper, + // RequestScope is not active in + // io.github.belgif.rest.problem.ee.core.jaxrs.client.ProblemResponseExceptionMapper, // but in fact I18N is not really needed on the client side anyway. if (Arc.container() != null && Arc.container().requestContext().isActive()) { return CDI.current().select(LocaleHolder.class).get().getLocale(); diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index a8021d42..baa784d8 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -285,7 +285,7 @@ Problem exceptions and framework exceptions (including bean validation) thrown b ===== JAX-RS ParamConverter -To implement an input-aware JAX-RS ParamConverter, extend from `io.github.belgif.rest.problem.ee.jaxrs.AbstractInputParamConverterProvider`. +To implement an input-aware JAX-RS ParamConverter, extend from `io.github.belgif.rest.problem.ee.server.jaxrs.AbstractInputParamConverterProvider`. It provides access to the input parameter name and location. Any BadRequestProblem thrown by the JAX-RS ParamConverter will be properly passed on to the client. diff --git a/src/main/asciidoc/release-notes.adoc b/src/main/asciidoc/release-notes.adoc index 605d4eee..d8b7e615 100644 --- a/src/main/asciidoc/release-notes.adoc +++ b/src/main/asciidoc/release-notes.adoc @@ -29,6 +29,11 @@ *belgif-rest-problem-java-ee:* +[WARNING] +==== +*Breaking change:* Some classes were moved to `client`-, `core`- and `server`-specific packages +==== + * Modify ProblemClientResponseFilter to obtain the ObjectMapper from the underlying JAX-RS or CDI runtime, instead of hardcoded ProblemObjectMapper instance * Don't register ClientProblemObjectMapperContextResolver on Quarkus * Prevent duplicate registrations of same JAX-RS component From 8db858aa238a3412988862ce947ea98a6a02469c Mon Sep 17 00:00:00 2001 From: Jimmy Praet Date: Wed, 22 Apr 2026 09:30:20 +0200 Subject: [PATCH 2/2] Finalize --- .../problem/quarkus/server/i18n/QuarkusLocaleResolver.java | 3 +-- src/main/asciidoc/release-notes.adoc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/belgif-rest-problem-quarkus-server/src/main/java/io/github/belgif/rest/problem/quarkus/server/i18n/QuarkusLocaleResolver.java b/belgif-rest-problem-quarkus-server/src/main/java/io/github/belgif/rest/problem/quarkus/server/i18n/QuarkusLocaleResolver.java index 25fc4381..a6e2d1a8 100644 --- a/belgif-rest-problem-quarkus-server/src/main/java/io/github/belgif/rest/problem/quarkus/server/i18n/QuarkusLocaleResolver.java +++ b/belgif-rest-problem-quarkus-server/src/main/java/io/github/belgif/rest/problem/quarkus/server/i18n/QuarkusLocaleResolver.java @@ -17,8 +17,7 @@ public class QuarkusLocaleResolver implements LocaleResolver { @Override public Locale getLocale() { // Workaround for https://github.com/belgif/rest-problem-java/issues/221 - // RequestScope is not active in - // io.github.belgif.rest.problem.ee.core.jaxrs.client.ProblemResponseExceptionMapper, + // RequestScope is not active in io.github.belgif.rest.problem.ee.client.jaxrs.ProblemResponseExceptionMapper, // but in fact I18N is not really needed on the client side anyway. if (Arc.container() != null && Arc.container().requestContext().isActive()) { return CDI.current().select(LocaleHolder.class).get().getLocale(); diff --git a/src/main/asciidoc/release-notes.adoc b/src/main/asciidoc/release-notes.adoc index d8b7e615..84c579d7 100644 --- a/src/main/asciidoc/release-notes.adoc +++ b/src/main/asciidoc/release-notes.adoc @@ -31,7 +31,7 @@ [WARNING] ==== -*Breaking change:* Some classes were moved to `client`-, `core`- and `server`-specific packages +*Breaking change:* Classes were moved to `client`-, `core`- and `server`-specific packages ==== * Modify ProblemClientResponseFilter to obtain the ObjectMapper from the underlying JAX-RS or CDI runtime, instead of hardcoded ProblemObjectMapper instance