Skip to content

Commit a8e1704

Browse files
author
Vali (Vasile Baluta)
committed
implement default values for rules and add downstream rules
1 parent 3dad0a3 commit a8e1704

File tree

2 files changed

+48
-6
lines changed

2 files changed

+48
-6
lines changed

src/main/java/com/ericsson/ei/rules/RulesObject.java

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,66 @@ public JsonNode getJsonRulesObject() {
1515
}
1616

1717
public String getMatchIdRules() {
18-
return rulesObject.get("MatchIdRules").toString();
18+
JsonNode jsonNode = rulesObject.get("MatchIdRules");
19+
if (jsonNode != null)
20+
return jsonNode.toString();
21+
return "";
1922
}
2023

2124
public String getIdRule() {
22-
return rulesObject.get("IdRule").textValue();
25+
JsonNode jsonNode = rulesObject.get("IdRule");
26+
if (jsonNode != null)
27+
return jsonNode.textValue();
28+
return "";
2329
}
2430

2531
public String getIdentifyRules() {
26-
return rulesObject.get("IdentifyRules").textValue();
32+
JsonNode jsonNode = rulesObject.get("IdentifyRules");
33+
if (jsonNode != null)
34+
return jsonNode.textValue();
35+
return "";
2736
}
2837

2938
public String getExtractionRules() {
30-
return rulesObject.get("ExtractionRules").textValue();
39+
JsonNode jsonNode = rulesObject.get("ExtractionRules");
40+
if (jsonNode != null)
41+
return jsonNode.textValue();
42+
return "";
3143
}
3244

3345
public String getMergeRules() {
34-
return rulesObject.get("MergeResolverRules").textValue();
46+
JsonNode jsonNode = rulesObject.get("MergeResolverRules");
47+
if (jsonNode != null)
48+
return jsonNode.textValue();
49+
return "";
50+
}
51+
52+
public String getDownstreamIdentifyRules() {
53+
JsonNode jsonNode = rulesObject.get("DownstreamIdentifyRules");
54+
if (jsonNode != null)
55+
return jsonNode.textValue();
56+
return "";
57+
}
58+
59+
public String getDownstreamExtractionRules() {
60+
JsonNode jsonNode = rulesObject.get("DownstreamExtractionRules");
61+
if (jsonNode != null)
62+
return jsonNode.textValue();
63+
return "";
64+
}
65+
66+
public String getDownstreamMergeRules() {
67+
JsonNode jsonNode = rulesObject.get("DownstreamMergeRules");
68+
if (jsonNode != null)
69+
return jsonNode.textValue();
70+
return "";
3571
}
3672

3773
public String fetchProcessRules() {
38-
return rulesObject.get("ProcessRules").textValue();
74+
JsonNode jsonNode = rulesObject.get("ProcessRules");
75+
if (jsonNode != null)
76+
return jsonNode.textValue();
77+
return "";
3978
}
4079

4180
public boolean equals(Object other) {

src/test/resources/ArtifactRules_new.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
"IdentifyRules" : "[meta.id]",
99
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
1010
"ExtractionRules" : "{ id : meta.id, type : meta.type, time : meta.time, gav : data.gav, fileInformation : data.fileInformation, buildCommand : data.buildCommand }",
11+
"DownstreamIdentifyRules" : "[meta.id]",
12+
"DownstreamMergeRules": "",
13+
"DownstreamExtractionRules" : "{ id : meta.id, type : meta.type, time : meta.time, gav : data.gav, fileInformation : data.fileInformation, buildCommand : data.buildCommand }",
1114
"MergeResolverRules" : "",
1215
"ArrayMergeOptions": "",
1316
"HistoryIdentifyRules":"links | [?type=='COMPOSITION'].target",

0 commit comments

Comments
 (0)