resolving comments

Author: Het

build.gradle

@@ -40,13 +40,15 @@ dependencies {
     implementation 'org.apache.maven:maven-artifact:3.5.2'
     implementation 'org.antlr:antlr4-runtime:4.11.1'
     implementation 'io.vavr:vavr:0.10.4'
-    implementation 'org.openjdk.jmh:jmh-core:1.35'
-    implementation 'org.openjdk.jmh:jmh-generator-annprocess:1.35'
+    testImplementation 'org.openjdk.jmh:jmh-core:1.35'
+    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.35'
 
-    compileOnly 'org.projectlombok:lombok:1.18.26'
+    implementation 'org.projectlombok:lombok:1.18.26'
     annotationProcessor 'org.projectlombok:lombok:1.18.26'
-    annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.36'
+    testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.36'
 
+    testImplementation 'org.openjdk.jmh:jmh-core:1.35'
+    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.35'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.4.2'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.4.2'
     testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'

…lication/BoolParserBenchmarkService.java …lication/EvaluationBenchmarkService.javasrc/main/java/com/github/sidhant92/boolparser/application/BoolParserBenchmarkService.java renamed to src/test/java/com/github/sidhant92/boolparser/application/EvaluationBenchmarkService.java src/main/java/com/github/sidhant92/boolparser/application/BoolParserBenchmarkService.java renamed to src/test/java/com/github/sidhant92/boolparser/application/EvaluationBenchmarkService.java

@@ -15,9 +15,8 @@
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.sidhant92.boolparser.parser.antlr.BoolParser;
+import com.github.sidhant92.boolparser.provider.BoolParserDataProvider;
 import lombok.SneakyThrows;
 
 /**
@@ -26,19 +25,17 @@
  */
 @State (Scope.Benchmark)
 @OutputTimeUnit (TimeUnit.MICROSECONDS)
-public class BoolParserBenchmarkService {
+public class EvaluationBenchmarkService {
     private static Map<String, Object> data;
 
-    private static String dataString;
-
     private static BoolParser parser;
 
     private static BooleanExpressionEvaluator evaluator;
 
     public static void main(String[] args) throws RunnerException, IOException {
 
         Options opt = new OptionsBuilder()
-                .include(BoolParserBenchmarkService.class.getSimpleName())
+                .include(EvaluationBenchmarkService.class.getSimpleName())
                 .forks(1)
                 .build();
         new Runner(opt).run();
@@ -47,9 +44,7 @@ public static void main(String[] args) throws RunnerException, IOException {
     @SneakyThrows
     @Setup
     public void setup() {
-        final ObjectMapper objectMapper = new ObjectMapper();
-        dataString = "{\"b\":1,\"c\":{\"d\":[\"x\",\"y\"],\"e\":\"xyz\"},\"f\":{\"g\":[\"arr1\",\"arr2\"],\"h\":{\"a\":\"b\",\"c\":\"d\",\"e\":true},\"j\":24},\"x\":[\"a1\",\"a2\",\"a3\",\"a4\"],\"y\":24, \"z\": \"c1\"}";
-        data = objectMapper.readValue(dataString, new TypeReference<Map<String, Object>>() {});
+        data = BoolParserDataProvider.getData();
         parser = new BoolParser();
         evaluator = new BooleanExpressionEvaluator(parser);
     }
@@ -62,12 +57,4 @@ public void benchmarkEvaluation() {
         evaluator.evaluate(rule, data);
     }
 
-    @Benchmark
-    @Warmup(iterations = 2)
-    @BenchmarkMode(Mode.SampleTime) // change here to check for specific mode
-    public void benchmarkParsing() {
-        final String rule = "b>0 AND z IN ('c1', 'c2')";
-        parser.parseExpression(rule);
-    }
-
 }

src/test/java/com/github/sidhant92/boolparser/application/ParserBenchmarkService.java

@@ -0,0 +1,53 @@
+package com.github.sidhant92.boolparser.application;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import com.github.sidhant92.boolparser.parser.antlr.BoolParser;
+import com.github.sidhant92.boolparser.provider.BoolParserDataProvider;
+import lombok.SneakyThrows;
+
+/**
+ * @author Het Shah
+ * @since 09/02/2023
+ */
+@State (Scope.Benchmark)
+@OutputTimeUnit (TimeUnit.MICROSECONDS)
+public class ParserBenchmarkService {
+    private static Map<String, Object> data;
+
+    private static BoolParser parser;
+
+
+    public static void main(String[] args) throws RunnerException, IOException {
+        Options opt = new OptionsBuilder().include(ParserBenchmarkService.class.getSimpleName()).forks(1).build();
+        new Runner(opt).run();
+    }
+
+    @SneakyThrows
+    @Setup
+    public void setup() {
+        data = BoolParserDataProvider.getData();
+        parser = new BoolParser();
+    }
+
+    @Benchmark
+    @Warmup (iterations = 2)
+    @BenchmarkMode (Mode.SampleTime) //change here to check for specific mode
+    public void benchmarkEvaluation() {
+        final String rule = "b>0 AND z IN ('c1', 'c2')";
+        parser.parseExpression(rule);
+    }
+}

src/test/java/com/github/sidhant92/boolparser/provider/BoolParserDataProvider.java

@@ -0,0 +1,19 @@
+package com.github.sidhant92.boolparser.provider;
+
+import java.io.File;
+import java.util.Map;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.vavr.control.Try;
+
+/**
+ * @author Het Shah
+ * @since 08/02/2023
+ */
+public class BoolParserDataProvider {
+    public static Map<String, Object> getData() {
+        final ObjectMapper objectMapper = CommonsDataProvider.getObjectMapper();
+        return Try.of(() -> objectMapper.readValue(new File("src/test/resources/data.json"), new TypeReference<Map<String, Object>>() {}))
+                  .getOrElseGet(ex -> null);
+    }
+}

src/test/java/com/github/sidhant92/boolparser/provider/CommonsDataProvider.java

@@ -0,0 +1,14 @@
+package com.github.sidhant92.boolparser.provider;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+
+/**
+ * @author Het Shah
+ * @since 08/02/2023
+ */
+public class CommonsDataProvider {
+    public static ObjectMapper getObjectMapper() {
+        return new ObjectMapper().setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+    }
+}

src/test/resources/data.json

@@ -0,0 +1,30 @@
+{
+  "b":1,
+  "c":{
+    "d":[
+      "x",
+      "y"
+    ],
+    "e":"xyz"
+  },
+  "f":{
+    "g":[
+      "arr1",
+      "arr2"
+    ],
+    "h":{
+      "a":"b",
+      "c":"d",
+      "e":true
+    },
+    "j":24
+  },
+  "x":[
+    "a1",
+    "a2",
+    "a3",
+    "a4"
+  ],
+  "y":24,
+  "z":"c1"
+}