From c25f0964d1110225642e480ea89b44bb47788df0 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Fri, 19 Mar 2021 20:38:55 +0100
Subject: [PATCH] Fix the fallback factory to implement correct interface

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .../assembler/jaxws/TransportTubeFactory.java | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/assembler/jaxws/TransportTubeFactory.java b/jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/assembler/jaxws/TransportTubeFactory.java
index 637de671e..c6f421060 100644
--- a/jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/assembler/jaxws/TransportTubeFactory.java
+++ b/jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/assembler/jaxws/TransportTubeFactory.java
@@ -10,10 +10,12 @@
 
 package com.sun.xml.ws.assembler.jaxws;
 
-import com.sun.xml.ws.api.BindingID;
-import com.sun.xml.ws.api.pipe.TubelineAssembler;
-import com.sun.xml.ws.api.pipe.TubelineAssemblerFactory;
+import com.sun.xml.ws.api.pipe.Tube;
+import com.sun.xml.ws.assembler.dev.ClientTubelineAssemblyContext;
+import com.sun.xml.ws.assembler.dev.ServerTubelineAssemblyContext;
+import com.sun.xml.ws.assembler.dev.TubeFactory;
 import com.sun.xml.ws.resources.TubelineassemblyMessages;
+import jakarta.xml.ws.WebServiceException;
 import java.util.logging.Logger;
 
 /**
@@ -21,17 +23,17 @@
  * @deprecated Use {@code com.sun.xml.ws.assembler.metro.jaxws.TransportTubeFactory} provided by metro-wsit instead.
  */
 @Deprecated
-public final class TransportTubeFactory extends TubelineAssemblerFactory {
+public final class TransportTubeFactory implements TubeFactory {
 
     private static final Logger LOG = Logger.getLogger(TransportTubeFactory.class.getName());
 
-    private final TubelineAssemblerFactory taf;
+    private final TubeFactory taf;
 
     public TransportTubeFactory() {
         super();
             LOG.warning(TubelineassemblyMessages.MASM_0050_DEPRECATED_TUBE(TransportTubeFactory.class.getName(), "com.sun.xml.ws.assembler.metro.jaxws.TransportTubeFactory"));
         try {
-            taf = (TubelineAssemblerFactory) Class.forName("com.sun.xml.ws.assembler.metro.jaxws.TransportTubeFactory").getConstructor().newInstance();
+            taf = (TubeFactory) Class.forName("com.sun.xml.ws.assembler.metro.jaxws.TransportTubeFactory").getConstructor().newInstance();
         } catch (ReflectiveOperationException | SecurityException ex) {
             LOG.fine(TubelineassemblyMessages.MASM_0014_UNABLE_TO_LOAD_CLASS("com.sun.xml.ws.assembler.metro.jaxws.TransportTubeFactory"));
             // cannot work without this
@@ -41,8 +43,13 @@ public TransportTubeFactory() {
 
 
     @Override
-    public TubelineAssembler doCreate(BindingID bindingId) {
-        return taf.doCreate(bindingId);
+    public Tube createTube(ClientTubelineAssemblyContext context) throws WebServiceException {
+        return taf.createTube(context);
+    }
+
+    @Override
+    public Tube createTube(ServerTubelineAssemblyContext context) throws WebServiceException {
+        return taf.createTube(context);
     }
 
 }