Author: chris.laprun(a)jboss.com Date: 2008-10-08 07:18:48 -0400 (Wed, 08 Oct 2008) New Revision: 12050 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java Log: - JBPORTAL-2147: renamed AliasBindingInfo.getNames to getParameterNames. - Fixed incorrect implementation of CoordinationService.getParameterBindings(page, qname) and added test cases. Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java 2008-10-08 10:54:02 UTC (rev 12049) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java 2008-10-08 11:18:48 UTC (rev 12050) @@ -34,7 +34,7 @@ */ public interface AliasBindingInfo { - Set<QName> getNames(); + Set<QName> getParameterNames(); String getName(); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java 2008-10-08 10:54:02 UTC (rev 12049) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java 2008-10-08 11:18:48 UTC (rev 12050) @@ -34,7 +34,6 @@ */ public interface EventWiringInfo { - String getName(); Map<Window, QName> getSources(); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-10-08 10:54:02 UTC (rev 12049) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-10-08 11:18:48 UTC (rev 12050) @@ -144,7 +144,7 @@ { for (AliasBindingInfo info : getAliasBindings(window.getPage())) { - if (info.getNames().contains(name)) + if (info.getParameterNames().contains(name)) { names.add(info.getName()); } @@ -679,14 +679,14 @@ public void renameAliasBinding(AliasBindingInfo aliasBinding, String newName) throws IllegalCoordinationException { removeAliasBinding(aliasBinding); - setAliasBinding(aliasBinding.getPage(), newName, aliasBinding.getNames()); + setAliasBinding(aliasBinding.getPage(), newName, aliasBinding.getParameterNames()); } public void renameAliasBinding(Page page, String bindingName, String newName) throws IllegalCoordinationException { AliasBindingInfo info = getAliasBinding(page, bindingName); removeAliasBinding(page, bindingName); - setAliasBinding(page, newName, info.getNames()); + setAliasBinding(page, newName, info.getParameterNames()); } public Collection<AliasBindingInfo> getAliasBindings(Page page) @@ -757,9 +757,13 @@ Collection<ParameterBindingInfo> infos = new HashSet<ParameterBindingInfo>(); for (ParameterBindingInfo pageParam : pageParams) { - if (pageParam.getMappings().containsValue(parameterName)) + Collection<Set<QName>> allQNames = pageParam.getMappings().values(); + for (Set<QName> qNameSet : allQNames) { - infos.add(pageParam); + if (qNameSet.contains(parameterName)) + { + infos.add(pageParam); + } } } return infos; @@ -1026,7 +1030,7 @@ return name; } - public Set<QName> getNames() + public Set<QName> getParameterNames() { return Collections.unmodifiableSet(names); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-10-08 10:54:02 UTC (rev 12049) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-10-08 11:18:48 UTC (rev 12050) @@ -349,6 +349,80 @@ TransactionAssert.commitTransaction(); } + public void testGetParameterBindings() throws IllegalCoordinationException + { + TransactionAssert.beginTransaction(); + + Page page1 = getPage1(); + + Window w1 = page1.getWindow("Window_1"); + Window w2 = page1.getWindow("Window_2"); + Window w4 = page1.getWindow("Window_4"); + + + Map<Window, Set<QName>> ws = new HashMap<Window, Set<QName>>(); + QName qName11 = new QName("ns1", "1"); + QName qName12 = new QName("ns1", "2"); + ws.put(w1, Collections.singleton(qName11)); + ws.put(w2, Collections.singleton(qName12)); + cos.setParameterBinding("binding1", ws); + + QName qName21 = new QName("ns2", "foo3"); + ws.clear(); + ws.put(w4, Collections.singleton(qName21)); + cos.setParameterBinding("binding2", ws); + + // check bindings on page + Collection<? extends ParameterBindingInfo> infos = cos.getParameterBindings(page1); + assertNotNull(infos); + assertEquals(2, infos.size()); + int count = 0; + for (ParameterBindingInfo info : infos) + { + String name = info.getName(); + if ("binding1".equals(name) || "binding2".equals(name)) + { + count++; + } + } + assertEquals(2, count); + + infos = cos.getParameterBindings(w1); + assertNotNull(infos); + assertEquals(1, infos.size()); + for (ParameterBindingInfo info : infos) + { + assertEquals("binding1", info.getName()); + } + + ws = new HashMap<Window, Set<QName>>(); + ws.put(w2, Collections.singleton(qName11)); + cos.setParameterBinding("binding3", ws); + + infos = cos.getParameterBindings(page1, qName21); + assertNotNull(infos); + assertEquals(1, infos.size()); + for (ParameterBindingInfo info : infos) + { + assertEquals("binding2", info.getName()); + } + + infos = cos.getParameterBindings(page1, qName11); + assertEquals(2, infos.size()); + count = 0; + for (ParameterBindingInfo info : infos) + { + String name = info.getName(); + if ("binding1".equals(name) || "binding3".equals(name)) + { + count++; + } + } + assertEquals(2, count); + + TransactionAssert.commitTransaction(); + } + public void testRemoveParameterBinding() throws Exception { TransactionAssert.beginTransaction(); @@ -428,10 +502,10 @@ AliasBindingInfo info = bindings1.iterator().next(); assertTrue(info.getName().equals("alias1")); - assertEquals(3, info.getNames().size()); - assertTrue(info.getNames().contains(qname1)); - assertTrue(info.getNames().contains(qname2)); - assertTrue(info.getNames().contains(qname3)); + assertEquals(3, info.getParameterNames().size()); + assertTrue(info.getParameterNames().contains(qname1)); + assertTrue(info.getParameterNames().contains(qname2)); + assertTrue(info.getParameterNames().contains(qname3)); cos.removeAliasBinding(info); assertTrue(cos.getAliasBindings(page1).isEmpty()); @@ -460,16 +534,16 @@ assertNotNull(info3); assertTrue(info2.getName().equals("alias2")); - assertEquals(3, info2.getNames().size()); - assertTrue(info2.getNames().contains(qname4)); - assertTrue(info2.getNames().contains(qname5)); - assertTrue(info2.getNames().contains(qname6)); + assertEquals(3, info2.getParameterNames().size()); + assertTrue(info2.getParameterNames().contains(qname4)); + assertTrue(info2.getParameterNames().contains(qname5)); + assertTrue(info2.getParameterNames().contains(qname6)); assertTrue(info3.getName().equals("alias3")); - assertEquals(3, info3.getNames().size()); - assertTrue(info3.getNames().contains(qname7)); - assertTrue(info3.getNames().contains(qname8)); - assertTrue(info3.getNames().contains(qname9)); + assertEquals(3, info3.getParameterNames().size()); + assertTrue(info3.getParameterNames().contains(qname7)); + assertTrue(info3.getParameterNames().contains(qname8)); + assertTrue(info3.getParameterNames().contains(qname9)); TransactionAssert.commitTransaction(); @@ -505,7 +579,7 @@ assertNotNull(info); assertEquals("alias1", info.getName()); assertEquals(page1, info.getPage()); - Set<QName> names = info.getNames(); + Set<QName> names = info.getParameterNames(); assertNotNull(names); assertEquals(3, names.size()); assertTrue(names.contains(qname1)); @@ -516,7 +590,7 @@ assertNotNull(info); assertEquals("alias2", info.getName()); assertEquals(page1, info.getPage()); - names = info.getNames(); + names = info.getParameterNames(); assertNotNull(names); assertEquals(3, names.size()); assertTrue(names.contains(qname4)); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-10-08 10:54:02 UTC (rev 12049) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-10-08 11:18:48 UTC (rev 12050) @@ -190,7 +190,7 @@ public DisplayAliasBinding(AliasBindingInfo binding) { alias = binding; - names = new ArrayList<QName>(binding.getNames()); + names = new ArrayList<QName>(binding.getParameterNames()); } public List<QName> getNames()