Author: mfranklin
Date: Tue Oct 16 14:01:40 2012
New Revision: 1398807
URL: http://svn.apache.org/viewvc?rev=1398807&view=rev
Log:
Created common interface for ModelOperations
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoModelOperations.java
- copied, changed from r1398764,
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoPageOperations.java
Removed:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoPageOperations.java
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoPageTemplate.java
Copied:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoModelOperations.java
(from r1398764,
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoPageOperations.java)
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoModelOperations.java?p2=rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoModelOperations.java&p1=rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoPageOperations.java&r1=1398764&r2=1398807&rev=1398807&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoPageOperations.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoModelOperations.java
Tue Oct 16 14:01:40 2012
@@ -26,12 +26,15 @@ import java.util.List;
/**
*/
-public interface MongoPageOperations {
-
+public interface MongoModelOperations<T> {
long count(Query query);
void remove(Query query);
- Page findOne(Query query);
- List<Page> find(Query query);
- Page get(long id);
- Page save(Page item);
+ T findOne(Query query);
+ List<T> find(Query query);
+ T get(long id);
+ T save(T item);
+
+ public static interface MongoPageOperations extends
MongoModelOperations<Page> {}
+ public static interface MongoUserOperations extends
MongoModelOperations<Page> {}
+ public static interface MongoWidgetOperations extends
MongoModelOperations<Page> {}
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java?rev=1398807&r1=1398806&r2=1398807&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
Tue Oct 16 14:01:40 2012
@@ -20,16 +20,26 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.Category;
+import org.apache.rave.portal.model.conversion.HydratingConverterFactory;
import org.apache.rave.portal.repository.CategoryRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public class MongoDbCategoryRepository implements CategoryRepository {
+
+ @Autowired
+ private MongoOperations template;
+
+ @Autowired
+ private HydratingConverterFactory converter;
+
@Override
public List<Category> getAll() {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return null;
}
@Override
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java?rev=1398807&r1=1398806&r2=1398807&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
Tue Oct 16 14:01:40 2012
@@ -25,6 +25,7 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.model.impl.PageUserImpl;
import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.repository.MongoModelOperations;
import org.apache.rave.portal.repository.PageRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Query;
@@ -41,7 +42,7 @@ import static org.springframework.data.m
public class MongoDbPageRepository implements PageRepository {
@Autowired
- private MongoPageTemplate template;
+ private MongoModelOperations.MongoPageOperations template;
@Override
public List<Page> getAllPages(Long userId, PageType pageType) {
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java?rev=1398807&r1=1398806&r2=1398807&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
Tue Oct 16 14:01:40 2012
@@ -22,7 +22,7 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.impl.RegionImpl;
-import org.apache.rave.portal.repository.MongoPageOperations;
+import org.apache.rave.portal.repository.MongoModelOperations;
import org.apache.rave.portal.repository.RegionRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Criteria;
@@ -38,7 +38,7 @@ import java.util.List;
public class MongoDbRegionRepository implements RegionRepository {
@Autowired
- private MongoPageOperations template;
+ private MongoModelOperations.MongoPageOperations template;
@Override
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java?rev=1398807&r1=1398806&r2=1398807&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
Tue Oct 16 14:01:40 2012
@@ -23,6 +23,7 @@ import org.apache.rave.portal.model.Mong
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.repository.MongoModelOperations;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Query;
@@ -37,7 +38,7 @@ import static org.springframework.data.m
public class MongoDbRegionWidgetRepository implements RegionWidgetRepository {
@Autowired
- private MongoPageTemplate template;
+ private MongoModelOperations.MongoPageOperations template;
@Override
public Class<? extends RegionWidget> getType() {
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java?rev=1398807&r1=1398806&r2=1398807&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
Tue Oct 16 14:01:40 2012
@@ -87,7 +87,7 @@ public class MongoDbUserRepository imple
@Override
public List<User> getAllByAddedWidget(long widgetId) {
- return null;
+ return null; //TODO COMPLETE
}
@Override
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoPageTemplate.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoPageTemplate.java?rev=1398807&r1=1398806&r2=1398807&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoPageTemplate.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoPageTemplate.java
Tue Oct 16 14:01:40 2012
@@ -22,17 +22,19 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.MongoDbPage;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.conversion.HydratingConverterFactory;
-import org.apache.rave.portal.repository.MongoPageOperations;
+import org.apache.rave.portal.repository.MongoModelOperations;
import org.apache.rave.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Component;
import java.util.List;
/**
*/
-public class MongoPageTemplate implements MongoPageOperations {
+@Component
+public class MongoPageTemplate implements
MongoModelOperations.MongoPageOperations {
public static final String COLLECTION = "page";
public static final Class<MongoDbPage> CLASS = MongoDbPage.class;
