Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java Mon Oct 29 03:59:56 2012 @@ -508,8 +508,8 @@ public class PersonServiceTest { dbPerson.setUsername(id); dbPerson.setDisplayName(DISPLAY_NAME); List<PersonProperty> properties = new ArrayList<PersonProperty>(); - properties.add(new PersonPropertyImpl(1L, Person.Field.TAGS.toString(), TAG, null, null, null)); - properties.add(new PersonPropertyImpl(2L, Person.Field.HAPPIEST_WHEN.toString(), HAPPIEST_WHEN, null, null, null)); + properties.add(new PersonPropertyImpl("1", Person.Field.TAGS.toString(), TAG, null, null, null)); + properties.add(new PersonPropertyImpl("2", Person.Field.HAPPIEST_WHEN.toString(), HAPPIEST_WHEN, null, null, null)); dbPerson.setProperties(properties); return dbPerson; }
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java (original) +++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java Mon Oct 29 03:59:56 2012 @@ -34,6 +34,10 @@ public class W3CWidget extends WidgetImp public W3CWidget() { } + + public W3CWidget(String id) { + super(id); + } /** * @return the width Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java (original) +++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java Mon Oct 29 03:59:56 2012 @@ -21,6 +21,7 @@ package org.apache.rave.provider.w3c.web import org.apache.rave.exception.NotSupportedException; import org.apache.rave.portal.model.*; +import org.apache.rave.portal.repository.WidgetRepository; import org.apache.rave.portal.service.UserService; import org.apache.rave.portal.service.WidgetProviderService; import org.apache.rave.portal.web.renderer.RegionWidgetRenderer; @@ -51,13 +52,15 @@ public class W3cWidgetRenderer implement private final WidgetProviderService widgetService; private final UserService userService; private ScriptManager scriptManager; + private WidgetRepository widgetRepository; @Autowired public W3cWidgetRenderer(@Qualifier("wookieWidgetService") WidgetProviderService widgetService, - UserService userService, ScriptManager scriptManager) { + UserService userService, ScriptManager scriptManager, WidgetRepository widgetRepository) { this.widgetService = widgetService; this.userService = userService; this.scriptManager = scriptManager; + this.widgetRepository = widgetRepository; } /** @@ -92,7 +95,7 @@ public class W3cWidgetRenderer implement */ @Override public String render(RegionWidget item, RenderContext context) { - Widget widget = item.getWidget(); + Widget widget = widgetRepository.get(item.getWidgetId()); if(!WIDGET_TYPE.equals(widget.getType())) { throw new NotSupportedException("Invalid widget type passed to renderer: " + widget.getType()); } @@ -122,7 +125,8 @@ public class W3cWidgetRenderer implement // // Get the Rave Widget for this regionWidget instance // - W3CWidget contextualizedWidget = (W3CWidget) widgetService.getWidget(user, sharedDataKey, item.getWidget()); + Widget widget = widgetRepository.get(item.getWidgetId()); + W3CWidget contextualizedWidget = (W3CWidget) widgetService.getWidget(user, sharedDataKey, widget); // // TODO make this do something useful; currently these preferences aren't @@ -151,7 +155,7 @@ public class W3cWidgetRenderer implement // get attributes about the sub page this regionWidget is on. This is needed to assist the client in // determining which gadgets are on visible tabs/sub pages initially to make widget rendering more efficient - Long pageId = null; + String pageId = null; String pageName = ""; boolean isDefault = false; Page page = item.getRegion().getPage(); @@ -174,7 +178,7 @@ public class W3cWidgetRenderer implement height, width, item.isCollapsed(), - item.getWidget().getId(), + item.getWidgetId(), item.isLocked(), item.isHideChrome(), pageId, Modified: rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java (original) +++ rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java Mon Oct 29 03:59:56 2012 @@ -22,6 +22,7 @@ package org.apache.rave.provider.w3c.web import org.apache.rave.exception.NotSupportedException; import org.apache.rave.portal.model.*; import org.apache.rave.portal.model.impl.*; +import org.apache.rave.portal.repository.WidgetRepository; import org.apache.rave.portal.service.UserService; import org.apache.rave.portal.service.WidgetProviderService; import org.apache.rave.portal.web.renderer.Renderer; @@ -51,6 +52,7 @@ public class W3cWidgetRendererTest { private UserService userService; private RenderContext renderContext; private ScriptManager scriptManager; + private WidgetRepository widgetRepository; @Before public void setup() { @@ -59,7 +61,8 @@ public class W3cWidgetRendererTest { wookieService = createNiceMock(WidgetProviderService.class); userService = createNiceMock(UserService.class); scriptManager = createNiceMock(ScriptManager.class); - renderer = new W3cWidgetRenderer(wookieService, userService, scriptManager); + widgetRepository = createMock(WidgetRepository.class); + renderer = new W3cWidgetRenderer(wookieService, userService, scriptManager, widgetRepository); } @Test @@ -69,13 +72,13 @@ public class W3cWidgetRendererTest { @Test public void render_valid() { - final long REGION_ID = 222L; - final long REGION_WIDGET_ID = 444L; - final long VALID_SUBPAGE_ID = 778899L; + final String REGION_ID = "222"; + final String REGION_WIDGET_ID = "444"; + final String VALID_SUBPAGE_ID = "778899"; final String VALID_SUBPAGE_NAME = "My Activity"; final boolean VALID_IS_DEFAULT_SUBPAGE = true; - User user = new UserImpl(9999L, "testUser"); + User user = new UserImpl("9999", "testUser"); expect(userService.getAuthenticatedUser()).andReturn(user); replay(userService); @@ -88,19 +91,22 @@ public class W3cWidgetRendererTest { subPage.setPageType(PageType.SUB_PAGE); page.getSubPages().add(subPage); - W3CWidget w = new W3CWidget(); + W3CWidget w = new W3CWidget("1"); w.setType(Constants.WIDGET_TYPE); w.setUrl("http://example.com/widgets/1";); Region region = new RegionImpl(REGION_ID); region.setPage(subPage); - RegionWidget rw = new RegionWidgetImpl(); - rw.setId(REGION_WIDGET_ID); - rw.setWidget(w); + RegionWidget rw = new RegionWidgetImpl(REGION_WIDGET_ID); + rw.setWidgetId(w.getId()); rw.setRegion(region); W3CWidget wookieWidget = new W3CWidget(); wookieWidget.setUrl(VALID_WIDGET_INSTANCE_URL); + expect(widgetRepository.get("1")).andReturn(w); + expect(widgetRepository.get("1")).andReturn(w); + replay(widgetRepository); + expect(wookieService.getWidget(eq(user), eq(rw.getId().toString()), isA(Widget.class))).andReturn(wookieWidget); replay(wookieService); @@ -110,12 +116,14 @@ public class W3cWidgetRendererTest { @Test(expected = NotSupportedException.class) public void render_invalid() { - Widget w = new WidgetImpl(); + Widget w = new WidgetImpl("1"); w.setType("NONE"); w.setUrl(VALID_WIDGET_URL); - RegionWidget rw = new RegionWidgetImpl(); - rw.setId(1L); - rw.setWidget(w); + RegionWidget rw = new RegionWidgetImpl("1"); + rw.setWidgetId(w.getId()); + + expect(widgetRepository.get("1")).andReturn(w); + replay(widgetRepository); RenderContext renderContext = createNiceMock(RenderContext.class); renderer.render(rw, renderContext);
