From 80ff7f6eb8443498f9b00ad0a5b4da1d532ce0f6 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Fri, 19 Apr 2024 14:47:27 +0200
Subject: [PATCH] Adapt to new DynamicDiscoveryClient API changes
---
.../ec/smp/spi/handler/OasisSMPSubresource10Handler.java | 5 +++--
.../ec/smp/spi/converter/SubresourceConverterTest.java | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10Handler.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10Handler.java
index 84bb992af..f4f466d96 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10Handler.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10Handler.java
@@ -106,7 +106,7 @@ public class OasisSMPSubresource10Handler extends AbstractOasisSMPHandler {
serviceInformationType.getDocumentIdentifier().setScheme(subresourceIdentifier.getScheme());
try {
- reader.serializeNative(subresource, responseData.getOutputStream(), true);
+ reader.serializeNativeAny(subresource, responseData.getOutputStream(), true);
} catch (TechnicalException e) {
throw new ResourceException(PARSE_ERROR, "Can not marshal extension for service group: [" + identifier + "]. Error: " + ExceptionUtils.getRootCauseMessage(e), e);
}
@@ -187,7 +187,8 @@ public class OasisSMPSubresource10Handler extends AbstractOasisSMPHandler {
ServiceMetadata subresource;
try {
- subresource = (ServiceMetadata) reader.parseNative(new ByteArrayInputStream(bytearray));
+
+ subresource = (ServiceMetadata) reader.parseNativeAny(new ByteArrayInputStream(bytearray));
} catch (TechnicalException e) {
throw new ResourceException(INVALID_RESOURCE, "Error occurred while validation Oasis SMP 1.0 ServiceMetadata: [" + identifier + "] with error: " + ExceptionUtils.getRootCauseMessage(e), e);
}
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/SubresourceConverterTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/SubresourceConverterTest.java
index f9e711e88..afdd05b53 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/SubresourceConverterTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/SubresourceConverterTest.java
@@ -55,7 +55,7 @@ class SubresourceConverterTest {
byte[] inputDoc = XmlTestUtils.loadDocumentAsByteArray(RES_PATH + "SubresourceWithServiceOk.xml");
//when
- ServiceMetadata subresource = (ServiceMetadata) testInstance.parseNative(new ByteArrayInputStream(inputDoc));
+ ServiceMetadata subresource = (ServiceMetadata) testInstance.parseNativeAny(new ByteArrayInputStream(inputDoc));
//then
assertNotNull(subresource);
@@ -75,7 +75,7 @@ class SubresourceConverterTest {
byte[] inputDoc = XmlTestUtils.loadDocumentAsByteArray(RES_PATH + "SubresourceWithServiceInformationUtf8.xml");
//when
- ServiceMetadata subresource = (ServiceMetadata) testInstance.parseNative(new ByteArrayInputStream(inputDoc));
+ ServiceMetadata subresource = (ServiceMetadata) testInstance.parseNativeAny(new ByteArrayInputStream(inputDoc));
//then
String serviceDescription = subresource.getServiceInformation().getProcessList().getProcesses().get(0).getServiceEndpointList().getEndpoints().get(0).getServiceDescription();
@@ -89,7 +89,7 @@ class SubresourceConverterTest {
byte[] inputDoc = XmlTestUtils.loadDocumentAsByteArray(RES_PATH + "SubresourceWithRedirect.xml");
//when
- ServiceMetadata subresource = (ServiceMetadata) testInstance.parseNative(new ByteArrayInputStream(inputDoc));
+ ServiceMetadata subresource = (ServiceMetadata) testInstance.parseNativeAny(new ByteArrayInputStream(inputDoc));
//then
assertNotNull(subresource);
--
GitLab