Author: mfranklin
Date: Mon Nov 19 21:10:06 2012
New Revision: 1411412
URL: http://svn.apache.org/viewvc?rev=1411412&view=rev
Log:
Centralized collection names
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/StatisticsAggregator.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/CollectionNames.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MonogoDbMapReduceStatisticsAggregatorTest.java
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
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/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/MongoDbPageLayoutRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoPageTemplate.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoUserTemplate.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoWidgetTemplate.java
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/StatisticsAggregator.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/StatisticsAggregator.java?rev=1411412&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/StatisticsAggregator.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/StatisticsAggregator.java
Mon Nov 19 21:10:06 2012
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+/**
+ * Manages statistics for various attributes of the Rave
+ */
+public interface StatisticsAggregator {
+}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java?rev=1411412&r1=1411411&r2=1411412&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
Mon Nov 19 21:10:06 2012
@@ -33,10 +33,10 @@ import java.util.List;
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;
+import static
org.apache.rave.portal.repository.util.CollectionNames.APP_DATA_COLLECTION;
@Repository
public class MongoDbApplicationDataRepository implements
ApplicationDataRepository {
- public static final String COLLECTION = "appData";
public static final Class<ApplicationDataImpl> CLASS =
ApplicationDataImpl.class;
@Autowired
@@ -44,12 +44,12 @@ public class MongoDbApplicationDataRepos
@Override
public List<ApplicationData> getApplicationData(List<String> userIds,
String appId) {
- return
CollectionUtils.<ApplicationData>toBaseTypedList(template.find(query(where("appUrl").is(appId).andOperator(where("userId").in(userIds))),
CLASS, COLLECTION));
+ return
CollectionUtils.<ApplicationData>toBaseTypedList(template.find(query(where("appUrl").is(appId).andOperator(where("userId").in(userIds))),
CLASS, APP_DATA_COLLECTION));
}
@Override
public ApplicationData getApplicationData(String personId, String appId) {
- return
template.findOne(query(where("appUrl").is(appId).andOperator(where("userId").is(personId))),
CLASS, COLLECTION);
+ return
template.findOne(query(where("appUrl").is(appId).andOperator(where("userId").is(personId))),
CLASS, APP_DATA_COLLECTION);
}
@Override
@@ -59,7 +59,7 @@ public class MongoDbApplicationDataRepos
@Override
public ApplicationData get(long id) {
- return template.findById(id, CLASS, COLLECTION);
+ return template.findById(id, CLASS, APP_DATA_COLLECTION);
}
@Override
@@ -67,12 +67,12 @@ public class MongoDbApplicationDataRepos
if(item.getId() == null) {
item.setId(generateId());
}
- template.save(item, COLLECTION);
+ template.save(item, APP_DATA_COLLECTION);
return item;
}
@Override
public void delete(ApplicationData item) {
- template.remove(item, COLLECTION);
+ template.remove(item, APP_DATA_COLLECTION);
}
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java?rev=1411412&r1=1411411&r2=1411412&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
Mon Nov 19 21:10:06 2012
@@ -35,11 +35,11 @@ import java.util.List;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
+import static
org.apache.rave.portal.repository.util.CollectionNames.AUTHORITY_COLLECTION;
@Repository
public class MongoDbAuthorityRepository implements AuthorityRepository {
- public static final String COLLECTION = "authority";
public static final Class<MongoDbAuthority> CLASS = MongoDbAuthority.class;
@Autowired
@@ -50,22 +50,22 @@ public class MongoDbAuthorityRepository
@Override
public Authority getByAuthority(String authorityName) {
- return template.findOne(query(where("authority").is(authorityName)),
CLASS, COLLECTION);
+ return template.findOne(query(where("authority").is(authorityName)),
CLASS, AUTHORITY_COLLECTION);
}
@Override
public List<Authority> getAll() {
- return
CollectionUtils.<Authority>toBaseTypedList(template.findAll(CLASS, COLLECTION));
+ return
CollectionUtils.<Authority>toBaseTypedList(template.findAll(CLASS,
AUTHORITY_COLLECTION));
}
@Override
public List<Authority> getAllDefault() {
- return
CollectionUtils.<Authority>toBaseTypedList(template.find(query(where("defaultForNewUser").is(true)),
CLASS, COLLECTION));
+ return
CollectionUtils.<Authority>toBaseTypedList(template.find(query(where("defaultForNewUser").is(true)),
CLASS, AUTHORITY_COLLECTION));
}
@Override
public int getCountAll() {
- return (int)template.count(new Query(), COLLECTION);
+ return (int)template.count(new Query(), AUTHORITY_COLLECTION);
}
@Override
@@ -88,12 +88,12 @@ public class MongoDbAuthorityRepository
fromDb.setDefaultForNewUser(item.isDefaultForNewUser());
save=fromDb;
}
- template.save(save, COLLECTION);
+ template.save(save, AUTHORITY_COLLECTION);
return save;
}
@Override
public void delete(Authority item) {
- template.remove(getByAuthority(item.getAuthority()), COLLECTION);
+ template.remove(getByAuthority(item.getAuthority()),
AUTHORITY_COLLECTION);
}
}
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=1411412&r1=1411411&r2=1411412&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
Mon Nov 19 21:10:06 2012
@@ -30,13 +30,12 @@ import org.springframework.stereotype.Re
import java.util.List;
+import static
org.apache.rave.portal.repository.util.CollectionNames.CATEGORY_COLLECTION;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@Repository
public class MongoDbCategoryRepository implements CategoryRepository {
-
- public static final String COLLECTION = "category";
public static final Class<MongoDbCategory> CLASS = MongoDbCategory.class;
@Autowired
@@ -47,12 +46,12 @@ public class MongoDbCategoryRepository i
@Override
public List<Category> getAll() {
- return
CollectionUtils.<Category>toBaseTypedList(hydrate(template.findAll(CLASS,
COLLECTION)));
+ return
CollectionUtils.<Category>toBaseTypedList(hydrate(template.findAll(CLASS,
CATEGORY_COLLECTION)));
}
@Override
public int removeFromCreatedOrModifiedFields(long userId) {
- List<MongoDbCategory> categories =
template.find(query(where("lastModifiedUserId").is(userId).orOperator(where("createdUserId").is(userId))),
CLASS, COLLECTION);
+ List<MongoDbCategory> categories =
template.find(query(where("lastModifiedUserId").is(userId).orOperator(where("createdUserId").is(userId))),
CLASS, CATEGORY_COLLECTION);
int count = 0;
for(MongoDbCategory category : categories) {
boolean updated = updateCategory(userId, category);
@@ -71,19 +70,19 @@ public class MongoDbCategoryRepository i
@Override
public Category get(long id) {
- return hydrate(template.findById(id, CLASS, COLLECTION));
+ return hydrate(template.findById(id, CLASS, CATEGORY_COLLECTION));
}
@Override
public Category save(Category item) {
MongoDbCategory converted = converter.convert(item, Category.class);
- template.save(converted, COLLECTION);
+ template.save(converted, CATEGORY_COLLECTION);
return hydrate(converted);
}
@Override
public void delete(Category item) {
- template.remove(get(item.getId()), COLLECTION);
+ template.remove(get(item.getId()), CATEGORY_COLLECTION);
}
private Category hydrate(MongoDbCategory category) {
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java?rev=1411412&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
Mon Nov 19 21:10:06 2012
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+import org.apache.rave.portal.repository.StatisticsAggregator;
+
+/**
+ * Provides Statistics via MapReduce jobs
+ */
+public class MongoDbMapReduceStatisticsAggregator implements
StatisticsAggregator {
+}
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=1411412&r1=1411411&r2=1411412&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
Mon Nov 19 21:10:06 2012
@@ -29,11 +29,11 @@ import org.springframework.stereotype.Re
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;
+import static
org.apache.rave.portal.repository.util.CollectionNames.OAUTH_TOKEN_COLLECTION;
@Repository
public class MongoDbOAuthTokenInfoRepository implements
OAuthTokenInfoRepository {
- public static final String COLLECTION = "oauthTokenInfo";
public static final Class<OAuthTokenInfoImpl> CLASS =
OAuthTokenInfoImpl.class;
@Autowired
@@ -47,7 +47,7 @@ public class MongoDbOAuthTokenInfoReposi
.andOperator(where("moduleId").is(moduleId))
.andOperator(where("tokenName").is(tokenName))
.andOperator(where("serviceName").is(serviceName))
- ), CLASS, COLLECTION);
+ ), CLASS, OAUTH_TOKEN_COLLECTION);
}
@Override
@@ -57,7 +57,7 @@ public class MongoDbOAuthTokenInfoReposi
@Override
public OAuthTokenInfo get(long id) {
- return template.findById(id, CLASS, COLLECTION);
+ return template.findById(id, CLASS, OAUTH_TOKEN_COLLECTION);
}
@Override
@@ -65,7 +65,7 @@ public class MongoDbOAuthTokenInfoReposi
if(item.getId() == null) {
item.setId(generateId());
}
- template.save(item, COLLECTION);
+ template.save(item, OAUTH_TOKEN_COLLECTION);
return item;
}
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=1411412&r1=1411411&r2=1411412&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
Mon Nov 19 21:10:06 2012
@@ -29,11 +29,10 @@ import org.springframework.stereotype.Re
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;
+import static
org.apache.rave.portal.repository.util.CollectionNames.OAUTH_CONSUMER_COLLECTION;
@Repository
public class MongoDbOauthConsumerStoreRepository implements
OAuthConsumerStoreRepository {
-
- public static final String COLLECTION = "oauthConsumerStore";
public static final Class<OAuthConsumerStoreImpl> CLASS =
OAuthConsumerStoreImpl.class;
@Autowired
@@ -41,7 +40,7 @@ public class MongoDbOauthConsumerStoreRe
@Override
public OAuthConsumerStore findByUriAndServiceName(String gadgetUri, String
serviceName) {
- return
template.findOne(query(where("gadgetUri").is(gadgetUri).andOperator(where("serviceName").is(serviceName))),
CLASS, COLLECTION);
+ return
template.findOne(query(where("gadgetUri").is(gadgetUri).andOperator(where("serviceName").is(serviceName))),
CLASS, OAUTH_CONSUMER_COLLECTION);
}
@Override
@@ -51,7 +50,7 @@ public class MongoDbOauthConsumerStoreRe
@Override
public OAuthConsumerStore get(long id) {
- return template.findById(id, CLASS, COLLECTION);
+ return template.findById(id, CLASS, OAUTH_CONSUMER_COLLECTION);
}
@Override
@@ -59,7 +58,7 @@ public class MongoDbOauthConsumerStoreRe
if(item.getId() == null) {
item.setId(generateId());
}
- template.save(item, COLLECTION);
+ template.save(item, OAUTH_CONSUMER_COLLECTION);
return item;
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java?rev=1411412&r1=1411411&r2=1411412&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
Mon Nov 19 21:10:06 2012
@@ -33,11 +33,10 @@ import java.util.List;
import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static
org.apache.rave.portal.repository.util.CollectionNames.PAGE_LAYOUT_COLLECTION;
@Repository
public class MongoDbPageLayoutRepository implements PageLayoutRepository {
-
- public static final String COLLECTION = "pageLayout";
public static final Class<MongoDbPageLayout> CLASS =
MongoDbPageLayout.class;
@Autowired
@@ -45,17 +44,17 @@ public class MongoDbPageLayoutRepository
@Override
public PageLayout getByPageLayoutCode(String codename) {
- return template.findOne(new Query(where("code").is(codename)), CLASS,
COLLECTION);
+ return template.findOne(new Query(where("code").is(codename)), CLASS,
PAGE_LAYOUT_COLLECTION);
}
@Override
public List<PageLayout> getAll() {
- return
CollectionUtils.<PageLayout>toBaseTypedList(template.findAll(CLASS,
COLLECTION));
+ return
CollectionUtils.<PageLayout>toBaseTypedList(template.findAll(CLASS,
PAGE_LAYOUT_COLLECTION));
}
@Override
public List<PageLayout> getAllUserSelectable() {
- List<MongoDbPageLayout> userSelectable = template.find(new
Query(where("userSelectable").is(true)), CLASS, COLLECTION);
+ List<MongoDbPageLayout> userSelectable = template.find(new
Query(where("userSelectable").is(true)), CLASS, PAGE_LAYOUT_COLLECTION);
return CollectionUtils.<PageLayout>toBaseTypedList(userSelectable);
}
@@ -77,7 +76,7 @@ public class MongoDbPageLayoutRepository
toSave.setId(generateId());
}
update(item, toSave);
- template.save(toSave, COLLECTION);
+ template.save(toSave, PAGE_LAYOUT_COLLECTION);
return toSave;
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java?rev=1411412&r1=1411411&r2=1411412&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
Mon Nov 19 21:10:06 2012
@@ -34,12 +34,12 @@ import org.springframework.stereotype.Re
import java.util.List;
import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static
org.apache.rave.portal.repository.util.CollectionNames.PAGE_TEMPLATE_COLLECTION;
/**
*/
@Repository
public class MongoDbPageTemplateRepository implements PageTemplateRepository {
- public static final String COLLECTION = "pageTemplate";
@Autowired
private HydratingConverterFactory converter;
@@ -49,7 +49,7 @@ public class MongoDbPageTemplateReposito
@Override
public List<PageTemplate> getAll() {
- List<MongoDbPageTemplate> templates =
template.findAll(MongoDbPageTemplate.class, COLLECTION);
+ List<MongoDbPageTemplate> templates =
template.findAll(MongoDbPageTemplate.class, PAGE_TEMPLATE_COLLECTION);
for(PageTemplateImpl temp : templates) {
converter.hydrate(temp, PageTemplate.class);
}
@@ -58,7 +58,7 @@ public class MongoDbPageTemplateReposito
@Override
public PageTemplate getDefaultPage(PageType pageType) {
- PageTemplate temp = template.findOne(new
Query(where("pageType").is(pageType.getPageType().toUpperCase()).andOperator(where("defaultTemplate").is(true))),
MongoDbPageTemplate.class, COLLECTION);
+ PageTemplate temp = template.findOne(new
Query(where("pageType").is(pageType.getPageType().toUpperCase()).andOperator(where("defaultTemplate").is(true))),
MongoDbPageTemplate.class, PAGE_TEMPLATE_COLLECTION);
converter.hydrate(temp, PageTemplate.class);
return temp;
}
@@ -66,7 +66,7 @@ public class MongoDbPageTemplateReposito
@Override
public PageTemplate save(PageTemplate pageTemplate) {
MongoDbPageTemplate converted = converter.convert(pageTemplate,
PageTemplate.class);
- template.save(converted, COLLECTION);
+ template.save(converted, PAGE_TEMPLATE_COLLECTION);
converter.hydrate(converted, PageTemplate.class);
return converted;
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java?rev=1411412&r1=1411411&r2=1411412&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
Mon Nov 19 21:10:06 2012
@@ -33,11 +33,12 @@ import java.util.List;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
+import static
org.apache.rave.portal.repository.util.CollectionNames.PREFERENCE_COLLECTION;
@Repository
public class MongoDbPortalPreferenceRepository implements
PortalPreferenceRepository {
- public static final String COLLECTION = "portalPreference";
+
public static final Class<PortalPreferenceImpl> CLASS =
PortalPreferenceImpl.class;
@Autowired
@@ -48,12 +49,12 @@ public class MongoDbPortalPreferenceRepo
@Override
public List<PortalPreference> getAll() {
- return
CollectionUtils.<PortalPreference>toBaseTypedList(template.findAll(CLASS,
COLLECTION));
+ return
CollectionUtils.<PortalPreference>toBaseTypedList(template.findAll(CLASS,
PREFERENCE_COLLECTION));
}
@Override
public PortalPreference getByKey(String key) {
- return template.findOne(query(where("key").is(key)), CLASS,
COLLECTION);
+ return template.findOne(query(where("key").is(key)), CLASS,
PREFERENCE_COLLECTION);
}
@Override
@@ -63,7 +64,7 @@ public class MongoDbPortalPreferenceRepo
@Override
public PortalPreference get(long id) {
- return template.findById(id, CLASS, COLLECTION);
+ return template.findById(id, CLASS, PREFERENCE_COLLECTION);
}
@Override
@@ -73,13 +74,13 @@ public class MongoDbPortalPreferenceRepo
if(fromDb != null) {
converted.setId(((MongoDbPortalPreference)fromDb).getId());
}
- template.save(converted, COLLECTION);
+ template.save(converted, PREFERENCE_COLLECTION);
converter.hydrate(converted, PortalPreference.class);
return converted;
}
@Override
public void delete(PortalPreference item) {
- template.remove(getByKey(item.getKey()), COLLECTION);
+ template.remove(getByKey(item.getKey()), PREFERENCE_COLLECTION);
}
}
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=1411412&r1=1411411&r2=1411412&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
Mon Nov 19 21:10:06 2012
@@ -24,13 +24,14 @@ import org.apache.rave.portal.model.Page
import org.apache.rave.portal.repository.MongoPageOperations;
import org.springframework.stereotype.Component;
+import static
org.apache.rave.portal.repository.util.CollectionNames.PAGE_COLLECTION;
+
/**
*/
@Component
public class MongoPageTemplate extends MongoModelTemplate<Page, MongoDbPage>
implements MongoPageOperations {
- public static final String COLLECTION = "page";
public MongoPageTemplate() {
- super(Page.class, MongoDbPage.class, COLLECTION);
+ super(Page.class, MongoDbPage.class, PAGE_COLLECTION);
}
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoUserTemplate.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoUserTemplate.java?rev=1411412&r1=1411411&r2=1411412&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoUserTemplate.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoUserTemplate.java
Mon Nov 19 21:10:06 2012
@@ -23,12 +23,12 @@ import org.apache.rave.portal.model.Mong
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.repository.MongoUserOperations;
import org.springframework.stereotype.Component;
+import static
org.apache.rave.portal.repository.util.CollectionNames.USER_COLLECTION;
@Component
public class MongoUserTemplate extends MongoModelTemplate<User, MongoDbUser>
implements MongoUserOperations {
- public static final String COLLECTION = "person";
public MongoUserTemplate() {
- super(User.class, MongoDbUser.class, COLLECTION);
+ super(User.class, MongoDbUser.class, USER_COLLECTION);
}
}
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=1411412&r1=1411411&r2=1411412&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
Mon Nov 19 21:10:06 2012
@@ -22,28 +22,16 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.MongoDbWidget;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.repository.MongoWidgetOperations;
-import org.springframework.data.mongodb.core.mapreduce.MapReduceResults;
-import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
+import static
org.apache.rave.portal.repository.util.CollectionNames.WIDGET_COLLECTION;
+
/**
*/
@Component
public class MongoWidgetTemplate extends MongoModelTemplate<Widget,
MongoDbWidget> implements MongoWidgetOperations {
- public static final String COLLECTION = "widget";
-
public MongoWidgetTemplate() {
- super(Widget.class, MongoDbWidget.class, COLLECTION);
- }
-
- @Override
- public <T> MapReduceResults<T> mapReduce(String mapFunction, String
reduceFunction, Class<T> entityClass) {
- return mongoTemplate.mapReduce(COLLECTION, mapFunction,
reduceFunction, entityClass);
- }
-
- @Override
- public <T> MapReduceResults<T> mapReduce(Query query, String mapFunction,
String reduceFunction, Class<T> entityClass) {
- return mongoTemplate.mapReduce(query, COLLECTION, mapFunction,
reduceFunction, entityClass);
+ super(Widget.class, MongoDbWidget.class, WIDGET_COLLECTION);
}
}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/CollectionNames.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/CollectionNames.java?rev=1411412&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/CollectionNames.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/CollectionNames.java
Mon Nov 19 21:10:06 2012
@@ -0,0 +1,37 @@
+/*
+ * 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.util;
+
+public class CollectionNames {
+ private CollectionNames() {}
+
+ public static final String WIDGET_COLLECTION = "widget";
+ public static final String USER_COLLECTION = "person";
+ public static final String PERSON_COLLECTION = USER_COLLECTION;
+ public static final String PAGE_COLLECTION = "page";
+ public static final String PREFERENCE_COLLECTION = "portalPreference";
+ public static final String PAGE_TEMPLATE_COLLECTION = "pageTemplate";
+ public static final String APP_DATA_COLLECTION = "appData";
+ public static final String AUTHORITY_COLLECTION = "authority";
+ public static final String CATEGORY_COLLECTION = "category";
+ public static final String OAUTH_CONSUMER_COLLECTION =
"oauthConsumerStore";
+ public static final String OAUTH_TOKEN_COLLECTION = "oauthTokenInfo";
+ public static final String PAGE_LAYOUT_COLLECTION = "pageLayout";
+}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MonogoDbMapReduceStatisticsAggregatorTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MonogoDbMapReduceStatisticsAggregatorTest.java?rev=1411412&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MonogoDbMapReduceStatisticsAggregatorTest.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MonogoDbMapReduceStatisticsAggregatorTest.java
Mon Nov 19 21:10:06 2012
@@ -0,0 +1,24 @@
+/*
+ * 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;
+
+public class MonogoDbMapReduceStatisticsAggregatorTest {
+
+}
