second parameter (pad length) of dec2hex function made optional, added compensation for zero value of this parameter (ignored, used default value of one instead)

Signed-off-by: Ľudovít Lučenič <[email protected]>

Author: Ľudovít Lučenič

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>sk.digitalorchestra.graylog.plugins</groupId>
     <artifactId>graylog-plugin-hexdec-functions</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -216,4 +216,8 @@
             </plugin>
         </plugins>
     </build>
+    <organization>
+    	<name>Digital Orchestra, s.r.o.</name>
+    	<url>www.digital-orchestra.sk</url>
+    </organization>
 </project>

src/main/java/sk/digitalorchestra/graylog/plugins/hexdec/Dec2HexFunction.java

@@ -25,7 +25,9 @@ public class Dec2HexFunction extends AbstractFunction<String> {
 
     private final ParameterDescriptor<Long, Long> lenParam = ParameterDescriptor
     		.integer(PARAM_LEN)
-    		.description("Result string length. Result will be padded with leading zeroes to have at least len length. The sign of the parameter value is ignored. Defaults to 1.")
+    		.optional()
+    		.description("Result string length. Result will be padded with leading zeroes to have at least len length. " +
+    				"The sign of the parameter value is ignored. Defaults to 1, even if parameter is 0.")
     		.build();
 
     @Override
@@ -34,8 +36,10 @@ public String evaluate(FunctionArgs functionArgs, EvaluationContext evaluationCo
     	Optional<Long> numLength = lenParam.optional(functionArgs, evaluationContext);
 
         if (number == null) return null;
-                
-        return String.format("%0" + String.valueOf(Math.abs(numLength.orElse(1L))) + "x", number);
+        
+        String length = String.valueOf(Math.abs(numLength.orElse(1L)));
+        
+        return String.format("%0" + (length == "0" ? "1" : length) + "x", number);
     }
 
    	@Override

src/main/java/sk/digitalorchestra/graylog/plugins/hexdec/HexDecFunctionsMetaData.java

@@ -37,7 +37,7 @@ public URI getURL() {
     @Override
     public Version getVersion() {
         return Version.fromPluginProperties(getClass(), PLUGIN_PROPERTIES, "version",
-        		Version.from(1, 1, 0));
+        		Version.from(1, 0, 0, "SNAPSHOT"));
     }
 
     @Override