Tal Nisan has uploaded a new change for review. Change subject: core: Removed deprecated StringBuilderCompat class ......................................................................
core: Removed deprecated StringBuilderCompat class Remove the deprecated StringBuilderCompat class and replaced all usages to use the standard StringBuilder, in the single classes that special methods were used, the methods were extracted to the using class itself Change-Id: I5192154dc008c18c4169020c8bfe71946c3c8716 Signed-off-by: Tal Nisan <[email protected]> --- D backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringBuilderCompat.java 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/SyntaxContainer.java 3 files changed, 22 insertions(+), 67 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/11660/1 diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringBuilderCompat.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringBuilderCompat.java deleted file mode 100644 index 552a17a..0000000 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringBuilderCompat.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.ovirt.engine.core.compat; - -/** - * @deprecated Use {@link StringBuilder} directly instead. - */ -@Deprecated -public class StringBuilderCompat { - - protected static final String SEP = System.getProperty("line.separator"); - - protected StringBuilder sb = new StringBuilder(); - - public StringBuilderCompat(String string) { - sb.append(string); - } - - public StringBuilderCompat() { - } - - public int length() { - return sb.length(); - } - - public void replace(String oldText, String newText) { - String t = sb.toString(); - sb = new StringBuilder(t.replaceAll(StringHelper.quote(oldText), newText)); - } - - public void append(String text) { - sb.append(text); - } - - public void AppendLine(String text) { - sb.append(text); - sb.append(SEP); - } - - public void append(boolean bool) { - sb.append(bool); - - } - - public void append(Object obj) { - sb.append(obj); - } - - public void delete(int start, int length) { - sb.delete(start, start + length); - } - - public String toString() { - return sb.toString(); - } - -} 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 31754c1..51a63ee 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,8 @@ package org.ovirt.engine.core.searchbackend; +import java.util.regex.Pattern; + import org.ovirt.engine.core.compat.Regex; -import org.ovirt.engine.core.compat.StringBuilderCompat; import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.StringHelper; @@ -79,7 +80,7 @@ if (mPluralAC.validate(searchText.substring(idx + 1, idx + 1 + 1))) { // Then just move things along. idx++; - StringBuilderCompat sb = new StringBuilderCompat(nextObject); + StringBuilder sb = new StringBuilder(nextObject); sb.append('S'); nextObject = sb.toString(); } @@ -268,7 +269,7 @@ } private static String generateAdQueryFromSyntaxContainer(SyntaxContainer syntax) { - StringBuilderCompat retval = new StringBuilderCompat(); + StringBuilder retval = new StringBuilder(); if (syntax.getvalid()) { IConditionFieldAutoCompleter conditionFieldAC; if (syntax.getSearchObjectStr().toUpperCase().contains("ADUSER")) { @@ -279,7 +280,7 @@ retval.append("(&(" + LDAP_GROUP_CATEGORY + ")"); conditionFieldAC = new AdGroupConditionFieldAutoCompleter(); } - StringBuilderCompat phrase = new StringBuilderCompat(); + StringBuilder phrase = new StringBuilder(); boolean nonEqual = false; boolean findAll = false; for (SyntaxObject so : syntax) { @@ -312,7 +313,7 @@ * replace all {value} occurences with the value searched. We escape the $ here for regex match, * as it is used in replace. */ - phrase.replace("{value}", so.getBody().replace("$", "\\$")); + phrase = replaceAll(phrase, "{value}", so.getBody().replace("$", "\\$")); } else { phrase.append(so.getBody() + ")"); } @@ -336,4 +337,9 @@ return retval.toString(); } + + private static StringBuilder replaceAll(StringBuilder builder, String oldText, String newText) { + String t = builder.toString(); + return new StringBuilder(t.replaceAll(Pattern.quote(oldText), newText)); + } } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java index 5c14485..af1b9dc 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java @@ -4,7 +4,6 @@ import java.util.LinkedList; import java.util.List; -import org.ovirt.engine.core.compat.StringBuilderCompat; import org.ovirt.engine.core.compat.StringHelper; public class SyntaxContainer implements Iterable<SyntaxObject> { @@ -13,6 +12,7 @@ private final LinkedList<SyntaxObject> mObjList = new LinkedList<SyntaxObject>(); private final List<String> mCurrentCompletions = new ArrayList<String>(); + protected static final String LINE_SEPARATOR = System.getProperty("line.separator"); private boolean mValid = false; private SyntaxError mError = SyntaxError.NO_ERROR; private final int[] mErrorPos = new int[2]; @@ -214,14 +214,17 @@ @Override public String toString() { - StringBuilderCompat sb = new StringBuilderCompat("---------------- SyntaxContainer ---------------------"); + StringBuilder sb = new StringBuilder("---------------- SyntaxContainer ---------------------"); sb.append("\n"); sb.append("mOrigText = "); - sb.AppendLine(mOrigText); + sb.append(mOrigText); + sb.append(LINE_SEPARATOR); sb.append("Valid = "); - sb.AppendLine(Boolean.toString(mValid)); + sb.append(Boolean.toString(mValid)); + sb.append(LINE_SEPARATOR); sb.append("Error = "); - sb.AppendLine(mError.toString()); + sb.append(mError.toString()); + sb.append(LINE_SEPARATOR); sb.append("CrossRefObjlist = "); for (String cro : getCrossRefObjList()) { sb.append(cro + ", "); @@ -229,14 +232,15 @@ sb.append("Syntax object list:"); for (SyntaxObject obj : mObjList) { - sb.AppendLine(" "); + sb.append(" "); + sb.append(LINE_SEPARATOR); sb.append(obj.toString()); } return sb.toString(); } public String ToStringBr() { - StringBuilderCompat sb = new StringBuilderCompat("---------------- SyntaxContainer ---------------------"); + StringBuilder sb = new StringBuilder("---------------- SyntaxContainer ---------------------"); sb.append("<BR>mOrigText = "); sb.append(mOrigText); sb.append("<BR>Valid = "); -- To view, visit http://gerrit.ovirt.org/11660 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5192154dc008c18c4169020c8bfe71946c3c8716 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
