chore: replace usages of deprecated methods in org.jboss.shrinkwrap.d…

…escriptor.api.DescriptorImporter (#479) Co-authored-by: Scott M Stark <starksm64@gmail.com>
arquillian · Nov 13, 2023 · 1a15120 · 1a15120
1 parent 8019ddd
commit 1a15120
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...c/test/java/org/jboss/arquillian/config/descriptor/impl/ArquillianDescriptorTestCase.java b/...c/test/java/org/jboss/arquillian/config/descriptor/impl/ArquillianDescriptorTestCase.java
@@ -506,7 +506,7 @@ private ArquillianDescriptor create() {
     private ArquillianDescriptor create(String xml) throws Exception {
         validateXML(desc);
 
-        return Descriptors.importAs(ArquillianDescriptor.class).from(xml);
+        return Descriptors.importAs(ArquillianDescriptor.class).fromString(xml);
     }
 
     private void validateXML(String xml) throws Exception {

diff --git a/...va/org/jboss/arquillian/config/impl/extension/ArquillianDescriptorPropertiesTestCase.java b/...va/org/jboss/arquillian/config/impl/extension/ArquillianDescriptorPropertiesTestCase.java
@@ -532,7 +532,7 @@ private ArquillianDescriptor create() {
     private ArquillianDescriptor create(String xml) throws Exception {
         validateXML(desc.exportAsString());
 
-        return Descriptors.importAs(ArquillianDescriptor.class).from(xml);
+        return Descriptors.importAs(ArquillianDescriptor.class).fromString(xml);
     }
 
     private void validateXML(String xml) throws Exception {

diff --git a/...in/java/org/jboss/arquillian/protocol/servlet5/v_5/ServletProtocolDeploymentPackager.java b/...in/java/org/jboss/arquillian/protocol/servlet5/v_5/ServletProtocolDeploymentPackager.java
@@ -140,7 +140,7 @@ private Archive<?> handleArchive(EnterpriseArchive applicationArchive, Collectio
                 .addAsModule(wrappedWar);
 
             if (applicationArchive.contains(APPLICATION_XML_PATH)) {
-                ApplicationDescriptor applicationXml = Descriptors.importAs(ApplicationDescriptor.class).from(
+                ApplicationDescriptor applicationXml = Descriptors.importAs(ApplicationDescriptor.class).fromStream(
                     applicationArchive.get(APPLICATION_XML_PATH).getAsset().openStream());
 
                 applicationXml.webModule(wrappedWar.getName(), ServletUtil.calculateContextRoot(wrappedWar.getName()));

diff --git a/...n/java/org/jboss/arquillian/protocol/servlet/v_2_5/ServletProtocolDeploymentPackager.java b/...n/java/org/jboss/arquillian/protocol/servlet/v_2_5/ServletProtocolDeploymentPackager.java
@@ -80,7 +80,7 @@ public Archive<?> generateDeployment(TestDeployment testDeployment, Collection<P
     private Archive<?> handleArchive(WebArchive applicationArchive, Collection<Archive<?>> auxiliaryArchives,
         WebArchive protocol, Processor processor) {
         if (applicationArchive.contains(WEB_XML_PATH)) {
-            WebAppDescriptor applicationWebXml = Descriptors.importAs(WebAppDescriptor.class).from(
+            WebAppDescriptor applicationWebXml = Descriptors.importAs(WebAppDescriptor.class).fromStream(
                 applicationArchive.get(WEB_XML_PATH).getAsset().openStream());
 
             // SHRINKWRAP-187, to eager on not allowing overrides, delete it first
@@ -154,7 +154,7 @@ private Archive<?> handleArchive(EnterpriseArchive applicationArchive, Collectio
                         new StringAsset(WebUtils.createNewDescriptor().exportAsString())));
 
             if (applicationArchive.contains(APPLICATION_XML_PATH)) {
-                ApplicationDescriptor applicationXml = Descriptors.importAs(ApplicationDescriptor.class).from(
+                ApplicationDescriptor applicationXml = Descriptors.importAs(ApplicationDescriptor.class).fromStream(
                     applicationArchive.get(APPLICATION_XML_PATH).getAsset().openStream());
 
                 applicationXml.webModule(protocol.getName(), ServletUtil.calculateContextRoot(protocol.getName()));

diff --git a/...ain/java/org/jboss/arquillian/protocol/servlet/v_3/ServletProtocolDeploymentPackager.java b/...ain/java/org/jboss/arquillian/protocol/servlet/v_3/ServletProtocolDeploymentPackager.java
@@ -139,7 +139,7 @@ private Archive<?> handleArchive(EnterpriseArchive applicationArchive, Collectio
                 .addAsModule(wrappedWar);
 
             if (applicationArchive.contains(APPLICATION_XML_PATH)) {
-                ApplicationDescriptor applicationXml = Descriptors.importAs(ApplicationDescriptor.class).from(
+                ApplicationDescriptor applicationXml = Descriptors.importAs(ApplicationDescriptor.class).fromStream(
                     applicationArchive.get(APPLICATION_XML_PATH).getAsset().openStream());
 
                 applicationXml.webModule(wrappedWar.getName(), ServletUtil.calculateContextRoot(wrappedWar.getName()));