Author: mfranklin
Date: Wed Oct 17 02:32:05 2012
New Revision: 1399084
URL: http://svn.apache.org/viewvc?rev=1399084&view=rev
Log:
Simplified repositories
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.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/MongoDbTagRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoWidgetTemplate.java
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java?rev=1399084&r1=1399083&r2=1399084&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
Wed Oct 17 02:32:05 2012
@@ -20,33 +20,57 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl;
import org.apache.rave.portal.repository.OAuthTokenInfoRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
+import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
+
@Repository
public class MongoDbOAuthTokenInfoRepository implements
OAuthTokenInfoRepository {
+
+ public static final String COLLECTION = "oauthTokenInfo";
+ public static final Class<OAuthTokenInfoImpl> CLASS =
OAuthTokenInfoImpl.class;
+
+ @Autowired
+ private MongoOperations template;
+
@Override
public OAuthTokenInfo findOAuthTokenInfo(String userId, String appUrl,
String moduleId, String tokenName, String serviceName) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return template.findOne(
+ query(where("userId").is(userId)
+ .andOperator(where("appUrl").is(appUrl))
+ .andOperator(where("moduleId").is(moduleId))
+ .andOperator(where("tokenName").is(tokenName))
+ .andOperator(where("serviceName").is(serviceName))
+ ), CLASS, COLLECTION);
}
@Override
public Class<? extends OAuthTokenInfo> getType() {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return CLASS;
}
@Override
public OAuthTokenInfo get(long id) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return template.findById(id, CLASS, COLLECTION);
}
@Override
public OAuthTokenInfo save(OAuthTokenInfo item) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ if(item.getId() == null) {
+ item.setId(generateId());
+ }
+ template.save(item, COLLECTION);
+ return item;
}
@Override
public void delete(OAuthTokenInfo item) {
- //To change body of implemented methods use File | Settings | File
Templates.
+ template.remove(get(item.getId()));
}
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java?rev=1399084&r1=1399083&r2=1399084&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
Wed Oct 17 02:32:05 2012
@@ -20,33 +20,51 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.OAuthConsumerStore;
+import org.apache.rave.portal.model.impl.OAuthConsumerStoreImpl;
import org.apache.rave.portal.repository.OAuthConsumerStoreRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
+import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
+
@Repository
public class MongoDbOauthConsumerStoreRepository implements
OAuthConsumerStoreRepository {
+
+ public static final String COLLECTION = "oauthConsumerStore";
+ public static final Class<OAuthConsumerStoreImpl> CLASS =
OAuthConsumerStoreImpl.class;
+
+ @Autowired
+ private MongoOperations template;
+
@Override
public OAuthConsumerStore findByUriAndServiceName(String gadgetUri, String
serviceName) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return
template.findOne(query(where("gadgetUri").is(gadgetUri).andOperator(where("serviceName").is(serviceName))),
CLASS, COLLECTION);
}
@Override
public Class<? extends OAuthConsumerStore> getType() {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return CLASS;
}
@Override
public OAuthConsumerStore get(long id) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return template.findById(id, CLASS, COLLECTION);
}
@Override
public OAuthConsumerStore save(OAuthConsumerStore item) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ if(item.getId() == null) {
+ item.setId(generateId());
+ }
+ template.save(item, COLLECTION);
+ return item;
}
@Override
public void delete(OAuthConsumerStore item) {
- //To change body of implemented methods use File | Settings | File
Templates.
+ template.remove(get(item.getId()));
}
}
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=1399084&r1=1399083&r2=1399084&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
Wed Oct 17 02:32:05 2012
@@ -33,9 +33,6 @@ import java.util.List;
import static org.springframework.data.mongodb.core.query.Criteria.where;
-/**
-
- */
@Repository
public class MongoDbRegionWidgetRepository implements RegionWidgetRepository {
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java?rev=1399084&r1=1399083&r2=1399084&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
Wed Oct 17 02:32:05 2012
@@ -23,8 +23,8 @@ package org.apache.rave.portal.repositor
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.Tag;
import org.apache.rave.portal.repository.TagRepository;
-import org.apache.rave.portal.repository.WidgetRepository;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -33,7 +33,7 @@ import java.util.List;
public class MongoDbTagRepository implements TagRepository{
@Autowired
- private WidgetRepository widgetRepository;
+ private MongoOperations template;
@Override
public List<Tag> getAll() {
@@ -42,12 +42,12 @@ public class MongoDbTagRepository implem
@Override
public int getCountAll() {
- return 0; //To change body of implemented methods use File | Settings
| File Templates.
+ return 0;
}
@Override
public Tag getByKeyword(String keyword) {
- 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/MongoWidgetTemplate.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoWidgetTemplate.java?rev=1399084&r1=1399083&r2=1399084&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoWidgetTemplate.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoWidgetTemplate.java
Wed Oct 17 02:32:05 2012
@@ -34,5 +34,4 @@ public class MongoWidgetTemplate extends
public MongoWidgetTemplate() {
super(Widget.class, MongoDbWidget.class, COLLECTION);
}
-
}
