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 5da506855 Enforce consistent formatting in axiom-impl 5da506855 is described below commit 5da506855e05a4f720447ba865e2b9ff4b67aaad Author: Andreas Veithen <andreas.veit...@gmail.com> AuthorDate: Sun Nov 6 11:34:25 2022 +0000 Enforce consistent formatting in axiom-impl --- implementations/axiom-impl/pom.xml | 11 +++++++++++ .../axiom/om/impl/llom/factory/LLOMNodeFactory.java | 5 +++-- .../impl/llom/factory/OMLinkedListMetaFactoryLoader.java | 9 +++++++-- .../apache/axiom/om/impl/llom/mixin/package-info.java | 7 ++++--- .../apache/axiom/om/impl/llom/OMImplementationTest.java | 16 ++++++++++------ .../axiom/soap/impl/llom/SOAPImplementationTest.java | 5 +++-- 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/implementations/axiom-impl/pom.xml b/implementations/axiom-impl/pom.xml index 993f76582..bbee686ad 100644 --- a/implementations/axiom-impl/pom.xml +++ b/implementations/axiom-impl/pom.xml @@ -213,6 +213,17 @@ </execution> </executions> </plugin> + <plugin> + <groupId>com.spotify.fmt</groupId> + <artifactId>fmt-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/LLOMNodeFactory.java b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/LLOMNodeFactory.java index 228672655..4b6d0d38d 100644 --- a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/LLOMNodeFactory.java +++ b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/LLOMNodeFactory.java @@ -22,9 +22,10 @@ import org.apache.axiom.core.NodeFactoryImpl; public final class LLOMNodeFactory extends NodeFactoryImpl { public static LLOMNodeFactory INSTANCE = new LLOMNodeFactory(); - + private LLOMNodeFactory() { - super(LLOMNodeFactory.class.getClassLoader(), + super( + LLOMNodeFactory.class.getClassLoader(), "org.apache.axiom.om.impl.llom.factory.AxiomNodeFactoryImpl", "org.apache.axiom.om.impl.llom", "org.apache.axiom.soap.impl.llom", diff --git a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactoryLoader.java b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactoryLoader.java index e470c7a63..a34874c66 100644 --- a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactoryLoader.java +++ b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactoryLoader.java @@ -26,9 +26,14 @@ import org.apache.axiom.om.impl.intf.factory.AxiomNodeFactory; public class OMLinkedListMetaFactoryLoader implements OMMetaFactoryLoader { @Override - public OMMetaFactory load(Map<String,Object> properties) { + public OMMetaFactory load(Map<String, Object> properties) { try { - return (AxiomNodeFactory)OMLinkedListMetaFactoryLoader.class.getClassLoader().loadClass("org.apache.axiom.om.impl.llom.factory.AxiomNodeFactoryImpl").getField("INSTANCE").get(null); + return (AxiomNodeFactory) + OMLinkedListMetaFactoryLoader.class + .getClassLoader() + .loadClass("org.apache.axiom.om.impl.llom.factory.AxiomNodeFactoryImpl") + .getField("INSTANCE") + .get(null); } catch (ReflectiveOperationException ex) { throw new Error(ex); } diff --git a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/mixin/package-info.java b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/mixin/package-info.java index 4767de364..6ea59b462 100644 --- a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/mixin/package-info.java +++ b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/mixin/package-info.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -@org.apache.axiom.weaver.annotation.WeavablePackage(mixins={ - AxiomInformationItemMixin.class, -}) +@org.apache.axiom.weaver.annotation.WeavablePackage( + mixins = { + AxiomInformationItemMixin.class, + }) package org.apache.axiom.om.impl.llom.mixin; diff --git a/implementations/axiom-impl/src/test/java/org/apache/axiom/om/impl/llom/OMImplementationTest.java b/implementations/axiom-impl/src/test/java/org/apache/axiom/om/impl/llom/OMImplementationTest.java index b2445bd2f..4f83611a8 100644 --- a/implementations/axiom-impl/src/test/java/org/apache/axiom/om/impl/llom/OMImplementationTest.java +++ b/implementations/axiom-impl/src/test/java/org/apache/axiom/om/impl/llom/OMImplementationTest.java @@ -28,14 +28,18 @@ import org.apache.axiom.ts.om.sourcedelement.TestGetSAXSourceWithPushOMDataSourc public class OMImplementationTest extends TestCase { public static TestSuite suite() { - OMTestSuiteBuilder builder = new OMTestSuiteBuilder(new OMLinkedListMetaFactoryLoader().load(null)); - - // TODO: if there is a comment node surrounded by text, then these text nodes need to be merged + OMTestSuiteBuilder builder = + new OMTestSuiteBuilder(new OMLinkedListMetaFactoryLoader().load(null)); + + // TODO: if there is a comment node surrounded by text, then these text nodes need to be + // merged builder.exclude(TestDigest.class, "(|(file=digest3.xml)(file=digest4.xml))"); - + // TODO: need to evaluate if the test case is correct - builder.exclude(TestGetSAXSourceWithPushOMDataSource.class, "(&(scenario=getNamespaceContext)(serializeParent=false))"); - + builder.exclude( + TestGetSAXSourceWithPushOMDataSource.class, + "(&(scenario=getNamespaceContext)(serializeParent=false))"); + return builder.build(); } } diff --git a/implementations/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java b/implementations/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java index 53ff9e375..a93340567 100644 --- a/implementations/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java +++ b/implementations/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java @@ -26,8 +26,9 @@ import org.apache.axiom.ts.soap.SOAPTestSuiteBuilder; public class SOAPImplementationTest extends TestCase { public static TestSuite suite() { - SOAPTestSuiteBuilder builder = new SOAPTestSuiteBuilder(new OMLinkedListMetaFactoryLoader().load(null)); - + SOAPTestSuiteBuilder builder = + new SOAPTestSuiteBuilder(new OMLinkedListMetaFactoryLoader().load(null)); + return builder.build(); } }