You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/05/26 16:09:44 UTC
svn commit: r1127926 - in /incubator/rave/trunk:
rave-portal/src/main/java/org/apache/rave/portal/repository/
rave-portal/src/main/java/org/apache/rave/portal/repository/impl/
rave-portal/src/main/java/org/apache/rave/portal/repository/impl/util/
rave-...
Author: mfranklin
Date: Thu May 26 14:09:43 2011
New Revision: 1127926
URL: http://svn.apache.org/viewvc?rev=1127926&view=rev
Log:
Cleanup of repositories
Modified:
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/util/JpaUtil.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaPageRepositoryTest.java
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionRepositoryTest.java
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionWidgetRepositoryTest.java
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaUserRepositoryTest.java
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaWidgetRepositoryTest.java
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/PageServiceTest.java
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/UserServiceTest.java
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/WidgetServiceTest.java
incubator/rave/trunk/rave-shindig/ (props changed)
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java Thu May 26 14:09:43 2011
@@ -18,5 +18,6 @@
*/
package org.apache.rave.portal.repository;
-public interface PageLayoutRepository {
-}
\ No newline at end of file
+import org.apache.rave.portal.model.PageLayout;
+
+public interface PageLayoutRepository extends Repository<PageLayout> { }
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java Thu May 26 14:09:43 2011
@@ -24,12 +24,4 @@ import org.apache.rave.portal.model.Regi
/**
* Provides persistence operations for the {@link Region} class
*/
-public interface RegionRepository extends Repository<Region>{
-
- /**
- * Creates or updates the region in the persistence context
- * @param region valid region to persist
- * @return the persisted region
- */
- Region save(Region region);
-}
\ No newline at end of file
+public interface RegionRepository extends Repository<Region>{ }
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java Thu May 26 14:09:43 2011
@@ -20,8 +20,4 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.RegionWidget;
-public interface RegionWidgetRepository {
- RegionWidget getById(long regionWidgetId);
-
- RegionWidget save(RegionWidget regionWidget);
-}
\ No newline at end of file
+public interface RegionWidgetRepository extends Repository<RegionWidget> { }
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java Thu May 26 14:09:43 2011
@@ -24,10 +24,17 @@ package org.apache.rave.portal.repositor
*/
public interface Repository<T> {
/**
- * Gets the specified object from the persistence context
+ * Gets the specified object from the persistence context by its id
*
* @param id the id of the object of type T to retrieve
* @return a valid instance if id exists; null otherwise
*/
- T getById(long id);
+ T get(long id);
+
+ /**
+ * Save the given item in the repository
+ * @param item the item to save
+ * @return the persisted item
+ */
+ T save(T item);
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java Thu May 26 14:09:43 2011
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.commons.lang.NotImplementedException;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.repository.PageRepository;
import org.springframework.stereotype.Repository;
@@ -42,7 +43,12 @@ public class JpaPageRepository implement
}
@Override
- public Page getById(long pageId) {
+ public Page get(long pageId) {
return manager.find(Page.class, pageId);
}
+
+ @Override
+ public Page save(Page item) {
+ throw new NotImplementedException("Save is not implemented for this repository");
+ }
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java Thu May 26 14:09:43 2011
@@ -37,7 +37,7 @@ public class JpaRegionRepository impleme
private EntityManager manager;
@Override
- public Region getById(long regionId) {
+ public Region get(long regionId) {
return manager.find(Region.class, regionId);
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java Thu May 26 14:09:43 2011
@@ -35,7 +35,7 @@ public class JpaRegionWidgetRepository i
private EntityManager manager;
@Override
- public RegionWidget getById(long regionWidgetId) {
+ public RegionWidget get(long regionWidgetId) {
return manager.find(RegionWidget.class, regionWidgetId);
}
@@ -44,4 +44,6 @@ public class JpaRegionWidgetRepository i
public RegionWidget save(RegionWidget regionWidget) {
return saveOrUpdate(regionWidget.getId(), manager, regionWidget);
}
+
+
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java Thu May 26 14:09:43 2011
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.commons.lang.NotImplementedException;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.repository.UserRepository;
import org.springframework.stereotype.Repository;
@@ -38,7 +39,7 @@ public class JpaUserRepository implement
private EntityManager manager;
@Override
- public User getById(long userId) {
+ public User get(long userId) {
return manager.find(User.class, userId);
}
@@ -48,4 +49,9 @@ public class JpaUserRepository implement
query.setParameter("username", username);
return getSingleResult(query.getResultList());
}
+
+ @Override
+ public User save(User item) {
+ throw new NotImplementedException("Save is not implemented for this repository");
+ }
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java Thu May 26 14:09:43 2011
@@ -20,6 +20,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.commons.lang.NotImplementedException;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.repository.WidgetRepository;
import org.springframework.stereotype.Repository;
@@ -42,7 +43,12 @@ public class JpaWidgetRepository impleme
}
@Override
- public Widget getById(long id) {
+ public Widget get(long id) {
return manager.find(Widget.class, id);
}
+
+ @Override
+ public Widget save(Widget item) {
+ throw new NotImplementedException("Save is not implemented for this repository");
+ }
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/util/JpaUtil.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/util/JpaUtil.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/util/JpaUtil.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/util/JpaUtil.java Thu May 26 14:09:43 2011
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.rave.portal.repository.impl.util;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java Thu May 26 14:09:43 2011
@@ -104,7 +104,7 @@ public class DefaultPageService implemen
}
private static <T> T getFromRepository(long id, Repository<T> repo) {
- T object = repo.getById(id);
+ T object = repo.get(id);
if(object == null) {
throw new IllegalArgumentException("Could not find object of given id in " + repo.getClass().getSimpleName());
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java Thu May 26 14:09:43 2011
@@ -43,7 +43,7 @@ public class DefaultRegionWidgetService
@Override
public RegionWidget getRegionWidget(long regionWidgetId) {
- return regionWidgetRepository.getById(regionWidgetId);
+ return regionWidgetRepository.get(regionWidgetId);
}
@Override
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Thu May 26 14:09:43 2011
@@ -73,7 +73,7 @@ public class DefaultUserService implemen
@Override
public void setAuthenticatedUser(long userId) {
- final User user = userRepository.getById(userId);
+ final User user = userRepository.get(userId);
if(user == null) {
throw new UsernameNotFoundException("User with id '" + userId + "' was not found!");
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java Thu May 26 14:09:43 2011
@@ -44,6 +44,6 @@ public class DefaultWidgetService implem
@Override
public Widget getWidget(long id) {
- return widgetRepository.getById(id);
+ return widgetRepository.get(id);
}
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java Thu May 26 14:09:43 2011
@@ -42,16 +42,16 @@ public class WidgetStoreController {
}
@RequestMapping(method = RequestMethod.GET)
- public String view(Model model, @RequestParam long referrerId) {
+ public String view(Model model, @RequestParam long referringPageId) {
model.addAttribute(ModelKeys.WIDGETS, widgetService.getAllWidgets());
- model.addAttribute(ModelKeys.REFERER, referrerId);
+ model.addAttribute(ModelKeys.REFERER, referringPageId);
return ViewNames.STORE;
}
@RequestMapping(method = RequestMethod.GET, value = "widget/{widgetId}")
- public String viewWidget(Model model, @PathVariable long widgetId, @RequestParam long referrerId) {
+ public String viewWidget(Model model, @PathVariable long widgetId, @RequestParam long referringPageId) {
model.addAttribute(ModelKeys.WIDGET, widgetService.getWidget(widgetId));
- model.addAttribute(ModelKeys.REFERER, referrerId);
+ model.addAttribute(ModelKeys.REFERER, referringPageId);
return ViewNames.WIDGET;
}
}
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp Thu May 26 14:09:43 2011
@@ -45,12 +45,12 @@
<div id="widgetAdded_${widget.id}" class="storeButton">
<button class="storeItemButton"
id="addWidget_${widget.id}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId: ${referrer}});">
+ onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId: ${referringPageId}});">
Add to Page
</button>
</div>
<a class="secondaryPageItemTitle"
- href="<spring:url value="/app/store/widget/${widget.id}" />?referrerId=${referrer}">${widget.title}
+ href="<spring:url value="/app/store/widget/${widget.id}" />?referringPageId=${referringPageId}">${widget.title}
</a>
<div class="storeWidgetAuthor">By:
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp Thu May 26 14:09:43 2011
@@ -27,7 +27,7 @@
<a href="<spring:url value="/index.html" />">Back to Rave</a>
</span>
<span>
- <a href="<spring:url value="/app/store?referrerId=${referrer}" />">Back to Store</a>
+ <a href="<spring:url value="/app/store?referringPageId=${referringPageId}" />">Back to Store</a>
</span>
</div>
@@ -59,7 +59,7 @@
<div id="widgetAdded_${widget.id}" class="storeButton">
<button class="storeItemButton"
id="addWidget_${widget.id}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId: ${referrer}});">
+ onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId: ${referringPageId}});">
Add to Page
</button>
</div>
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaPageRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaPageRepositoryTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaPageRepositoryTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaPageRepositoryTest.java Thu May 26 14:09:43 2011
@@ -19,7 +19,6 @@
package org.apache.rave.portal.repository;
import org.apache.rave.portal.model.Page;
-import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,14 +63,14 @@ public class JpaPageRepositoryTest {
@Test
public void getById_valid() {
- Page p = repository.getById(1L);
+ Page p = repository.get(1L);
assertThat(p, is(notNullValue()));
assertThat(p.getId(), is(equalTo(1L)));
}
@Test
public void getById_invalid() {
- Page p = repository.getById(-1L);
+ Page p = repository.get(-1L);
assertThat(p, is(nullValue()));
}
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionRepositoryTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionRepositoryTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionRepositoryTest.java Thu May 26 14:09:43 2011
@@ -52,7 +52,7 @@ public class JpaRegionRepositoryTest {
@Test
public void getById_validId() {
- Region region = repository.getById(REGION_ID);
+ Region region = repository.get(REGION_ID);
assertThat(region, is(notNullValue()));
assertThat(region.getId(), is(equalTo(1L)));
assertThat(region.getRegionWidgets().size(), is(equalTo(2)));
@@ -60,7 +60,7 @@ public class JpaRegionRepositoryTest {
@Test
public void getById_invalidId() {
- Region region = repository.getById(INVALID_REGION_ID);
+ Region region = repository.get(INVALID_REGION_ID);
assertThat(region, is(nullValue()));
}
@@ -126,7 +126,7 @@ public class JpaRegionRepositoryTest {
@Test
public void save_cascadeOrphan() {
- Region region = repository.getById(1L);
+ Region region = repository.get(1L);
long id = region.getRegionWidgets().get(0).getId();
region.getRegionWidgets().remove(0);
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionWidgetRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionWidgetRepositoryTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionWidgetRepositoryTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaRegionWidgetRepositoryTest.java Thu May 26 14:09:43 2011
@@ -53,14 +53,14 @@ public class JpaRegionWidgetRepositoryTe
@Test
public void getById_validId() {
- RegionWidget regionWidget = repository.getById(VALID_REGION_WIDGET_ID);
+ RegionWidget regionWidget = repository.get(VALID_REGION_WIDGET_ID);
assertThat(regionWidget, is(notNullValue()));
assertThat(regionWidget.getId(), is(equalTo(VALID_REGION_WIDGET_ID)));
}
@Test
public void getById_invalidId() {
- RegionWidget regionWidget = repository.getById(INVALID_REGION_WIDGET_ID);
+ RegionWidget regionWidget = repository.get(INVALID_REGION_WIDGET_ID);
assertThat(regionWidget, is(nullValue()));
}
@@ -135,7 +135,7 @@ public class JpaRegionWidgetRepositoryTe
public void save_cascadeOrphan() {
long VALID_PREFERENCE_ID = addPreferenceToRegionWidget(VALID_REGION_WIDGET_ID);
- RegionWidget regionWidget = repository.getById(VALID_REGION_WIDGET_ID);
+ RegionWidget regionWidget = repository.get(VALID_REGION_WIDGET_ID);
regionWidget.getPreferences().remove(0);
RegionWidget saved = repository.save(regionWidget);
@@ -147,7 +147,7 @@ public class JpaRegionWidgetRepositoryTe
}
private long addPreferenceToRegionWidget(long validRegionWidgetId) {
- RegionWidget regionWidget = repository.getById(validRegionWidgetId);
+ RegionWidget regionWidget = repository.get(validRegionWidgetId);
RegionWidgetPreference regionWidgetPreference = new RegionWidgetPreference(null, validRegionWidgetId,
VALID_PREFERENCE_NAME, VALID_PREFERENCE_VALUE);
regionWidget.getPreferences().add(regionWidgetPreference);
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaUserRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaUserRepositoryTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaUserRepositoryTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaUserRepositoryTest.java Thu May 26 14:09:43 2011
@@ -43,7 +43,7 @@ public class JpaUserRepositoryTest {
@Test
public void getById_validId() {
- User user = repository.getById(USER_ID);
+ User user = repository.get(USER_ID);
assertThat(user, CoreMatchers.notNullValue());
assertThat(user.getUsername(), is(equalTo(USER_NAME)));
assertThat(user.getPassword(), is(equalTo(USER_NAME)));
@@ -51,7 +51,7 @@ public class JpaUserRepositoryTest {
}
@Test
public void getById_invalidId() {
- User user = repository.getById(INVALID_USER);
+ User user = repository.get(INVALID_USER);
assertThat(user, is(nullValue()));
}
@Test
@@ -64,7 +64,7 @@ public class JpaUserRepositoryTest {
}
@Test
public void getByUsername_invalid() {
- User user = repository.getById(INVALID_USER);
+ User user = repository.get(INVALID_USER);
assertThat(user, is(nullValue()));
}
}
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaWidgetRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaWidgetRepositoryTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaWidgetRepositoryTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/JpaWidgetRepositoryTest.java Thu May 26 14:09:43 2011
@@ -20,7 +20,6 @@
package org.apache.rave.portal.repository;
import org.apache.rave.portal.model.Widget;
-import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,14 +49,14 @@ public class JpaWidgetRepositoryTest {
@Test
public void getById_valid() {
- Widget widget = repository.getById(1L);
+ Widget widget = repository.get(1L);
assertThat(widget, is(notNullValue()));
assertThat(widget.getId(), is(equalTo(1L)));
}
@Test
public void getById_invValid() {
- Widget widget = repository.getById(-1L);
+ Widget widget = repository.get(-1L);
assertThat(widget, is(nullValue()));
}
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/PageServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/PageServiceTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/PageServiceTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/PageServiceTest.java Thu May 26 14:09:43 2011
@@ -184,8 +184,8 @@ public class PageServiceTest {
value.getRegions().add(targetRegion);
Widget widget = new Widget();
- expect(pageRepository.getById(PAGE_ID)).andReturn(value);
- expect(widgetRepository.getById(WIDGET_ID)).andReturn(widget);
+ expect(pageRepository.get(PAGE_ID)).andReturn(value);
+ expect(widgetRepository.get(WIDGET_ID)).andReturn(widget);
expect(regionRepository.save(originalRegion)).andReturn(originalRegion);
replay(pageRepository);
replay(regionRepository);
@@ -207,8 +207,8 @@ public class PageServiceTest {
public void addWidgetToPage_invalidWidget() {
long PAGE_ID = 1L;
long WIDGET_ID = -1L;
- expect(pageRepository.getById(PAGE_ID)).andReturn(new Page());
- expect(widgetRepository.getById(WIDGET_ID)).andReturn(null);
+ expect(pageRepository.get(PAGE_ID)).andReturn(new Page());
+ expect(widgetRepository.get(WIDGET_ID)).andReturn(null);
replay(pageRepository);
replay(regionRepository);
replay(widgetRepository);
@@ -220,8 +220,8 @@ public class PageServiceTest {
public void addWidgetToPage_invalidPage() {
long PAGE_ID = 1L;
long WIDGET_ID = -1L;
- expect(pageRepository.getById(PAGE_ID)).andReturn(null);
- expect(widgetRepository.getById(WIDGET_ID)).andReturn(new Widget());
+ expect(pageRepository.get(PAGE_ID)).andReturn(null);
+ expect(widgetRepository.get(WIDGET_ID)).andReturn(new Widget());
replay(pageRepository);
replay(regionRepository);
replay(widgetRepository);
@@ -240,15 +240,15 @@ public class PageServiceTest {
}
private void createMoveBetweenRegionsExpectations() {
- expect(regionRepository.getById(TO_REGION_ID)).andReturn(targetRegion);
- expect(regionRepository.getById(FROM_REGION_ID)).andReturn(originalRegion);
+ expect(regionRepository.get(TO_REGION_ID)).andReturn(targetRegion);
+ expect(regionRepository.get(FROM_REGION_ID)).andReturn(originalRegion);
expect(regionRepository.save(targetRegion)).andReturn(targetRegion);
expect(regionRepository.save(originalRegion)).andReturn(originalRegion);
replay(regionRepository);
}
private void createMoveWithinRegionsExpectations() {
- expect(regionRepository.getById(FROM_REGION_ID)).andReturn(originalRegion);
+ expect(regionRepository.get(FROM_REGION_ID)).andReturn(originalRegion);
expect(regionRepository.save(originalRegion)).andReturn(originalRegion);
replay(regionRepository);
}
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java Thu May 26 14:09:43 2011
@@ -51,7 +51,7 @@ public class RegionWidgetServiceTest {
public void getRegionWidget_validId() {
final RegionWidget VALID_REGION_WIDGET = new RegionWidget(VALID_REGION_WIDGET_ID);
- expect(regionWidgetRepository.getById(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET);
+ expect(regionWidgetRepository.get(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET);
replay(regionWidgetRepository);
assertThat(regionWidgetService.getRegionWidget(VALID_REGION_WIDGET_ID), CoreMatchers.sameInstance(VALID_REGION_WIDGET));
@@ -59,7 +59,7 @@ public class RegionWidgetServiceTest {
@Test
public void getRegionWidget_invalidId() {
- expect(regionWidgetRepository.getById(INVALID_REGION_WIDGET_ID)).andReturn(null);
+ expect(regionWidgetRepository.get(INVALID_REGION_WIDGET_ID)).andReturn(null);
replay(regionWidgetRepository);
assertThat(regionWidgetService.getRegionWidget(INVALID_REGION_WIDGET_ID), CoreMatchers.<Object>nullValue());
@@ -80,7 +80,7 @@ public class RegionWidgetServiceTest {
final RegionWidget VALID_REGION_WIDGET = new RegionWidget(VALID_REGION_WIDGET_ID);
VALID_REGION_WIDGET.setPreferences(getTestExistingRegionWidgetPreferences());
- expect(regionWidgetRepository.getById(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET);
+ expect(regionWidgetRepository.get(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET);
expect(regionWidgetRepository.save(VALID_REGION_WIDGET)).andReturn(VALID_REGION_WIDGET);
replay(regionWidgetRepository);
@@ -96,7 +96,7 @@ public class RegionWidgetServiceTest {
final RegionWidget VALID_REGION_WIDGET = new RegionWidget(VALID_REGION_WIDGET_ID);
VALID_REGION_WIDGET.setPreferences(getTestExistingRegionWidgetPreferences());
- expect(regionWidgetRepository.getById(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET).anyTimes();
+ expect(regionWidgetRepository.get(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET).anyTimes();
expect(regionWidgetRepository.save(VALID_REGION_WIDGET)).andReturn(VALID_REGION_WIDGET).anyTimes();
replay(regionWidgetRepository);
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/UserServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/UserServiceTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/UserServiceTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/UserServiceTest.java Thu May 26 14:09:43 2011
@@ -95,7 +95,7 @@ public class UserServiceTest {
@Test
public void setAuthenticatedUser_valid() {
final User authUser = new User(USER_ID);
- expect(repository.getById(USER_ID)).andReturn(authUser).anyTimes();
+ expect(repository.get(USER_ID)).andReturn(authUser).anyTimes();
replay(repository);
service.setAuthenticatedUser(USER_ID);
@@ -106,7 +106,7 @@ public class UserServiceTest {
@Test(expected = UsernameNotFoundException.class)
public void setAuthenticatedUser_invalid_null() {
final User authUser = new User(USER_ID);
- expect(repository.getById(USER_ID)).andReturn(null).anyTimes();
+ expect(repository.get(USER_ID)).andReturn(null).anyTimes();
replay(repository);
service.setAuthenticatedUser(USER_ID);
@@ -133,7 +133,7 @@ public class UserServiceTest {
@Test(expected = UsernameNotFoundException.class)
public void loadByUsername_invalid_null() {
final User authUser = new User(USER_ID);
- expect(repository.getById(USER_ID)).andReturn(null).anyTimes();
+ expect(repository.get(USER_ID)).andReturn(null).anyTimes();
replay(repository);
service.setAuthenticatedUser(USER_ID);
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/WidgetServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/WidgetServiceTest.java?rev=1127926&r1=1127925&r2=1127926&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/WidgetServiceTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/service/WidgetServiceTest.java Thu May 26 14:09:43 2011
@@ -56,7 +56,7 @@ public class WidgetServiceTest {
@Test
public void getWidget() {
Widget w = new Widget();
- expect(repository.getById(1L)).andReturn(w);
+ expect(repository.get(1L)).andReturn(w);
replay(repository);
Widget result = service.getWidget(1L);
@@ -66,7 +66,7 @@ public class WidgetServiceTest {
@Test
public void getWidget_null() {
- expect(repository.getById(1L)).andReturn(null);
+ expect(repository.get(1L)).andReturn(null);
replay(repository);
Widget result = service.getWidget(1L);
Propchange: incubator/rave/trunk/rave-shindig/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 26 14:09:43 2011
@@ -5,3 +5,5 @@ target
.classpath
.project
+
+*.iml