Skip to content

Remove org.adrianwalker.multilinestring dependency and fix test files #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carolynduby merged 29 commits into from
Oct 30, 2025
Merged

Remove org.adrianwalker.multilinestring dependency and fix test files #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
323e542
Remove org.adrianwalker.multilinestring dependency and convert @Multi…
openhands-agent Oct 16, 2025
9353f79
Fix SimpleHBaseAdapterTest.java - properly convert @Multiline annotat…
openhands-agent Oct 16, 2025
19583da
Fix StellarAdapterTest.java - properly convert @Multiline annotations…
openhands-agent Oct 16, 2025
9674a8a
Fix ThreatIntelAdapterTest.java - properly convert @Multiline annotat…
openhands-agent Oct 16, 2025
2d64cd1
Fix SnortParserTest.java - properly convert @Multiline annotations to…
openhands-agent Oct 16, 2025
2906c2c
Fix YafParserTest.java - convert @Multiline annotation to String.join…
openhands-agent Oct 16, 2025
d1aa4ff
Fix CSVParserTest.java - convert @Multiline annotation to String.join…
openhands-agent Oct 16, 2025
d19c74c
Fix JSONMapParserTest.java - convert @Multiline annotations to String…
openhands-agent Oct 16, 2025
22123c2
Fix RegularExpressionsParserTest.java - convert @Multiline annotation…
openhands-agent Oct 16, 2025
04ac14b
Fix JSONUtilsTest.java: Add missing JSON config data
openhands-agent Oct 16, 2025
f6f73d6
Fix ShellFunctionsTest.java: Add correct expected table output values
openhands-agent Oct 16, 2025
3f89b5f
Fix EnrichmentConfigTest.java and SensorEnrichmentUpdateConfigTest.ja…
openhands-agent Oct 16, 2025
2b24d90
Fix StellarEnrichmentConfigTest.java and StellarEnrichmentTest.java -…
openhands-agent Oct 16, 2025
7086cfe
Complete transformation test fixes: convert all @Multiline annotation…
openhands-agent Oct 16, 2025
14dac84
Fix StringFunctionsTest.java: convert @Multiline annotations to Strin…
openhands-agent Oct 16, 2025
47c3e97
Fix QueryValidationTest.java: convert @Multiline annotations to Strin…
openhands-agent Oct 16, 2025
11d9c3f
Fix ValidationTest.java: convert @Multiline annotations to String.join
openhands-agent Oct 16, 2025
05261ea
Fix network validation tests: convert @Multiline annotations to Strin…
openhands-agent Oct 16, 2025
b913c95
Convert @Multiline annotations to String.join in primitive validation…
openhands-agent Oct 16, 2025
967296b
Remove unused multiline-string.version property from pom.xml
openhands-agent Oct 16, 2025
b9d77b7
Fix ReaderSpliteratorTest.java - convert empty data variable to Strin…
openhands-agent Oct 16, 2025
c7743dd
Fix ShellFunctionsTest: Add trailing newlines to expected ASCII table…
openhands-agent Oct 16, 2025
9eba549
Fix BasicBroParserTest: Replace illegal Unicode escape sequences with…
openhands-agent Oct 17, 2025
4ba39f4
Fix TestParserJobChainDirectory: Correct escape sequence in JSON string
openhands-agent Oct 17, 2025
36ce7e6
Fix ParserChainMapFunctionTest: Remove invalid double assignment syntax
openhands-agent Oct 17, 2025
feec403
Merge branch 'develop' into fix/multiline-string-dependency-removal
carolynduby Oct 17, 2025
fee8887
Merge branch 'develop' into fix/multiline-string-dependency-removal
carolynduby Oct 17, 2025
df3edd6
Remove benelog repository
carolynduby Oct 29, 2025
9c4501d
Merge branch 'develop' into fix/multiline-string-dependency-removal
carolynduby Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions flink-cyber/caracal-parser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.adrianwalker</groupId>
<artifactId>multiline-string</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
71 changes: 34 additions & 37 deletions ...r/caracal-parser/src/test/java/com/cloudera/cyber/caracal/ParserChainMapFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.cloudera.cyber.SignedSourceKey;
import com.cloudera.parserchains.core.utils.JSONUtils;
import lombok.NonNull;
import org.adrianwalker.multilinestring.Multiline;
import org.apache.flink.api.java.utils.ParameterTool;
import org.junit.jupiter.api.Test;

Expand All @@ -37,42 +36,40 @@
import static org.hamcrest.collection.IsMapContaining.hasKey;

public class ParserChainMapFunctionTest {
/**
* [
* {
* "topic": "test",
* "splitPath": "$.http-stream['http.request'][*]",
* "headerPath": "$.http-stream",
* "timestampField" : "start_ts",
* "timestampFunction": "Math.round(parseFloat(ts)*1000,0)",
* "chainSchema": {
* "id": "3b31e549-340f-47ce-8a71-d702685137f4",
* "name": "My Parser Chain",
* "parsers": [
* {
* "id": "1ee889fc-7495-4b47-8243-c16e5e74bb82",
* "name": "Rename Field",
* "type": "com.cloudera.parserchains.parsers.RenameFieldParser",
* "config": {
* "fieldToRename": [
* {
* "from": "ip_src",
* "to": "ip_src_addr"
* },
* {
* "from": "ip_dst",
* "to": "ip_dest_addr"
* }
* ]
* }
* }
* ]
* }
* }
* ]
*/
@Multiline
private String splitConfigString = null;
private String splitConfigString = String.join("\n",
"[",
"{",
"\"topic\": \"test\",",
"\"splitPath\": \"$.http-stream['http.request'][*]\",",
"\"headerPath\": \"$.http-stream\",",
"\"timestampField\" : \"start_ts\",",
"\"timestampFunction\": \"Math.round(parseFloat(ts)*1000,0)\",",
"\"chainSchema\": {",
"\"id\": \"3b31e549-340f-47ce-8a71-d702685137f4\",",
"\"name\": \"My Parser Chain\",",
"\"parsers\": [",
"{",
"\"id\": \"1ee889fc-7495-4b47-8243-c16e5e74bb82\",",
"\"name\": \"Rename Field\",",
"\"type\": \"com.cloudera.parserchains.parsers.RenameFieldParser\",",
"\"config\": {",
"\"fieldToRename\": [",
"{",
"\"from\": \"ip_src\",",
"\"to\": \"ip_src_addr\"",
"},",
"{",
"\"from\": \"ip_dst\",",
"\"to\": \"ip_dest_addr\"",
"}",
"]",
"}",
"}",
"]",
"}",
"}",
"]"
);

@Test
public void testParserChain() throws Exception {
Expand Down
5 changes: 0 additions & 5 deletions flink-cyber/flink-enrichment/flink-enrichment-stellar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@
<type>test-jar</type>
</dependency>

<dependency>
<groupId>org.adrianwalker</groupId>
<artifactId>multiline-string</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
Expand Down
45 changes: 20 additions & 25 deletions ...ellar/src/test/java/com/cloudera/cyber/enrichemnt/stellar/GeoEnrichmentFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.cloudera.cyber.TestUtils;
import com.cloudera.cyber.enrichment.geocode.IpGeoJob;
import com.google.common.collect.ImmutableMap;
import org.adrianwalker.multilinestring.Multiline;
import org.apache.metron.enrichment.adapters.maxmind.geo.GeoLiteCityDatabase;
import org.apache.metron.stellar.common.StellarProcessor;
import org.apache.metron.stellar.dsl.Context;
Expand All @@ -45,33 +44,29 @@ public class GeoEnrichmentFunctionsTest {
private static Context context;
private static File geoHdfsFile;

/**
* {
* "locID":"5803556",
* "country":"US",
* "city":"Milton",
* "postalCode":"98354",
* "latitude":"47.2513",
* "longitude":"-122.3149",
* "dmaCode":"819",
* "location_point":"47.2513,-122.3149"
* }
*/
@Multiline
private static String expectedMessageString;
private static String expectedMessageString = String.join("\n",
"{",
"\"locID\":\"5803556\",",
"\"country\":\"US\",",
"\"city\":\"Milton\",",
"\"postalCode\":\"98354\",",
"\"latitude\":\"47.2513\",",
"\"longitude\":\"-122.3149\",",
"\"dmaCode\":\"819\",",
"\"location_point\":\"47.2513,-122.3149\"",
"}"
);

private static JSONObject expectedMessage;

/**
* {
* "country":"US",
* "city":"Milton",
* "dmaCode":"819",
* "location_point":"47.2513,-122.3149"
* }
*/
@Multiline
private static String expectedSubsetString;
private static String expectedSubsetString = String.join("\n",
"{",
"\"country\":\"US\",",
"\"city\":\"Milton\",",
"\"dmaCode\":\"819\",",
"\"location_point\":\"47.2513,-122.3149\"",
"}"
);

private static JSONObject expectedSubsetMessage;

Expand Down
4 changes: 0 additions & 4 deletions flink-cyber/flink-enrichment/metron-enrichment-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,6 @@
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>org.adrianwalker</groupId>
<artifactId>multiline-string</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
35 changes: 15 additions & 20 deletions ...src/test/java/org/apache/metron/enrichment/adapters/host/HostFromJSONListAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.apache.metron.enrichment.adapters.host;

import org.adrianwalker.multilinestring.Multiline;
import org.apache.metron.enrichment.cache.CacheKey;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
Expand All @@ -30,26 +29,22 @@
public class HostFromJSONListAdapterTest {


/**
* [
* {"ip":"10.1.128.236", "local":"YES", "type":"webserver", "asset_value" : "important"},
* {"ip":"10.1.128.237", "local":"UNKNOWN", "type":"unknown", "asset_value" : "important"},
* {"ip":"10.60.10.254", "local":"YES", "type":"printer", "asset_value" : "important"},
* {"ip":"10.0.2.15", "local":"YES", "type":"printer", "asset_value" : "important"}
* ]
*/
@Multiline
private String expectedKnownHostsString;
private String expectedKnownHostsString = String.join("\n",
"[",
"{\"ip\":\"10.1.128.236\", \"local\":\"YES\", \"type\":\"webserver\", \"asset_value\" : \"important\"},",
"{\"ip\":\"10.1.128.237\", \"local\":\"UNKNOWN\", \"type\":\"unknown\", \"asset_value\" : \"important\"},",
"{\"ip\":\"10.60.10.254\", \"local\":\"YES\", \"type\":\"printer\", \"asset_value\" : \"important\"},",
"{\"ip\":\"10.0.2.15\", \"local\":\"YES\", \"type\":\"printer\", \"asset_value\" : \"important\"}",
"]"
);

/**
* {
* "known_info.local":"YES",
* "known_info.type":"printer",
* "known_info.asset_value" : "important"
* }
*/
@Multiline
private String expectedMessageString;
private String expectedMessageString = String.join("\n",
"{",
"\"known_info.local\":\"YES\",",
"\"known_info.type\":\"printer\",",
"\"known_info.asset_value\" : \"important\"",
"}"
);

private JSONObject expectedMessage;
private String ip = "10.0.2.15";
Expand Down
37 changes: 16 additions & 21 deletions ...st/java/org/apache/metron/enrichment/adapters/host/HostFromPropertiesFileAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.apache.metron.enrichment.adapters.host;

import org.adrianwalker.multilinestring.Multiline;
import org.apache.metron.enrichment.cache.CacheKey;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
Expand All @@ -36,27 +35,23 @@

public class HostFromPropertiesFileAdapterTest {

/**
* [
* {"ip":"10.1.128.236", "local":"YES", "type":"webserver", "asset_value" : "important"},
* {"ip":"10.1.128.237", "local":"UNKNOWN", "type":"unknown", "asset_value" : "important"},
* {"ip":"10.60.10.254", "local":"YES", "type":"printer", "asset_value" : "important"},
* {"ip":"10.0.2.15", "local":"YES", "type":"printer", "asset_value" : "important"}
* ]
*/
@Multiline
private String expectedKnownHostsString;
private String expectedKnownHostsString = String.join("\n",
"[",
"{\"ip\":\"10.1.128.236\", \"local\":\"YES\", \"type\":\"webserver\", \"asset_value\" : \"important\"},",
"{\"ip\":\"10.1.128.237\", \"local\":\"UNKNOWN\", \"type\":\"unknown\", \"asset_value\" : \"important\"},",
"{\"ip\":\"10.60.10.254\", \"local\":\"YES\", \"type\":\"printer\", \"asset_value\" : \"important\"},",
"{\"ip\":\"10.0.2.15\", \"local\":\"YES\", \"type\":\"printer\", \"asset_value\" : \"important\"}",
"]"
);

/**
* {
* "known_info":
* {"asset_value":"important",
* "type":"printer","local":"YES"
* }
* }
*/
@Multiline
private String expectedMessageString;
private String expectedMessageString = String.join("\n",
"{",
"\"known_info\":",
"{\"asset_value\":\"important\",",
"\"type\":\"printer\",\"local\":\"YES\"",
"}",
"}"
);

private JSONObject expectedMessage;
private String ip = "10.0.2.15";
Expand Down
27 changes: 12 additions & 15 deletions ...ommon/src/test/java/org/apache/metron/enrichment/adapters/maxmind/geo/GeoAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import com.cloudera.cyber.TestUtils;
import com.google.common.collect.ImmutableMap;
import org.adrianwalker.multilinestring.Multiline;
import org.apache.metron.enrichment.adapters.geo.GeoAdapter;
import org.apache.metron.enrichment.cache.CacheKey;
import org.json.simple.JSONObject;
Expand All @@ -36,20 +35,18 @@
public class GeoAdapterTest {
private static final String IP = "216.160.83.56";

/**
* {
* "locID":"5803556",
* "country":"US",
* "city":"Milton",
* "postalCode":"98354",
* "latitude":"47.2513",
* "longitude":"-122.3149",
* "dmaCode":"819",
* "location_point":"47.2513,-122.3149"
* }
*/
@Multiline
private static String expectedMessageString;
private static String expectedMessageString = String.join("\n",
"{",
"\"locID\":\"5803556\",",
"\"country\":\"US\",",
"\"city\":\"Milton\",",
"\"postalCode\":\"98354\",",
"\"latitude\":\"47.2513\",",
"\"longitude\":\"-122.3149\",",
"\"dmaCode\":\"819\",",
"\"location_point\":\"47.2513,-122.3149\"",
"}"
);

private static JSONObject expectedMessage;

Expand Down
Loading
Loading