You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2013/05/20 07:17:09 UTC
svn commit: r1484374 - in /rave/trunk/rave-components:
rave-core-api/src/main/java/org/apache/rave/repository/
rave-core-api/src/main/java/org/apache/rave/service/
rave-core/src/main/java/org/apache/rave/portal/service/impl/
rave-core/src/test/java/org...
Author: cgeer
Date: Mon May 20 05:17:08 2013
New Revision: 1484374
URL: http://svn.apache.org/r1484374
Log:
RAVE-967 - Added the Group service and implementation. Also added a getAll method to the Group repositories.
Added:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/service/
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/service/GroupService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultGroupService.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultGroupServiceTest.java
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaGroup.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaGroupRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepositoryTest.java
Modified: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java?rev=1484374&r1=1484373&r2=1484374&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java Mon May 20 05:17:08 2013
@@ -20,7 +20,11 @@ package org.apache.rave.repository;
import org.apache.rave.model.Group;
+import java.util.List;
+
public interface GroupRepository extends Repository<Group> {
Group findByTitle(String title);
+
+ List<Group> getAll();
}
Added: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/service/GroupService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/service/GroupService.java?rev=1484374&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/service/GroupService.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/service/GroupService.java Mon May 20 05:17:08 2013
@@ -0,0 +1,35 @@
+/*
+ * 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.service;
+
+import org.apache.rave.model.Group;
+
+import java.util.List;
+
+public interface GroupService {
+
+ Group getGroupByID(String id);
+
+ List<Group> getAllGroups();
+
+ Group getGroupByTitle(String title);
+
+ Group save(Group group);
+}
Added: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultGroupService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultGroupService.java?rev=1484374&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultGroupService.java (added)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultGroupService.java Mon May 20 05:17:08 2013
@@ -0,0 +1,62 @@
+/*
+ * 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.service.impl;
+
+import org.apache.rave.model.Group;
+import org.apache.rave.repository.GroupRepository;
+import org.apache.rave.service.GroupService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service(value = "groupService")
+public class DefaultGroupService implements GroupService {
+ private static final Logger log = LoggerFactory.getLogger(DefaultGroupService.class);
+
+ private final GroupRepository groupRepository;
+
+ @Autowired
+ public DefaultGroupService(GroupRepository groupRepository) {
+ this.groupRepository = groupRepository;
+ }
+
+ @Override
+ public Group getGroupByID(String id) {
+ return groupRepository.get(id);
+ }
+
+ @Override
+ public List<Group> getAllGroups() {
+ return groupRepository.getAll();
+ }
+
+ @Override
+ public Group getGroupByTitle(String title) {
+ return groupRepository.findByTitle(title);
+ }
+
+ @Override
+ public Group save(Group group) {
+ return groupRepository.save(group);
+ }
+}
Added: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultGroupServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultGroupServiceTest.java?rev=1484374&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultGroupServiceTest.java (added)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultGroupServiceTest.java Mon May 20 05:17:08 2013
@@ -0,0 +1,96 @@
+/*
+ * 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.service.impl;
+
+import org.apache.rave.model.Group;
+import org.apache.rave.portal.model.impl.GroupImpl;
+import org.apache.rave.repository.GroupRepository;
+import org.apache.rave.service.GroupService;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class DefaultGroupServiceTest {
+
+ private GroupService service;
+ private GroupRepository repository;
+
+ @Before
+ public void setup() {
+ repository = createMock(GroupRepository.class);
+ service = new DefaultGroupService(repository);
+ }
+
+ @Test
+ public void getGroupById() {
+ Group group = createGroup("test");
+ expect(repository.get("1")).andReturn(group);
+ replay(repository);
+ Group sGroup = service.getGroupByID("1");
+ assertEquals(sGroup, group);
+ verify(repository);
+ }
+
+
+ private static Group createGroup(String title) {
+ GroupImpl group = new GroupImpl();
+ group.setTitle(title);
+ return group;
+ }
+
+ @Test
+ public void getGroupById_NotFound() {
+ final String entityId = "456";
+ expect(repository.get(entityId)).andReturn(null);
+ replay(repository);
+ Group sGroup = service.getGroupByID(entityId);
+ assertNull(sGroup);
+
+ verify(repository);
+ }
+
+ @Test
+ public void allGroups() {
+ List<Group> tags = new ArrayList<Group>();
+ Group group = createGroup("test");
+ tags.add(group);
+ expect(repository.getAll()).andReturn(tags);
+ replay(repository);
+ List<Group> allGroups = service.getAllGroups();
+ verify(repository);
+ assertTrue(allGroups.size() > 0);
+ }
+
+ @Test
+ public void findByTitle() {
+ Group group = createGroup("test");
+ expect(repository.findByTitle("test")).andReturn(group);
+ expect(repository.findByTitle("TEST")).andReturn(group);
+ expect(repository.findByTitle(" test")).andReturn(group);
+
+ }
+}
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaGroup.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaGroup.java?rev=1484374&r1=1484373&r2=1484374&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaGroup.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaGroup.java Mon May 20 05:17:08 2013
@@ -31,12 +31,14 @@ import java.util.List;
@Entity
@Access(AccessType.FIELD)
@Table(name = "groups")
-@NamedQueries(
- @NamedQuery(name = JpaGroup.FIND_BY_TITLE, query="select g from JpaGroup g where g.title = :title")
-)
+@NamedQueries({
+ @NamedQuery(name = JpaGroup.FIND_BY_TITLE, query="select g from JpaGroup g where g.title = :title"),
+ @NamedQuery(name = JpaGroup.GET_ALL, query = "select g from JpaGroup g order by g.title asc")
+})
public class JpaGroup implements BasicEntity, Group {
public static final String FIND_BY_TITLE = "Group.findByTitle";
+ public static final String GET_ALL = "Group.getAll";
public static final String GROUP_TITLE_PARAM = "title";
/**
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java?rev=1484374&r1=1484373&r2=1484374&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java Mon May 20 05:17:08 2013
@@ -22,6 +22,7 @@ import org.apache.rave.model.Group;
import org.apache.rave.portal.model.JpaGroup;
import org.apache.rave.portal.model.conversion.JpaGroupConverter;
import org.apache.rave.repository.GroupRepository;
+import org.apache.rave.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@@ -29,6 +30,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
+import java.util.List;
+
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
@@ -53,6 +56,12 @@ public class JpaGroupRepository implemen
}
@Override
+ public List<Group> getAll() {
+ TypedQuery<JpaGroup> query = manager.createNamedQuery(JpaGroup.GET_ALL, JpaGroup.class);
+ return CollectionUtils.<Group>toBaseTypedList(query.getResultList());
+ }
+
+ @Override
public Group save(Group item) {
JpaGroup converted = converter.convert(item);
return saveOrUpdate(converted.getEntityId(), manager, converted);
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaGroupRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaGroupRepositoryTest.java?rev=1484374&r1=1484373&r2=1484374&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaGroupRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaGroupRepositoryTest.java Mon May 20 05:17:08 2013
@@ -32,10 +32,12 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.util.Arrays;
+import java.util.List;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
@Transactional
@RunWith(SpringJUnit4ClassRunner.class)
@@ -75,6 +77,12 @@ public class JpaGroupRepositoryTest {
}
@Test
+ public void getList() {
+ List<Group> list = repository.getAll();
+ assertEquals(2, list.size());
+ }
+
+ @Test
public void createGroup() {
JpaGroup newGroup = new JpaGroup();
newGroup.setTitle("TEST GROUP");
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java?rev=1484374&r1=1484373&r2=1484374&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java Mon May 20 05:17:08 2013
@@ -5,8 +5,11 @@ import org.apache.rave.portal.model.Mong
import org.apache.rave.portal.repository.MongoGroupOperations;
import org.apache.rave.repository.GroupRepository;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -32,6 +35,11 @@ public class MongoDbGroupRepository impl
}
@Override
+ public List<Group> getAll() {
+ return template.find(new Query());
+ }
+
+ @Override
public Group save(Group item) {
return template.save(item);
}
Modified: rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepositoryTest.java?rev=1484374&r1=1484373&r2=1484374&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepositoryTest.java Mon May 20 05:17:08 2013
@@ -79,6 +79,18 @@ public class MongoDbGroupRepositoryTest
}
@Test
+ public void getAll() {
+ List<Group> groups = Arrays.<Group>asList(new GroupImpl(), new GroupImpl());
+
+ expect(groupTemplate.find(new Query())).andReturn(groups);
+ replay(groupTemplate);
+
+ List<Group> result = repo.getAll();
+ assertNotNull(result);
+ assertThat(result.size(), is(equalTo(groups.size())));
+ }
+
+ @Test
public void save(){
String title = "TITLE";
Group group = new GroupImpl();