Yevgeny Zaspitsky has uploaded a new change for review. Change subject: engine: define auto-completion for EngineSession objects ......................................................................
engine: define auto-completion for EngineSession objects Define auto-completion for EngineSession objects. Change-Id: I187848874a509c7f26ae7a0ddf5dc18540107d5c Bug-Url: https://bugzilla.redhat.com/1025796 Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java A backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SessionConditionFieldAutoCompleter.java 3 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/38383/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java index 93c595c..3aed8af 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java @@ -30,6 +30,7 @@ mVerbs.add(SearchObjects.PROVIDER_PLU_OBJ_NAME); mVerbs.add(SearchObjects.INSTANCE_TYPE_PLU_OBJ_NAME); mVerbs.add(SearchObjects.IMAGE_TYPE_PLU_OBJ_NAME); + mVerbs.add(SearchObjects.SESSION_OBJ_NAME); buildCompletions(); mVerbs.add(SearchObjects.VM_OBJ_NAME); @@ -410,6 +411,12 @@ "providers", "id", "name ASC")); + put(SearchObjects.SESSION_OBJ_NAME, new EntitySearchInfo(null, + new SessionConditionFieldAutoCompleter(), + "engine_sessions", + "engine_sessions", + "id", + "user_name ASC, id")); } }); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java index 3f14f8f..fbbbc4d 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java @@ -50,6 +50,8 @@ public static final String INSTANCE_TYPE_PLU_OBJ_NAME = "INSTANCETYPES"; public static final String IMAGE_TYPE_OBJ_NAME = "IMAGETYPE"; public static final String IMAGE_TYPE_PLU_OBJ_NAME = "IMAGETYPES"; + public static final String SESSION_OBJ_NAME = "SESSION"; + public static final String SESSION_PLU_OBJ_NAME = "SESSIONS"; //special searches private static final String ALERT = "EVENTS: severity=alert"; @@ -101,6 +103,8 @@ add(getName(INSTANCE_TYPE_PLU_OBJ_NAME)); add(getName(IMAGE_TYPE_OBJ_NAME)); add(getName(IMAGE_TYPE_PLU_OBJ_NAME)); + add(getName(SESSION_OBJ_NAME)); + add(getName(SESSION_PLU_OBJ_NAME)); } }); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SessionConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SessionConditionFieldAutoCompleter.java new file mode 100644 index 0000000..a1d5dac --- /dev/null +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SessionConditionFieldAutoCompleter.java @@ -0,0 +1,34 @@ +package org.ovirt.engine.core.searchbackend; + +import java.util.UUID; + +public class SessionConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { + + public static final String USER_ID = "USER_ID"; + public static final String USER_NAME = "USER_NAME"; + + public SessionConditionFieldAutoCompleter() { + // Building the basic verbs dict. + mVerbs.add(USER_ID); + mVerbs.add(USER_NAME); + + // Building the autoCompletion dict. + buildCompletions(); + + // Building the types dict. + getTypeDictionary().put(USER_ID, UUID.class); + getTypeDictionary().put(USER_NAME, String.class); + + // building the ColumnName dict. + columnNameDict.put(USER_ID, USER_ID); + columnNameDict.put(USER_NAME, USER_NAME); + + // Building the validation dict. + buildBasicValidationTable(); + } + + @Override + public IAutoCompleter getFieldRelationshipAutoCompleter(final String fieldName) { + return StringConditionRelationAutoCompleter.INSTANCE; + } +} -- To view, visit https://gerrit.ovirt.org/38383 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I187848874a509c7f26ae7a0ddf5dc18540107d5c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
