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 2020/05/10 13:14:15 UTC
[ws-axiom] branch master updated: Update enforcer-maven-plugin and
fix newly detected package cycle
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 5267fd5 Update enforcer-maven-plugin and fix newly detected package cycle
5267fd5 is described below
commit 5267fd566ffde2feade88910c6966278c45b3f42
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun May 10 14:14:00 2020 +0100
Update enforcer-maven-plugin and fix newly detected package cycle
---
.../axiom/soap/impl/common/builder/SOAPModel.java | 12 +--
.../axiom/soap/impl/factory/SOAP11Factory.java | 3 +-
.../axiom/soap/impl/factory/SOAP12Factory.java | 3 +-
.../apache/axiom/soap/impl/intf/SOAPHelper.java | 88 +---------------------
.../axiom/soap/impl/intf/soap11/SOAP11Helper.java | 64 ++++++++++++++++
.../axiom/soap/impl/intf/soap12/SOAP12Helper.java | 64 ++++++++++++++++
.../soap/impl/mixin/AxiomSOAP11ElementSupport.aj | 3 +-
.../soap/impl/mixin/AxiomSOAP12ElementSupport.aj | 3 +-
pom.xml | 2 +-
9 files changed, 145 insertions(+), 97 deletions(-)
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
index 0012bbf..26348ad 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
@@ -31,6 +31,8 @@ import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.intf.AxiomSOAPMessage;
import org.apache.axiom.soap.impl.intf.SOAPHelper;
+import org.apache.axiom.soap.impl.intf.soap11.SOAP11Helper;
+import org.apache.axiom.soap.impl.intf.soap12.SOAP12Helper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -71,10 +73,10 @@ public final class SOAPModel implements Model {
// determine SOAP version and from that determine a proper factory here.
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(namespaceURI)) {
- soapHelper = SOAPHelper.SOAP12;
+ soapHelper = SOAP12Helper.INSTANCE;
log.debug("Starting to process SOAP 1.2 message");
} else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(namespaceURI)) {
- soapHelper = SOAPHelper.SOAP11;
+ soapHelper = SOAP11Helper.INSTANCE;
log.debug("Starting to process SOAP 1.1 message");
} else {
throw new SOAPProcessingException(
@@ -108,7 +110,7 @@ public final class SOAPModel implements Model {
throw new SOAPProcessingException(localName + " is not supported here.",
getSenderFaultCode());
}
- } else if (soapHelper == SOAPHelper.SOAP11 && bodyPresent) {
+ } else if (soapHelper == SOAP11Helper.INSTANCE && bodyPresent) {
elementType = AxiomElement.class;
} else {
throw new SOAPProcessingException("Disallowed element found inside Envelope : {"
@@ -132,9 +134,9 @@ public final class SOAPModel implements Model {
// this is a SOAP fault
elementType = soapHelper.getFaultClass();
processingFault = true;
- if (soapHelper == SOAPHelper.SOAP12) {
+ if (soapHelper == SOAP12Helper.INSTANCE) {
builderHelper = new SOAP12BuilderHelper();
- } else if (soapHelper == SOAPHelper.SOAP11) {
+ } else if (soapHelper == SOAP11Helper.INSTANCE) {
builderHelper = new SOAP11BuilderHelper();
}
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java
index ec2f9dc..f35f295 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java
@@ -29,6 +29,7 @@ import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultText;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.impl.intf.SOAPHelper;
+import org.apache.axiom.soap.impl.intf.soap11.SOAP11Helper;
public class SOAP11Factory extends SOAPFactoryImpl {
public SOAP11Factory(OMMetaFactory metaFactory, NodeFactory nodeFactory) {
@@ -37,7 +38,7 @@ public class SOAP11Factory extends SOAPFactoryImpl {
@Override
public final SOAPHelper getSOAPHelper() {
- return SOAPHelper.SOAP11;
+ return SOAP11Helper.INSTANCE;
}
@Override
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
index 709c089..b68a0e2 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
@@ -35,6 +35,7 @@ import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultNode;
import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultSubCode;
import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultText;
import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultValue;
+import org.apache.axiom.soap.impl.intf.soap12.SOAP12Helper;
public class SOAP12Factory extends SOAPFactoryImpl {
public SOAP12Factory(OMMetaFactory metaFactory, NodeFactory nodeFactory) {
@@ -43,7 +44,7 @@ public class SOAP12Factory extends SOAPFactoryImpl {
@Override
public final SOAPHelper getSOAPHelper() {
- return SOAPHelper.SOAP12;
+ return SOAP12Helper.INSTANCE;
}
public final SOAPFaultValue internalCreateSOAPFaultValue(SOAPFaultClassifier parent) {
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
index b76919d..161c33f 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
@@ -23,29 +23,9 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPVersion;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11Body;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11Envelope;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11Fault;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11FaultCode;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11FaultDetail;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11FaultReason;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11FaultRole;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11Header;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11HeaderBlock;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Body;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Envelope;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Fault;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultCode;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultDetail;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultReason;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultRole;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Header;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12HeaderBlock;
/**
* Encapsulates certain SOAP version specific behaviors. This API defines methods that could also be
@@ -53,72 +33,6 @@ import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12HeaderBlock;
* not be part of the public API.
*/
public abstract class SOAPHelper {
- public static final SOAPHelper SOAP11 = new SOAPHelper(SOAPVersion.SOAP11, "SOAP 1.1",
- AxiomSOAP11Envelope.class,
- AxiomSOAP11Header.class,
- AxiomSOAP11HeaderBlock.class,
- AxiomSOAP11Body.class,
- AxiomSOAP11Fault.class,
- AxiomSOAP11FaultCode.class,
- AxiomSOAP11FaultReason.class,
- AxiomSOAP11FaultRole.class,
- AxiomSOAP11FaultDetail.class,
- SOAP11Constants.ATTR_ACTOR, null) {
- @Override
- public SOAPFactory getSOAPFactory(OMMetaFactory metaFactory) {
- return metaFactory.getSOAP11Factory();
- }
-
- @Override
- public Boolean parseBoolean(String literal) {
- if (literal.equals("1")) {
- return Boolean.TRUE;
- } else if (literal.equals("0")) {
- return Boolean.FALSE;
- } else {
- return null;
- }
- }
-
- @Override
- public String formatBoolean(boolean value) {
- return value ? "1" : "0";
- }
- };
-
- public static final SOAPHelper SOAP12 = new SOAPHelper(SOAPVersion.SOAP12, "SOAP 1.2",
- AxiomSOAP12Envelope.class,
- AxiomSOAP12Header.class,
- AxiomSOAP12HeaderBlock.class,
- AxiomSOAP12Body.class,
- AxiomSOAP12Fault.class,
- AxiomSOAP12FaultCode.class,
- AxiomSOAP12FaultReason.class,
- AxiomSOAP12FaultRole.class,
- AxiomSOAP12FaultDetail.class,
- SOAP12Constants.SOAP_ROLE, SOAP12Constants.SOAP_RELAY) {
- @Override
- public SOAPFactory getSOAPFactory(OMMetaFactory metaFactory) {
- return metaFactory.getSOAP12Factory();
- }
-
- @Override
- public Boolean parseBoolean(String literal) {
- if (literal.equals("true") || literal.equals("1")) {
- return Boolean.TRUE;
- } else if (literal.equals("false") || literal.equals("0")) {
- return Boolean.FALSE;
- } else {
- return null;
- }
- }
-
- @Override
- public String formatBoolean(boolean value) {
- return String.valueOf(value);
- }
- };
-
private final SOAPVersion version;
private final OMNamespace namespace;
private final String specName;
@@ -138,7 +52,7 @@ public abstract class SOAPHelper {
private final QName roleAttributeQName;
private final QName relayAttributeQName;
- private SOAPHelper(SOAPVersion version, String specName,
+ protected SOAPHelper(SOAPVersion version, String specName,
Class<? extends AxiomSOAPEnvelope> envelopeClass,
Class<? extends AxiomSOAPHeader> headerClass,
Class<? extends AxiomSOAPHeaderBlock> headerBlockClass,
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java
new file mode 100644
index 0000000..86ba94f
--- /dev/null
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.soap.impl.intf.soap11;
+
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPVersion;
+import org.apache.axiom.soap.impl.intf.SOAPHelper;
+
+public final class SOAP11Helper extends SOAPHelper {
+ public static final SOAP11Helper INSTANCE = new SOAP11Helper();
+
+ private SOAP11Helper() {
+ super(SOAPVersion.SOAP11, "SOAP 1.1",
+ AxiomSOAP11Envelope.class,
+ AxiomSOAP11Header.class,
+ AxiomSOAP11HeaderBlock.class,
+ AxiomSOAP11Body.class,
+ AxiomSOAP11Fault.class,
+ AxiomSOAP11FaultCode.class,
+ AxiomSOAP11FaultReason.class,
+ AxiomSOAP11FaultRole.class,
+ AxiomSOAP11FaultDetail.class,
+ SOAP11Constants.ATTR_ACTOR, null);
+ }
+
+ @Override
+ public SOAPFactory getSOAPFactory(OMMetaFactory metaFactory) {
+ return metaFactory.getSOAP11Factory();
+ }
+
+ @Override
+ public Boolean parseBoolean(String literal) {
+ if (literal.equals("1")) {
+ return Boolean.TRUE;
+ } else if (literal.equals("0")) {
+ return Boolean.FALSE;
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String formatBoolean(boolean value) {
+ return value ? "1" : "0";
+ }
+}
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java
new file mode 100644
index 0000000..74a75ba
--- /dev/null
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.soap.impl.intf.soap12;
+
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPVersion;
+import org.apache.axiom.soap.impl.intf.SOAPHelper;
+
+public final class SOAP12Helper extends SOAPHelper {
+ public static final SOAP12Helper INSTANCE = new SOAP12Helper();
+
+ private SOAP12Helper() {
+ super(SOAPVersion.SOAP12, "SOAP 1.2",
+ AxiomSOAP12Envelope.class,
+ AxiomSOAP12Header.class,
+ AxiomSOAP12HeaderBlock.class,
+ AxiomSOAP12Body.class,
+ AxiomSOAP12Fault.class,
+ AxiomSOAP12FaultCode.class,
+ AxiomSOAP12FaultReason.class,
+ AxiomSOAP12FaultRole.class,
+ AxiomSOAP12FaultDetail.class,
+ SOAP12Constants.SOAP_ROLE, SOAP12Constants.SOAP_RELAY);
+ }
+
+ @Override
+ public SOAPFactory getSOAPFactory(OMMetaFactory metaFactory) {
+ return metaFactory.getSOAP12Factory();
+ }
+
+ @Override
+ public Boolean parseBoolean(String literal) {
+ if (literal.equals("true") || literal.equals("1")) {
+ return Boolean.TRUE;
+ } else if (literal.equals("false") || literal.equals("0")) {
+ return Boolean.FALSE;
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String formatBoolean(boolean value) {
+ return String.valueOf(value);
+ }
+}
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11ElementSupport.aj b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11ElementSupport.aj
index 3bf61a6..328f079 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11ElementSupport.aj
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11ElementSupport.aj
@@ -20,9 +20,10 @@ package org.apache.axiom.soap.impl.mixin;
import org.apache.axiom.soap.impl.intf.SOAPHelper;
import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11Element;
+import org.apache.axiom.soap.impl.intf.soap11.SOAP11Helper;
public aspect AxiomSOAP11ElementSupport {
public final SOAPHelper AxiomSOAP11Element.getSOAPHelper() {
- return SOAPHelper.SOAP11;
+ return SOAP11Helper.INSTANCE;
}
}
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12ElementSupport.aj b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12ElementSupport.aj
index c717f71..184be7a 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12ElementSupport.aj
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12ElementSupport.aj
@@ -20,9 +20,10 @@ package org.apache.axiom.soap.impl.mixin;
import org.apache.axiom.soap.impl.intf.SOAPHelper;
import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Element;
+import org.apache.axiom.soap.impl.intf.soap12.SOAP12Helper;
public aspect AxiomSOAP12ElementSupport {
public final SOAPHelper AxiomSOAP12Element.getSOAPHelper() {
- return SOAPHelper.SOAP12;
+ return SOAP12Helper.INSTANCE;
}
}
diff --git a/pom.xml b/pom.xml
index fec2f4b..b703ca4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -852,7 +852,7 @@
<plugin>
<groupId>com.github.veithen.phos</groupId>
<artifactId>enforcer-maven-plugin</artifactId>
- <version>0.2.1</version>
+ <version>0.3.0</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>