Martin Peřina has uploaded a new change for review. Change subject: tools: Remove EngineConfigCLIParser instance variable from EngineConfig ......................................................................
tools: Remove EngineConfigCLIParser instance variable from EngineConfig Removes EngineConfigCLIParser instance variable from EngineConfig since it's needed only in EngineConfig.setUpAndExecute() method. Change-Id: I1390755096670c7ed21882a487280d85426e576f Bug-Url: https://bugzilla.redhat.com/1063901 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java 1 file changed, 6 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/26589/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java index 1a3b419..046a81b 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java @@ -26,7 +26,6 @@ public static final String CONFIG_FILE_PATH_PROPERTY = "engine-config.config.file.path"; public static final File DEFAULT_CONFIG_PATH = new File(EngineLocalConfig.getInstance().getEtcDir(), "engine-config"); - private EngineConfigCLIParser parser; private EngineConfigLogic engineConfigLogic; private static EngineConfig instance = new EngineConfig(); @@ -37,13 +36,12 @@ * Parses the arguments, validates that they are valid, instantiates the EngineConfigLogic object and executes the * desired action. * - * @param args - * The arguments given by the user. + * @param parser + * parser instance with parsed args * * @throws Exception */ - public void setUpAndExecute(String... args) throws Exception { - parser.parse(args); + public void setUpAndExecute(EngineConfigCLIParser parser) throws Exception { log.debug("Arguments have been parsed: " + parser.engineConfigMapToString()); ConfigActionType actionType = parser.getConfigAction(); actionType.validate(parser.getEngineConfigMap()); @@ -76,8 +74,9 @@ public static void main(String... args) { initLogging(); try { - getInstance().setParser(new EngineConfigCLIParser()); - getInstance().setUpAndExecute(args); + EngineConfigCLIParser parser = new EngineConfigCLIParser(); + parser.parse(args); + getInstance().setUpAndExecute(parser); } catch (Throwable t) { log.debug("Exiting with error: ", t); @@ -88,10 +87,6 @@ public void setEngineConfigLogic(EngineConfigLogic engineConfigLogic) { this.engineConfigLogic = engineConfigLogic; - } - - public void setParser(EngineConfigCLIParser parser) { - this.parser = parser; } public EngineConfigLogic getEngineConfigLogic() { -- To view, visit http://gerrit.ovirt.org/26589 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1390755096670c7ed21882a487280d85426e576f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
