Laszlo Hornyak has uploaded a new change for review. Change subject: engine: rename QueryData2 to QueryData (5/N) ......................................................................
engine: rename QueryData2 to QueryData (5/N) There is no QueryData class, so there is no reason the have a second version of it. Change-Id: I09ee1504bae1fca5e171279ce6c3f58dd3cae474 Signed-off-by: Laszlo Hornyak <[email protected]> --- R 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, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/14618/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData2.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java similarity index 96% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData2.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java index ef0f6fb..852f751 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData2.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll; -public class QueryData2 { +public class QueryData { private String query; private String type; private java.util.Date date = new java.util.Date(0); 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 613534d..c52f680 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 @@ -49,7 +49,7 @@ import org.ovirt.engine.core.searchbackend.SyntaxError; public class SearchQuery<P extends SearchParameters> extends QueriesCommandBase<P> { - private static final HashMap<String, QueryData2> mQueriesCache = new HashMap<String, QueryData2>(); + private static final HashMap<String, QueryData> mQueriesCache = new HashMap<String, QueryData>(); public SearchQuery(P parameters) { super(parameters); @@ -145,7 +145,7 @@ private List<VM> searchVmsFromDb() { List<VM> returnValue = null; - QueryData2 data = initQueryData(true); + QueryData data = initQueryData(true); if (data == null) { returnValue = new ArrayList<VM>(); getQueryReturnValue().setExceptionString(getQueryReturnValue().getExceptionString()); @@ -186,7 +186,7 @@ * @return The result of the query */ private <T extends IVdcQueryable> List<T> adSearch(LdapQueryType ldapQueryType, AdActionType adActionType) { - QueryData2 data = initQueryData(true); + QueryData data = initQueryData(true); if (data == null) { return new ArrayList<T>(); @@ -228,7 +228,7 @@ private final <T extends IVdcQueryable> List<T> genericSearch(final SearchDAO<T> dao, final boolean useCache, final Filter<T> filter) { - final QueryData2 data = initQueryData(useCache); + final QueryData data = initQueryData(useCache); if (data == null) { return new ArrayList<T>(); } @@ -274,8 +274,8 @@ return genericSearch(getDbFacade().getNetworkViewDao(), true, null); } - private QueryData2 initQueryData(boolean useCache) { - QueryData2 data = null; + private QueryData initQueryData(boolean useCache) { + QueryData data = null; boolean isExistsValue = false; boolean IsFromYesterday = false; boolean isSafe = false; @@ -302,7 +302,7 @@ // search text. if (!isExistsValue || IsFromYesterday) { log.debugFormat("ResourceManager::searchBusinessObjects(''{0}'') - entered", searchText); - data = new QueryData2(); + data = new QueryData(); ISyntaxChecker curSyntaxChecker; String[] splitted = searchText.split("[:@ ]"); final String objectName = splitted[0].toUpperCase(); -- To view, visit http://gerrit.ovirt.org/14618 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09ee1504bae1fca5e171279ce6c3f58dd3cae474 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
