From b237364d670a1709297e4816241a8c483e971011 Mon Sep 17 00:00:00 2001
From: Flavia Rainone <frainone@redhat.com>
Date: Mon, 17 Jun 2019 10:55:26 -0300
Subject: [PATCH 1/2] [WFLY-11759] Revert UndertowTransformersTestCase
 workaround

KernelServicesBuilder.excludeResourceFromParent API is no longer needed, the test runs okay
---
 .../undertow/UndertowTransformersTestCase.java     | 11 -----------
 .../undertow/undertow-7.1-transformers.xml         | 14 ++++----------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/undertow/src/test/java/org/wildfly/extension/undertow/UndertowTransformersTestCase.java b/undertow/src/test/java/org/wildfly/extension/undertow/UndertowTransformersTestCase.java
index ff2eb517b527..8bcebc2cf988 100644
--- a/undertow/src/test/java/org/wildfly/extension/undertow/UndertowTransformersTestCase.java
+++ b/undertow/src/test/java/org/wildfly/extension/undertow/UndertowTransformersTestCase.java
@@ -213,17 +213,6 @@ private void doRejectTest(ModelTestControllerVersion controllerVersion, ModelVer
 
         List<ModelNode> ops = builder.parseXmlResource("undertow-reject.xml");
 
-        if (controllerVersion == ModelTestControllerVersion.EAP_7_1_0) {
-            // The EAP 7.1 tests load a legacy version of undertow in the child first classloader
-            // But the current version is in the parent. PredicateValidator's use of PredicateParser
-            // fails in this situation as it results in ServiceLoader trying to load classes from both
-            // jars. So just disable testing of params that involve PredicateValidator.
-            for (ModelNode op : ops) {
-                op.remove(Constants.PREDICATE);
-                op.remove(Constants.MANAGEMENT_ACCESS_PREDICATE);
-            }
-        }
-
         ModelTestUtils.checkFailedTransformedBootOperations(mainServices, targetVersion, ops, config);
     }
 
diff --git a/undertow/src/test/resources/org/wildfly/extension/undertow/undertow-7.1-transformers.xml b/undertow/src/test/resources/org/wildfly/extension/undertow/undertow-7.1-transformers.xml
index 2c1ef117e4c7..d33a55a0f896 100644
--- a/undertow/src/test/resources/org/wildfly/extension/undertow/undertow-7.1-transformers.xml
+++ b/undertow/src/test/resources/org/wildfly/extension/undertow/undertow-7.1-transformers.xml
@@ -36,19 +36,17 @@
             <filter-ref name="limit-connections"/>
             <filter-ref name="headers" priority="${some.priority:10}"/>
             <filter-ref name="404-handler"/>
-            <!--
             <filter-ref name="static-gzip" predicate="path-suffix('.js')"/>
-            -->
          </location>
-         <!--<access-log directory="${jboss.server.server.dir}" pattern="REQ %{i,test-header}" predicate="not path-suffix(*.css)" prefix="access" rotate="false"/>-->
-         <access-log directory="${jboss.server.server.dir}" pattern="REQ %{i,test-header}" prefix="access" rotate="false"/>
+         <access-log directory="${jboss.server.server.dir}" pattern="REQ %{i,test-header}" predicate="not path-suffix(*.css)" prefix="access" rotate="false"/>
+         <!-- <access-log directory="${jboss.server.server.dir}" pattern="REQ %{i,test-header}" prefix="access" rotate="false"/> -->
          <single-sign-on cookie-name="SSOID" domain="${prop.domain:myDomain}" http-only="true" path="/path" secure="true"/>
       </host>
       <host alias="www.mysite.com,${prop.value:default-alias}" default-response-code="501" default-web-module="something-else.war" disable-console-redirect="true" name="other-host">
          <location handler="welcome-content" name="/">
             <filter-ref name="limit-connections"/>
             <filter-ref name="headers"/>
-            <!--<filter-ref name="static-gzip" predicate="path-suffix('.js') or path-suffix('.css') or path-prefix('/resources')"/>-->
+            <filter-ref name="static-gzip" predicate="path-suffix('.js') or path-suffix('.css') or path-prefix('/resources')"/>
             <filter-ref name="404-handler"/>
             <filter-ref name="mod-cluster"/>
          </location>
@@ -80,13 +78,9 @@
       <response-header header-name="MY_HEADER" header-value="someValue" name="headers"/>
       <gzip name="static-gzip"/>
       <error-page code="404" name="404-handler" path="/opt/data/404.html"/>
-      <!--<mod-cluster advertise-frequency="1000" advertise-path="/foo" advertise-protocol="ajp" advertise-socket-binding="advertise-socket-binding"
-                   name="mod-cluster" broken-node-timeout="1000" cached-connections-per-thread="10" connection-idle-timeout="10"
-                   health-check-interval="600" management-access-predicate="method[GET]" management-socket-binding="test3" max-request-time="1000"
-                   failover-strategy="DETERMINISTIC" max-retries="10" security-key="password" security-realm="UndertowRealm" />-->
       <mod-cluster advertise-frequency="1000" advertise-path="/foo" advertise-protocol="ajp" advertise-socket-binding="advertise-socket-binding"
                    name="mod-cluster" broken-node-timeout="1000" cached-connections-per-thread="10" connection-idle-timeout="10"
-                   health-check-interval="600" management-socket-binding="test3" max-request-time="1000"
+                   health-check-interval="600" management-access-predicate="method[GET]" management-socket-binding="test3" max-request-time="1000"
                    failover-strategy="DETERMINISTIC" max-retries="10" security-key="password" security-realm="UndertowRealm" />
       <filter class-name="io.undertow.server.handlers.HttpTraceHandler" module="io.undertow.core" name="custom-filter"/>
       <expression-filter expression="dump-request" name="requestDumper"/>

From bb6096ff57cdb9a0ce93d90a86ba4a3327c2d099 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Mon, 17 Jun 2019 19:21:44 -0500
Subject: [PATCH 2/2] [WFLY-11759] Exclude problematic Undertow interfaces from
 ServiceLoader calls when testing management model transformation

---
 .../extension/undertow/UndertowTransformersTestCase.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/undertow/src/test/java/org/wildfly/extension/undertow/UndertowTransformersTestCase.java b/undertow/src/test/java/org/wildfly/extension/undertow/UndertowTransformersTestCase.java
index 8bcebc2cf988..1a0b55e6be33 100644
--- a/undertow/src/test/java/org/wildfly/extension/undertow/UndertowTransformersTestCase.java
+++ b/undertow/src/test/java/org/wildfly/extension/undertow/UndertowTransformersTestCase.java
@@ -286,9 +286,9 @@ private void addExtraMavenUrls(ModelTestControllerVersion controllerVersion, Leg
         if (controllerVersion == ModelTestControllerVersion.EAP_7_1_0 || controllerVersion == ModelTestControllerVersion.EAP_7_2_0) {
             init.addMavenResourceURL(controllerVersion.getMavenGroupId() + ":wildfly-clustering-common:" + controllerVersion.getMavenGavVersion());
             init.addMavenResourceURL(controllerVersion.getMavenGroupId() + ":wildfly-web-common:" + controllerVersion.getMavenGavVersion());
-            // The version here appears to be required to be set to the current version of undertow
-            init.addMavenResourceURL("io.undertow:undertow-servlet:2.0.20.Final");
-            init.addMavenResourceURL("io.undertow:undertow-core:2.0.20.Final");
+            // Prevent service loader loading of io.undertow.predicate.PredicateBuilder or io.undertow.attribute.ExchangeAttributeBuilder
+            // from the parent as the parent includes classes not available in the child
+            init.excludeResourceFromParent("META-INF/services/io.undertow.*");
         }
     }