Updated dependencies/Fixed build for newer Java versions, dropped Java 7 support

Author: tobiasstamann

.github/workflows/default.yml

@@ -12,8 +12,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest,macos-latest]
-        java: [ 7, 7.0.181, 8, 8.0.192, 9.0.x, 10, 11.0.x, 11.0.3, 12 ]
+        os: [ ubuntu-latest,macos-latest ]
+        java: [ 8.0.x, 9.0.x, 11.0.x, 12.0.x, 13.0.x, 14.0.x, 15.0.x, 16.0.x, 17.0.x, 18.0.x ]
 
     steps:
       - uses: actions/checkout@v1

.github/workflows/jacoco.yml

@@ -35,7 +35,7 @@ jobs:
         run: ./mvnw verify jacoco:report-aggregate -B -q
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.0.2
+        uses: codecov/codecov-action@v2
         with:
           token: ${{secrets.CODECOV_TOKEN}}
-          file: target/site/jacoco-aggregate/jacoco.xml
+          files: target/site/jacoco-aggregate/jacoco.xml

README.md

@@ -16,6 +16,7 @@ Additionally it will generate a service locator for you.
 Annotation processor that
 - provides support for generating service locator file in _/META-INF/services/<Full qualified spi interface name>_
 - provides support for generating service locator class for accessing the SPI implementations
+- compatible with Java >= 8 (Java 7 support up to version 0.8.2)
 
 # How does it work?
 

pom.xml

@@ -76,32 +76,28 @@
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <encoding>UTF-8</encoding>
 
-        <java.version>1.7</java.version>
+        <java.version>1.8</java.version>
 
-        <java.compile.source.version>1.7</java.compile.source.version>
-        <java.compile.target.version>1.7</java.compile.target.version>
+        <java.compile.source.version>${java.version}</java.compile.source.version>
+        <java.compile.target.version>${java.version}</java.compile.target.version>
 
 
-        <cute.version>0.9.0</cute.version>
-        <aptk.version>0.15.1</aptk.version>
+        <cute.version>0.12.0</cute.version>
+        <aptk.version>0.20.0</aptk.version>
 
         <!-- versions of test dependencies -->
-        <junit.version>4.12</junit.version>
+        <junit.version>4.13.2</junit.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <mockito.version>2.28.2</mockito.version>
-        <lombok.version>1.18.4</lombok.version>
-
+        <mockito.version>4.5.1</mockito.version>
 
         <!-- plugin versions -->
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
-        <maven-bundle-plugin.version>4.2.1</maven-bundle-plugin.version>
-        <maven-failsafe-plugin.version>2.18.1</maven-failsafe-plugin.version>
-        <maven-jacoco-plugin.version>0.8.2</maven-jacoco-plugin.version>
-        <maven-processor-plugin.version>2.2.4</maven-processor-plugin.version>
-        <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+        <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
+        <maven-jacoco-plugin.version>0.8.8</maven-jacoco-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 
-        <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
 
 
     </properties>
@@ -386,14 +382,14 @@
 
             <dependency>
                 <groupId>io.toolisticon.aptk</groupId>
-                <artifactId>tools</artifactId>
+                <artifactId>aptk-tools</artifactId>
                 <version>${aptk.version}</version>
             </dependency>
 
             <!-- processors apis -->
             <dependency>
                 <groupId>io.toolisticon.aptk</groupId>
-                <artifactId>annotationwrapper-api</artifactId>
+                <artifactId>aptk-annotationwrapper-api</artifactId>
                 <version>${aptk.version}</version>
                 <scope>provided</scope>
             </dependency>

processor/pom.xml

@@ -18,7 +18,7 @@
 
         <dependency>
             <groupId>io.toolisticon.aptk</groupId>
-            <artifactId>tools</artifactId>
+            <artifactId>aptk-tools</artifactId>
         </dependency>
 
         <dependency>
@@ -28,7 +28,7 @@
 
         <dependency>
             <groupId>io.toolisticon.aptk</groupId>
-            <artifactId>annotationwrapper-api</artifactId>
+            <artifactId>aptk-annotationwrapper-api</artifactId>
         </dependency>
 
         <dependency>
@@ -110,7 +110,7 @@
                     <annotationProcessorPaths>
                         <path>
                             <groupId>io.toolisticon.aptk</groupId>
-                            <artifactId>annotationwrapper-processor</artifactId>
+                            <artifactId>aptk-annotationwrapper-processor</artifactId>
                             <version>${aptk.version}</version>
                         </path>
                     </annotationProcessorPaths>

processor/src/main/java/io/toolisticon/spiap/processor/ServiceProcessor.java

@@ -1,21 +1,21 @@
 package io.toolisticon.spiap.processor;
 
 import io.toolisticon.aptk.tools.AbstractAnnotationProcessor;
-import io.toolisticon.aptk.tools.AnnotationUtils;
 import io.toolisticon.aptk.tools.ElementUtils;
 import io.toolisticon.aptk.tools.FilerUtils;
 import io.toolisticon.aptk.tools.MessagerUtils;
-import io.toolisticon.aptk.tools.ProcessingEnvironmentUtils;
+import io.toolisticon.aptk.tools.TypeMirrorWrapper;
 import io.toolisticon.aptk.tools.TypeUtils;
 import io.toolisticon.aptk.tools.generators.SimpleResourceWriter;
+import io.toolisticon.aptk.tools.wrapper.ElementWrapper;
+import io.toolisticon.aptk.tools.wrapper.TypeElementWrapper;
 import io.toolisticon.spiap.api.OutOfService;
 import io.toolisticon.spiap.api.Service;
 import io.toolisticon.spiap.api.Services;
 
 import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
 import javax.tools.StandardLocation;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -28,15 +28,13 @@
 /**
  * Annotation Processor for {@link Service} and {@link Services}.
  * Creates the service descriptor file in "/META-INF/services/fqnOfSpi".
- * Additionally it creates a property file containing all additional metadata used by the ServiceLocator (like order, id and description)
+ * Additionally, it creates a property file containing all additional metadata used by the ServiceLocator (like order, id and description)
  * to get rid of the api library as run time dependency.
  */
 public class ServiceProcessor extends AbstractAnnotationProcessor {
 
     private final static Set<String> SUPPORTED_ANNOTATIONS = createSupportedAnnotationSet(Services.class, Service.class);
 
-    private final Map<String, SimpleResourceWriter> spiResourceFilePool = new HashMap<String, SimpleResourceWriter>();
-
     private final ServiceImplMap serviceImplHashMap = new ServiceImplMap();
 
     /**
@@ -46,18 +44,14 @@ protected static class ServiceImplMap extends HashMap<String, Set<String>> {
 
         /**
          * Convenience method to add a value.
-         * Creates a Set if no entry for passedkey can be found.
+         * Creates a Set if no entry for passed key can be found.
          *
          * @param key   the key to look for
          * @param value the value to store in keys set
          * @return the keys set
          */
         public Set<String> put(String key, String value) {
-            Set<String> set = this.get(key);
-            if (set == null) {
-                set = new HashSet<String>();
-                this.put(key, set);
-            }
+            Set<String> set = this.computeIfAbsent(key, k -> new HashSet<>());
             set.add(value);
             return set;
         }
@@ -73,7 +67,7 @@ public Set<String> getSupportedAnnotationTypes() {
     public boolean processAnnotations(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
 
         if (!roundEnv.processingOver()) {
-            processAnnotationsInternally(annotations, roundEnv);
+            processAnnotationsInternally(roundEnv);
         } else {
             writeConfigurationFiles();
         }
@@ -82,7 +76,7 @@ public boolean processAnnotations(Set<? extends TypeElement> annotations, RoundE
 
     }
 
-    private void processAnnotationsInternally(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+    private void processAnnotationsInternally(RoundEnvironment roundEnv) {
 
         // process Services annotation
         for (Element element : roundEnv.getElementsAnnotatedWith(Services.class)) {
@@ -93,7 +87,7 @@ private void processAnnotationsInternally(Set<? extends TypeElement> annotations
             }
 
             // read annotation
-            ServicesWrapper servicesAnnotationWrapper = ServicesWrapper.wrapAnnotationOfElement(element);
+            ServicesWrapper servicesAnnotationWrapper = ServicesWrapper.wrap(element);
 
             for (ServiceWrapper serviceWrapper : servicesAnnotationWrapper.value()) {
                 processAnnotation(serviceWrapper, element);
@@ -112,7 +106,7 @@ private void processAnnotationsInternally(Set<? extends TypeElement> annotations
             }
 
             // read annotation
-            ServiceWrapper serviceAnnotationWrapper = ServiceWrapper.wrapAnnotationOfElement(element);
+            ServiceWrapper serviceAnnotationWrapper = ServiceWrapper.wrap(element);
 
             processAnnotation(serviceAnnotationWrapper, element);
 
@@ -141,31 +135,31 @@ private void processAnnotation(ServiceWrapper serviceAnnotationWrapper, Element
 
         // Now create the service locator
 
-        TypeElement typeElement = ElementUtils.CastElement.castClass(annotatedElement);
+        TypeElementWrapper typeElement = TypeElementWrapper.wrap((TypeElement) annotatedElement);
 
         if (serviceAnnotationWrapper != null) {
 
-            Set<String> spiInterfaces = new HashSet<String>();
+            Set<String> spiInterfaces = new HashSet<>();
             String spiAttributeTypes = serviceAnnotationWrapper.valueAsFqn();
             if (spiAttributeTypes != null) {
                 spiInterfaces.add(spiAttributeTypes);
             }
 
             for (String fqTypeName : spiInterfaces) {
 
-                TypeMirror typeMirror = TypeUtils.TypeRetrieval.getTypeMirror(fqTypeName);
-                TypeElement typeMirrorTypeElement = (TypeElement) ProcessingEnvironmentUtils.getTypes().asElement(typeMirror);
+                TypeMirrorWrapper typeMirror = TypeMirrorWrapper.wrap(fqTypeName);
+                TypeElementWrapper typeMirrorTypeElement = typeMirror.getTypeElement().get();
 
                 //check if type is interface
-                if (!ElementUtils.CheckKindOfElement.isInterface(typeMirrorTypeElement)) {
-                    MessagerUtils.error(annotatedElement, ServiceProcessorMessages.ERROR_VALUE_ATTRIBUTE_MUST_ONLY_CONTAIN_INTERFACES, typeMirrorTypeElement.getQualifiedName().toString());
+                if (!typeMirrorTypeElement.isInterface()) {
+                    MessagerUtils.error(annotatedElement, ServiceProcessorMessages.ERROR_VALUE_ATTRIBUTE_MUST_ONLY_CONTAIN_INTERFACES, typeMirrorTypeElement.getQualifiedName());
                     break;
                 }
 
                 // check if annotatedElement is assignable to spi interface == implements the spi interface
-                if (!TypeUtils.TypeComparison.isAssignableTo(typeElement, typeMirror)) {
+                if (!TypeUtils.TypeComparison.isAssignableTo(typeElement.unwrap(), typeMirror.unwrap())) {
 
-                    MessagerUtils.error(annotatedElement, ServiceProcessorMessages.ERROR_ANNOTATED_CLASS_MUST_IMPLEMENT_CONFIGURED_INTERFACES, typeMirrorTypeElement.getQualifiedName().toString());
+                    MessagerUtils.error(annotatedElement, ServiceProcessorMessages.ERROR_ANNOTATED_CLASS_MUST_IMPLEMENT_CONFIGURED_INTERFACES, typeMirrorTypeElement.getQualifiedName());
                     break;
 
                 }
@@ -174,7 +168,7 @@ private void processAnnotation(ServiceWrapper serviceAnnotationWrapper, Element
                 writePropertiesFile(typeElement, serviceAnnotationWrapper);
 
                 // put service provider implementations in map by using the SPI fqn as key
-                serviceImplHashMap.put(fqTypeName, typeElement.getQualifiedName().toString());
+                serviceImplHashMap.put(fqTypeName, typeElement.getQualifiedName());
 
 
             }
@@ -186,15 +180,15 @@ private void processAnnotation(ServiceWrapper serviceAnnotationWrapper, Element
      * This method generates the property files of configured service annotation values.
      * This allows us not to get rid of spiap-api dependency at runtime.
      *
-     * @param annotatedTypeElement the annotated element
-     * @param serviceAnnotationWrapper     The Service annotations AnotationMirror
+     * @param annotatedTypeElement     the annotated element
+     * @param serviceAnnotationWrapper The Service annotations AnnotationMirror
      */
-    private void writePropertiesFile(TypeElement annotatedTypeElement, ServiceWrapper serviceAnnotationWrapper) {
+    private void writePropertiesFile(TypeElementWrapper annotatedTypeElement, ServiceWrapper serviceAnnotationWrapper) {
 
 
         String spiClassName = serviceAnnotationWrapper.valueAsFqn();
-        ;
-        String serviceClassName = annotatedTypeElement.getQualifiedName().toString();
+
+        String serviceClassName = annotatedTypeElement.getQualifiedName();
         String fileName = "META-INF/spiap/" + spiClassName + "/" + serviceClassName + ".properties";
 
         try {
@@ -209,7 +203,7 @@ private void writePropertiesFile(TypeElement annotatedTypeElement, ServiceWrappe
             properties.setProperty(Constants.PROPERTY_KEY_ID, !serviceAnnotationWrapper.id().isEmpty() ? serviceAnnotationWrapper.id() : serviceClassName);
             properties.setProperty(Constants.PROPERTY_KEY_DESCRIPTION, serviceAnnotationWrapper.description());
             properties.setProperty(Constants.PROPERTY_KEY_PRIORITY, "" + serviceAnnotationWrapper.priority());
-            properties.setProperty(Constants.PROPERTY_KEY_OUT_OF_SERVICE, "" + (AnnotationUtils.getAnnotationMirror(annotatedTypeElement, OutOfService.class) != null));
+            properties.setProperty(Constants.PROPERTY_KEY_OUT_OF_SERVICE, "" + annotatedTypeElement.getAnnotation(OutOfService.class).isPresent());
 
             StringWriter writer = new StringWriter();
             properties.store(writer, "Property files used by the spi service locator");
@@ -221,8 +215,7 @@ private void writePropertiesFile(TypeElement annotatedTypeElement, ServiceWrappe
 
 
         } catch (IOException e) {
-            MessagerUtils.error(annotatedTypeElement, "Wasn't able to write service provider properties file for service ${0} for spi ${1}", serviceClassName, spiClassName);
-            return;
+            MessagerUtils.error(annotatedTypeElement.unwrap(), "Wasn't able to write service provider properties file for service ${0} for spi ${1}", serviceClassName, spiClassName);
         }
 
     }
@@ -244,15 +237,15 @@ private void writeConfigurationFiles() {
                 return;
             }
 
-            Set<String> allServiceImplementations = new HashSet<String>(entry.getValue());
+            Set<String> allServiceImplementations = new HashSet<>(entry.getValue());
             allServiceImplementations.addAll(existingServiceImplementations);
 
             try {
 
                 // write service provider file by using a template
                 SimpleResourceWriter writer = FilerUtils.createResource(StandardLocation.CLASS_OUTPUT, "", serviceProviderFile);
 
-                Map<String, Object> model = new HashMap<String, Object>();
+                Map<String, Object> model = new HashMap<>();
                 model.put("fqns", allServiceImplementations);
 
                 writer.writeTemplateString("!{for fqn: fqns}${fqn}\n!{/for}", model);
@@ -294,7 +287,7 @@ protected Set<String> readServiceFile(String serviceProviderFile) {
 
         MessagerUtils.info(null, "Reading existing service file : ${0}", serviceProviderFile);
 
-        Set<String> resultSet = new HashSet<String>();
+        Set<String> resultSet = new HashSet<>();
 
         try {