Merge remote-tracking branch 'eclipse/master' into cleanup-properties

This commit is contained in:
Kai Zimmermann
2016-02-25 18:01:56 +01:00
77 changed files with 426 additions and 2723 deletions

View File

@@ -73,7 +73,7 @@ public class RedisConfiguration {
*/
@Bean
public RedisTemplate<String, Object> redisTemplate() {
final RedisTemplate<String, Object> redisTemplate = new RedisTemplate<String, Object>();
final RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
redisTemplate.setConnectionFactory(jedisConnectionFactory());
redisTemplate.setKeySerializer(new JdkSerializationRedisSerializer());
redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());

View File

@@ -95,7 +95,7 @@ public class EventDistributor {
* wants to subscribe
*/
public Collection<Topic> getTopics() {
final List<Topic> topics = new ArrayList<Topic>();
final List<Topic> topics = new ArrayList<>();
topics.add(new PatternTopic(SUB_DISTRIBUTION_CHANNEL));
return topics;
}