added second (optional) parameter to dec2hex function defining leadin…

…g zero-padding length

Signed-off-by: Ľudovít Lučenič <ludovit.lucenic@digital-orchestra.sk>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "HexDecFunctions",
-  "version": "1.0.0-SNAPSHOT",
+  "version": "1.1.0",
   "description": "",
   "repository": {
     "type": "git",

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>sk.digitalorchestra.graylog.plugins</groupId>
     <artifactId>graylog-plugin-hexdec-functions</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

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

@@ -6,35 +6,44 @@
 import org.graylog.plugins.pipelineprocessor.ast.functions.FunctionDescriptor;
 import org.graylog.plugins.pipelineprocessor.ast.functions.ParameterDescriptor;
 
+import java.util.Optional;
+
 /**
  * This is the plugin. Your class should implement one of the existing plugin
  * interfaces. (i.e. AlarmCallback, MessageInput, MessageOutput)
  */
 public class Dec2HexFunction extends AbstractFunction<String> {
 
     public static final String NAME = "dec2hex";
-    private static final String PARAM = "long";
+    private static final String PARAM = "longval";
+    private static final String PARAM_LEN = "len";
+
+    private final ParameterDescriptor<Long, Long> valueParam = ParameterDescriptor
+    		.integer(PARAM)
+    		.description("A number, negative or positive.")
+    		.build();
+
+    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.")
+    		.build();
 
     @Override
     public String evaluate(FunctionArgs functionArgs, EvaluationContext evaluationContext) {
     	Long number = valueParam.required(functionArgs, evaluationContext);
+    	Optional<Long> numLength = lenParam.optional(functionArgs, evaluationContext);
 
         if (number == null) return null;
 
-        return Long.toHexString(number);
+        return String.format("%0" + String.valueOf(Math.abs(numLength.orElse(1L))) + "x", number);
     }
 
-    private final ParameterDescriptor<Long, Long> valueParam = ParameterDescriptor
-    		.integer(PARAM)
-    		.description("A number, negative or positive.")
-    		.build();
-
    	@Override
    	public FunctionDescriptor<String> descriptor() {
    	    return FunctionDescriptor.<String>builder()
    	            .name(NAME)
-   	            .description("Returns hexadecimal lower case string representation of the given number. No prefix or leading zeros.")
-   	            .params(valueParam)
+   	            .description("Returns hexadecimal lower case string representation of the given number. No prefix, optionally left padded with zeros.")
+   	            .params(valueParam, lenParam)
    	            .returnType(String.class)
    	            .build();
    	}

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

@@ -13,7 +13,7 @@
 public class Hex2DecFunction extends AbstractFunction<Long> {
 
     public static final String NAME = "hex2dec";
-    private static final String PARAM = "string";
+    private static final String PARAM = "hexstring";
 
     @Override
     public Long evaluate(FunctionArgs functionArgs, EvaluationContext evaluationContext) {

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, 0, 0));
+        		Version.from(1, 1, 0));
     }
 
     @Override