ID-4250: fikse config, fjerne dependabot (#22)

* fikse config, fjerne dependabot

* fikse config, fjerne dependabot

* testfix

* test with one node

eidas-redis/pom.xml

@@ -51,6 +51,18 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

eidas-redis/src/main/java/no/idporten/eidas/redis/cache/RedisConfig.java

@@ -60,8 +60,11 @@ private LettuceConnectionFactory createSentinelConnectionFactory() {
         RedisSentinelConfiguration sentinelConfig = new RedisSentinelConfiguration()
                 .master(sentinelMaster);
 
-        for (int i = 1; i < nodes.size(); i++) {
-            String[] parts = nodes.get(i).split(":");
+        for (String node : nodes) {
+            String[] parts = node.split(":");
+            if(parts.length != 2) {
+                throw new IllegalArgumentException(String.format("Invalid sentinel node configuration %s", node));
+            }
             sentinelConfig.sentinel(parts[0], Integer.parseInt(parts[1]));
         }
 

eidas-redis/src/test/java/no/idporten/eidas/redis/cache/RedisConfigTest.java

@@ -0,0 +1,70 @@
+package no.idporten.eidas.redis.cache;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+import static org.junit.Assert.*;
+
+
+public class RedisConfigTest {
+
+    private RedisConfig config;
+
+
+    @Before
+    public void setUp() {
+        config = new RedisConfig();
+        config.setRedisHost("localhost");
+        config.setRedisPort("6379");
+        config.setRedisPassword("password");
+    }
+
+    @Test
+    public void testStandaloneRedisConnectionFactory() {
+        config.setSentinelNodes(null);
+        LettuceConnectionFactory factory = config.redisConnectionFactory();
+        assertNotNull(factory);
+        assertEquals("localhost", factory.getHostName());
+        assertEquals(6379, factory.getPort());
+        assertFalse(factory.isRedisSentinelAware());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testStandaloneRedisConnectionFactoryMissingHost() {
+        config.setRedisHost(null);
+        config.redisConnectionFactory();
+    }
+
+    @Test
+    public void testSentinelRedisConnectionFactory() {
+        config.setSentinelNodes("node1:26379");
+        config.setSentinelMaster("mymaster");
+        LettuceConnectionFactory factory = config.redisConnectionFactory();
+        assertNotNull(factory);
+        assertTrue(factory.isRedisSentinelAware());
+    }
+
+    @Test
+    public void testMultipleSentinelRedisConnectionFactory() {
+        config.setSentinelNodes("node1:26379,node2:26379");
+        config.setSentinelMaster("mymaster");
+        LettuceConnectionFactory factory = config.redisConnectionFactory();
+        assertNotNull(factory);
+        assertTrue(factory.isRedisSentinelAware());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSentinelRedisConnectionFactoryInvalidNode() {
+        config.setSentinelNodes("node1:26379,invalid_node");
+        config.redisConnectionFactory();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSentinelRedisConnectionFactoryMissingPassword() {
+        config.setSentinelNodes("node1:26379,node2:26379");
+        config.setSentinelMaster("mymaster");
+        config.setRedisPassword(null);
+        config.redisConnectionFactory();
+    }
+}