feat(fabric8io#1382): Rename filenames to filenameTypes

lordofthejars · Oct 2, 2018 · 8e0a22c · 8e0a22c
1 parent a792117
commit 8e0a22c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/core/src/main/java/io/fabric8/maven/core/config/MappingConfig.java b/core/src/main/java/io/fabric8/maven/core/config/MappingConfig.java
@@ -1,24 +1,28 @@
 package io.fabric8.maven.core.config;
 
-import org.apache.maven.plugins.annotations.Parameter;
-
 public class MappingConfig {
 
-    @Parameter(required = true)
     private String kind;
 
-    @Parameter(required = true)
-    private String filenames;
+    private String filenameTypes;
 
     public String getKind() {
         return kind;
     }
 
-    public String getFilenames() {
-        return filenames;
+    public String getFilenameTypes() {
+        return filenameTypes;
     }
 
     public String[] getFilenamesAsArray() {
-        return filenames.split(",\\s*");
+        if (this.filenameTypes == null) {
+            return new String[0];
+        }
+        return filenameTypes.split(",\\s*");
+    }
+
+    public boolean isValid() {
+        return kind != null &&  filenameTypes.length() > 0;
     }
+
 }
diff --git a/doc/src/main/asciidoc/inc/_appendix.adoc b/doc/src/main/asciidoc/inc/_appendix.adoc
@@ -25,7 +25,7 @@ By default if no environment variable nor system property is set, scan for a fil
     <mappings>
       <mapping>
         <kind>Var</kind>
-        <filenames>foo, bar</filenames>
+        <filenameTypes>foo, bar</filenameTypes>
       </mapping>
     </mappings>
   </configuration>

diff --git a/it/src/it/custom-raw-resources/pom.xml b/it/src/it/custom-raw-resources/pom.xml
@@ -34,7 +34,7 @@
           <mappings>
             <mapping>
               <kind>Service</kind>
-              <filenames>foo</filenames>
+              <filenameTypes>foo</filenameTypes>
             </mapping>
           </mappings>
         </configuration>

diff --git a/plugin/src/main/java/io/fabric8/maven/plugin/mojo/build/ResourceMojo.java b/plugin/src/main/java/io/fabric8/maven/plugin/mojo/build/ResourceMojo.java
@@ -431,7 +431,9 @@ private void updateKindFilenameMappings() {
         if (mappings != null) {
             final Map<String, List<String>> mappingKindFilename = new HashMap<>();
             for(MappingConfig mappingConfig : this.mappings) {
-                mappingKindFilename.put(mappingConfig.getKind(), Arrays.asList(mappingConfig.getFilenamesAsArray()));
+                if (mappingConfig.isValid()) {
+                    mappingKindFilename.put(mappingConfig.getKind(), Arrays.asList(mappingConfig.getFilenamesAsArray()));
+                }
             }
             KubernetesResourceUtil.updateKindFilenameMapper(mappingKindFilename);
         }