Itamar Heim has uploaded a new change for review.
Change subject: cleanup: desktops are always supported in search
......................................................................
cleanup: desktops are always supported in search
The distinction of servers-only has been removed a while back. only calls to
search with 'false' for desktops are actually in the unitests.
Change-Id: Ib5f89927643a71025302a897c175257018fda000
Signed-off-by: Itamar Heim <ih...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java
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/SyntaxChecker.java
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java
M
backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java
M
backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
6 files changed, 19 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/14493/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java
index 96d0b1f..c5d7eea 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java
@@ -137,13 +137,13 @@
* - The dao to be used
*/
private void mockDiskSao(final DiskDao diskDAO) {
- SearchObjectAutoCompleter search = new
SearchObjectAutoCompleter(false);
+ SearchObjectAutoCompleter search = new SearchObjectAutoCompleter();
Mockito.when(diskDAO.getAllWithQuery(Matchers.matches(getDiskImageRegexString(search))))
.thenReturn(diskImageResultList);
}
private void mockQuotaDAO(final QuotaDAO quotaDAO) {
- SearchObjectAutoCompleter search = new
SearchObjectAutoCompleter(false);
+ SearchObjectAutoCompleter search = new SearchObjectAutoCompleter();
Mockito.when(quotaDAO.getAllWithQuery(Matchers.matches(getQuotaRegexString(search))))
.thenReturn(quotaResultList);
}
@@ -164,7 +164,7 @@
* - The dao to be used
*/
private void mockVdsGroupDAO(final VdsGroupDAO vdsGroupDAO) {
- SearchObjectAutoCompleter search = new
SearchObjectAutoCompleter(false);
+ SearchObjectAutoCompleter search = new SearchObjectAutoCompleter();
Mockito.when(vdsGroupDAO.getAllWithQuery(Matchers.matches(getVdsGroupRegexString(search))))
.thenReturn(vdsGroupResultList);
}
@@ -179,7 +179,7 @@
* - The dao to be used
*/
private void mockStoragePoolDAO(final StoragePoolDAO storagePoolDAO) {
- SearchObjectAutoCompleter search = new
SearchObjectAutoCompleter(false);
+ SearchObjectAutoCompleter search = new SearchObjectAutoCompleter();
Mockito.when(storagePoolDAO.getAllWithQuery(Matchers.matches(getStoragePoolRegexString(search))))
.thenReturn(storagePoolResultList);
}
@@ -194,13 +194,13 @@
* - The dao to be used
*/
private void mockGlusterVolumeDao(final GlusterVolumeDao glusterVolumeDao)
{
- SearchObjectAutoCompleter search = new
SearchObjectAutoCompleter(false);
+ SearchObjectAutoCompleter search = new SearchObjectAutoCompleter();
Mockito.when(glusterVolumeDao.getAllWithQuery(Matchers.matches(getGlusterVolumeRegexString(search))))
.thenReturn(glusterVolumeList);
}
private void mockNetworkDao(final NetworkViewDao networkViewDao) {
- SearchObjectAutoCompleter search = new
SearchObjectAutoCompleter(false);
+ SearchObjectAutoCompleter search = new SearchObjectAutoCompleter();
Mockito.when(networkViewDao.getAllWithQuery(Matchers.matches(getNetworkRegexString(search))))
.thenReturn(networkResultList);
}
@@ -226,7 +226,7 @@
* - The dao to be used
*/
private void mockVdsDAO(final VdsDAO vdsDAO) {
- SearchObjectAutoCompleter search = new
SearchObjectAutoCompleter(false);
+ SearchObjectAutoCompleter search = new SearchObjectAutoCompleter();
Mockito.when(vdsDAO.getAllWithQuery(Matchers.matches(getVdsRegexString(search))))
.thenReturn(vdsResultList);
}
@@ -241,7 +241,7 @@
* - The dao to be used
*/
private void mockVMDAO(final VmDAO vmDAO) {
- SearchObjectAutoCompleter search = new
SearchObjectAutoCompleter(false);
+ SearchObjectAutoCompleter search = new SearchObjectAutoCompleter();
Mockito.when(vmDAO.getAllUsingQuery(Matchers.matches(getVMRegexString(search))))
.thenReturn(vmResultList);
}
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 0ed91e3..1ea10b5 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
@@ -11,12 +11,10 @@
public class SearchObjectAutoCompleter extends SearchObjectsBaseAutoCompleter {
private final Map<String, String[]> mJoinDictionary = new HashMap<String,
String[]>();
- public SearchObjectAutoCompleter(boolean isDesktopsAllowed) {
+ public SearchObjectAutoCompleter() {
mVerbs.put(SearchObjects.VM_PLU_OBJ_NAME,
SearchObjects.VM_PLU_OBJ_NAME);
- if (isDesktopsAllowed) {
- mVerbs.put(SearchObjects.VDC_POOL_PLU_OBJ_NAME,
SearchObjects.VDC_POOL_PLU_OBJ_NAME);
- }
+ mVerbs.put(SearchObjects.VDC_POOL_PLU_OBJ_NAME,
SearchObjects.VDC_POOL_PLU_OBJ_NAME);
mVerbs.put(SearchObjects.VDS_PLU_OBJ_NAME,
SearchObjects.VDS_PLU_OBJ_NAME);
mVerbs.put(SearchObjects.TEMPLATE_PLU_OBJ_NAME,
SearchObjects.TEMPLATE_PLU_OBJ_NAME);
mVerbs.put(SearchObjects.AUDIT_PLU_OBJ_NAME,
SearchObjects.AUDIT_PLU_OBJ_NAME);
@@ -31,9 +29,7 @@
buildCompletions();
mVerbs.put(SearchObjects.VM_OBJ_NAME, SearchObjects.VM_OBJ_NAME);
- if (isDesktopsAllowed) {
- mVerbs.put(SearchObjects.VDC_POOL_OBJ_NAME,
SearchObjects.VDC_POOL_OBJ_NAME);
- }
+ mVerbs.put(SearchObjects.VDC_POOL_OBJ_NAME,
SearchObjects.VDC_POOL_OBJ_NAME);
mVerbs.put(SearchObjects.DISK_OBJ_NAME, SearchObjects.DISK_OBJ_NAME);
mVerbs.put(SearchObjects.VDS_OBJ_NAME, SearchObjects.VDS_OBJ_NAME);
mVerbs.put(SearchObjects.TEMPLATE_OBJ_NAME,
SearchObjects.TEMPLATE_OBJ_NAME);
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java
index bd40f2d..d277100 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java
@@ -35,9 +35,9 @@
private List<Character> mDisAllowedChars;
private static SqlInjectionChecker sqlInjectionChecker;
- public SyntaxChecker(int searchReasultsLimit, boolean hasDesktop) {
+ public SyntaxChecker(int searchReasultsLimit) {
- mSearchObjectAC = new SearchObjectAutoCompleter(hasDesktop);
+ mSearchObjectAC = new SearchObjectAutoCompleter();
mColonAC = new BaseAutoCompleter(":");
mPluralAC = new BaseAutoCompleter("S");
mSortbyAC = new BaseAutoCompleter("SORTBY");
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java
index 59a0082..43ec174 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java
@@ -6,7 +6,7 @@
public class SyntaxCheckerFactory {
private static String ConfigAuthenticationMethod;
- private static final ISyntaxChecker uiSyntaxChecker = new
SyntaxChecker(100, true);
+ private static final ISyntaxChecker uiSyntaxChecker = new
SyntaxChecker(100);
private static ISyntaxChecker backendSyntaxChecker = null;
private static final ISyntaxChecker adSyntaxChecker = new
ADSyntaxChecker();
@@ -21,8 +21,7 @@
public static ISyntaxChecker CreateBackendSyntaxChecker(String
AuthenticationMethod) {
ConfigAuthenticationMethod = AuthenticationMethod;
if(backendSyntaxChecker == null) {
- backendSyntaxChecker = new SyntaxChecker(Config.<Integer>
GetValue(ConfigValues.SearchResultsLimit),
- true);
+ backendSyntaxChecker = new SyntaxChecker(Config.<Integer>
GetValue(ConfigValues.SearchResultsLimit));
}
return backendSyntaxChecker;
}
diff --git
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java
index bc9dbc3..0d86bd5 100644
---
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java
+++
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java
@@ -14,7 +14,7 @@
@Before
public void setUp() {
- comp = new SearchObjectAutoCompleter(true);
+ comp = new SearchObjectAutoCompleter();
}
@Test
diff --git
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
index 2979c60..312566d 100644
---
a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
+++
b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerTest.java
@@ -23,7 +23,7 @@
*/
@Test
public void testVMCompletion() {
- SyntaxChecker chkr = new SyntaxChecker(20, true);
+ SyntaxChecker chkr = new SyntaxChecker(20);
SyntaxContainer res = null;
res = chkr.getCompletion("");
assertTrue("Vms", contains(res, "Vms"));
@@ -42,7 +42,7 @@
* asc
*/
public void testHostCompletion() {
- SyntaxChecker chkr = new SyntaxChecker(20, true);
+ SyntaxChecker chkr = new SyntaxChecker(20);
SyntaxContainer res = null;
res = chkr.getCompletion("");
assertTrue("Hosts", contains(res, "Hosts"));
@@ -62,7 +62,7 @@
public void testGetPagPhrase() {
mcr.mockConfigValue(ConfigValues.DBPagingType, "wrongPageType");
mcr.mockConfigValue(ConfigValues.DBPagingSyntax, "wrongPageSyntax");
- SyntaxChecker chkr = new SyntaxChecker(20, true);
+ SyntaxChecker chkr = new SyntaxChecker(20);
SyntaxContainer res = new SyntaxContainer("");
res.setMaxCount(0);
--
To view, visit http://gerrit.ovirt.org/14493
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5f89927643a71025302a897c175257018fda000
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Itamar Heim <ih...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
