Laszlo Hornyak has uploaded a new change for review. Change subject: engine: make QueryData immutable (7/N) ......................................................................
engine: make QueryData immutable (7/N) Change-Id: I0d96ecd50b7fe86fa450e2288affcb9cdf58417f Signed-off-by: Laszlo Hornyak <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java 2 files changed, 19 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/14620/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java index 398cf2f..af2f1af 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java @@ -3,48 +3,35 @@ import java.util.Date; public class QueryData { - private String query; - private String type; - private Date date = new Date(0); - private String domain; + public QueryData(String query, String type, Date date, String domain) { + this.query = query; + this.type = type; + this.date = date; + this.domain = domain; + } + + private final String query; + private final String type; + private final Date date; + private final String domain; public String getDomain() { return domain; - } - - public void setDomain(String value) { - domain = value; } public String getQuery() { return query; } - public void setQuery(String value) { - query = value; - } - public String getQueryForAdBroker() { return query; - } - - public void setQueryForAdBroker(String value) { - query = value; } public String getQType() { return type; } - public void setQType(String value) { - type = value; - } - public Date getDate() { return date; - } - - public void setDate(Date value) { - date = value; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java index c52f680..3840ed6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java @@ -302,7 +302,7 @@ // search text. if (!isExistsValue || IsFromYesterday) { log.debugFormat("ResourceManager::searchBusinessObjects(''{0}'') - entered", searchText); - data = new QueryData(); + String queryDomain = null; ISyntaxChecker curSyntaxChecker; String[] splitted = searchText.split("[:@ ]"); final String objectName = splitted[0].toUpperCase(); @@ -311,12 +311,11 @@ || (SearchObjects.AD_GROUP_OBJ_NAME.equals(objectName)) || (SearchObjects.AD_GROUP_PLU_OBJ_NAME.equals(objectName))) { if (searchText.indexOf('@') > 0 && splitted.length > 1) { - data.setDomain(splitted[1]); + queryDomain = splitted[1]; searchText = searchText.substring(0, searchText.indexOf('@')) + searchText.substring(searchText.indexOf(':')); } else { - String domain = getDefaultDomain(); - data.setDomain(domain); + queryDomain = getDefaultDomain(); } curSyntaxChecker = SyntaxCheckerFactory.CreateADSyntaxChecker(Config .<String> GetValue(ConfigValues.AuthenticationMethod)); @@ -359,9 +358,11 @@ return null; } // An expression is considered safe if matches a trivial search. - data.setQType(searchObj.getSearchObjectStr()); - data.setQuery(curSyntaxChecker.generateQueryFromSyntaxContainer(searchObj, isSafe)); - data.setDate(new Date()); + data = + new QueryData(curSyntaxChecker.generateQueryFromSyntaxContainer(searchObj, isSafe), + searchObj.getSearchObjectStr(), + new Date(), + queryDomain); // when looking for tags , the query contains all parent children tag id's // statically, therefore , in order to reflect changes in the parent tree // we should not rely on the cached query in such case and have to build the -- To view, visit http://gerrit.ovirt.org/14620 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d96ecd50b7fe86fa450e2288affcb9cdf58417f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
