Allon Mureinik has uploaded a new change for review. Change subject: core: rm VmCompletionMap from SyntaxChecker ......................................................................
core: rm VmCompletionMap from SyntaxChecker The VmCompletionMap is a deprecated concept which does not make sense (and is indeed unused) in ISyntaxChecker and all its implementations. This patch removes this property and all references to it. Change-Id: I93999dfb0287730fee294de45b284571807e25bf Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ISyntaxChecker.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java 3 files changed, 0 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/22010/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java index 7345ee7..1380671 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java @@ -1,7 +1,5 @@ package org.ovirt.engine.core.searchbackend; -import java.util.HashMap; - import org.ovirt.engine.core.compat.Regex; import org.ovirt.engine.core.compat.StringHelper; @@ -265,16 +263,6 @@ retval = generateAdQueryFromSyntaxContainer(syntax); } return retval; - } - - @Override - public void setVmCompletionMap(HashMap<Integer, String> map) { - throw new UnsupportedOperationException("vm completion isn't implemented nor relevant here."); - } - - @Override - public HashMap<Integer, String> getVmCompletionMap() { - throw new UnsupportedOperationException("vm completion isn't implemented nor relevant here."); } private static String generateAdQueryFromSyntaxContainer(SyntaxContainer syntax) { diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ISyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ISyntaxChecker.java index a4f5449..e21f482 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ISyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ISyntaxChecker.java @@ -1,15 +1,9 @@ package org.ovirt.engine.core.searchbackend; -import java.util.HashMap; - public interface ISyntaxChecker { SyntaxContainer analyzeSyntaxState(String searchText, boolean final2); SyntaxContainer getCompletion(String searchText); String generateQueryFromSyntaxContainer(SyntaxContainer syntax, boolean isSafe); - - void setVmCompletionMap(HashMap<Integer, String> map); - - HashMap<Integer, String> getVmCompletionMap(); } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java index bf95ad8..4040f6d 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java @@ -34,7 +34,6 @@ private Regex mNonSpaceRegexp; private List<Character> mDisAllowedChars; private SqlInjectionChecker sqlInjectionChecker; - private HashMap<Integer, String> vmCompletionMap; public SyntaxChecker(int searchReasultsLimit) { @@ -690,16 +689,6 @@ retval = generateSqlFromSyntaxContainer(syntax, isSafe); } return retval; - } - - @Override - public void setVmCompletionMap(HashMap<Integer, String> map) { - this.vmCompletionMap = map; - } - - @Override - public HashMap<Integer, String> getVmCompletionMap() { - return this.vmCompletionMap; } private String generateFromStatement(SyntaxContainer syntax) { -- To view, visit http://gerrit.ovirt.org/22010 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93999dfb0287730fee294de45b284571807e25bf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
