Merge pull request #2623 from jplag/auto-service

robinmaisch · web-flow · commit e419838bae4c · 2025-10-13T12:13:53.000+02:00
Introduce Google Auto Service
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -126,8 +126,8 @@
         </dependency>
         <!-- CLI -->
         <dependency>
-            <groupId>org.kohsuke.metainf-services</groupId>
-            <artifactId>metainf-services</artifactId>
+            <groupId>com.google.auto.service</groupId>
+            <artifactId>auto-service</artifactId>
         </dependency>
 
         <dependency>
diff --git a/cli/src/main/java/de/jplag/cli/logger/CollectedLoggerServiceProvider.java b/cli/src/main/java/de/jplag/cli/logger/CollectedLoggerServiceProvider.java
@@ -1,17 +1,18 @@
 package de.jplag.cli.logger;
 
-import org.kohsuke.MetaInfServices;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.IMarkerFactory;
 import org.slf4j.helpers.BasicMarkerFactory;
 import org.slf4j.helpers.NOPMDCAdapter;
 import org.slf4j.spi.MDCAdapter;
 import org.slf4j.spi.SLF4JServiceProvider;
 
+import com.google.auto.service.AutoService;
+
 /**
  * SLF4J service provider for integrating the CollectedLogger with SLF4J API.
  */
-@MetaInfServices(SLF4JServiceProvider.class)
+@AutoService(SLF4JServiceProvider.class)
 public class CollectedLoggerServiceProvider implements SLF4JServiceProvider {
 
     /**
diff --git a/language-api/pom.xml b/language-api/pom.xml
@@ -12,8 +12,8 @@
     <description>Language API for JPlag language modules</description>
     <dependencies>
         <dependency>
-            <groupId>org.kohsuke.metainf-services</groupId>
-            <artifactId>metainf-services</artifactId>
+            <groupId>com.google.auto.service</groupId>
+            <artifactId>auto-service</artifactId>
         </dependency>
         <dependency>
             <groupId>com.ibm.icu</groupId>
diff --git a/languages/c/src/main/java/de/jplag/c/CLanguage.java b/languages/c/src/main/java/de/jplag/c/CLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Facade for the C language.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class CLanguage implements Language {
 
     @Override
diff --git a/languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java b/languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * The entry point for the ANTLR parser based C++ language module.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class CPPLanguage implements Language {
 
     @Override
diff --git a/languages/csharp/src/main/java/de/jplag/csharp/CSharpLanguage.java b/languages/csharp/src/main/java/de/jplag/csharp/CSharpLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * C# language with full support of C# 6 features and below.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class CSharpLanguage implements Language {
 
     @Override
diff --git a/languages/emf-metamodel/src/main/java/de/jplag/emf/EmfLanguage.java b/languages/emf-metamodel/src/main/java/de/jplag/emf/EmfLanguage.java
@@ -5,19 +5,20 @@
 import java.util.Set;
 
 import org.eclipse.emf.ecore.EcorePackage;
-import org.kohsuke.MetaInfServices;
 
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 import de.jplag.emf.parser.EcoreParser;
 import de.jplag.emf.util.EMFUtil;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Language for EMF metamodels from the Eclipse Modeling Framework (EMF).
  * @author Timur Saglam
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class EmfLanguage implements Language {
 
     /**
diff --git a/languages/emf-model/src/main/java/de/jplag/emf/model/EmfModelLanguage.java b/languages/emf-model/src/main/java/de/jplag/emf/model/EmfModelLanguage.java
@@ -5,20 +5,20 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 import de.jplag.emf.dynamic.DynamicEmfLanguage;
 import de.jplag.emf.model.parser.DynamicModelParser;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Language for EMF metamodels from the Eclipse Modeling Framework (EMF). This language is based on a dynamically
  * created token set.
  * @author Timur Saglam
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class EmfModelLanguage extends DynamicEmfLanguage {
 
     @Override
diff --git a/languages/golang/src/main/java/de/jplag/golang/GoLanguage.java b/languages/golang/src/main/java/de/jplag/golang/GoLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Facade for the ANTLR-based Go language module.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class GoLanguage implements Language {
 
     @Override
diff --git a/languages/java/src/main/java/de/jplag/java/JavaLanguage.java b/languages/java/src/main/java/de/jplag/java/JavaLanguage.java
@@ -5,18 +5,18 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 import de.jplag.commentextraction.CommentExtractorSettings;
 import de.jplag.commentextraction.EnvironmentDelimiter;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Language for Java programs. Supports the Java version with which is project is build with (see top-level pom.xml).
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class JavaLanguage implements Language {
 
     @Override
diff --git a/languages/javascript/src/main/java/de/jplag/javascript/JavaScriptLanguage.java b/languages/javascript/src/main/java/de/jplag/javascript/JavaScriptLanguage.java
@@ -2,16 +2,16 @@
 
 import java.util.List;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.typescript.TypeScriptLanguage;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Represents the JavaScript Language as a variance of TypeScript. Delegates all responsibility to the TypeScript
  * language.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class JavaScriptLanguage extends TypeScriptLanguage {
 
     @Override
diff --git a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinLanguage.java b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * This represents the Kotlin language as a language supported by JPlag.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class KotlinLanguage implements Language {
 
     @Override
diff --git a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * The entry point for the ANTLR parser based LLVM IR language module.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class LLVMIRLanguage implements Language {
 
     @Override
diff --git a/languages/multi-language/src/main/java/de/jplag/multilang/MultiLanguage.java b/languages/multi-language/src/main/java/de/jplag/multilang/MultiLanguage.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,11 +13,13 @@
 import de.jplag.Token;
 import de.jplag.options.LanguageOptions;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Multi-language facade. Delegates all source code files of known languages to the corresponding concrete language
  * modules.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class MultiLanguage implements Language {
     private static final Logger logger = LoggerFactory.getLogger(MultiLanguage.class);
     private static final String WARNING = "This module only allows parsing of multiple languages. No comparisons will be made between languages";
diff --git a/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java b/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Language facade for Python 3.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class PythonLanguage implements Language {
 
     @Override
diff --git a/languages/rlang/src/main/java/de/jplag/rlang/RLanguage.java b/languages/rlang/src/main/java/de/jplag/rlang/RLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * This represents the R language as a language supported by JPlag.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class RLanguage implements Language {
 
     @Override
diff --git a/languages/rust/src/main/java/de/jplag/rust/RustLanguage.java b/languages/rust/src/main/java/de/jplag/rust/RustLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * This represents the Rust language as a language supported by JPlag.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class RustLanguage implements Language {
 
     @Override
diff --git a/languages/scala/src/main/resources/META-INF/services/de.jplag.Language b/languages/scala/src/main/resources/META-INF/services/de.jplag.Language
diff --git a/languages/scala/src/main/scala/de/jplag/scala/ScalaLanguage.java b/languages/scala/src/main/scala/de/jplag/scala/ScalaLanguage.java
@@ -8,9 +8,12 @@
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Scala language module.
  */
+@AutoService(Language.class)
 public class ScalaLanguage implements Language {
     @Override
     public List<String> fileExtensions() {
diff --git a/languages/scheme/src/main/java/de/jplag/scheme/SchemeLanguage.java b/languages/scheme/src/main/java/de/jplag/scheme/SchemeLanguage.java
@@ -4,16 +4,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Scheme language module facade.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class SchemeLanguage implements Language {
 
     @Override
diff --git a/languages/scxml/src/main/java/de/jplag/scxml/ScxmlLanguage.java b/languages/scxml/src/main/java/de/jplag/scxml/ScxmlLanguage.java
@@ -4,17 +4,17 @@
 import java.util.List;
 import java.util.Set;
 
-import org.kohsuke.MetaInfServices;
-
 import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 import de.jplag.scxml.parser.ScxmlParserAdapter;
 
+import com.google.auto.service.AutoService;
+
 /**
  * Language for statecharts in the State Chart XML (SCXML) format.
  */
-@MetaInfServices(Language.class)
+@AutoService(Language.class)
 public class ScxmlLanguage implements Language {
 
     /** File extension for the view files. **/
diff --git a/languages/swift/src/main/java/de/jplag/swift/SwiftLanguage.java b/languages/swift/src/main/java/de/jplag/swift/SwiftLanguage.java
diff --git a/languages/text/src/main/java/de/jplag/text/NaturalLanguage.java b/languages/text/src/main/java/de/jplag/text/NaturalLanguage.java
diff --git a/languages/typescript/src/main/java/de/jplag/typescript/TypeScriptLanguage.java b/languages/typescript/src/main/java/de/jplag/typescript/TypeScriptLanguage.java
diff --git a/pom.xml b/pom.xml
