Fixing case where configuration is first element

mrdon · Mar 30, 2009 · 8541aee · 8541aee
1 parent d831a7d
commit 8541aee
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 4 deletions.
diff --git a/src/main/java/org/twdata/maven/yamlpom/XmlToYamlConverter.java b/src/main/java/org/twdata/maven/yamlpom/XmlToYamlConverter.java
@@ -30,6 +30,7 @@ private void validateTargetContents(String yamlText) throws InvalidFormatExcepti
         }
         catch (RuntimeException ex)
         {
+            System.out.println("yaml:"+yamlText);
             throw new InvalidFormatException("Invalid YAML", yamlText, ex);
         }
 
@@ -75,13 +76,13 @@ private void convert(Element element, String tabs, boolean isInList, Writer yaml
             {
                 if (isConfigurationNotYamlSafe(element, tabs, tab))
                 {
-                    yamlWriter.write(tabs + "configuration : |\n");
+                    yamlWriter.write(tabs + prefix + "configuration : |\n");
                     StringWriter blockWriter = new StringWriter();
                     for (Iterator i = element.elementIterator(); i.hasNext(); )
                     {
                         blockWriter.append(elementToBlockString((Element) i.next()));
                     }
-                    yamlWriter.write(indent(blockWriter.toString(), tabs + tab));
+                    yamlWriter.write(indent(blockWriter.toString(), (isInList ? "  " : "") + tabs + tab));
                     return;
                 }
             }
@@ -132,7 +133,7 @@ else if (list.elements().isEmpty())
                 yamlWriter.write(tabs + prefix + name + ":\n");
                 for (Iterator i = element.elementIterator(); i.hasNext(); )
                 {
-                    convert((Element) i.next(), tabs + tab, false, yamlWriter, tab);
+                    convert((Element) i.next(), (isInList ? "  " : "") + tabs + tab, false, yamlWriter, tab);
                 }
             }
         }

diff --git a/src/test/java/org/twdata/maven/yamlpom/XmlToYamlConvertTest.java b/src/test/java/org/twdata/maven/yamlpom/XmlToYamlConvertTest.java
@@ -75,13 +75,53 @@ public void testConvertConfigAsYamlWithSingleAttribute() throws Exception
         assertTrue(config.toString().contains("implementation=\"org.apache"));
     }
 
+    public void testConvertConfigAsYamlWithConfigAsFirstElement() throws Exception
+    {
+        Map<String, Object> data = buildYaml("/pom.config.xml");
+
+        Map plugin = (Map) ((List)((Map)data.get("build")).get("plugins")).get(3);
+        Object exec = ((List<Object>)plugin.get("executions")).get(0);
+        assertNotNull(exec);
+        assertTrue(exec instanceof Map);
+        //System.out.println(config);
+        Object config = ((Map<String,Object>)exec).get("configuration");
+        assertNotNull(config);
+        assertTrue(config instanceof Map);
+        assertEquals("true", ((Map<String,String>)config).get("createDependencyReducedPom"));
+
+        Object goals = ((Map<String,Object>)exec).get("goals");
+        assertNotNull(goals);
+        assertEquals(1, ((List<String>)goals).size());
+        assertEquals("go", ((List<String>)goals).get(0));
+    }
+
+    public void testConvertConfigAsStringWithConfigAsFirstElement() throws Exception
+    {
+        Map<String, Object> data = buildYaml("/pom.config.xml");
+
+        Map plugin = (Map) ((List)((Map)data.get("build")).get("plugins")).get(4);
+        Object exec = ((List<Object>)plugin.get("executions")).get(0);
+        assertNotNull(exec);
+        assertTrue(exec instanceof Map);
+        //System.out.println(config);
+        Object config = ((Map<String,Object>)exec).get("configuration");
+        assertNotNull(config);
+        assertTrue(config instanceof String);
+        assertTrue(config.toString().contains("implementation=\"org.apache"));
+
+        Object goals = ((Map<String,Object>)exec).get("goals");
+        assertNotNull(goals);
+        assertEquals(1, ((List<String>)goals).size());
+        assertEquals("go", ((List<String>)goals).get(0));
+    }
+
     private Map<String, Object> buildYaml(String path) throws Exception
     {
         ConverterOptions opt = new ConverterOptions().indent("  ");
         String yamlText = new XmlToYamlConverter().convert(pathToReader(path), opt);
 
         Yaml yaml = YamlUtils.buildYaml();
-        //System.out.println(yamlText);
+        System.out.println(yamlText);
         Map<String,Object> data = (Map<String,Object>) yaml.load(yamlText);
         return data;
     }

diff --git a/src/test/resources/pom.config.xml b/src/test/resources/pom.config.xml
@@ -64,6 +64,46 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                        <goals>
+                            <goal>go</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <artifactSet>
+                              <includes>
+                                <include>SnakeYAML:SnakeYAML</include>
+                              </includes>
+                            </artifactSet>
+                            <transformers>
+                              <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+                            </transformers>
+                        </configuration>
+                        <goals>
+                            <goal>go</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 </project>