You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2021/11/28 12:10:40 UTC

[ws-axiom] branch master updated: Eliminate duplicate code

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new dd11fca  Eliminate duplicate code
dd11fca is described below

commit dd11fca52823bb038e8cfd00c657c2ce3780ad38
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sun Nov 28 12:10:32 2021 +0000

    Eliminate duplicate code
    
    Also move the OMMetaFactory implementation to a different package to
    avoid a package cycle.
---
 .../om/impl/dom/factory/OMDOMMetaFactory.java      | 28 ++-----------------
 .../impl/llom/factory/OMLinkedListMetaFactory.java | 26 +-----------------
 .../factory/{ => meta}/AbstractOMMetaFactory.java  | 32 ++++++++++++++++++++--
 .../common/factory/{ => meta}/BuilderFactory.java  |  2 +-
 .../common/factory/{ => meta}/BuilderSpec.java     |  2 +-
 .../factory/{ => meta}/DetachableInputStream.java  |  2 +-
 .../factory/{ => meta}/DetachableReader.java       |  2 +-
 .../factory/{ => meta}/NSUnawareNodeFilter.java    |  2 +-
 .../{ => meta}/NSUnawareNodeFilterHandler.java     |  2 +-
 9 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMMetaFactory.java b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMMetaFactory.java
index 580a5e4..7386745 100644
--- a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMMetaFactory.java
+++ b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMMetaFactory.java
@@ -21,13 +21,8 @@ package org.apache.axiom.om.impl.dom.factory;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.dom.DOMMetaFactory;
-import org.apache.axiom.om.impl.common.factory.AbstractOMMetaFactory;
-import org.apache.axiom.om.impl.common.factory.OMFactoryImpl;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.factory.SOAP11Factory;
-import org.apache.axiom.soap.impl.factory.SOAP12Factory;
+import org.apache.axiom.om.impl.common.factory.meta.AbstractOMMetaFactory;
 import org.w3c.dom.DOMImplementation;
 
 /**
@@ -36,32 +31,13 @@ import org.w3c.dom.DOMImplementation;
 public class OMDOMMetaFactory extends AbstractOMMetaFactory implements DOMMetaFactory {
     public static final OMDOMMetaFactory INSTANCE = new OMDOMMetaFactory();
     
-    private final OMFactory omFactory = new OMFactoryImpl(this, DOOMNodeFactory.INSTANCE);
-    private final SOAPFactory soap11Factory = new SOAP11Factory(this, DOOMNodeFactory.INSTANCE);
-    private final SOAPFactory soap12Factory = new SOAP12Factory(this, DOOMNodeFactory.INSTANCE);
-
     private OMDOMMetaFactory() {
         super(DOOMNodeFactory.INSTANCE);
     }
-    
-    @Override
-    public OMFactory getOMFactory() {
-        return omFactory;
-    }
-
-    @Override
-    public SOAPFactory getSOAP11Factory() {
-        return soap11Factory;
-    }
-
-    @Override
-    public SOAPFactory getSOAP12Factory() {
-        return soap12Factory;
-    }
 
     @Override
     public DocumentBuilderFactory newDocumentBuilderFactory() {
-        return new DOOMDocumentBuilderFactory(omFactory);
+        return new DOOMDocumentBuilderFactory(getOMFactory());
     }
 
     @Override
diff --git a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactory.java b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactory.java
index 41f9448..efa1a5e 100644
--- a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactory.java
+++ b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactory.java
@@ -19,12 +19,7 @@
 
 package org.apache.axiom.om.impl.llom.factory;
 
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.factory.AbstractOMMetaFactory;
-import org.apache.axiom.om.impl.common.factory.OMFactoryImpl;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.factory.SOAP11Factory;
-import org.apache.axiom.soap.impl.factory.SOAP12Factory;
+import org.apache.axiom.om.impl.common.factory.meta.AbstractOMMetaFactory;
 
 /**
  * Meta factory for the linked list OM implementation.
@@ -32,26 +27,7 @@ import org.apache.axiom.soap.impl.factory.SOAP12Factory;
 public class OMLinkedListMetaFactory extends AbstractOMMetaFactory {
     public static final OMLinkedListMetaFactory INSTANCE = new OMLinkedListMetaFactory();
     
-    private final OMFactory omFactory = new OMFactoryImpl(this, LLOMNodeFactory.INSTANCE);
-    private final SOAPFactory soap11Factory = new SOAP11Factory(this, LLOMNodeFactory.INSTANCE);
-    private final SOAPFactory soap12Factory = new SOAP12Factory(this, LLOMNodeFactory.INSTANCE);
-    
     private OMLinkedListMetaFactory() {
         super(LLOMNodeFactory.INSTANCE);
     }
-    
-    @Override
-    public OMFactory getOMFactory() {
-        return omFactory;
-    }
-    
-    @Override
-    public SOAPFactory getSOAP11Factory() {
-        return soap11Factory;
-    }
-    
-    @Override
-    public SOAPFactory getSOAP12Factory() {
-        return soap12Factory;
-    }
 }
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/AbstractOMMetaFactory.java
similarity index 80%
rename from mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
rename to mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/AbstractOMMetaFactory.java
index 5487a59..9177953 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/AbstractOMMetaFactory.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl.common.factory;
+package org.apache.axiom.om.impl.common.factory.meta;
 
-import static org.apache.axiom.om.impl.common.factory.BuilderFactory.OM;
-import static org.apache.axiom.om.impl.common.factory.BuilderFactory.SOAP;
+import static org.apache.axiom.om.impl.common.factory.meta.BuilderFactory.OM;
+import static org.apache.axiom.om.impl.common.factory.meta.BuilderFactory.SOAP;
 
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
@@ -28,11 +28,16 @@ import javax.xml.transform.sax.SAXSource;
 import org.apache.axiom.core.NodeFactory;
 import org.apache.axiom.mime.MultipartBody;
 import org.apache.axiom.om.OMAttachmentAccessor;
+import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMMetaFactorySPI;
 import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.common.factory.OMFactoryImpl;
 import org.apache.axiom.om.util.StAXParserConfiguration;
+import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPModelBuilder;
+import org.apache.axiom.soap.impl.factory.SOAP11Factory;
+import org.apache.axiom.soap.impl.factory.SOAP12Factory;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 
@@ -42,9 +47,30 @@ import org.xml.sax.InputSource;
  */
 public abstract class AbstractOMMetaFactory implements OMMetaFactorySPI {
     private final NodeFactory nodeFactory;
+    private final OMFactory omFactory;
+    private final SOAPFactory soap11Factory;
+    private final SOAPFactory soap12Factory;
     
     public AbstractOMMetaFactory(NodeFactory nodeFactory) {
         this.nodeFactory = nodeFactory;
+        omFactory = new OMFactoryImpl(this, nodeFactory);
+        soap11Factory = new SOAP11Factory(this, nodeFactory);
+        soap12Factory = new SOAP12Factory(this, nodeFactory);
+    }
+    
+    @Override
+    public final OMFactory getOMFactory() {
+        return omFactory;
+    }
+
+    @Override
+    public final SOAPFactory getSOAP11Factory() {
+        return soap11Factory;
+    }
+
+    @Override
+    public final SOAPFactory getSOAP12Factory() {
+        return soap12Factory;
     }
     
     @Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderFactory.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderFactory.java
similarity index 98%
rename from mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderFactory.java
rename to mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderFactory.java
index 87f79d2..9aa33ff 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderFactory.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl.common.factory;
+package org.apache.axiom.om.impl.common.factory.meta;
 
 import org.apache.axiom.core.CoreNode;
 import org.apache.axiom.core.NodeFactory;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderSpec.java
similarity index 99%
rename from mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java
rename to mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderSpec.java
index 7865d46..5780d86 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderSpec.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl.common.factory;
+package org.apache.axiom.om.impl.common.factory.meta;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableInputStream.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableInputStream.java
similarity index 97%
rename from mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableInputStream.java
rename to mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableInputStream.java
index 275f8f0..d6355ad 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableInputStream.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableInputStream.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl.common.factory;
+package org.apache.axiom.om.impl.common.factory.meta;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableReader.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
similarity index 98%
rename from mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableReader.java
rename to mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
index 138954e..cfa6318 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableReader.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl.common.factory;
+package org.apache.axiom.om.impl.common.factory.meta;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/NSUnawareNodeFilter.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilter.java
similarity index 96%
rename from mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/NSUnawareNodeFilter.java
rename to mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilter.java
index c1abe46..ab246ef 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/NSUnawareNodeFilter.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl.common.factory;
+package org.apache.axiom.om.impl.common.factory.meta;
 
 import org.apache.axiom.core.stream.XmlFilter;
 import org.apache.axiom.core.stream.XmlHandler;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/NSUnawareNodeFilterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilterHandler.java
similarity index 97%
rename from mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/NSUnawareNodeFilterHandler.java
rename to mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilterHandler.java
index 2e56514..d01a563 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/NSUnawareNodeFilterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilterHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl.common.factory;
+package org.apache.axiom.om.impl.common.factory.meta;
 
 import javax.xml.XMLConstants;