FORGE-2202: Added JavaResource.setContents(InputStream,Properties)

Author: gastaldi

parser-java/api/src/main/java/org/jboss/forge/addon/parser/java/resources/JavaResource.java

@@ -8,6 +8,8 @@
 package org.jboss.forge.addon.parser.java.resources;
 
 import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.Properties;
 
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.Resource;
@@ -40,4 +42,9 @@ public interface JavaResource extends FileResource<JavaResource>
     */
    <T extends JavaType<?>> T getJavaType() throws FileNotFoundException;
 
+   /**
+    * Sets the contents using the given formatter properties
+    */
+   JavaResource setContents(InputStream data, Properties formatterProperties);
+
 }

parser-java/impl/src/main/java/org/jboss/forge/addon/parser/java/resources/JavaResourceImpl.java

@@ -44,6 +44,7 @@
 /**
  * @author Mike Brock
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 public class JavaResourceImpl extends AbstractFileResource<JavaResource> implements JavaResource
 {
@@ -212,23 +213,33 @@ public boolean supports(ResourceFacet type)
    @Override
    public JavaResource setContents(final InputStream data)
    {
-      InputStream contents = data;
       if (formatterProfilePath != null)
       {
          try (FileInputStream fis = new FileInputStream(formatterProfilePath))
          {
             FormatterProfileReader reader = FormatterProfileReader.fromEclipseXml(fis);
-            Properties formatterProfile = reader.getProfileNames().contains(formatterProfileName) ? reader
+            Properties formatterProfileProperties = reader.getProfileNames().contains(formatterProfileName) ? reader
                      .getPropertiesFor(formatterProfileName) : reader.getDefaultProperties();
-            String formattedSource = Roaster.format(formatterProfile, Streams.toString(data));
-            contents = new ByteArrayInputStream(formattedSource.getBytes());
+            return setContents(data, formatterProfileProperties);
          }
          catch (IOException e)
          {
             Logger.getLogger(getClass().getName()).log(Level.FINE, "Error while reading formatter path", e);
          }
       }
-      return super.setContents(contents);
+      return super.setContents(data);
    }
 
+   @Override
+   public JavaResource setContents(InputStream data, Properties formatterProperties)
+   {
+      InputStream contents = data;
+      if (formatterProperties != null)
+      {
+         String source = Streams.toString(data);
+         String formattedSource = Roaster.format(formatterProperties, source);
+         contents = new ByteArrayInputStream(formattedSource.getBytes());
+      }
+      return super.setContents(contents);
+   }
 }

parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/resources/JavaResourceTest.java

@@ -9,10 +9,12 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+import java.util.Properties;
 
 import javax.inject.Inject;
 
@@ -30,6 +32,7 @@
 import org.jboss.forge.roaster.model.JavaType;
 import org.jboss.forge.roaster.model.source.JavaClassSource;
 import org.jboss.forge.roaster.model.source.JavaSource;
+import org.jboss.forge.roaster.model.util.FormatterProfileReader;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
 import org.junit.Assert;
@@ -105,8 +108,9 @@ public void testParserClass() throws Exception
    }
 
    @Test
-   public void testCustomClassFormatting() throws Exception
+   public void testDefaultClassFormatting() throws Exception
    {
+      configuration.clearProperty(JavaResource.FORMATTER_PROFILE_PATH_KEY);
       String forgeFormatterContents = Streams.toString(getClass().getResourceAsStream("formatter_forge.jv"));
       String eclipseFormatterContents = Streams.toString(getClass().getResourceAsStream("formatter_eclipse.jv"));
       File tmpFile = File.createTempFile("MyClass", ".java");
@@ -124,4 +128,32 @@ public void testCustomClassFormatting() throws Exception
       resource.setContents(forgeFormatterContents);
       Assert.assertEquals(eclipseFormatterContents, resource.getContents());
    }
+
+   @Test
+   public void testCustomClassFormattingProperties() throws Exception
+   {
+      configuration.clearProperty(JavaResource.FORMATTER_PROFILE_PATH_KEY);
+      String forgeFormatterContents = Streams.toString(getClass().getResourceAsStream("formatter_forge.jv"));
+      File tmpFile = File.createTempFile("MyClass", ".java");
+      tmpFile.deleteOnExit();
+      JavaResource resource = resourceFactory.create(JavaResource.class, tmpFile);
+      resource.setContents(forgeFormatterContents);
+      Assert.assertEquals(forgeFormatterContents, resource.getContents());
+      File profileFile = File.createTempFile("profile", ".xml");
+      try (InputStream is = getClass().getResourceAsStream("eclipse_profile.xml"))
+      {
+         Files.copy(is, profileFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+      }
+      Properties properties = null;
+      try (InputStream is = getClass().getResourceAsStream("forge_profile.xml"))
+      {
+         FormatterProfileReader reader = FormatterProfileReader.fromEclipseXml(is);
+         properties = reader.getPropertiesFor("Forge");
+      }
+      configuration.setProperty(JavaResource.FORMATTER_PROFILE_PATH_KEY, profileFile.getAbsolutePath());
+      resource = resourceFactory.create(JavaResource.class, tmpFile);
+      resource.setContents(new ByteArrayInputStream(forgeFormatterContents.getBytes()), properties);
+      Assert.assertEquals(forgeFormatterContents, resource.getContents());
+   }
+
 }