Fixed problems during the Spring context's initialisation.

Author: ppodgorsek

cache-invalidation-core/src/main/java/com/github/ppodgorsek/cache/invalidation/helper/AbstractChainedInvalidationHelper.java

@@ -1,10 +1,8 @@
 package com.github.ppodgorsek.cache.invalidation.helper;
 
-import javax.annotation.PostConstruct;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.annotation.Required;
 
 import com.github.ppodgorsek.cache.invalidation.exception.InvalidationException;
 import com.github.ppodgorsek.cache.invalidation.logger.InvalidationLogger;
@@ -32,20 +30,6 @@ public abstract class AbstractChainedInvalidationHelper<T extends InvalidationEn
 
 	private InvalidationHelper<T> nextHelper;
 
-	@SuppressWarnings("unchecked")
-	@PostConstruct
-	public void init(final ApplicationContext applicationContext) {
-
-		if (invalidationLogger == null) {
-			LOGGER.info("The invalidation logger hasn't been set, trying to determine a default one.");
-
-			invalidationLogger = applicationContext.getBean(InvalidationLogger.class);
-
-			LOGGER.info("Invalidation logger found in the application context, using it: {}",
-					invalidationLogger);
-		}
-	}
-
 	@Override
 	public void invalidateEntries() {
 
@@ -92,6 +76,7 @@ public InvalidationLogger<T> getInvalidationLogger() {
 		return invalidationLogger;
 	}
 
+	@Required
 	public void setInvalidationLogger(final InvalidationLogger<T> logger) {
 		invalidationLogger = logger;
 	}

cache-invalidation-core/src/main/java/com/github/ppodgorsek/cache/invalidation/processor/impl/HelperInvalidationProcessor.java

@@ -1,10 +1,8 @@
 package com.github.ppodgorsek.cache.invalidation.processor.impl;
 
-import javax.annotation.PostConstruct;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.annotation.Required;
 
 import com.github.ppodgorsek.cache.invalidation.helper.InvalidationHelper;
 import com.github.ppodgorsek.cache.invalidation.model.InvalidationEntry;
@@ -22,20 +20,6 @@ public class HelperInvalidationProcessor implements InvalidationProcessor {
 
 	private InvalidationHelper<InvalidationEntry> invalidationHelper;
 
-	@SuppressWarnings("unchecked")
-	@PostConstruct
-	public void init(final ApplicationContext applicationContext) {
-
-		if (invalidationHelper == null) {
-			LOGGER.info("The invalidation helper hasn't been set, trying to determine a default one.");
-
-			invalidationHelper = applicationContext.getBean(InvalidationHelper.class);
-
-			LOGGER.info("Invalidation helper found in the application context, using it: {}",
-					invalidationHelper);
-		}
-	}
-
 	@Override
 	public void processEntries() {
 
@@ -48,6 +32,7 @@ protected InvalidationHelper<InvalidationEntry> getInvalidationHelper() {
 		return invalidationHelper;
 	}
 
+	@Required
 	public void setInvalidationHelper(final InvalidationHelper<InvalidationEntry> helper) {
 		invalidationHelper = helper;
 	}