INS-48042: Rename Record to UCRecord

common/build.gradle

@@ -12,8 +12,8 @@ version "${file("VERSION").text.trim()}"
 // ===========================================================================
 
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
 buildscript {
     repositories {

common/src/main/java/com/ibm/guardium/universalconnector/commons/Util.java

@@ -5,7 +5,7 @@
 package com.ibm.guardium.universalconnector.commons;
 
 /**
- * A utility class for creating a Guardium {@link com.ibm.guardium.universalconnector.commons.structures.Record Record}.
+ * A utility class for creating a Guardium {@link com.ibm.guardium.universalconnector.commons.structures.UCRecord Record}.
  */
 public class Util {
     /**

common/src/main/java/com/ibm/guardium/universalconnector/commons/structures/Accessor.java

@@ -174,7 +174,7 @@ public String getServiceName() {
      * the OS level service that runs the DB instace.
      * 
      * @param serviceName Usually identical to DB name, or container identifier in data source.
-     * @see Record#setDbName(String)
+     * @see UCRecord#setDbName(String)
      */
     public void setServiceName(String serviceName) {
         this.serviceName = serviceName;

common/src/main/java/com/ibm/guardium/universalconnector/commons/structures/Record.java → common/src/main/java/com/ibm/guardium/universalconnector/commons/structures/UCRecord.java

@@ -24,7 +24,7 @@
  * <li>App username specifies an application username
  * </ul>
  */
-public class Record {
+public class UCRecord {
 
     /**
      * Not to be filled by filter developer
@@ -233,7 +233,7 @@ public void setRecordsAffected(Integer recordsAffected) {
 
     @Override
     public String toString() {
-        return "Record{" +
+        return "UCRecord{" +
                 "connectorName='" + connectorName + '\'' +
                 ", connectorId='" + connectorId + '\'' +
                 ", sessionId='" + sessionId + '\'' +
@@ -247,4 +247,4 @@ public String toString() {
                 ", recordsAffected=" + recordsAffected +
                 '}';
     }
-}
+}

common/src/test/java/com/ibm/guardium/universalconnector/commons/structures/RecordTest.java

@@ -9,7 +9,7 @@
 
 public class RecordTest {
 
-    Record record = new Record();
+     UCRecord record = new UCRecord();
 
     @Test 
     public void testAccessorPostManipulation() {

filter-plugin/logstash-filter-aurora-mysql-guardium/build.gradle

@@ -11,7 +11,7 @@ group                      'com.ibm.guardium.auroramysql' // must match the pack
 version                    "${file("VERSION").text.trim()}" // read from required VERSION file
 description                = "Aurora Mysql Guardium filter plugin"
 pluginInfo.licenses        = ['Apache-2.0'] // list of SPDX license IDs
-pluginInfo.longDescription = "This gem is a Logstash saphana filter plugin required to be installed as part of IBM Security Guardium, Guardium Universal connector configuration. This gem is not a stand-alone program."
+pluginInfo.longDescription = "This gem is a Logstash Aurora MySQL filter plugin required to be installed as part of IBM Security Guardium, Guardium Universal connector configuration. This gem is not a stand-alone program."
 pluginInfo.authors         = ['IBM', 'Laxmikant Mahale']
 pluginInfo.email           = ['[email protected]']
 pluginInfo.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -20,10 +20,10 @@ pluginInfo.pluginClass     = "AuroraMysqlGuardiumPluginFilter"
 pluginInfo.pluginName      = "auroramysqlguardiumpluginfilter" // must match the @LogstashPlugin annotation in the main plugin class
 // ===========================================================================
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
-def jacocoVersion = '0.8.4'
+def jacocoVersion = '0.8.8'
 // minimumCoverage can be set by Travis ENV
 def minimumCoverageStr = System.getenv("MINIMUM_COVERAGE") ?: "50.0%"
 if (minimumCoverageStr.endsWith("%")) {
@@ -41,8 +41,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
-        classpath "org.barfuin.gradle.jacocolog:gradle-jacoco-log:3.0.0-RC2"
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.1'
+        classpath "org.barfuin.gradle.jacocolog:gradle-jacoco-log:3.1.0"
         classpath group: 'org.yaml', name: 'snakeyaml', version: '2.2'
     }
 }

filter-plugin/logstash-filter-aurora-mysql-guardium/src/main/java/com/ibm/guardium/auroramysql/AuroraMysqlGuardiumPluginFilter.java

@@ -56,7 +56,7 @@ public Collection<Event> filter(Collection<Event> events, FilterMatchListener ma
 				JsonObject data = new JsonObject();
 				data = inputData(e);
 				try {
-					Record record = Parser.parseRecord(data);
+					UCRecord record = Parser.parseRecord(data);
 					final GsonBuilder builder = new GsonBuilder();
 					builder.serializeNulls();
 					final Gson gson = builder.create();

filter-plugin/logstash-filter-aurora-mysql-guardium/src/main/java/com/ibm/guardium/auroramysql/Parser.java

@@ -11,8 +11,8 @@ public class Parser {
 
 	private static Logger log = LogManager.getLogger(Parser.class);
 
-	public static Record parseRecord(final JsonObject data) throws ParseException {
-		Record record = new Record();
+	public static UCRecord parseRecord(final JsonObject data) throws ParseException {
+		UCRecord record = new UCRecord();
 
 		if (data != null) {
 			if (data.has(Constants.SESSION_ID) && !data.get(Constants.SESSION_ID).isJsonNull()) {

filter-plugin/logstash-filter-aurora-mysql-guardium/src/test/java/com/ibm/guardium/auroramysql/ParserTest.java

@@ -6,10 +6,7 @@
 
 import java.text.ParseException;
 import com.google.gson.JsonObject;
-import com.ibm.guardium.auroramysql.Constants;
-import com.ibm.guardium.auroramysql.Parser;
 import com.ibm.guardium.universalconnector.commons.structures.*;
-import com.ibm.guardium.universalconnector.commons.structures.Record;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -35,7 +32,7 @@ public void testParseRecord_CreateTable() throws ParseException {
 		data.addProperty(Constants.DB_USER, "admin");
 		data.addProperty(Constants.DB_NAME, "music");
 		data.addProperty(Constants.SERVERHOSTNAME, "serverHostName");
-		final Record record = Parser.parseRecord(data);
+		final UCRecord record = Parser.parseRecord(data);
 
 		Assert.assertEquals(
 				"CREATE TABLE Orders (OrderID int NOT NULL,OrderNumber int NOT NULL,PersonID int,PRIMARY KEY (OrderID))",
@@ -56,7 +53,7 @@ public void testParseRecord_Error () throws ParseException {
 		data.addProperty(Constants.DB_USER, "JOHNNY");
 		data.addProperty(Constants.DB_NAME, "music");
 		data.addProperty(Constants.SERVERHOSTNAME, "serverHostName");
-		final Record record = Parser.parseRecord(data);
+		final UCRecord record = Parser.parseRecord(data);
 		Assert.assertEquals("LOGIN_FAILED", record.getException().getExceptionTypeId());
 		Assert.assertEquals("CONNECT", record.getException().getDescription());
 	}
@@ -78,7 +75,7 @@ public void testParseAccessor() throws ParseException {
 		data.addProperty(Constants.DB_USER, "JOHNNY");
 		data.addProperty(Constants.DB_NAME, "MUSIC");
 		data.addProperty(Constants.SERVERHOSTNAME, "serverHostName");
-		Record record = Parser.parseRecord(data);
+		UCRecord record = Parser.parseRecord(data);
 		Accessor actual = record.getAccessor();
 
 		Assert.assertEquals(Constants.DB_PROTOCOL, actual.getDbProtocol());

filter-plugin/logstash-filter-azure-apachesolr-guardium/build.gradle

@@ -21,10 +21,10 @@ pluginInfo.pluginName      = "apache_solr_azure_connector" // must match the @Lo
 // ===========================================================================
 
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
-def jacocoVersion = '0.8.4'
+def jacocoVersion = '0.8.8'
 // minimumCoverage can be set by Travis ENV
 def minimumCoverageStr = System.getenv("MINIMUM_COVERAGE") ?: "50.0%"
 if (minimumCoverageStr.endsWith("%")) {
@@ -42,8 +42,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
-        classpath "org.barfuin.gradle.jacocolog:gradle-jacoco-log:3.0.0-RC2"
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.0'
+        classpath "org.barfuin.gradle.jacocolog:gradle-jacoco-log:3.1.0"
         classpath group: 'org.yaml', name: 'snakeyaml', version: '2.2'
 
     }

filter-plugin/logstash-filter-azure-apachesolr-guardium/src/main/java/com/ibm/guardium/apachesolrdb/ApacheSolrAzureConnector.java

@@ -11,7 +11,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.ibm.guardium.universalconnector.commons.GuardConstants;
-import com.ibm.guardium.universalconnector.commons.structures.Record;
+import com.ibm.guardium.universalconnector.commons.structures.UCRecord;
 import co.elastic.logstash.api.Configuration;
 import co.elastic.logstash.api.Context;
 import co.elastic.logstash.api.Event;
@@ -47,7 +47,7 @@ public Collection<Event> filter(Collection<Event> events, FilterMatchListener ma
 		for (Event event : events) {
 			if (isQtpEvent(event)) {
 				try {
-					Record rec = Parser.parseQtpRecord(event);
+					UCRecord rec = Parser.parseQtpRecord(event);
 					final GsonBuilder builder = new GsonBuilder();
 					builder.serializeNulls();
 					final Gson gson = builder.disableHtmlEscaping().create();

filter-plugin/logstash-filter-azure-apachesolr-guardium/src/main/java/com/ibm/guardium/apachesolrdb/Parser.java

@@ -27,7 +27,7 @@
 import com.ibm.guardium.universalconnector.commons.structures.Construct;
 import com.ibm.guardium.universalconnector.commons.structures.Data;
 import com.ibm.guardium.universalconnector.commons.structures.ExceptionRecord;
-import com.ibm.guardium.universalconnector.commons.structures.Record;
+import com.ibm.guardium.universalconnector.commons.structures.UCRecord;
 import com.ibm.guardium.universalconnector.commons.structures.Sentence;
 import com.ibm.guardium.universalconnector.commons.structures.SentenceObject;
 import com.ibm.guardium.universalconnector.commons.structures.SessionLocator;
@@ -54,8 +54,8 @@ public class Parser {
 	 * @return record
 	 * @throws Exception
 	 */
-	public static Record parseQtpRecord(final Event event) throws Exception {
-		Record record = new Record();
+	public static UCRecord parseQtpRecord(final Event event) throws Exception {
+		UCRecord record = new UCRecord();
 		try {
 			record.setSessionId(getSessionId(event));
 			record.setAppUserName(ApplicationConstant.NOT_AVAILABLE);
@@ -385,7 +385,7 @@ private static String getRedactedData(Event event) {
 	/**
 	 * Using this to set redactedDataSql
 	 * 
-	 * @param eventF
+	 * @param event
 	 * @return redactedsql
 	 */
 	private static String getRedactedSql(final Event event) {
@@ -453,7 +453,7 @@ protected static Sentence parseQtpSentence(final Event event) throws Exception {
 	 * Using this to perform operation on input, convert String core into
 	 * sentenceObject Object and then return the value as response
 	 *
-	 * @param String core
+	 * @param core
 	 * @return sentenceobject
 	 *
 	 */

filter-plugin/logstash-filter-azure-apachesolr-guardium/src/test/java/com/ibm/guardium/apachesolrdb/ParserTest.java

@@ -12,7 +12,7 @@
 import com.ibm.guardium.universalconnector.commons.structures.Accessor;
 import com.ibm.guardium.universalconnector.commons.structures.Construct;
 import com.ibm.guardium.universalconnector.commons.structures.ExceptionRecord;
-import com.ibm.guardium.universalconnector.commons.structures.Record;
+import com.ibm.guardium.universalconnector.commons.structures.UCRecord;
 import com.ibm.guardium.universalconnector.commons.structures.Sentence;
 import com.ibm.guardium.universalconnector.commons.structures.SessionLocator;
 
@@ -111,7 +111,7 @@ public void testRedacted() throws Exception {
 		event.setField(ApplicationConstant.WEBAPP_FOR_FULLSQL, ApplicationConstantTest.WEBAPP_FOR_FULLSQL_VALUE);
 		event.setField(ApplicationConstant.PATH_FOR_FULLSQL, ApplicationConstantTest.PATH_FOR_FULLSQL_VALUE);
 		event.setField(ApplicationConstant.PARAMS, ApplicationConstantTest.PARAMS_VALUE);
-		Record record = Parser.parseQtpRecord(event);
+		UCRecord record = Parser.parseQtpRecord(event);
 		String redacted = record.getData().getConstruct().getRedactedSensitiveDataSql();
 		Assert.assertNotNull(redacted);
 		Assert.assertEquals(ApplicationConstantTest.REDACTED_VALUE, redacted);

filter-plugin/logstash-filter-azure-postgresql-guardium/build.gradle

@@ -21,10 +21,10 @@ pluginInfo.pluginName      = "azure_postgresql_guardium_plugin_filter" // must m
 // ===========================================================================shPlugin annotation in the main plugin class
 // ===========================================================================
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
-def jacocoVersion = '0.8.4'
+def jacocoVersion = '0.8.8'
 // minimumCoverage can be set by Travis ENV
 def minimumCoverageStr = System.getenv("MINIMUM_COVERAGE") ?: "50.0%"
 if (minimumCoverageStr.endsWith("%")) {
@@ -42,8 +42,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
-        classpath "org.barfuin.gradle.jacocolog:gradle-jacoco-log:3.0.0-RC2"
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.0'
+        classpath "org.barfuin.gradle.jacocolog:gradle-jacoco-log:3.1.0"
         classpath group: 'org.yaml', name: 'snakeyaml', version: '2.2'
     }
 }
@@ -137,7 +137,6 @@ tasks.register("copyDependencyLibs", Copy){
 }
 
 apply plugin: 'jacoco'
-//apply plugin: 'org.barfuin.gradle.jacocolog' version '2.0.0'
 apply plugin: "org.barfuin.gradle.jacocolog"
 // ------------------------------------
 // JaCoCo is a code coverage tool
@@ -188,4 +187,4 @@ jacocoTestCoverageVerification {
         }))
     }
 }
-project.tasks.check.dependsOn(jacocoTestCoverageVerification, jacocoTestReport)
+project.tasks.check.dependsOn(jacocoTestCoverageVerification, jacocoTestReport)

filter-plugin/logstash-filter-azure-postgresql-guardium/src/main/java/com/ibm/guardium/azurepostgresql/AzurePostgresqlGuardiumPluginFilter.java

@@ -8,17 +8,15 @@
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 
-import org.apache.commons.collections.map.HashedMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.ibm.guardium.universalconnector.commons.GuardConstants;
-import com.ibm.guardium.universalconnector.commons.structures.Record;
+import com.ibm.guardium.universalconnector.commons.structures.UCRecord;
 
 import co.elastic.logstash.api.Configuration;
 import co.elastic.logstash.api.Context;
@@ -74,7 +72,7 @@ public Collection<Event> filter(Collection<Event> events, FilterMatchListener ma
 
 			try {
 
-				Record record = Parser.parseRecord(e);
+				UCRecord  record = Parser.parseRecord(e);
 
 				final GsonBuilder builder = new GsonBuilder();
 

filter-plugin/logstash-filter-azure-postgresql-guardium/src/main/java/com/ibm/guardium/azurepostgresql/Parser.java

@@ -4,37 +4,24 @@
 #*/
 package com.ibm.guardium.azurepostgresql;
 
-import java.text.SimpleDateFormat;
-
-import org.apache.logging.log4j.LogManager;
-
-import org.apache.logging.log4j.Logger;
-
 import java.util.Date;
-
+import java.text.SimpleDateFormat;
 import java.text.ParseException;
 
-import com.ibm.guardium.universalconnector.commons.structures.Accessor;
-
-import com.ibm.guardium.universalconnector.commons.structures.Data;
-
-import com.ibm.guardium.universalconnector.commons.structures.ExceptionRecord;
-
-import com.ibm.guardium.universalconnector.commons.structures.Record;
+import com.ibm.guardium.universalconnector.commons.structures.*;
 
-import com.ibm.guardium.universalconnector.commons.structures.SessionLocator;
-
-import com.ibm.guardium.universalconnector.commons.structures.Time;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import co.elastic.logstash.api.Event;
 
 public class Parser {
 
 	private static Logger log = LogManager.getLogger(Parser.class);
 
-	public static Record parseRecord(final Event e) throws ParseException {
+	public static UCRecord parseRecord(final Event e) throws ParseException {
 
-		Record record = new Record();
+		UCRecord record = new UCRecord();
 
 		String dbname = Constants.NA;
 		if (e.getField(Constants.DATABASE_NAME) != null) {
@@ -102,7 +89,7 @@ public static Time parseTimestamp(final Event e) {
 		return new Time(millis, 0, 0);
 	}
 
-	public static void parseSessionId(final Event e, final Record record) {
+	public static void parseSessionId(final Event e, final UCRecord record) {
 
 		if (e.getField(Constants.SESSION_ID) != null) {
 			record.setSessionId(e.getField(Constants.SESSION_ID).toString());

filter-plugin/logstash-filter-azure-postgresql-guardium/src/test/java/com/ibm/guardium/azurepostgresql/AzurePostgresqlGuardiumPluginFilterTest.java

@@ -11,8 +11,6 @@
 import org.junit.Test;
 import org.logstash.plugins.ContextImpl;
 
-import com.ibm.guardium.azurepostgresql.Constants;
-import com.ibm.guardium.azurepostgresql.AzurePostgresqlGuardiumPluginFilter;
 import com.ibm.guardium.universalconnector.commons.GuardConstants;
 import co.elastic.logstash.api.Context;
 import co.elastic.logstash.api.Event;