DATAREDIS-599 - Remove references to single-argument assertion methods of Spring.

Author: christophstrobl

src/main/java/org/springframework/data/redis/connection/ClusterCommandExecutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,9 +73,9 @@ public class ClusterCommandExecutor implements DisposableBean {
 public ClusterCommandExecutor(ClusterTopologyProvider topologyProvider, ClusterNodeResourceProvider resourceProvider,
 ExceptionTranslationStrategy exceptionTranslation) {
 
-Assert.notNull(topologyProvider);
-Assert.notNull(resourceProvider);
-Assert.notNull(exceptionTranslation);
+Assert.notNull(topologyProvider, "ClusterTopologyProvider must not be null!");
+Assert.notNull(resourceProvider, "ClusterNodeResourceProvider must not be null!");
+Assert.notNull(exceptionTranslation, "ExceptionTranslationStrategy must not be null!");
 
 this.topologyProvider = topologyProvider;
 this.resourceProvider = resourceProvider;

src/main/java/org/springframework/data/redis/connection/RedisSentinelConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -158,7 +158,7 @@ public String getName() {
  */
 public void setMaster(NamedNode master) {
 
-notNull("Sentinel master node must not be 'null'.");
+notNull(master, "Sentinel master node must not be 'null'.");
 this.master = master;
 }
 

src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -607,7 +607,7 @@ public byte[] getSet(byte[] key, byte[] value) {
 @Override
 public List<byte[]> mGet(byte[]... keys) {
 
-Assert.noNullElements(keys);
+Assert.noNullElements(keys, "Keys must not contain null elements!");
 
 if (ClusterSlotHashUtil.isSameSlotForAllKeys(keys)) {
 return cluster.mget(keys);

src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -294,7 +294,7 @@ private JedisCluster createCluster() {
  */
 protected JedisCluster createCluster(RedisClusterConfiguration clusterConfig, GenericObjectPoolConfig poolConfig) {
 
-Assert.notNull("Cluster configuration must not be null!");
+Assert.notNull(clusterConfig, "Cluster configuration must not be null!");
 
 Set<HostAndPort> hostAndPort = new HashSet<HostAndPort>();
 for (RedisNode node : clusterConfig.getClusterNodes()) {
@@ -603,7 +603,7 @@ public RedisSentinelConnection getSentinelConnection() {
 
 private Jedis getActiveSentinel() {
 
-Assert.notNull(this.sentinelConfig);
+Assert.notNull(this.sentinelConfig, "SentinelConfig must not be null!");
 
 for (RedisNode node : this.sentinelConfig.getSentinels()) {
 

src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -334,7 +334,7 @@ public static DataAccessException toDataAccessException(Exception ex) {
 }
 
 public static LIST_POSITION toListPosition(Position source) {
-Assert.notNull("list positions are mandatory");
+Assert.notNull(source, "list positions are mandatory");
 return (Position.AFTER.equals(source) ? LIST_POSITION.AFTER : LIST_POSITION.BEFORE);
 }
 

src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -216,7 +216,7 @@ static byte[] asBit(boolean value) {
 }
 
 static LIST_POSITION convertPosition(Position where) {
-Assert.notNull("list positions are mandatory");
+Assert.notNull(where, "list positions are mandatory");
 return (Position.AFTER.equals(where) ? LIST_POSITION.AFTER : LIST_POSITION.BEFORE);
 }
 

src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ public JredisConnectionFactory(Pool<JRedis> pool) {
 
 public void afterPropertiesSet() {
 if (connectionSpec == null && pool == null) {
-Assert.hasText(hostName);
+Assert.hasText(hostName, "Redis host name must not be null!");
 connectionSpec = DefaultConnectionSpec.newSpec(hostName, port, dbIndex, DEFAULT_REDIS_PASSWORD);
 connectionSpec.setConnectionFlag(Connection.Flag.RELIABLE, false);
 

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -453,7 +453,7 @@ public static ScriptOutputType toScriptOutputType(ReturnType returnType) {
 }
 
 public static boolean toBoolean(Position where) {
-Assert.notNull("list positions are mandatory");
+Assert.notNull(where, "list positions are mandatory");
 return (Position.AFTER.equals(where) ? false : true);
 }
 

src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2017 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -234,7 +234,7 @@ public List<Object> get() {
 
 SrpConnection(RedisClient client) {
 
-Assert.notNull(client);
+Assert.notNull(client, "RedisClient must not be null!");
 this.client = client;
 this.queue = new ArrayBlockingQueue<SrpConnection>(50);
 }

src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -387,7 +387,7 @@ public static byte[][] toByteArrays(Map<byte[], byte[]> source) {
 }
 
 public static byte[] toBytes(Position source) {
-Assert.notNull("list positions are mandatory");
+Assert.notNull(source, "list positions are mandatory");
 return (Position.AFTER.equals(source) ? AFTER : BEFORE);
 }