Integrate JavaCC plugin

nccgroup · Oct 20, 2023 · f6970e4 · f6970e4
1 parent 05fa4c0
commit f6970e4
Show file tree

Hide file tree

Showing 32 changed files with 50 additions and 4,402 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id "io.freefair.lombok" version "6.5.1"
+    id "org.javacc.javacc" version "3.0.0"
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
@@ -26,6 +27,19 @@ dependencies {
     testRuntimeOnly files("${System.properties['user.home']}/BurpSuiteCommunity/burpsuite_community.jar")
 }
 
+sourceSets {
+    main {
+        java {
+            srcDir compileJavacc.outputDirectory
+            srcDir compileJjtree.outputDirectory
+        }
+    }
+}
+
+compileJjtree {
+    include '**/*.java'
+}
+
 jar {
     baseName = project.name
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE

diff --git a/src/main/java/com/nccgroup/loggerplusplus/exports/ElasticExporter.java b/src/main/java/com/nccgroup/loggerplusplus/exports/ElasticExporter.java
@@ -3,13 +3,9 @@
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch.core.BulkRequest;
 import co.elastic.clients.elasticsearch.core.BulkResponse;
-import co.elastic.clients.elasticsearch.core.IndexRequest;
 import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem;
 import co.elastic.clients.elasticsearch.indices.CreateIndexRequest;
 import co.elastic.clients.elasticsearch.indices.ExistsRequest;
-import co.elastic.clients.elasticsearch.indices.GetIndexRequest;
-import co.elastic.clients.json.JsonData;
-import co.elastic.clients.json.jackson.JacksonJsonpGenerator;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.endpoints.BooleanResponse;
@@ -21,14 +17,11 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import com.nccgroup.loggerplusplus.LoggerPlusPlus;
 import com.nccgroup.loggerplusplus.filter.logfilter.LogTableFilter;
 import com.nccgroup.loggerplusplus.filter.parser.ParseException;
 import com.nccgroup.loggerplusplus.logentry.LogEntry;
 import com.nccgroup.loggerplusplus.logentry.LogEntryField;
-import com.nccgroup.loggerplusplus.logentry.LogEntrySerializer;
 import com.nccgroup.loggerplusplus.logentry.Status;
 import com.nccgroup.loggerplusplus.util.Globals;
 import lombok.extern.log4j.Log4j2;
@@ -47,7 +40,6 @@
 import java.net.ConnectException;
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
-import java.security.SecureRandom;
 import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

diff --git a/src/main/java/com/nccgroup/loggerplusplus/exports/ElasticExporterConfigDialog.java b/src/main/java/com/nccgroup/loggerplusplus/exports/ElasticExporterConfigDialog.java
@@ -7,7 +7,6 @@
 import com.nccgroup.loggerplusplus.LoggerPlusPlus;
 import com.nccgroup.loggerplusplus.filter.logfilter.LogTableFilter;
 import com.nccgroup.loggerplusplus.filter.parser.ParseException;
-import com.nccgroup.loggerplusplus.filterlibrary.FilterLibraryController;
 import com.nccgroup.loggerplusplus.logentry.LogEntryField;
 import com.nccgroup.loggerplusplus.util.Globals;
 import com.nccgroup.loggerplusplus.util.MoreHelp;

diff --git a/src/main/java/com/nccgroup/loggerplusplus/filter/FilterExpression.java b/src/main/java/com/nccgroup/loggerplusplus/filter/FilterExpression.java
@@ -1,7 +1,10 @@
 package com.nccgroup.loggerplusplus.filter;
 
 import com.nccgroup.loggerplusplus.LoggerPlusPlus;
-import com.nccgroup.loggerplusplus.filter.parser.*;
+import com.nccgroup.loggerplusplus.filter.parser.ASTExpression;
+import com.nccgroup.loggerplusplus.filter.parser.FilterEvaluationVisitor;
+import com.nccgroup.loggerplusplus.filter.parser.FilterParser;
+import com.nccgroup.loggerplusplus.filter.parser.ParseException;
 import com.nccgroup.loggerplusplus.logentry.FieldGroup;
 import com.nccgroup.loggerplusplus.logentry.LogEntry;
 import com.nccgroup.loggerplusplus.logentry.LogEntryField;

diff --git a/src/main/java/com/nccgroup/loggerplusplus/filter/logfilter/LogFilterController.java b/src/main/java/com/nccgroup/loggerplusplus/filter/logfilter/LogFilterController.java
@@ -2,7 +2,6 @@
 
 import com.coreyd97.BurpExtenderUtilities.HistoryField;
 import com.coreyd97.BurpExtenderUtilities.Preferences;
-import com.nccgroup.loggerplusplus.LoggerPlusPlus;
 import com.nccgroup.loggerplusplus.filter.parser.ParseException;
 import com.nccgroup.loggerplusplus.logentry.FieldGroup;
 import com.nccgroup.loggerplusplus.logentry.LogEntryField;