FORGE-2438: Introduces AbstractXMLResource

forge · Aug 17, 2015 · c81dafa · c81dafa
1 parent 81e8f6b
commit c81dafa
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 29 deletions.
diff --git a/maven/impl/src/main/java/org/jboss/forge/addon/maven/resources/MavenModelResourceImpl.java b/maven/impl/src/main/java/org/jboss/forge/addon/maven/resources/MavenModelResourceImpl.java
@@ -17,7 +17,7 @@
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.jboss.forge.addon.parser.xml.resources.XMLResourceImpl;
+import org.jboss.forge.addon.parser.xml.resources.AbstractXMLResource;
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.resource.ResourceFactory;
 import org.jboss.forge.furnace.util.Streams;
@@ -26,7 +26,7 @@
  * @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-public class MavenModelResourceImpl extends XMLResourceImpl implements MavenModelResource
+public class MavenModelResourceImpl extends AbstractXMLResource implements MavenModelResource
 {
    private Model currentModel;
 

diff --git a/...xml/api/src/main/java/org/jboss/forge/addon/parser/xml/resources/AbstractXMLResource.java b/...xml/api/src/main/java/org/jboss/forge/addon/parser/xml/resources/AbstractXMLResource.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.jboss.forge.addon.parser.xml.resources;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.forge.addon.resource.AbstractFileResource;
+import org.jboss.forge.addon.resource.Resource;
+import org.jboss.forge.addon.resource.ResourceFactory;
+import org.jboss.forge.parser.xml.Node;
+import org.jboss.forge.parser.xml.XMLParser;
+
+/**
+ * Created abstract class for {@link XMLResource}
+ * 
+ * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
+ */
+public abstract class AbstractXMLResource extends AbstractFileResource<XMLResource>implements XMLResource
+{
+   public AbstractXMLResource(final ResourceFactory factory, final File file)
+   {
+      super(factory, file);
+   }
+
+   @Override
+   public XMLResource setContents(Node node)
+   {
+      setContents(XMLParser.toXMLString(node));
+      return this;
+   }
+
+   @Override
+   public Node getXmlSource() throws FileNotFoundException
+   {
+      return XMLParser.parse(getResourceInputStream());
+   }
+
+   @Override
+   protected List<Resource<?>> doListResources()
+   {
+      return Collections.emptyList();
+   }
+
+}
diff --git a/...er-xml/impl/src/main/java/org/jboss/forge/addon/parser/xml/resources/XMLResourceImpl.java b/...er-xml/impl/src/main/java/org/jboss/forge/addon/parser/xml/resources/XMLResourceImpl.java
@@ -8,49 +8,23 @@
 package org.jboss.forge.addon.parser.xml.resources;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.Collections;
-import java.util.List;
 
-import org.jboss.forge.addon.resource.AbstractFileResource;
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.resource.ResourceFactory;
-import org.jboss.forge.parser.xml.Node;
-import org.jboss.forge.parser.xml.XMLParser;
 
 /**
  * @author <a href="mailto:koen.aers@gmail.com">Koen Aers</a>
  */
-public class XMLResourceImpl extends AbstractFileResource<XMLResource> implements XMLResource
+public class XMLResourceImpl extends AbstractXMLResource
 {
    public XMLResourceImpl(final ResourceFactory factory, final File file)
    {
       super(factory, file);
    }
 
-   @Override
-   public XMLResource setContents(Node node)
-   {
-      setContents(XMLParser.toXMLString(node));
-      return this;
-   }
-
-   @Override
-   public Node getXmlSource() throws FileNotFoundException
-   {
-      return XMLParser.parse(getResourceInputStream());
-   }
-
    @Override
    public Resource<File> createFrom(File file)
    {
       return new XMLResourceImpl(getResourceFactory(), file);
    }
-
-   @Override
-   protected List<Resource<?>> doListResources()
-   {
-      return Collections.emptyList();
-   }
-
 }