diff --git a/jpa/odata-jpa-processor-parallel/src/main/java/com/sap/olingo/jpa/processor/core/exception/ODataJPABatchException.java b/jpa/odata-jpa-processor-parallel/src/main/java/com/sap/olingo/jpa/processor/core/exception/ODataJPABatchException.java index 32be28899..bae2e79be 100644 --- a/jpa/odata-jpa-processor-parallel/src/main/java/com/sap/olingo/jpa/processor/core/exception/ODataJPABatchException.java +++ b/jpa/odata-jpa-processor-parallel/src/main/java/com/sap/olingo/jpa/processor/core/exception/ODataJPABatchException.java @@ -6,10 +6,10 @@ public class ODataJPABatchException extends ODataJPAProcessException { // NOSONAR /** - * + * */ private static final long serialVersionUID = 8492368933922574285L; - private static final String BUNDLE_NAME = "processor-exceptions-i18n"; + private static final String BUNDLE_NAME = "batch-parallel-exceptions-i18n"; public enum MessageKeys implements ODataJPAMessageKey { UNSUPPORTED_BATCH_PARTS; diff --git a/jpa/odata-jpa-processor-parallel/src/main/resources/processor-exceptions-i18n.properties b/jpa/odata-jpa-processor-parallel/src/main/resources/batch-parallel-exceptions-i18n.properties similarity index 100% rename from jpa/odata-jpa-processor-parallel/src/main/resources/processor-exceptions-i18n.properties rename to jpa/odata-jpa-processor-parallel/src/main/resources/batch-parallel-exceptions-i18n.properties diff --git a/jpa/odata-jpa-processor-parallel/src/test/java/com/sap/olingo/jpa/processor/core/processor/JPAODataParallelBatchProcessorTest.java b/jpa/odata-jpa-processor-parallel/src/test/java/com/sap/olingo/jpa/processor/core/processor/JPAODataParallelBatchProcessorTest.java index c56b8da69..d2d891edf 100644 --- a/jpa/odata-jpa-processor-parallel/src/test/java/com/sap/olingo/jpa/processor/core/processor/JPAODataParallelBatchProcessorTest.java +++ b/jpa/odata-jpa-processor-parallel/src/test/java/com/sap/olingo/jpa/processor/core/processor/JPAODataParallelBatchProcessorTest.java @@ -98,6 +98,8 @@ void testBuildGroupsThrowsExceptionOnNonChangeSetWithMultipleEntries() { final ODataJPABatchException act = Assertions.assertThrows(ODataJPABatchException.class, () -> cut.buildGroups( requests)); Assertions.assertEquals(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), act.getStatusCode()); + Assertions.assertNotNull(act.getMessage()); + Assertions.assertFalse(act.getMessage().contains("No message text found")); } @Test diff --git a/jpa/odata-jpa-processor/pom.xml b/jpa/odata-jpa-processor/pom.xml index a05e2ff89..423b88aa8 100644 --- a/jpa/odata-jpa-processor/pom.xml +++ b/jpa/odata-jpa-processor/pom.xml @@ -44,6 +44,12 @@ org.apache.olingo odata-server-core ${odata.version} + + + com.fasterxml.jackson.core + jackson-core + + jakarta.persistence @@ -76,6 +82,11 @@ jackson-dataformat-xml ${jackson.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + com.fasterxml.jackson.core jackson-annotations diff --git a/jpa/pom.xml b/jpa/pom.xml index 18fe629b6..a9e3a7340 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -13,17 +13,17 @@ 17 17 3.8.0 - 4.9.0 - 2.14.1 + 4.10.0 + 2.16.0 1.7.1 4.3.0 3.1.0 2.0.1 - 6.0.11 - 5.9.1 - 1.9.1 - 5.5.0 - 0.8.10 + 6.0.14 + 5.10.1 + 1.10.1 + 5.7.0 + 0.8.11 ${project.basedir}/odata-jpa-coverage/target/site/jacoco-aggregate/jacoco.xml, ${project.basedir}/../odata-jpa-coverage/target/site/jacoco-aggregate/jacoco.xml