Merge branch 'latest-qa' into develop

Author: jonathanaustin

pom.xml

@@ -49,7 +49,7 @@
 			<dependency>
 				<groupId>com.github.bordertech.didums</groupId>
 				<artifactId>didums-core</artifactId>
-				<version>1.0.0</version>
+				<version>1.0.2</version>
 			</dependency>
 
 			<!-- Injection interface. JSR 330 -->
@@ -63,7 +63,7 @@
 			<dependency>
 				<groupId>com.github.bordertech.config</groupId>
 				<artifactId>config</artifactId>
-				<version>1.0.1</version>
+				<version>1.0.2</version>
 			</dependency>
 
 			<!-- SLF4J Logging -->

taskmaster-cache-helper/src/main/java/com/github/bordertech/taskmaster/cache/CachingHelper.java

@@ -13,17 +13,7 @@
  */
 public final class CachingHelper {
 
-	private static final CachingHelperProvider PROVIDER;
-
-	static {
-		// Check if instance defined
-		if (Didums.hasService(CachingHelperProvider.class)) {
-			PROVIDER = Didums.getService(CachingHelperProvider.class);
-		} else {
-			// Default Implementation
-			PROVIDER = new CachingHelperProviderDefault();
-		}
-	}
+	private static final CachingHelperProvider PROVIDER = Didums.getService(CachingHelperProvider.class, CachingHelperProviderDefault.class);
 
 	/**
 	 * Private constructor.

taskmaster-core/src/main/java/com/github/bordertech/taskmaster/TaskMaster.java

@@ -23,17 +23,7 @@
  */
 public final class TaskMaster {
 
-	private static final TaskMasterProvider PROVIDER;
-
-	static {
-		// Check if instance defined
-		if (Didums.hasService(TaskMasterProvider.class)) {
-			PROVIDER = Didums.getService(TaskMasterProvider.class);
-		} else {
-			// Default Implementation
-			PROVIDER = new TaskMasterProviderExecutorService();
-		}
-	}
+	private static final TaskMasterProvider PROVIDER = Didums.getService(TaskMasterProvider.class, TaskMasterProviderExecutorService.class);
 
 	/**
 	 * Private constructor.

taskmaster-service-helper/src/main/java/com/github/bordertech/taskmaster/service/ServiceHelper.java

@@ -5,22 +5,10 @@
 
 /**
  * Service invocation helper.
- *
- * @author jonathan
  */
 public final class ServiceHelper {
 
-	private static final ServiceHelperProvider PROVIDER;
-
-	static {
-		// Check if instance defined
-		if (Didums.hasService(ServiceHelperProvider.class)) {
-			PROVIDER = Didums.getService(ServiceHelperProvider.class);
-		} else {
-			// Default Implementation
-			PROVIDER = new ServiceHelperProviderDefault();
-		}
-	}
+	private static final ServiceHelperProvider PROVIDER = Didums.getService(ServiceHelperProvider.class, ServiceHelperProviderDefault.class);
 
 	/**
 	 * Private constructor.

taskmaster-service-helper/src/main/java/com/github/bordertech/taskmaster/service/ServiceHelperProvider.java

@@ -8,8 +8,6 @@
 
 /**
  * Service invocation helper provider.
- *
- * @author jonathan
  */
 public interface ServiceHelperProvider {