Tal Nisan has uploaded a new change for review. Change subject: core: Removed deprecated StringTokenizerCompat class ......................................................................
core: Removed deprecated StringTokenizerCompat class Removed the deprecated StringTokenizerCompat class and replaced all usages to the standard StringTokenizer Change-Id: I6e1e6af00c92cd715321d00dfcc95e56fe709363 Signed-off-by: Tal Nisan <[email protected]> --- D backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringTokenizerCompat.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java 2 files changed, 2 insertions(+), 35 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/11662/1 diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringTokenizerCompat.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringTokenizerCompat.java deleted file mode 100644 index da5d234..0000000 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringTokenizerCompat.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ovirt.engine.core.compat; - -import java.util.StringTokenizer; - -/** - * Wrapper class for StringTokenizer - * @deprecated Use {@link StringTokenizer} directly instead. - */ -@Deprecated -public class StringTokenizerCompat { - - protected StringTokenizer st; - - public StringTokenizerCompat(String str) { - st = new StringTokenizer(str); - } - - public StringTokenizerCompat(String str, String delim) { - st = new StringTokenizer(str, delim); - } - - public StringTokenizerCompat(String str, String delim, boolean returnDelims) { - st = new StringTokenizer(str, delim, returnDelims); - } - - public boolean hasMoreTokens() { - return st.hasMoreTokens(); - } - - public String nextToken() { - return st.nextToken(); - } -} diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java index 10631a6..10549a6 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java @@ -1,10 +1,10 @@ package org.ovirt.engine.core.searchbackend; import java.util.HashSet; +import java.util.StringTokenizer; import org.ovirt.engine.core.common.errors.SearchEngineIllegalCharacterException; import org.ovirt.engine.core.compat.StringFormat; -import org.ovirt.engine.core.compat.StringTokenizerCompat; public abstract class SqlInjectionChecker { @@ -73,7 +73,7 @@ for (String s : QUOTES_INSIDE_VALUE_INDICATORES) { sql = sql.replaceAll(s, ""); } - StringTokenizerCompat st = new StringTokenizerCompat(sql, DELIMITERS, true); + StringTokenizer st = new StringTokenizer(sql, DELIMITERS, true); while(st.hasMoreTokens()) { String token = st.nextToken(); if (token.equals(QUOTE_STR)) { -- To view, visit http://gerrit.ovirt.org/11662 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e1e6af00c92cd715321d00dfcc95e56fe709363 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
