Allon Mureinik has uploaded a new change for review. Change subject: core: Removed GetTagIdsAndChildrenIdsByRegExp refs ......................................................................
core: Removed GetTagIdsAndChildrenIdsByRegExp refs GetTagIdsAndChildrenIdsByRegExp seems to have been a useful function in oVirt 3.0, but it has since been (partially) removed, and is not called from anywhere. This patch removes the leftovers of that partial cleanup. This patch removes: * The function in TagsDirector (was only used by the function of the same name in TagsHandler and in tests) * The function in TagsHandler and its interface, ITagsHandler (wasn't used anywhere) * The constant in VdcQueryType (useless, has no corresponding query object) Change-Id: I1f7a7ab04a5c1a9fc1104d0ddb2d3a3a8ec0f1e0 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsHandler.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/ITagsHandler.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java 5 files changed, 4 insertions(+), 80 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/12601/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java index 8eb5fc3..6d8960f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java @@ -290,26 +290,6 @@ return sb.toString(); } - /** - * This function will return the tags IDs of all tags that their names match the specified regular expression and - * ALL their children (regardless if the children match the reg-exp or not). Its used to determine if a tag is - * assigned to an entity. Tag is determined as assigned to an entity if the entity is assigned to the tag or to one - * of its children. - * - * @param tagNameRegExp - * the name of the 'root' tag. - * @return a comma separated list of IDs. - */ - public String GetTagIdsAndChildrenIdsByRegExp(String tagNameRegExp) { - // add RegEx chars or beginning of string ('^') and end of string ('$'): - tagNameRegExp = String.format("^%1$s$", tagNameRegExp); - // convert to the regular expression format: - tagNameRegExp = tagNameRegExp.replace("*", ".*"); - StringBuilder sb = new StringBuilder(); - RecursiveGetTagsAndChildrenByRegExp(tagNameRegExp, sb, GetRootTag(), TagReturnValueIndicator.ID); - return sb.toString(); - } - public String GetTagNamesAndChildrenNamesByRegExp(String tagNameRegExp) { // add RegEx chars or beginning of string ('^') and end of string ('$'): tagNameRegExp = String.format("^%1$s$", tagNameRegExp); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsHandler.java index 315bca8..314e26f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsHandler.java @@ -1,9 +1,9 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.businessentities.*; -import org.ovirt.engine.core.common.interfaces.*; -import org.ovirt.engine.core.dal.dbbroker.*; +import org.ovirt.engine.core.common.businessentities.tags; +import org.ovirt.engine.core.common.interfaces.ITagsHandler; +import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class TagsHandler implements ITagsHandler { @@ -14,11 +14,6 @@ @Override public tags GetTagByTagName(String tagName) { return TagsDirector.getInstance().GetTagByName(tagName); - } - - @Override - public String GetTagIdsAndChildrenIdsByRegExp(String tagNameRegExp) { - return TagsDirector.getInstance().GetTagIdsAndChildrenIdsByRegExp(tagNameRegExp); } @Override diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java index e99f577..f5ebfca 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java @@ -363,54 +363,6 @@ assertEquals(tag2.gettag_id(), changedTag.getparent_id()); } - @Test - public void testGetTagIdsAndChildrenIdsByRegExpNoTagMatches() { - String result = tagsDirector.GetTagIdsAndChildrenIdsByRegExp("tag*"); - assertEquals(StringUtils.EMPTY, result); - } - - @Test - public void testGetTagIdsAndChildrenIdsByRegExp() { - tags tag1 = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag1); - validateRegexpQueryResult("tag1", tag1); - } - - @Test - public void testGetTagIdsAndChildrenIdsByRegExpWithWildcard() { - tags tag1 = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag1); - validateRegexpQueryResult("tag1*", tag1); - } - - @Test - public void testGetTagIdsAndChildrenIdsByRegExpWithWildcardAndSeveralChildren() { - tags tag1 = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag1); - tags tag2 = createTag("tag2", "desc2"); - tagsDirector.AddTag(tag2); - validateRegexpQueryResult("tag*", tag1, tag2); - } - - @Test - public void testGetTagIdsAndChildrenIdsByRegExpWithWildcardAndSeveralChildrenAndHierachy() { - tags tag1 = createTag("tag1", "desc1"); - tags tag2 = createTag("tag2", "desc2"); - tag2.getChildren().add(tag1); - tag1.setparent_id(tag2.gettag_id()); - tagsDirector.AddTag(tag2); - tagsDirector.AddTag(tag1); - validateRegexpQueryResult("tag*", tag1, tag2); - } - - private void validateRegexpQueryResult(String regexp, tags... tagArray) { - String result = tagsDirector.GetTagIdsAndChildrenIdsByRegExp(regexp); - for (int counter = 0; counter < tagArray.length; counter++) { - tags tagToCheck = tagArray[counter]; - assertTrue(result.indexOf(tagToCheck.gettag_id().toString()) > -1); - } - } - public void testDirectDescetor() { tags tag1 = createTag("tag1", "desc1"); tags tag2 = createTag("tag2", "desc2"); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/ITagsHandler.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/ITagsHandler.java index 2824e26..d504b7b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/ITagsHandler.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/ITagsHandler.java @@ -11,7 +11,5 @@ String GetTagNameAndChildrenNames(Guid tagId); - String GetTagIdsAndChildrenIdsByRegExp(String tagNameRegExp); - String GetTagNamesAndChildrenNamesByRegExp(String tagNameRegExp); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index c95256e..587c40b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -135,7 +135,6 @@ GetTagsByUserId, GetTagsByVmId, GetTagsByVdsId, - GetTagIdsAndChildrenIdsByRegExp, GetTagIdAndChildrenIds, // System -- To view, visit http://gerrit.ovirt.org/12601 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f7a7ab04a5c1a9fc1104d0ddb2d3a3a8ec0f1e0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
