Added possibility to have a local configuration to instantiate Analyser
This commit is contained in:
parent
117814a7c0
commit
97d51c1206
|
@ -48,8 +48,8 @@ public class Analyser {
|
||||||
return globalConfiguration;
|
return globalConfiguration;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setGlobalConfiguration(ObjectNode originalGlobal) {
|
public void setGlobalConfiguration(ObjectNode originalGlobalConfiguration) {
|
||||||
this.globalConfiguration = originalGlobal.deepCopy();
|
this.globalConfiguration = originalGlobalConfiguration.deepCopy();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ArrayNode getArtifactMetadataArray() {
|
public ArrayNode getArtifactMetadataArray() {
|
||||||
|
|
|
@ -24,17 +24,34 @@ public class AnalyserFactory {
|
||||||
return getAnalyser(jsonNode);
|
return getAnalyser(jsonNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Analyser getAnalyser(String json) throws Exception {
|
public static Analyser getAnalyser(String inputJson) throws Exception {
|
||||||
ObjectMapper objectMapper = Utils.getObjectMapper();
|
ObjectMapper objectMapper = Utils.getObjectMapper();
|
||||||
JsonNode jsonNode = objectMapper.readTree(json);
|
JsonNode inputNode = objectMapper.readTree(inputJson);
|
||||||
return getAnalyser(jsonNode);
|
return getAnalyser(inputNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Analyser getAnalyser(JsonNode jsonNode) throws Exception {
|
public static Analyser getAnalyser(JsonNode inputNode) throws Exception {
|
||||||
Analyser analyser = new Analyser();
|
Analyser analyser = new Analyser();
|
||||||
ObjectNode originalGlobalConfiguration = (ObjectNode) jsonNode.get(CONFIGURATION_PROPERTY_NAME);
|
ObjectNode originalGlobalConfiguration = (ObjectNode) inputNode.get(CONFIGURATION_PROPERTY_NAME);
|
||||||
analyser.setGlobalConfiguration(originalGlobalConfiguration);
|
analyser.setGlobalConfiguration(originalGlobalConfiguration);
|
||||||
ArrayNode originalArtifactMetadataArray = (ArrayNode) jsonNode.get(ARTIFACTS_PROPERTY_NAME);
|
ArrayNode originalArtifactMetadataArray = (ArrayNode) inputNode.get(ARTIFACTS_PROPERTY_NAME);
|
||||||
|
analyser.setArtifactMetadataArray(originalArtifactMetadataArray);
|
||||||
|
return analyser;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Analyser getAnalyser(String localConfiguration, String inputJson) throws Exception {
|
||||||
|
ObjectMapper objectMapper = Utils.getObjectMapper();
|
||||||
|
JsonNode localConfigurationNode = objectMapper.readTree(localConfiguration);
|
||||||
|
JsonNode inputNode = objectMapper.readTree(inputJson);
|
||||||
|
return getAnalyser(localConfigurationNode, inputNode);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Analyser getAnalyser(JsonNode localConfiguration, JsonNode inputNode) throws Exception {
|
||||||
|
Analyser analyser = new Analyser();
|
||||||
|
ObjectNode inputConfiguration = (ObjectNode) inputNode.get(CONFIGURATION_PROPERTY_NAME);
|
||||||
|
ObjectNode mergedConfiguration = (ObjectNode) Utils.merge(localConfiguration, inputConfiguration);
|
||||||
|
analyser.setGlobalConfiguration(mergedConfiguration);
|
||||||
|
ArrayNode originalArtifactMetadataArray = (ArrayNode) inputNode.get(ARTIFACTS_PROPERTY_NAME);
|
||||||
analyser.setArtifactMetadataArray(originalArtifactMetadataArray);
|
analyser.setArtifactMetadataArray(originalArtifactMetadataArray);
|
||||||
return analyser;
|
return analyser;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue