Merge pull request #70 from powerunit/jdk/10

boretti · web-flow · commit 4f84a7dbd6d3 · 2019-11-11T20:39:54.000+01:00
Migration library to support only java 10 and also fixes #69
diff --git a/.travis.yml b/.travis.yml
@@ -6,16 +6,14 @@ notifications:
    - "$slack_key#exceptions"
 matrix:
  include:
-  - os: linux
-    jdk: oraclejdk9
   - os: linux
     jdk: openjdk10
   - os: linux
     jdk: openjdk11
 jobs:
   allow_failures:
-    - os: linux
-      jdk: openjdk11
+#    - os: linux
+#      jdk: openjdk11
 sudo: false
 addons:
     apt:
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.com/powerunit/powerunit-extensions-exceptions.svg?branch=master)](https://travis-ci.com/powerunit/powerunit-extensions-exceptions)[![Known Vulnerabilities](https://snyk.io/test/github/powerunit/powerunit-extensions-exceptions/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/powerunit/powerunit-extensions-exceptions?targetFile=pom.xml) [![DepShield Badge](https://depshield.sonatype.org/badges/powerunit/powerunit-extensions-exceptions/depshield.svg)](https://depshield.github.io) [![Total alerts](https://img.shields.io/lgtm/alerts/g/powerunit/powerunit-extensions-exceptions.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/powerunit/powerunit-extensions-exceptions/alerts/)[![Coverage Status](https://coveralls.io/repos/github/powerunit/powerunit-extensions-exceptions/badge.svg?branch=master)](https://coveralls.io/github/powerunit/powerunit-extensions-exceptions?branch=master)[![codecov](https://codecov.io/gh/powerunit/powerunit-extensions-exceptions/branch/master/graph/badge.svg)](https://codecov.io/gh/powerunit/powerunit-extensions-exceptions)[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/54e6f34a650147e48b1864a420695a1c)](https://www.codacy.com/app/mathieu.boretti/powerunit-extensions-exceptions?utm_source=github.com&utm_medium=referral&utm_content=powerunit/powerunit-extensions-exceptions&utm_campaign=Badge_Coverage)[![Codacy Badge](https://api.codacy.com/project/badge/Grade/54e6f34a650147e48b1864a420695a1c)](https://www.codacy.com/app/mathieu.boretti/powerunit-extensions-exceptions?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=powerunit/powerunit-extensions-exceptions&amp;utm_campaign=Badge_Grade)[![CodeFactor](https://www.codefactor.io/repository/github/powerunit/powerunit-extensions-exceptions/badge)](https://www.codefactor.io/repository/github/powerunit/powerunit-extensions-exceptions)[![BCH compliance](https://bettercodehub.com/edge/badge/powerunit/powerunit-extensions-exceptions?branch=master)](https://bettercodehub.com/results/powerunit/powerunit-extensions-exceptions)[![codebeat badge](https://codebeat.co/badges/cdebf167-fee0-46b4-b33d-c613f1586a9d)](https://codebeat.co/projects/github-com-powerunit-powerunit-extensions-exceptions-master)[![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.powerunit.extensions/powerunit-extensions-exceptions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.powerunit.extensions/powerunit-extensions-exceptions)![mergify-status](https://gh.mergify.io/badges/powerunit/powerunit-extensions-exceptions.png?style=cut)[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=powerunit_powerunit-extensions-exceptions&metric=alert_status)](https://sonarcloud.io/dashboard?id=powerunit_powerunit-extensions-exceptions)[![badge](https://report.ci/status/powerunit/powerunit-extensions-exceptions/badge.svg?branch=master)](https://report.ci/status/powerunit/powerunit-extensions-exceptions?branch=master)[![javadoc](http://javadoc.io/badge/ch.powerunit.extensions/powerunit-extensions-exceptions.svg?color=yellow)](http://javadoc.io/doc/ch.powerunit.extensions/powerunit-extensions-exceptions)
 
-**This version doesn't support anymore Java 8. [Please use an older version, for instance the version 1.2.0](https://github.com/powerunit/powerunit-extensions-exceptions/tree/powerunit-extensions-exceptions-1.2.0)**
+**This version doesn't support anymore Java 9. [Please use an older version, for instance the version 2.2.0](https://github.com/powerunit/powerunit-extensions-exceptions/tree/powerunit-extensions-exceptions-2.2.0)**
 
 
 This library provides support to wraps _checked exception_, to be used as target functional interface (which by default only support `RuntimeException`).
@@ -28,7 +28,7 @@ Add the following dependency to your maven project :
 <dependency>
   <groupId>ch.powerunit.extensions</groupId>
   <artifactId>powerunit-extensions-exceptions</artifactId>
-  <version>2.2.0</version>
+  <version>3.0.0</version>
 </dependency>
 ```
 
@@ -161,7 +161,7 @@ Also, some dedicated, _ready to used_, Exception Mapper are provided :
 
 #### Define global ExceptionMapper
 
-_Since version 2.2.0, it is possible to define a default exception mappers by using service loader._
+It is possible to define a default exception mappers by using service loader.
 
 By default, the exception are wrapped in a `WrappedException`. This behaviour may be change by implementing the required `ExceptionMapper` and register them as _service implementation_. 
 
@@ -198,7 +198,7 @@ module XXX {
 
 ### CommonsCollections4Helper
 
-_This helper is only available since version 2.2.0 and only if the commons-collections4 library is available_
+_This helper is only available if the commons-collections4 library is available_
 
 The class `CommonsCollections4Helper` provides several static methods to convert interface
 from this library to the corresponding version in commons-collections4.
diff --git a/pom.xml b/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.powerunit.extensions</groupId>
 	<artifactId>powerunit-extensions-exceptions</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 
-	<name>Powerunit - Java Testing framework for JDK 1.9 - Extension to provide unchecked exception for lambda.</name>
-	<description>This is a test framework for the JDK 1.9 - Extension to provide unchecked exception for lambda.</description>
+	<name>Powerunit - Java Testing framework for JDK 10 - Extension to provide unchecked exception for lambda.</name>
+	<description>This is a test framework for the JDK 10 - Extension to provide unchecked exception for lambda.</description>
 
 	<issueManagement>
 		<system>GitHub</system>
@@ -57,8 +57,8 @@
 
 
 	<properties>
-		<maven.compiler.source>9</maven.compiler.source>
-		<maven.compiler.target>9</maven.compiler.target>
+		<maven.compiler.source>10</maven.compiler.source>
+		<maven.compiler.target>10</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<deploy.url>https://oss.sonatype.org/content/repositories/snapshots</deploy.url>
 		<deploy.id>oss-snapshots</deploy.id>
@@ -338,6 +338,7 @@
 					</execution>
 				</executions>
 				<configuration>
+					<additionalOptions>-html5</additionalOptions>
 					<excludePackageNames>ch.powerunit.extensions.exceptions.impl*:ch.powerunit.extensions.exceptions.impl</excludePackageNames>
 					<docfilessubdirs>true</docfilessubdirs>
 					<linksource>false</linksource>
@@ -471,6 +472,7 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>3.1.1</version>
 				<configuration>
+					<additionalOptions>-html5</additionalOptions>
 					<excludePackageNames>ch.powerunit.extensions.exceptions.impl*:ch.powerunit.extensions.exceptions.impl</excludePackageNames>
 					<docfilessubdirs>true</docfilessubdirs>
 					<linksource>true</linksource>
diff --git a/src/it/module-commons-collections4/params.properties b/src/it/module-commons-collections4/params.properties
@@ -1,4 +1,4 @@
-invoker.java.version=9+
+invoker.java.version=10+
 invoker.goals.1=dependency:resolve 
 invoker.goals.2=dependency:resolve-plugins 
 invoker.goals.3=dependency:go-offline
diff --git a/src/it/module-commons-collections4/pom.xml b/src/it/module-commons-collections4/pom.xml
@@ -9,8 +9,8 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<maven.compiler.source>9</maven.compiler.source>
-		<maven.compiler.target>9</maven.compiler.target>
+		<maven.compiler.source>10</maven.compiler.source>
+		<maven.compiler.target>10</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jaxb-api.version>2.3.0.1</jaxb-api.version>
 	</properties>
diff --git a/src/it/module-override/params.properties b/src/it/module-override/params.properties
@@ -1,4 +1,4 @@
-invoker.java.version=9+
+invoker.java.version=10+
 invoker.goals.1=dependency:resolve 
 invoker.goals.2=dependency:resolve-plugins 
 invoker.goals.3=dependency:go-offline
diff --git a/src/it/module-override/pom.xml b/src/it/module-override/pom.xml
@@ -9,8 +9,8 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<maven.compiler.source>9</maven.compiler.source>
-		<maven.compiler.target>9</maven.compiler.target>
+		<maven.compiler.source>10</maven.compiler.source>
+		<maven.compiler.target>10</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jaxb-api.version>2.3.0.1</jaxb-api.version>
 	</properties>
diff --git a/src/it/module-simple-jdk11/pom.xml b/src/it/module-simple-jdk11/pom.xml
@@ -9,8 +9,8 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<maven.compiler.source>9</maven.compiler.source>
-		<maven.compiler.target>9</maven.compiler.target>
+		<maven.compiler.source>10</maven.compiler.source>
+		<maven.compiler.target>10</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jaxb-api.version>2.3.0.1</jaxb-api.version>
 	</properties>
diff --git a/src/it/module-simple/params.properties b/src/it/module-simple/params.properties
@@ -1,4 +1,4 @@
-invoker.java.version=9+,10-,!11
+invoker.java.version=10,!11
 invoker.goals.1=dependency:resolve 
 invoker.goals.2=dependency:resolve-plugins 
 invoker.goals.3=dependency:go-offline
diff --git a/src/it/module-simple/pom.xml b/src/it/module-simple/pom.xml
@@ -9,8 +9,8 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<maven.compiler.source>9</maven.compiler.source>
-		<maven.compiler.target>9</maven.compiler.target>
+		<maven.compiler.source>10</maven.compiler.source>
+		<maven.compiler.target>10</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jaxb-api.version>2.3.0.1</jaxb-api.version>
 	</properties>
diff --git a/src/main/java/ch/powerunit/extensions/exceptions/ExceptionHandlerSupport.java b/src/main/java/ch/powerunit/extensions/exceptions/ExceptionHandlerSupport.java
@@ -172,26 +172,4 @@ default Function<Exception, RuntimeException> exceptionMapper() {
 	 */
 	F ignore();
 
-	/**
-	 * Helper methods to create exception wrapper that check the exception class.
-	 *
-	 * @param clazz
-	 *            the class of the exception to be wrapped.
-	 * @param mapper
-	 *            the exception mapper.
-	 * @param <E>
-	 *            the type of the exception.
-	 * @return A new exception mapper, which use the one received as parameter or
-	 *         for the other exception just create a {@code WrappedException}.
-	 * @since 1.1.0
-	 * @deprecated Since 2.0.0, use the {@link ExceptionMapper} interface and the
-	 *             method {@link ExceptionMapper#forException} or the others methods
-	 *             of this interface.
-	 */
-	@Deprecated(forRemoval = true, since = "2.0.0")
-	static <E extends Exception> Function<Exception, RuntimeException> exceptionMapperFor(Class<E> clazz,
-			Function<E, RuntimeException> mapper) {
-		return ExceptionMapper.forException(clazz, mapper);
-	}
-
 }
diff --git a/src/test/java/ch/powerunit/extensions/exceptions/ExceptionHandlerSupportTest.java b/src/test/java/ch/powerunit/extensions/exceptions/ExceptionHandlerSupportTest.java
@@ -20,7 +20,6 @@
 package ch.powerunit.extensions.exceptions;
 
 import java.io.IOException;
-import java.sql.SQLException;
 
 import ch.powerunit.Test;
 import ch.powerunit.TestSuite;
@@ -50,18 +49,4 @@ public Object ignore() {
 				.is(both(exceptionMessage("test")).and(instanceOf(WrappedException.class)));
 	}
 
-	@Test
-	public void testExceptionMapperForSameException() {
-		assertThatFunction(
-				ExceptionHandlerSupport.exceptionMapperFor(IOException.class, e -> new WrappedException("testme")),
-				new IOException("test")).is(both(exceptionMessage("testme")).and(instanceOf(WrappedException.class)));
-	}
-
-	@Test
-	public void testExceptionMapperForOtherException() {
-		assertThatFunction(
-				ExceptionHandlerSupport.exceptionMapperFor(IOException.class, e -> new WrappedException("testme")),
-				new SQLException("test")).is(both(exceptionMessage("test")).and(instanceOf(WrappedException.class)));
-	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-invoker.java.version=9+`
	`1`	`+invoker.java.version=10+`
`2`	`2`	`invoker.goals.1=dependency:resolve`
`3`	`3`	`invoker.goals.2=dependency:resolve-plugins`
`4`	`4`	`invoker.goals.3=dependency:go-offline`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-invoker.java.version=9+,10-,!11`
	`1`	`+invoker.java.version=10,!11`
`2`	`2`	`invoker.goals.1=dependency:resolve`
`3`	`3`	`invoker.goals.2=dependency:resolve-plugins`
`4`	`4`	`invoker.goals.3=dependency:go-offline`