Merge pull request #38 from BorderTech/latest-qa

Latest qa

Author: jonathanaustin

.travis.yml

@@ -1,3 +1,15 @@
+dist: trusty
+
+cache:
+  directories:
+  - $HOME/.m2
+
+addons:
+  sonarcloud:
+    organization: "bordertech-github"
+    token:
+        secure: $SONAR_TOKEN
+
 before_install:
 - echo "MAVEN_OPTS='-Xmx512m -XX:MaxPermSize=128m'" > ~/.mavenrc
 - mvn clean
@@ -9,7 +21,7 @@ jdk:
 
 ## Travis installs the project with the following maven command:- "mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V"
 script:
- - mvn package
+ - mvn package sonar:sonar -Dsonar.projectKey="bordertech-java-taskmaster"
 
 ## Send Coverage to Codacy
 after_success:

README.md

@@ -3,8 +3,10 @@ Task Master helps run ASYNC tasks.
 
 ## Status
 [![Build Status](https://travis-ci.com/BorderTech/java-taskmaster.svg?branch=master)](https://travis-ci.com/BorderTech/java-taskmaster)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=bordertech-java-taskmaster&metric=alert_status)](https://sonarcloud.io/dashboard?id=bordertech-java-taskmaster)
+[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=bordertech-java-taskmaster&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=bordertech-java-taskmaster)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=bordertech-java-taskmaster&metric=coverage)](https://sonarcloud.io/dashboard?id=bordertech-java-taskmaster)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/83bcfdba5e34433894e8b958bdb958a5)](https://www.codacy.com/app/BorderTech/java-taskmaster?utm_source=github.com&utm_medium=referral&utm_content=BorderTech/java-taskmaster&utm_campaign=Badge_Grade)
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/83bcfdba5e34433894e8b958bdb958a5)](https://www.codacy.com/app/BorderTech/java-taskmaster?utm_source=github.com&utm_medium=referral&utm_content=BorderTech/java-taskmaster&utm_campaign=Badge_Coverage)
 [![Javadocs](https://www.javadoc.io/badge/com.github.bordertech.taskmaster/taskmaster-core.svg)](https://www.javadoc.io/doc/com.github.bordertech.taskmaster/taskmaster-core)
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.bordertech.taskmaster/taskmaster-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.github.bordertech.taskmaster%22%20AND%20a:%22taskmaster-core%22)
 

pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.github.bordertech.common</groupId>
 		<artifactId>qa-parent</artifactId>
-		<version>1.0.11</version>
+		<version>1.0.15</version>
 	</parent>
 
 	<packaging>pom</packaging>
@@ -49,7 +49,7 @@
 			<dependency>
 				<groupId>com.github.bordertech.didums</groupId>
 				<artifactId>didums-core</artifactId>
-				<version>1.0.3</version>
+				<version>1.0.4</version>
 			</dependency>
 
 			<!-- Injection interface. JSR 330 -->
@@ -63,14 +63,14 @@
 			<dependency>
 				<groupId>com.github.bordertech.config</groupId>
 				<artifactId>config</artifactId>
-				<version>1.0.3</version>
+				<version>1.0.5</version>
 			</dependency>
 
 			<!-- SLF4J Logging -->
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.7.25</version>
+				<version>1.7.26</version>
 			</dependency>
 
 			<!-- Commons Logging -->
@@ -84,7 +84,7 @@
 			<dependency>
 				<groupId>javax.cache</groupId>
 				<artifactId>cache-api</artifactId>
-				<version>1.1.0</version>
+				<version>1.1.1</version>
 			</dependency>
 
 			<!-- Servlet Interface -->
@@ -98,14 +98,14 @@
 			<dependency>
 				<groupId>org.ehcache</groupId>
 				<artifactId>ehcache</artifactId>
-				<version>3.6.3</version>
+				<version>3.7.1</version>
 			</dependency>
 
 			<!-- Common Lang3 -->
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.8.1</version>
+				<version>3.9</version>
 			</dependency>
 
 		</dependencies>

taskmaster-core/pom.xml

@@ -20,6 +20,10 @@
 		Task Master allows a Runnable task to be submitted for execution and returns a Future representing that task.
 	</description>
 
+	<properties>
+		<spotbugs.excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</spotbugs.excludeFilterFile>
+	</properties>
+
 	<dependencies>
 
 		<!-- TaskMaster Cache Helper -->

taskmaster-core/spotbugs-exclude-filter.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+
+	<!-- False Positives -->
+	<Match>
+		<Bug pattern="PMB_POSSIBLE_MEMORY_BLOAT" />
+	</Match>
+
+</FindBugsFilter>

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

@@ -103,7 +103,11 @@ public synchronized <S extends Serializable, T extends Serializable> ResultHolde
 		ProcessingMutableResult serviceResult;
 		try {
 			serviceResult = future.get();
-		} catch (InterruptedException | ExecutionException e) {
+		} catch (InterruptedException e) {
+			// Restore interrupted state...
+			Thread.currentThread().interrupt();
+			throw new AsyncServiceException("Getting result from Future but thread was interrupted. " + e.getMessage(), e);
+		} catch (ExecutionException e) {
 			throw new AsyncServiceException("Could not get result from the future. " + e.getMessage(), e);
 		}
 		ResultHolder result;