Merge pull request #50 from ulfsauer0815/custom-encryption-listener-b…

…ean-registration-fails

Fix custom EncryptionEventListener bean registration

src/main/java/com/bol/config/EncryptAutoConfiguration.java

@@ -27,7 +27,7 @@ CryptVault cryptVault(EncryptConfigurationProperties properties) {
     }
 
     @Bean
-    @ConditionalOnMissingBean({ReflectionEncryptionEventListener.class, CachedEncryptionEventListener.class})
+    @ConditionalOnMissingBean({AbstractEncryptionEventListener.class})
     @ConditionalOnBean(CryptVault.class)
     AbstractEncryptionEventListener encryptionEventListener(CryptVault cryptVault, EncryptConfigurationProperties properties) {
         AbstractEncryptionEventListener eventListener;

src/test/java/com/bol/system/autoconfig/EncryptionWithCustomAbstractEventListenerTest.java

@@ -0,0 +1,45 @@
+package com.bol.system.autoconfig;
+
+import com.bol.config.EncryptAutoConfiguration;
+import com.bol.crypt.CryptVault;
+import com.bol.secure.AbstractEncryptionEventListener;
+import com.bol.secure.CachedEncryptionEventListener;
+import com.bol.secure.ReflectionEncryptionEventListener;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ActiveProfiles("autoconfig-short")
+@RunWith(SpringRunner.class)
+@EnableAutoConfiguration
+@SpringBootTest(classes = {EncryptionWithCustomAbstractEventListenerTest.class, EncryptionWithCustomAbstractEventListenerTest.AbstractEventListenerConfig.class, EncryptAutoConfiguration.class})
+public class EncryptionWithCustomAbstractEventListenerTest {
+
+    @Autowired(required = false) CryptVault cryptVault;
+    @Autowired(required = false) AbstractEncryptionEventListener<?> eventListener;
+
+    @Test
+    public void sanityTest() {
+        assertThat(cryptVault).isNotNull();
+        assertThat(eventListener).isNotNull();
+        assertThat(eventListener).isInstanceOf(ReflectionEncryptionEventListener.class);
+    }
+
+
+    @TestConfiguration
+    static class AbstractEventListenerConfig {
+        @Bean
+        AbstractEncryptionEventListener<?> encryptionEventListener(CryptVault cryptVault) {
+            return new ReflectionEncryptionEventListener(cryptVault);
+        }
+    }
+}