Skip to content
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

Jump to bottom

Issue #134: Improve the append and prepend computes to replace dynamic entries in string values #138

Merged
merged 4 commits into from
Mar 28, 2024
Merged

Issue #134: Improve the append and prepend computes to replace dynamic entries in string values #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bc18b6
Issue #134: Improve the append and prepend computes to replace dynam…
TNohaic Mar 27, 2024
223a6ff
Issue #134: Improve the append and prepend computes to replace dynam…
TNohaic Mar 28, 2024
a4973c1
Merge remote-tracking branch 'origin/main' into feature/issue-134-imp…
TNohaic Mar 28, 2024
2e6761d
Merge remote-tracking branch 'origin/main' into feature/issue-134-imp…
TNohaic Mar 28, 2024
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
2 changes: 1 addition & 1 deletion ...rc/main/java/org/sentrysoftware/metricshub/engine/common/helpers/MetricsHubConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ public class MetricsHubConstants {
/**
* Column Reference pattern
*/
public static final Pattern COLUMN_REFERENCE_PATTERN = Pattern.compile("\\$(\\d+)");
public static final Pattern COLUMN_REFERENCE_PATTERN = Pattern.compile("(?<!\\$)\\$([1-9]\\d*)");

/**
* Double Pattern
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/org/sentrysoftware/metricshub/engine/strategy/source/SourceUpdaterProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
*/

import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.COLUMN_REFERENCE_PATTERN;
import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.EMPTY;
import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.NEW_LINE;
import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.SEMICOLON;
Expand Down Expand Up @@ -71,7 +72,6 @@
@Slf4j
public class SourceUpdaterProcessor implements ISourceProcessor {

private static final Pattern COLUMN_REF_PATTERN = Pattern.compile("(?<!\\$)\\$([1-9]\\d*)", Pattern.CASE_INSENSITIVE);
private static final Pattern MONO_INSTANCE_REPLACEMENT_PATTERN = Pattern.compile(
"\\$\\{attribute::(\\w+)\\}",
Pattern.CASE_INSENSITIVE
Expand Down Expand Up @@ -523,7 +523,7 @@ static String replaceDynamicEntry(final String dataValue, @NonNull final List<St
return null;
}

final Matcher matcher = COLUMN_REF_PATTERN.matcher(dataValue);
final Matcher matcher = COLUMN_REFERENCE_PATTERN.matcher(dataValue);

final StringBuffer sb = new StringBuffer();
while (matcher.find()) {
Expand Down
14 changes: 12 additions & 2 deletions ...n/java/org/sentrysoftware/metricshub/engine/strategy/source/compute/ComputeProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/

import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.COLUMN_PATTERN;
import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.COLUMN_REFERENCE_PATTERN;
import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.COMMA;
import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.DEFAULT;
import static org.sentrysoftware.metricshub.engine.common.helpers.MetricsHubConstants.DOUBLE_PATTERN;
Expand Down Expand Up @@ -1773,9 +1774,18 @@ private void concatString(final List<String> line, final int columnIndex, final
return;
}

String concatValue = abstractConcat.getValue();
Matcher matcher = COLUMN_REFERENCE_PATTERN.matcher(concatValue);

while (matcher.find()) {
int concatColumnIndex = Integer.parseInt(matcher.group(1)) - 1;

concatValue = concatValue.replace(matcher.group(0), line.get(concatColumnIndex));
}

final String result = abstractConcat instanceof Prepend
? abstractConcat.getValue().concat(line.get(columnIndex))
: line.get(columnIndex).concat(abstractConcat.getValue());
? concatValue.concat(line.get(columnIndex))
: line.get(columnIndex).concat(concatValue);

line.set(columnIndex, result);
}
Expand Down
190 changes: 174 additions & 16 deletions ...va/org/sentrysoftware/metricshub/engine/strategy/source/compute/ComputeProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,36 @@ class ComputeProcessorTest {
private static final String PREFIX_MANUFACTURER1 = "prefix_MANUFACTURER1";
private static final String PREFIX_MANUFACTURER2 = "prefix_MANUFACTURER2";
private static final String PREFIX_MANUFACTURER3 = "prefix_MANUFACTURER3";
private static final String SUFFIX_APPEND_REF_MANUFACTURER1 = "MANUFACTURER1prefix_ID1_middle_NAME1_suffix";
private static final String SUFFIX_APPEND_REF_MANUFACTURER2 = "MANUFACTURER2prefix_ID2_middle_NAME2_suffix";
private static final String SUFFIX_APPEND_REF_MANUFACTURER3 = "MANUFACTURER3prefix_ID3_middle_NAME3_suffix";
private static final String PREFIX_PREPEND_REF_MANUFACTURER1 = "prefix_ID1_middle_NAME1_suffixMANUFACTURER1";
private static final String PREFIX_PREPEND_REF_MANUFACTURER2 = "prefix_ID2_middle_NAME2_suffixMANUFACTURER2";
private static final String PREFIX_PREPEND_REF_MANUFACTURER3 = "prefix_ID3_middle_NAME3_suffixMANUFACTURER3";
private static final String PREFIX_PREPEND_REF_MANUFACTURER1_PROTECTED =
"prefix_$$1_middle_NAME1_suffixMANUFACTURER1";
private static final String PREFIX_PREPEND_REF_MANUFACTURER2_PROTECTED =
"prefix_$$1_middle_NAME2_suffixMANUFACTURER2";
private static final String PREFIX_PREPEND_REF_MANUFACTURER3_PROTECTED =
"prefix_$$1_middle_NAME3_suffixMANUFACTURER3";
private static final String SUFFIX_APPEND_REF_MANUFACTURER1_PROTECTED = "MANUFACTURER1prefix_$$1_middle_NAME1_suffix";
private static final String SUFFIX_APPEND_REF_MANUFACTURER2_PROTECTED = "MANUFACTURER2prefix_$$1_middle_NAME2_suffix";
private static final String SUFFIX_APPEND_REF_MANUFACTURER3_PROTECTED = "MANUFACTURER3prefix_$$1_middle_NAME3_suffix";
private static final String MANUFACTURER1_SUFFIX = "MANUFACTURER1_suffix";
private static final String MANUFACTURER2_SUFFIX = "MANUFACTURER2_suffix";
private static final String MANUFACTURER3_SUFFIX = "MANUFACTURER3_suffix";
private static final String NAME1 = "NAME1";
private static final String NAME2 = "NAME2";
private static final String NAME3 = "NAME3";
private static final String NEW_COMMA_COLUMN = "new,Column";
private static final String NEW_COMMA_DOLLAR_4 = "new,$4";
private static final String NEW_COMMA_NUMBER_OF_DISKS1 = "new,NUMBER_OF_DISKS1";
private static final String NEW_COMMA_NUMBER_OF_DISKS2 = "new,NUMBER_OF_DISKS2";
private static final String NEW_COMMA_NUMBER_OF_DISKS3 = "new,NUMBER_OF_DISKS3";
private static final String NUMBER_OF_DISKS1 = "NUMBER_OF_DISKS1";
private static final String NUMBER_OF_DISKS2 = "NUMBER_OF_DISKS2";
private static final String NUMBER_OF_DISKS3 = "NUMBER_OF_DISKS3";
private static final String PREFIX = "prefix_";
private static final String MIDDLE_VALUE = "_middle_";
private static final String SUFFIX = "_suffix";
private static final String TYPE1 = "TYPE1";
private static final String TYPE2 = "TYPE2";
Expand Down Expand Up @@ -165,6 +183,46 @@ class ComputeProcessorTest {
Arrays.asList(ID3, NAME3, MANUFACTURER3_SUFFIX, NUMBER_OF_DISKS3)
);

private static final List<String> LINE_1_RESULT_APPEND_REF = new ArrayList<>(
Arrays.asList(ID1, NAME1, SUFFIX_APPEND_REF_MANUFACTURER1, NUMBER_OF_DISKS1)
);
private static final List<String> LINE_2_RESULT_APPEND_REF = new ArrayList<>(
Arrays.asList(ID2, NAME2, SUFFIX_APPEND_REF_MANUFACTURER2, NUMBER_OF_DISKS2)
);
private static final List<String> LINE_3_RESULT_APPEND_REF = new ArrayList<>(
Arrays.asList(ID3, NAME3, SUFFIX_APPEND_REF_MANUFACTURER3, NUMBER_OF_DISKS3)
);

private static final List<String> LINE_1_RESULT_PREPEND_REF = new ArrayList<>(
Arrays.asList(ID1, NAME1, PREFIX_PREPEND_REF_MANUFACTURER1, NUMBER_OF_DISKS1)
);
private static final List<String> LINE_2_RESULT_PREPEND_REF = new ArrayList<>(
Arrays.asList(ID2, NAME2, PREFIX_PREPEND_REF_MANUFACTURER2, NUMBER_OF_DISKS2)
);
private static final List<String> LINE_3_RESULT_PREPEND_REF = new ArrayList<>(
Arrays.asList(ID3, NAME3, PREFIX_PREPEND_REF_MANUFACTURER3, NUMBER_OF_DISKS3)
);

private static final List<String> LINE_1_RESULT_PREPEND_REF_PROTECTED = new ArrayList<>(
Arrays.asList(ID1, NAME1, PREFIX_PREPEND_REF_MANUFACTURER1_PROTECTED, NUMBER_OF_DISKS1)
);
private static final List<String> LINE_2_RESULT_PREPEND_REF_PROTECTED = new ArrayList<>(
Arrays.asList(ID2, NAME2, PREFIX_PREPEND_REF_MANUFACTURER2_PROTECTED, NUMBER_OF_DISKS2)
);
private static final List<String> LINE_3_RESULT_PREPEND_REF_PROTECTED = new ArrayList<>(
Arrays.asList(ID3, NAME3, PREFIX_PREPEND_REF_MANUFACTURER3_PROTECTED, NUMBER_OF_DISKS3)
);

private static final List<String> LINE_1_RESULT_APPEND_REF_PROTECTED = new ArrayList<>(
Arrays.asList(ID1, NAME1, SUFFIX_APPEND_REF_MANUFACTURER1_PROTECTED, NUMBER_OF_DISKS1)
);
private static final List<String> LINE_2_RESULT_APPEND_REF_PROTECTED = new ArrayList<>(
Arrays.asList(ID2, NAME2, SUFFIX_APPEND_REF_MANUFACTURER2_PROTECTED, NUMBER_OF_DISKS2)
);
private static final List<String> LINE_3_RESULT_APPEND_REF_PROTECTED = new ArrayList<>(
Arrays.asList(ID3, NAME3, SUFFIX_APPEND_REF_MANUFACTURER3_PROTECTED, NUMBER_OF_DISKS3)
);

private static final List<String> LINE_1_ONE_COLUMN = new ArrayList<>(Collections.singletonList(ID1));
private static final List<String> LINE_2_ONE_COLUMN = new ArrayList<>(Collections.singletonList(ID2));
private static final List<String> LINE_3_ONE_COLUMN = new ArrayList<>(Collections.singletonList(ID3));
Expand Down Expand Up @@ -688,9 +746,9 @@ void testProcessPrependNotColumn1() {

final List<List<String>> table = sourceTable.getTable();

assertEquals(new ArrayList<>(Arrays.asList(ID1, NAME1, "$1_MANUFACTURER1", NUMBER_OF_DISKS1)), table.get(0));
assertEquals(new ArrayList<>(Arrays.asList(ID2, NAME2, "$1_MANUFACTURER2", NUMBER_OF_DISKS2)), table.get(1));
assertEquals(new ArrayList<>(Arrays.asList(ID3, NAME3, "$1_MANUFACTURER3", NUMBER_OF_DISKS3)), table.get(2));
assertEquals(new ArrayList<>(Arrays.asList(ID1, NAME1, "ID1_MANUFACTURER1", NUMBER_OF_DISKS1)), table.get(0));
assertEquals(new ArrayList<>(Arrays.asList(ID2, NAME2, "ID2_MANUFACTURER2", NUMBER_OF_DISKS2)), table.get(1));
assertEquals(new ArrayList<>(Arrays.asList(ID3, NAME3, "ID3_MANUFACTURER3", NUMBER_OF_DISKS3)), table.get(2));
}

@Test
Expand All @@ -703,9 +761,9 @@ void testProcessPrependNotColumn2() {

final List<List<String>> table = sourceTable.getTable();

assertEquals(new ArrayList<>(Arrays.asList(ID1, NAME1, "_$1MANUFACTURER1", NUMBER_OF_DISKS1)), table.get(0));
assertEquals(new ArrayList<>(Arrays.asList(ID2, NAME2, "_$1MANUFACTURER2", NUMBER_OF_DISKS2)), table.get(1));
assertEquals(new ArrayList<>(Arrays.asList(ID3, NAME3, "_$1MANUFACTURER3", NUMBER_OF_DISKS3)), table.get(2));
assertEquals(new ArrayList<>(Arrays.asList(ID1, NAME1, "_ID1MANUFACTURER1", NUMBER_OF_DISKS1)), table.get(0));
assertEquals(new ArrayList<>(Arrays.asList(ID2, NAME2, "_ID2MANUFACTURER2", NUMBER_OF_DISKS2)), table.get(1));
assertEquals(new ArrayList<>(Arrays.asList(ID3, NAME3, "_ID3MANUFACTURER3", NUMBER_OF_DISKS3)), table.get(2));
}

@Test
Expand Down Expand Up @@ -744,19 +802,40 @@ void testProcessPrependTwoNewColumns() {

assertEquals(
new ArrayList<>(
Arrays.asList(NEW_COMMA_DOLLAR_4, ANOTHER_NEW_COLUMN, PREFIX_ID1, NAME1, MANUFACTURER1, NUMBER_OF_DISKS1)
Arrays.asList(
NEW_COMMA_NUMBER_OF_DISKS1,
ANOTHER_NEW_COLUMN,
PREFIX_ID1,
NAME1,
MANUFACTURER1,
NUMBER_OF_DISKS1
)
),
table.get(0)
);
assertEquals(
new ArrayList<>(
Arrays.asList(NEW_COMMA_DOLLAR_4, ANOTHER_NEW_COLUMN, PREFIX_ID2, NAME2, MANUFACTURER2, NUMBER_OF_DISKS2)
Arrays.asList(
NEW_COMMA_NUMBER_OF_DISKS2,
ANOTHER_NEW_COLUMN,
PREFIX_ID2,
NAME2,
MANUFACTURER2,
NUMBER_OF_DISKS2
)
),
table.get(1)
);
assertEquals(
new ArrayList<>(
Arrays.asList(NEW_COMMA_DOLLAR_4, ANOTHER_NEW_COLUMN, PREFIX_ID3, NAME3, MANUFACTURER3, NUMBER_OF_DISKS3)
Arrays.asList(
NEW_COMMA_NUMBER_OF_DISKS3,
ANOTHER_NEW_COLUMN,
PREFIX_ID3,
NAME3,
MANUFACTURER3,
NUMBER_OF_DISKS3
)
),
table.get(2)
);
Expand Down Expand Up @@ -808,6 +887,35 @@ void testProcessPrependColumnValueOutOfBand() {
}
}

@Test
void testProcessPrependColumnReferenceInString() {
initializeSourceTable();

final Prepend prepend = new Prepend();

final List<List<String>> table = sourceTable.getTable();

prepend.setColumn(3);
prepend.setValue(String.format("%s%s%s%s%s", PREFIX, "$1", MIDDLE_VALUE, "$2", SUFFIX));

computeProcessor.process(prepend);

assertEquals(LINE_1_RESULT_PREPEND_REF, table.get(0));
assertEquals(LINE_2_RESULT_PREPEND_REF, table.get(1));
assertEquals(LINE_3_RESULT_PREPEND_REF, table.get(2));

// Check with a protected '$'
initializeSourceTable();
prepend.setColumn(3);
prepend.setValue(String.format("%s%s%s%s%s", PREFIX, "$$1", MIDDLE_VALUE, "$2", SUFFIX));

computeProcessor.process(prepend);

assertEquals(LINE_1_RESULT_PREPEND_REF_PROTECTED, table.get(0));
assertEquals(LINE_2_RESULT_PREPEND_REF_PROTECTED, table.get(1));
assertEquals(LINE_3_RESULT_PREPEND_REF_PROTECTED, table.get(2));
}

@Test
void testProcessAppend() {
initializeSourceTable();
Expand Down Expand Up @@ -899,9 +1007,9 @@ void testProcessAppendNotColumn1() {

final List<List<String>> table = sourceTable.getTable();

assertEquals(new ArrayList<>(Arrays.asList(ID1, NAME1, "MANUFACTURER1_$1", NUMBER_OF_DISKS1)), table.get(0));
assertEquals(new ArrayList<>(Arrays.asList(ID2, NAME2, "MANUFACTURER2_$1", NUMBER_OF_DISKS2)), table.get(1));
assertEquals(new ArrayList<>(Arrays.asList(ID3, NAME3, "MANUFACTURER3_$1", NUMBER_OF_DISKS3)), table.get(2));
assertEquals(new ArrayList<>(Arrays.asList(ID1, NAME1, "MANUFACTURER1_ID1", NUMBER_OF_DISKS1)), table.get(0));
assertEquals(new ArrayList<>(Arrays.asList(ID2, NAME2, "MANUFACTURER2_ID2", NUMBER_OF_DISKS2)), table.get(1));
assertEquals(new ArrayList<>(Arrays.asList(ID3, NAME3, "MANUFACTURER3_ID3", NUMBER_OF_DISKS3)), table.get(2));
}

@Test
Expand Down Expand Up @@ -940,19 +1048,40 @@ void testProcessAppendTwoNewColumns() {

assertEquals(
new ArrayList<>(
Arrays.asList(ID1_SUFFIX, NEW_COMMA_DOLLAR_4, ANOTHER_NEW_COLUMN, NAME1, MANUFACTURER1, NUMBER_OF_DISKS1)
Arrays.asList(
ID1_SUFFIX,
NEW_COMMA_NUMBER_OF_DISKS1,
ANOTHER_NEW_COLUMN,
NAME1,
MANUFACTURER1,
NUMBER_OF_DISKS1
)
),
table.get(0)
);
assertEquals(
new ArrayList<>(
Arrays.asList(ID2_SUFFIX, NEW_COMMA_DOLLAR_4, ANOTHER_NEW_COLUMN, NAME2, MANUFACTURER2, NUMBER_OF_DISKS2)
Arrays.asList(
ID2_SUFFIX,
NEW_COMMA_NUMBER_OF_DISKS2,
ANOTHER_NEW_COLUMN,
NAME2,
MANUFACTURER2,
NUMBER_OF_DISKS2
)
),
table.get(1)
);
assertEquals(
new ArrayList<>(
Arrays.asList(ID3_SUFFIX, NEW_COMMA_DOLLAR_4, ANOTHER_NEW_COLUMN, NAME3, MANUFACTURER3, NUMBER_OF_DISKS3)
Arrays.asList(
ID3_SUFFIX,
NEW_COMMA_NUMBER_OF_DISKS3,
ANOTHER_NEW_COLUMN,
NAME3,
MANUFACTURER3,
NUMBER_OF_DISKS3
)
),
table.get(2)
);
Expand Down Expand Up @@ -1066,6 +1195,35 @@ void testProcessAppendColumnValueOutOfBand() {
}
}

@Test
void testProcessAppendColumnReferenceInString() {
initializeSourceTable();

final Append append = new Append();

final List<List<String>> table = sourceTable.getTable();

append.setColumn(3);
append.setValue(String.format("%s%s%s%s%s", PREFIX, "$1", MIDDLE_VALUE, "$2", SUFFIX));

computeProcessor.process(append);

assertEquals(LINE_1_RESULT_APPEND_REF, table.get(0));
assertEquals(LINE_2_RESULT_APPEND_REF, table.get(1));
assertEquals(LINE_3_RESULT_APPEND_REF, table.get(2));

// Check with a protected '$'
initializeSourceTable();
append.setColumn(3);
append.setValue(String.format("%s%s%s%s%s", PREFIX, "$$1", MIDDLE_VALUE, "$2", SUFFIX));

computeProcessor.process(append);

assertEquals(LINE_1_RESULT_APPEND_REF_PROTECTED, table.get(0));
assertEquals(LINE_2_RESULT_APPEND_REF_PROTECTED, table.get(1));
assertEquals(LINE_3_RESULT_APPEND_REF_PROTECTED, table.get(2));
}

@Test
void testJson2Csv() {
// Retrieve the Json file and extract its content as String
Expand Down