Allon Mureinik has uploaded a new change for review. Change subject: core: TagsDirector method naming convention ......................................................................
core: TagsDirector method naming convention Renamed all methods to start with lower case letters, as per proper Java conventions. Change-Id: I50e515e2e6634201650c1531c7e6a37b38d3228a Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddTagCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TagsDirectorTest.java 6 files changed, 74 insertions(+), 74 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/25675/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddTagCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddTagCommand.java index 1f940e3..1fe3aa1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddTagCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddTagCommand.java @@ -15,7 +15,7 @@ protected void executeCommand() { DbFacade.getInstance().getTagDao().save(getTag()); - TagsDirector.getInstance().AddTag(getTag()); + TagsDirector.getInstance().addTag(getTag()); setSucceeded(true); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java index 3fcb725..fa45b88 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllTagsQuery.java @@ -9,6 +9,6 @@ @Override protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue(TagsDirector.getInstance().GetAllTags()); + getQueryReturnValue().setReturnValue(TagsDirector.getInstance().getAllTags()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java index 55662d8..4db9451 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRootTagQuery.java @@ -9,6 +9,6 @@ @Override protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue(TagsDirector.getInstance().GetRootTag()); + getQueryReturnValue().setReturnValue(TagsDirector.getInstance().getRootTag()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java index 64fde1f..1f9fa72 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveTagCommand.java @@ -21,7 +21,7 @@ returnValue = false; } if (TagsDirector.getInstance() - .IsTagDescestorOfTag(getParameters().getTagId(), getParameters().getNewParentId())) { + .isTagDescestorOfTag(getParameters().getTagId(), getParameters().getNewParentId())) { addCanDoActionMessage(VdcBllMessages.TAGS_SPECIFIED_TAG_CANNOT_BE_THE_PARENT_OF_ITSELF); returnValue = false; } 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 5609186..4961898 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 @@ -64,13 +64,13 @@ tagsMapByID.clear(); tagsMapByName.clear(); Tags root = new Tags("root", null, true, ROOT_TAG_ID, "root"); - AddTagToHash(root); - AddChildren(root); + addTagToHash(root); + addChildren(root); log.info("Finished initializing " + getClass().getSimpleName()); } - private void AddTagToHash(Tags tag) { + private void addTagToHash(Tags tag) { tagsMapByID.put(tag.gettag_id(), tag); tagsMapByName.put(tag.gettag_name(), tag); if (tag.getparent_id() != null) { @@ -83,7 +83,7 @@ } List<Tags> parentChildren = parentTag.getChildren(); replaceTagInChildren(tag, parentChildren); - AddTagToHash(parentTag); // replace the parent tag after the modification + addTagToHash(parentTag); // replace the parent tag after the modification } } @@ -107,15 +107,15 @@ * @param tag */ - private void AddChildren(Tags tag) { + private void addChildren(Tags tag) { log.infoFormat("Tag {0} added to tree", tag.gettag_name()); List<Tags> children = getTagDAO().getAllForParent(tag.gettag_id()); for (Tags child : children) { - AddChildren(child); + addChildren(child); log.infoFormat("Tag {0} added as child to parent {1}", child.gettag_name(), tag.gettag_name()); tag.getChildren().add(child); - AddTagToHash(tag); - AddTagToHash(child); + addTagToHash(tag); + addTagToHash(child); } } @@ -134,12 +134,12 @@ return instance; } - public void AddTag(Tags tag) { + public void addTag(Tags tag) { if (tagsMapByID.containsKey(tag.getparent_id())) { Tags parent = tagsMapByID.get(tag.getparent_id()); parent.getChildren().add(tag); - AddTagToHash(tag); - AddTagToHash(parent); + addTagToHash(tag); + addTagToHash(parent); } else { log.errorFormat("Trying to add tag {0}, parent doesn't exist in Data Structure - {1}", tag.gettag_name(), tag.getparent_id()); @@ -158,7 +158,7 @@ RemoveTagAndChildren(tag); Tags parent = tagsMapByID.get(tag.getparent_id()); parent.getChildren().remove(tag); - AddTagToHash(parent); + addTagToHash(parent); } else { log.warnFormat("Trying to remove tag, not exists in Data Structure - {0}", tagId); } @@ -182,7 +182,7 @@ // Copy the children of the cached tag to keep the object hierarchy consistent. tag.setChildren(tagFromCache.getChildren()); - AddTagToHash(tag); + addTagToHash(tag); } else { log.warnFormat("Trying to update tag, not exists in Data Structure - {0}", tag.gettag_name()); } @@ -195,7 +195,7 @@ if (tagsMapByID.containsKey(tag.getparent_id())) { Tags parentTag = tagsMapByID.get(tag.getparent_id()); parentTag.getChildren().remove(tag); - AddTagToHash(parentTag); + addTagToHash(parentTag); } else { log.warnFormat("Trying to move tag from parent that doesn't exist in Data Structure - {0}", tag.getparent_id()); @@ -203,7 +203,7 @@ Tags newParentTag = tagsMapByID.get(newParent); newParentTag.getChildren().add(tag); tag.setparent_id(newParent); - AddTagToHash(newParentTag); // Parent got changed, modify it. + addTagToHash(newParentTag); // Parent got changed, modify it. updateTagInBackend(tag); } else { log.errorFormat("Trying to move tag, to parent not exists in Data Structure - {0}", newParent); @@ -294,7 +294,7 @@ // convert to the regular expression format: tagNameRegExp = tagNameRegExp.replace("*", ".*"); StringBuilder sb = new StringBuilder(); - RecursiveGetTagsAndChildrenByRegExp(tagNameRegExp, sb, GetRootTag(), TagReturnValueIndicator.NAME); + RecursiveGetTagsAndChildrenByRegExp(tagNameRegExp, sb, getRootTag(), TagReturnValueIndicator.NAME); return sb.toString(); } @@ -361,10 +361,10 @@ * * @return a tags list. */ - public ArrayList<Tags> GetAllTags() { + public ArrayList<Tags> getAllTags() { ArrayList<Tags> ret = new ArrayList<>(tagsMapByID.values()); // remove the root - it is not a real tag: - ret.remove(GetRootTag()); + ret.remove(getRootTag()); return ret; } @@ -373,18 +373,18 @@ * * @return the root tag. */ - public Tags GetRootTag() { + public Tags getRootTag() { return tagsMapByID.get(ROOT_TAG_ID); } - public boolean IsTagDescestorOfTag(Guid sourceTagId, Guid potentialDescestorId) { + public boolean isTagDescestorOfTag(Guid sourceTagId, Guid potentialDescestorId) { if (sourceTagId.equals(potentialDescestorId)) { return true; } Tags tag = GetTagById(sourceTagId); if (tag != null && tag.getChildren() != null) { for (Tags childTag : tag.getChildren()) { - if (IsTagDescestorOfTag(childTag.gettag_id(), potentialDescestorId)) { + if (isTagDescestorOfTag(childTag.gettag_id(), potentialDescestorId)) { return true; } } 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 e2d7cde..1f3eb01 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 @@ -69,7 +69,7 @@ tag.settag_id(tagId); tag.settag_name(name); tag.settype(TagsType.GeneralTag); - tag.setparent_id(tagsDirector.GetRootTag().gettag_id()); + tag.setparent_id(tagsDirector.getRootTag().gettag_id()); return tag; } @@ -91,7 +91,7 @@ Tags tagFromDirector = tagsDirector.GetTagById(tag.gettag_id()); assertNull(tagFromDirector); - tagsDirector.AddTag(tag); + tagsDirector.addTag(tag); tagFromDirector = tagsDirector.GetTagById(tag.gettag_id()); assertNotNull(tagFromDirector); assertEquals(tag, tagFromDirector); @@ -100,7 +100,7 @@ @Test public void testChangeValueAfterAdd() { Tags tag = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag); + tagsDirector.addTag(tag); tag.settag_name("tag2"); Tags tagFromDirector = tagsDirector.GetTagById(tag.gettag_id()); assertNotNull(tagFromDirector); @@ -109,15 +109,15 @@ @Test public void testGetRootTag() { - Tags tags = tagsDirector.GetRootTag(); + Tags tags = tagsDirector.getRootTag(); assertNotNull(tags); } @Test public void testGetRootWithHierarchy() { Tags tag = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag); - Tags tags = tagsDirector.GetRootTag(); + tagsDirector.addTag(tag); + Tags tags = tagsDirector.getRootTag(); assertNotNull(tags); assertEquals(tags.gettag_id(), TagsDirector.ROOT_TAG_ID); assertEquals(1, tags.getChildren().size()); @@ -127,10 +127,10 @@ @Test public void testUpdateChildren() { Tags tag = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag); + tagsDirector.addTag(tag); tag.settag_name("booboo"); tagsDirector.UpdateTag(tag); - Tags rootTag = tagsDirector.GetRootTag(); + Tags rootTag = tagsDirector.getRootTag(); tag = rootTag.getChildren().get(0); assertEquals("booboo", tag.gettag_name()); } @@ -140,12 +140,12 @@ // let's have two top level tag under root Tags level1obj1 = createTag("level1obj1", ""); level1obj1.settag_id(Guid.newGuid()); - level1obj1.setparent_id(tagsDirector.GetRootTag().gettag_id()); - tagsDirector.AddTag(level1obj1); + level1obj1.setparent_id(tagsDirector.getRootTag().gettag_id()); + tagsDirector.addTag(level1obj1); Tags level1obj2 = createTag("level1obj2", ""); level1obj2.settag_id(Guid.newGuid()); - level1obj2.setparent_id(tagsDirector.GetRootTag().gettag_id()); - tagsDirector.AddTag(level1obj2); + level1obj2.setparent_id(tagsDirector.getRootTag().gettag_id()); + tagsDirector.addTag(level1obj2); // now none of these should have any children Assert.assertEquals(0, tagsDirector.GetTagById(level1obj1.gettag_id()).getChildren().size()); @@ -155,7 +155,7 @@ Tags level2obj1 = createTag("level2obj1", ""); level2obj1.settag_id(Guid.newGuid()); level2obj1.setparent_id(level1obj1.gettag_id()); - tagsDirector.AddTag(level2obj1); + tagsDirector.addTag(level2obj1); // now check the number of children Assert.assertEquals(1, tagsDirector.GetTagById(level1obj1.gettag_id()).getChildren().size()); @@ -176,17 +176,17 @@ // let's have two top level tag under root Tags level1obj1 = createTag("level1obj1", ""); level1obj1.settag_id(Guid.newGuid()); - level1obj1.setparent_id(tagsDirector.GetRootTag().gettag_id()); - tagsDirector.AddTag(level1obj1); + level1obj1.setparent_id(tagsDirector.getRootTag().gettag_id()); + tagsDirector.addTag(level1obj1); Tags level1obj2 = createTag("level1obj2", ""); level1obj2.settag_id(Guid.newGuid()); - level1obj2.setparent_id(tagsDirector.GetRootTag().gettag_id()); - tagsDirector.AddTag(level1obj2); + level1obj2.setparent_id(tagsDirector.getRootTag().gettag_id()); + tagsDirector.addTag(level1obj2); // now none of these should have any children Assert.assertEquals(0, tagsDirector.GetTagById(level1obj1.gettag_id()).getChildren().size()); Assert.assertEquals(0, tagsDirector.GetTagById(level1obj2.gettag_id()).getChildren().size()); - Assert.assertEquals(2, tagsDirector.GetRootTag().getChildren().size()); + Assert.assertEquals(2, tagsDirector.getRootTag().getChildren().size()); // should be all right so far. // now let's do the trick: move the second level tag to under the other first level tag @@ -194,7 +194,7 @@ // and now let's recheck, the first top level should have 0 children, the second should have 1 Assert.assertEquals(1, tagsDirector.GetTagById(level1obj2.gettag_id()).getChildren().size()); - Assert.assertEquals(1, tagsDirector.GetRootTag().getChildren().size()); + Assert.assertEquals(1, tagsDirector.getRootTag().getChildren().size()); } @@ -202,8 +202,8 @@ public void testUpdateParentTag() { Tags tag = createTag("tag1", "desc1"); tag.settag_id(Guid.newGuid()); - tagsDirector.AddTag(tag); - Tags rootTag = tagsDirector.GetRootTag(); + tagsDirector.addTag(tag); + Tags rootTag = tagsDirector.getRootTag(); tag = rootTag.getChildren().get(0); assertEquals("tag1", tag.gettag_name()); @@ -211,10 +211,10 @@ Tags sub = createTag("subtag1", "subdesc"); sub.settag_id(Guid.newGuid()); sub.setparent_id(tag.gettag_id()); - tagsDirector.AddTag(sub); + tagsDirector.addTag(sub); // so now the root tag must have 1 child - Assert.assertEquals(1, tagsDirector.GetRootTag().getChildren().size()); + Assert.assertEquals(1, tagsDirector.getRootTag().getChildren().size()); Assert.assertEquals(1, tagsDirector.GetTagById(tag.gettag_id()).getChildren().size()); // get the parent, and rename it @@ -223,7 +223,7 @@ // now let's see the number of children in the tag objects // this is the assertion that fails without fix for #732640 - Assert.assertEquals(1, tagsDirector.GetRootTag().getChildren().size()); + Assert.assertEquals(1, tagsDirector.getRootTag().getChildren().size()); Assert.assertEquals(1, tagsDirector.GetTagById(tag.gettag_id()).getChildren().size()); // let's check the same thing on overwriting description @@ -231,7 +231,7 @@ tagsDirector.UpdateTag(tag); // and all the checks once again just to make sure - Assert.assertEquals(1, tagsDirector.GetRootTag().getChildren().size()); + Assert.assertEquals(1, tagsDirector.getRootTag().getChildren().size()); Assert.assertEquals(1, tagsDirector.GetTagById(tag.gettag_id()).getChildren().size()); } @@ -245,7 +245,7 @@ @Test public void testGetByName() { Tags tag = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag); + tagsDirector.addTag(tag); Tags fromTagsDirector = tagsDirector.GetTagByName("tag1"); assertNotNull(fromTagsDirector); assertEquals(tag, fromTagsDirector); @@ -253,15 +253,15 @@ @Test public void testGetAllTags() { - ArrayList<Tags> allTags = tagsDirector.GetAllTags(); + ArrayList<Tags> allTags = tagsDirector.getAllTags(); assertEquals(0, allTags.size()); Tags tag = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag); - allTags = tagsDirector.GetAllTags(); + tagsDirector.addTag(tag); + allTags = tagsDirector.getAllTags(); assertEquals(1, allTags.size()); tag = createTag("tag2", "desc2"); - tagsDirector.AddTag(tag); - allTags = tagsDirector.GetAllTags(); + tagsDirector.addTag(tag); + allTags = tagsDirector.getAllTags(); assertEquals(2, allTags.size()); } @@ -278,7 +278,7 @@ Tags tag2 = createTag("tag2", "desc2"); tag.getChildren().add(tag2); tag2.setparent_id(tag.getparent_id()); - tagsDirector.AddTag(tag); + tagsDirector.addTag(tag); String idsStr = tagsDirector.GetTagIdAndChildrenIds(tag.gettag_id()); String[] ids = idsStr.split("[,]"); assertEquals(2, ids.length); @@ -292,7 +292,7 @@ Tags tag2 = createTag("tag2", "desc2"); tag.getChildren().add(tag2); tag2.setparent_id(tag.getparent_id()); - tagsDirector.AddTag(tag); + tagsDirector.addTag(tag); Set<Guid> idsToCheck = new HashSet<Guid>(); idsToCheck.add(tag.gettag_id()); idsToCheck.add(tag2.gettag_id()); @@ -306,7 +306,7 @@ Tags tag2 = createTag("tag2", "desc2"); tag.getChildren().add(tag2); tag2.setparent_id(tag.getparent_id()); - tagsDirector.AddTag(tag); + tagsDirector.addTag(tag); String idsStr = tagsDirector.GetTagIdAndChildrenIds(tag.gettag_name()); String[] ids = idsStr.split("[,]"); assertEquals(2, ids.length); @@ -322,7 +322,7 @@ @Test public void testUpdate() { Tags tag = createTag("tag1", "desc1"); - tagsDirector.AddTag(tag); + tagsDirector.addTag(tag); tag.settag_name("new name"); tagsDirector.UpdateTag(tag); Tags fromDirector = tagsDirector.GetTagById(tag.gettag_id()); @@ -336,12 +336,12 @@ Tags tag3 = createTag("tag3", "desc3"); Tags tag4 = createTag("tag4", "desc4"); - tagsDirector.AddTag(tag1); - tagsDirector.AddTag(tag2); - tagsDirector.AddTag(tag3); - tagsDirector.AddTag(tag4); + tagsDirector.addTag(tag1); + tagsDirector.addTag(tag2); + tagsDirector.addTag(tag3); + tagsDirector.addTag(tag4); // Emulates the REST API behavior of getting all the tags prior to updating - ArrayList<Tags> tags = tagsDirector.GetAllTags(); + ArrayList<Tags> tags = tagsDirector.getAllTags(); Tags tagToChange = null; for (Tags tag : tags) { if (tag.gettag_name().equals("tag1")) { @@ -352,7 +352,7 @@ tagToChange.setparent_id(tag2.gettag_id()); tagsDirector.UpdateTag(tagToChange); // Emulates the REST API behavior of getting all the tags after updating - tags = tagsDirector.GetAllTags(); + tags = tagsDirector.getAllTags(); Tags changedTag = null; for (Tags tag : tags) { if (tag.gettag_name().equals("tag1")) { @@ -366,10 +366,10 @@ public void testDirectDescetor() { Tags tag1 = createTag("tag1", "desc1"); Tags tag2 = createTag("tag2", "desc2"); - tagsDirector.AddTag(tag1); - tagsDirector.AddTag(tag2); + tagsDirector.addTag(tag1); + tagsDirector.addTag(tag2); tagsDirector.MoveTag(tag2.gettag_id(), tag1.gettag_id()); - assertTrue(tagsDirector.IsTagDescestorOfTag(tag1.gettag_id(), tag2.gettag_id())); + assertTrue(tagsDirector.isTagDescestorOfTag(tag1.gettag_id(), tag2.gettag_id())); } @Test @@ -377,18 +377,18 @@ Tags tag1 = createTag("tag1", "desc1"); Tags tag2 = createTag("tag2", "desc2"); Tags tag3 = createTag("tag3", "desc3"); - tagsDirector.AddTag(tag1); - tagsDirector.AddTag(tag2); - tagsDirector.AddTag(tag3); + tagsDirector.addTag(tag1); + tagsDirector.addTag(tag2); + tagsDirector.addTag(tag3); tagsDirector.MoveTag(tag3.gettag_id(), tag1.gettag_id()); tagsDirector.MoveTag(tag2.gettag_id(), tag3.gettag_id()); - assertTrue(tagsDirector.IsTagDescestorOfTag(tag1.gettag_id(), tag2.gettag_id())); + assertTrue(tagsDirector.isTagDescestorOfTag(tag1.gettag_id(), tag2.gettag_id())); } @Test public void testNotDescetor() { Tags tag1 = createTag("tag1", "desc1"); Tags tag2 = createTag("tag2", "desc2"); - assertFalse(tagsDirector.IsTagDescestorOfTag(tag1.gettag_id(), tag2.gettag_id())); + assertFalse(tagsDirector.isTagDescestorOfTag(tag1.gettag_id(), tag2.gettag_id())); } } -- To view, visit http://gerrit.ovirt.org/25675 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50e515e2e6634201650c1531c7e6a37b38d3228a 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
