Merge branch 'sameira-master'

spring-data-redis/.classpath

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

spring-data-redis/.project

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sprint-data-redis</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>

spring-data-redis/pom.xml

@@ -1,16 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>com.baeldung</groupId>
-    <artifactId>sprint-data-redis</artifactId>
+    <artifactId>spring-data-redis</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        
         <spring.version>4.2.5.RELEASE</spring.version>
-        
         <spring-data-redis>1.6.2.RELEASE</spring-data-redis>
         <nosqlunit.version>0.8.0</nosqlunit.version>
     </properties>
@@ -72,7 +71,6 @@
             <artifactId>nosqlunit-redis</artifactId>
             <version>${nosqlunit.version}</version>
         </dependency>
-
     </dependencies>
     
 </project>

spring-data-redis/src/main/java/com/baeldung/spring/data/redis/config/RedisConfig.java

@@ -0,0 +1,55 @@
+package com.baeldung.spring.data.redis.config;
+
+import com.baeldung.spring.data.redis.queue.MessagePublisher;
+import com.baeldung.spring.data.redis.queue.RedisMessagePublisher;
+import com.baeldung.spring.data.redis.queue.RedisMessageSubscriber;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.listener.ChannelTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
+import org.springframework.data.redis.serializer.GenericToStringSerializer;
+
+@Configuration
+@ComponentScan("com.baeldung.spring.data.redis")
+public class RedisConfig {
+
+    @Bean
+    JedisConnectionFactory jedisConnectionFactory() {
+        return new JedisConnectionFactory();
+    }
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        final RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
+        template.setConnectionFactory(jedisConnectionFactory());
+        template.setValueSerializer(new GenericToStringSerializer<Object>(Object.class));
+        return template;
+    }
+
+    @Bean
+    MessageListenerAdapter messageListener() {
+        return new MessageListenerAdapter(new RedisMessageSubscriber());
+    }
+
+    @Bean
+    RedisMessageListenerContainer redisContainer() {
+        final RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(jedisConnectionFactory());
+        container.addMessageListener(messageListener(), topic());
+        return container;
+    }
+
+    @Bean
+    MessagePublisher redisPublisher() {
+        return new RedisMessagePublisher(redisTemplate(), topic());
+    }
+
+    @Bean
+    ChannelTopic topic() {
+        return new ChannelTopic("pubsub:queue");
+    }
+}

spring-data-redis/src/main/java/com/baeldung/spring/data/redis/model/Student.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.redis.model;
+package com.baeldung.spring.data.redis.model;
 
 import java.io.Serializable;
 

spring-data-redis/src/main/java/com/baeldung/spring/data/redis/queue/MessagePublisher.java

@@ -0,0 +1,7 @@
+package com.baeldung.spring.data.redis.queue;
+
+
+public interface MessagePublisher {
+
+    void publish(final String message);
+}

spring-data-redis/src/main/java/com/baeldung/spring/data/redis/queue/RedisMessagePublisher.java

@@ -0,0 +1,28 @@
+package com.baeldung.spring.data.redis.queue;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.listener.ChannelTopic;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RedisMessagePublisher implements MessagePublisher {
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+    @Autowired
+    private ChannelTopic topic;
+
+    public RedisMessagePublisher() {
+    }
+
+    public RedisMessagePublisher(final RedisTemplate<String, Object> redisTemplate,
+                                 final ChannelTopic topic) {
+        this.redisTemplate = redisTemplate;
+        this.topic = topic;
+    }
+
+    public void publish(final String message) {
+        redisTemplate.convertAndSend(topic.getTopic(), message);
+    }
+}

spring-data-redis/src/main/java/com/baeldung/spring/data/redis/queue/RedisMessageSubscriber.java

@@ -0,0 +1,19 @@
+package com.baeldung.spring.data.redis.queue;
+
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class RedisMessageSubscriber implements MessageListener {
+
+    public static List<String> messageList = new ArrayList<String>();
+
+    public void onMessage(final Message message, final byte[] pattern) {
+        messageList.add(message.toString());
+        System.out.println("Message received: " + new String(message.getBody()));
+    }
+}

spring-data-redis/src/main/java/com/baeldung/spring/data/redis/repo/StudentRepository.java

@@ -1,15 +1,13 @@
-package org.baeldung.spring.data.redis.repo;
+package com.baeldung.spring.data.redis.repo;
 
-import org.baeldung.spring.data.redis.model.Student;
+import com.baeldung.spring.data.redis.model.Student;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
 public interface StudentRepository {
 
     void saveStudent(Student person);
-    
+
     void updateStudent(Student student);
 
     Student findStudent(String id);

spring-data-redis/src/main/java/com/baeldung/spring/data/redis/repo/StudentRepositoryImpl.java

@@ -1,6 +1,6 @@
-package org.baeldung.spring.data.redis.repo;
+package com.baeldung.spring.data.redis.repo;
 
-import org.baeldung.spring.data.redis.model.Student;
+import com.baeldung.spring.data.redis.model.Student;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;

spring-data-redis/src/main/java/org/baeldung/spring/data/redis/config/RedisConfig.java

@@ -1,24 +0,0 @@
-package org.baeldung.spring.data.redis.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-
-@Configuration
-@ComponentScan("org.baeldung.spring.data.redis")
-public class RedisConfig {
-
-    @Bean
-    JedisConnectionFactory jedisConnectionFactory() {
-        return new JedisConnectionFactory();
-    }
-
-    @Bean
-    public RedisTemplate<String, Object> redisTemplate() {
-        final RedisTemplate< String, Object> template =  new RedisTemplate<String, Object>();
-        template.setConnectionFactory(jedisConnectionFactory());
-        return template;
-    }
-}

spring-data-redis/src/test/java/com/baeldung/spring/data/redis/RedisMessageListenerTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.spring.data.redis;
+
+import com.baeldung.spring.data.redis.config.RedisConfig;
+import com.baeldung.spring.data.redis.queue.RedisMessageSubscriber;
+import com.baeldung.spring.data.redis.queue.RedisMessagePublisher;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.UUID;
+
+import static org.junit.Assert.assertTrue;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = RedisConfig.class)
+public class RedisMessageListenerTest {
+
+    @Autowired
+    private RedisMessagePublisher redisMessagePublisher;
+
+    @Test
+    public void testOnMessage() throws Exception {
+        String message = "Message " + UUID.randomUUID();
+        redisMessagePublisher.publish(message);
+        Thread.sleep(100);
+        assertTrue(RedisMessageSubscriber.messageList.get(0).contains(message));
+    }
+}

spring-data-redis/src/test/java/com/baeldung/spring/data/redis/repo/StudentRepositoryTest.java

@@ -1,8 +1,7 @@
-package org.baeldung.spring.data.redis.repo;
+package com.baeldung.spring.data.redis.repo;
 
-import org.baeldung.spring.data.redis.config.RedisConfig;
+import com.baeldung.spring.data.redis.config.RedisConfig;
-import org.baeldung.spring.data.redis.model.Student;
+import com.baeldung.spring.data.redis.model.Student;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;