Support Java9 Platform Module System(JPMS)

- escalate Contributor(s), TokenExpressionFactory public - move modules classes - o.l.launguage to o.l.l.(lang) - o.l.chunking to o.l.c.(lang) - o.l.synthesis to o.l.s.(lang) - Add Automatic-Module-Name manifest entry - Update imports to adjust for the above changes Signed-off-by: Hiroshi Miura <[email protected]>
languagetool-org · Sep 30, 2023 · 22f1afc · 22f1afc
1 parent 127949a
commit 22f1afc
Show file tree

Hide file tree

Showing 551 changed files with 1,232 additions and 819 deletions.
diff --git a/languagetool-commandline/src/main/java/org/languagetool/commandline/Main.java b/languagetool-commandline/src/main/java/org/languagetool/commandline/Main.java
@@ -22,7 +22,8 @@
 import org.apache.commons.io.input.BOMInputStream;
 import org.languagetool.*;
 import org.languagetool.bitext.TabBitextReader;
-import org.languagetool.language.*;
+import org.languagetool.language.en.AmericanEnglish;
+import org.languagetool.language.en.English;
 import org.languagetool.language.identifier.LanguageIdentifier;
 import org.languagetool.language.identifier.LanguageIdentifierService;
 import org.languagetool.rules.Rule;

diff --git a/languagetool-core/pom.xml b/languagetool-core/pom.xml
@@ -277,6 +277,7 @@
                         <manifestEntries>
                             <ComponentVersion>${project.version}</ComponentVersion>
                             <Implementation-Date>${maven.build.timestamp}</Implementation-Date>
+                            <Automatic-Module-Name>org.languagetool.core</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                 </configuration>

diff --git a/languagetool-core/src/main/java/org/languagetool/Languages.java b/languagetool-core/src/main/java/org/languagetool/Languages.java
@@ -148,10 +148,10 @@ private static Language createLanguageObjects(URL url, String className) {
 
   static boolean hasPremium(String className) {
     return className.matches("org\\.languagetool\\.language\\.(" +
-      "Portuguese|AngolaPortuguese|BrazilianPortuguese|MozambiquePortuguese|PortugalPortuguese|" +
-      "German|GermanyGerman|AustrianGerman|SwissGerman|" +
-      "Dutch|French|Spanish|" +
-      "English|AustralianEnglish|AmericanEnglish|BritishEnglish|CanadianEnglish|NewZealandEnglish|SouthAfricanEnglish" +
+      "pt\\.Portuguese|pt\\.AngolaPortuguese|pt\\.BrazilianPortuguese|pt\\.MozambiquePortuguese|pt\\.PortugalPortuguese|" +
+      "de\\.German|de\\.GermanyGerman|de\\.AustrianGerman|de\\.SwissGerman|" +
+      "nl\\.Dutch|fr\\.French|es\\.Spanish|" +
+      "en\\.English|en\\.AustralianEnglish|en\\.AmericanEnglish|en\\.BritishEnglish|en\\.CanadianEnglish|en\\.NewZealandEnglish|en\\.SouthAfricanEnglish" +
       ")");
   }
 

diff --git a/languagetool-core/src/main/java/org/languagetool/chunking/TokenExpressionFactory.java b/languagetool-core/src/main/java/org/languagetool/chunking/TokenExpressionFactory.java
@@ -25,14 +25,14 @@
 /**
  * @since 2.9
  */
-final class TokenExpressionFactory extends ExpressionFactory<ChunkTaggedToken> {
+public final class TokenExpressionFactory extends ExpressionFactory<ChunkTaggedToken> {
 
   private final boolean caseSensitive;
 
   /**
    * @param caseSensitive whether word tokens should be compared case-sensitively - also used for regular expressions
    */
-  TokenExpressionFactory(boolean caseSensitive) {
+  public TokenExpressionFactory(boolean caseSensitive) {
     this.caseSensitive = caseSensitive;
   }
 

diff --git a/languagetool-core/src/main/java/org/languagetool/language/Contributor.java b/languagetool-core/src/main/java/org/languagetool/language/Contributor.java
@@ -18,6 +18,8 @@
  */
 package org.languagetool.language;
 
+import lombok.Getter;
+
 import java.util.Objects;
 
 /**
@@ -30,21 +32,21 @@ public final class Contributor {
 
   /**
    * @param name full name
-   * @param url URL to homepage or similar (optional)
+   * @param url  URL to homepage or similar (optional)
    */
-  Contributor(String name, String url) {
+  public Contributor(String name, String url) {
     this.name = Objects.requireNonNull(name, "name cannot be null");
     this.url = url;
   }
 
-  Contributor(String name) {
+  public Contributor(String name) {
     this(name, null);
   }
-  
+
   public String getName() {
     return name;
   }
-  
+
   public String getUrl() {
     return url;
   }
@@ -53,5 +55,4 @@ public String getUrl() {
   public String toString() {
     return name;
   }
-
 }
diff --git a/languagetool-core/src/main/java/org/languagetool/language/Contributors.java b/languagetool-core/src/main/java/org/languagetool/language/Contributors.java
@@ -21,13 +21,13 @@
 /**
  * Constants for contributors who contribute to more than one language (use to avoid duplication).
  */
-final class Contributors {
+public final class Contributors {
 
   private Contributors() {
   }
 
-  static final Contributor MARCIN_MILKOWSKI = new Contributor("Marcin Miłkowski", "http://marcinmilkowski.pl");
-  static final Contributor DANIEL_NABER = new Contributor("Daniel Naber", "http://www.danielnaber.de");
-  static final Contributor DOMINIQUE_PELLE = new Contributor("Dominique Pellé", "http://dominiko.livejournal.com/tag/lingvoilo");
+  public static final Contributor MARCIN_MILKOWSKI = new Contributor("Marcin Miłkowski", "http://marcinmilkowski.pl");
+  public static final Contributor DANIEL_NABER = new Contributor("Daniel Naber", "http://www.danielnaber.de");
+  public static final Contributor DOMINIQUE_PELLE = new Contributor("Dominique Pellé", "http://dominiko.livejournal.com/tag/lingvoilo");
 
 }
diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/GenderWordFinder.java b/languagetool-dev/src/main/java/org/languagetool/dev/GenderWordFinder.java
@@ -19,7 +19,7 @@
 package org.languagetool.dev;
 
 import org.languagetool.JLanguageTool;
-import org.languagetool.language.GermanyGerman;
+import org.languagetool.language.de.GermanyGerman;
 import org.languagetool.rules.Rule;
 import org.languagetool.rules.de.GermanSpellerRule;
 

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/GermanOldSpellingFinder.java b/languagetool-dev/src/main/java/org/languagetool/dev/GermanOldSpellingFinder.java
@@ -19,7 +19,7 @@
 package org.languagetool.dev;
 
 import org.languagetool.AnalyzedToken;
-import org.languagetool.language.GermanyGerman;
+import org.languagetool.language.de.GermanyGerman;
 import org.languagetool.synthesis.Synthesizer;
 
 import java.io.IOException;

diff --git a/...uagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundAdjectiveFinder.java b/...uagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundAdjectiveFinder.java
@@ -20,7 +20,7 @@
 
 import de.danielnaber.jwordsplitter.GermanWordSplitter;
 import org.languagetool.AnalyzedTokenReadings;
-import org.languagetool.language.GermanyGerman;
+import org.languagetool.language.de.GermanyGerman;
 import org.languagetool.tagging.Tagger;
 import org.languagetool.tools.StringTools;
 

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundsFinder.java b/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundsFinder.java
@@ -20,7 +20,7 @@
 
 import de.danielnaber.jwordsplitter.GermanWordSplitter;
 import org.languagetool.JLanguageTool;
-import org.languagetool.language.GermanyGerman;
+import org.languagetool.language.de.GermanyGerman;
 import org.languagetool.rules.de.GermanSpellerRule;
 import org.languagetool.tools.StringTools;
 

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanWords.java b/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanWords.java
@@ -1,8 +1,8 @@
 package org.languagetool.dev;
 
 import org.languagetool.JLanguageTool;
-import org.languagetool.language.AmericanEnglish;
-import org.languagetool.language.GermanyGerman;
+import org.languagetool.language.en.AmericanEnglish;
+import org.languagetool.language.de.GermanyGerman;
 import org.languagetool.rules.de.GermanSpellerRule;
 import org.languagetool.rules.en.MorfologikAmericanSpellerRule;
 import org.languagetool.tagging.de.GermanTagger;

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/RuleOverview.java b/languagetool-dev/src/main/java/org/languagetool/dev/RuleOverview.java
@@ -21,7 +21,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.languagetool.*;
 import org.languagetool.broker.ResourceDataBroker;
-import org.languagetool.language.AmericanEnglish;
+import org.languagetool.language.en.AmericanEnglish;
 import org.languagetool.language.Contributor;
 import org.languagetool.rules.ConfusionSetLoader;
 import org.languagetool.rules.Rule;

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/archive/GermanTaggerEnhancer.java b/languagetool-dev/src/main/java/org/languagetool/dev/archive/GermanTaggerEnhancer.java
@@ -24,7 +24,7 @@
 
 import org.languagetool.AnalyzedTokenReadings;
 import org.languagetool.JLanguageTool;
-import org.languagetool.language.GermanyGerman;
+import org.languagetool.language.de.GermanyGerman;
 import org.languagetool.tagging.Tagger;
 import org.languagetool.tools.StringTools;
 

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/archive/SimpleRuleCounter.java b/languagetool-dev/src/main/java/org/languagetool/dev/archive/SimpleRuleCounter.java
@@ -21,7 +21,7 @@
 import org.languagetool.JLanguageTool;
 import org.languagetool.Language;
 import org.languagetool.Languages;
-//import org.languagetool.language.English;
+//import org.languagetool.language.en.English;
 import org.languagetool.rules.Rule;
 import org.languagetool.rules.patterns.PatternRule;
 import org.languagetool.rules.patterns.PatternToken;

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/ConfusionRuleEvaluator.java b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/ConfusionRuleEvaluator.java
@@ -24,7 +24,7 @@
 import org.languagetool.chunking.Chunker;
 import org.languagetool.dev.dumpcheck.*;
 import org.languagetool.dev.eval.FMeasure;
-import org.languagetool.language.English;
+import org.languagetool.language.en.English;
 import org.languagetool.languagemodel.LanguageModel;
 import org.languagetool.languagemodel.LuceneLanguageModel;
 import org.languagetool.rules.*;

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/GermanReflexiveVerbGuesser.java b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/GermanReflexiveVerbGuesser.java
@@ -19,7 +19,7 @@
 package org.languagetool.dev.bigdata;
 
 import org.languagetool.AnalyzedToken;
-import org.languagetool.language.GermanyGerman;
+import org.languagetool.language.de.GermanyGerman;
 import org.languagetool.languagemodel.LuceneLanguageModel;
 import org.languagetool.synthesis.Synthesizer;
 

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NGramUrlGenerator.java b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NGramUrlGenerator.java
@@ -19,7 +19,7 @@
 package org.languagetool.dev.bigdata;
 
 import org.languagetool.JLanguageTool;
-import org.languagetool.language.AmericanEnglish;
+import org.languagetool.language.en.AmericanEnglish;
 import org.languagetool.rules.ConfusionPair;
 import org.languagetool.rules.ConfusionSetLoader;
 

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NeededNGramCounter.java b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NeededNGramCounter.java
@@ -24,7 +24,7 @@
 import org.languagetool.JLanguageTool;
 import org.languagetool.Language;
 import org.languagetool.Languages;
-import org.languagetool.language.AmericanEnglish;
+import org.languagetool.language.en.AmericanEnglish;
 import org.languagetool.rules.ConfusionSetLoader;
 
 import java.io.File;

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/eval/CheckBNC.java b/languagetool-dev/src/main/java/org/languagetool/dev/eval/CheckBNC.java
@@ -26,7 +26,7 @@
 
 import org.languagetool.JLanguageTool;
 import org.languagetool.commandline.CommandLineTools;
-import org.languagetool.language.English;
+import org.languagetool.language.en.English;
 import org.languagetool.tokenizers.Tokenizer;
 import org.languagetool.tools.StringTools;
 

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/eval/LanguageToolEvaluator.java b/languagetool-dev/src/main/java/org/languagetool/dev/eval/LanguageToolEvaluator.java
@@ -19,8 +19,8 @@
 package org.languagetool.dev.eval;
 
 import org.languagetool.JLanguageTool;
-import org.languagetool.language.BritishEnglish;
-import org.languagetool.language.English;
+import org.languagetool.language.en.BritishEnglish;
+import org.languagetool.language.en.English;
 import org.languagetool.languagemodel.LanguageModel;
 import org.languagetool.languagemodel.LuceneLanguageModel;
 import org.languagetool.markup.AnnotatedText;

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/eval/RealWordFalseAlarmEvaluator.java b/languagetool-dev/src/main/java/org/languagetool/dev/eval/RealWordFalseAlarmEvaluator.java
@@ -21,9 +21,8 @@
 import org.apache.commons.io.IOUtils;
 import org.languagetool.JLanguageTool;
 import org.languagetool.Language;
-import org.languagetool.language.AmericanEnglish;
-import org.languagetool.language.BritishEnglish;
-import org.languagetool.language.English;
+import org.languagetool.language.en.AmericanEnglish;
+import org.languagetool.language.en.BritishEnglish;
 import org.languagetool.languagemodel.LanguageModel;
 import org.languagetool.languagemodel.LuceneLanguageModel;
 import org.languagetool.rules.*;

diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/eval/SimpleCorpusEvaluator.java b/languagetool-dev/src/main/java/org/languagetool/dev/eval/SimpleCorpusEvaluator.java
@@ -24,7 +24,7 @@
 import org.languagetool.dev.errorcorpus.ErrorCorpus;
 import org.languagetool.dev.errorcorpus.ErrorSentence;
 import org.languagetool.dev.errorcorpus.SimpleCorpus;
-import org.languagetool.language.English;
+import org.languagetool.language.en.English;
 import org.languagetool.languagemodel.LanguageModel;
 import org.languagetool.languagemodel.LuceneLanguageModel;
 import org.languagetool.languagemodel.LuceneSingleIndexLanguageModel;

diff --git a/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/CommonCrawlToNgramTest.java b/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/CommonCrawlToNgramTest.java
@@ -24,7 +24,7 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.languagetool.language.GermanyGerman;
+import org.languagetool.language.de.GermanyGerman;
 
 public class CommonCrawlToNgramTest {
 

diff --git a/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/ContextBuilderTest.java b/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/ContextBuilderTest.java
@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.languagetool.AnalyzedSentence;
 import org.languagetool.JLanguageTool;
-import org.languagetool.language.English;
+import org.languagetool.language.en.English;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/languagetool-language-modules/ar/pom.xml b/languagetool-language-modules/ar/pom.xml
@@ -93,6 +93,17 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jar-plugin</artifactId>
+              <configuration>
+                <archive>
+                  <manifestEntries>
+                    <Automatic-Module-Name>org.languagetool.language.ar</Automatic-Module-Name>
+                  </manifestEntries>
+                </archive>
+              </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/...ava/org/languagetool/language/Arabic.java → .../org/languagetool/language/ar/Arabic.java b/...ava/org/languagetool/language/Arabic.java → .../org/languagetool/language/ar/Arabic.java
@@ -16,13 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
-package org.languagetool.language;
+package org.languagetool.language.ar;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.languagetool.Language;
 import org.languagetool.LanguageMaintainedState;
 import org.languagetool.UserConfig;
+import org.languagetool.language.Contributor;
 import org.languagetool.languagemodel.LanguageModel;
 import org.languagetool.rules.*;
 import org.languagetool.rules.ar.*;
@@ -96,8 +97,8 @@ public Synthesizer createDefaultSynthesizer() {
   @Override
   public Contributor[] getMaintainers() {
     return new Contributor[]{
-      new Contributor("Taha Zerrouki"),
-      new Contributor("Sohaib Afifi")
+      new Contributor("Taha Zerrouki", null),
+      new Contributor("Sohaib Afifi", null)
     };
   }
 

diff --git a/...uagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDarjaRule.java b/...uagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDarjaRule.java
@@ -19,7 +19,7 @@
  */
 package org.languagetool.rules.ar;
 
-import org.languagetool.language.Arabic;
+import org.languagetool.language.ar.Arabic;
 import org.languagetool.rules.AbstractSimpleReplaceRule2;
 import org.languagetool.rules.Categories;
 import org.languagetool.rules.Example;

diff --git a/...ool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDiacriticsRule.java b/...ool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDiacriticsRule.java
@@ -19,7 +19,7 @@
  */
 package org.languagetool.rules.ar;
 
-import org.languagetool.language.Arabic;
+import org.languagetool.language.ar.Arabic;
 import org.languagetool.rules.AbstractSimpleReplaceRule2;
 import org.languagetool.rules.Categories;
 import org.languagetool.rules.Example;

diff --git a/...ool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHomophonesRule.java b/...ool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHomophonesRule.java
@@ -19,7 +19,7 @@
  */
 package org.languagetool.rules.ar;
 
-import org.languagetool.language.Arabic;
+import org.languagetool.language.ar.Arabic;
 import org.languagetool.rules.AbstractSimpleReplaceRule2;
 import org.languagetool.rules.Categories;
 import org.languagetool.rules.Example;

diff --git a/...anguage-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHunspellSpellerRule.java b/...anguage-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHunspellSpellerRule.java
@@ -21,7 +21,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.languagetool.UserConfig;
-import org.languagetool.language.Arabic;
+import org.languagetool.language.ar.Arabic;
 import org.languagetool.rules.spelling.hunspell.HunspellRule;
 import org.languagetool.tools.ArabicStringTools;
 

diff --git a/...modules/ar/src/main/java/org/languagetool/rules/ar/ArabicInflectedOneWordReplaceRule.java b/...modules/ar/src/main/java/org/languagetool/rules/ar/ArabicInflectedOneWordReplaceRule.java
@@ -22,7 +22,7 @@
 import org.languagetool.AnalyzedSentence;
 import org.languagetool.AnalyzedToken;
 import org.languagetool.AnalyzedTokenReadings;
-import org.languagetool.language.Arabic;
+import org.languagetool.language.ar.Arabic;
 import org.languagetool.rules.*;
 import org.languagetool.synthesis.ar.ArabicSynthesizer;
 import org.languagetool.tagging.ar.ArabicTagger;

diff --git a/...ool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicRedundancyRule.java b/...ool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicRedundancyRule.java
@@ -19,7 +19,7 @@
  */
 package org.languagetool.rules.ar;
 
-import org.languagetool.language.Arabic;
+import org.languagetool.language.ar.Arabic;
 import org.languagetool.rules.AbstractSimpleReplaceRule2;
 import org.languagetool.rules.Categories;
 import org.languagetool.rules.Example;

diff --git a/...-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicSimpleReplaceRule.java b/...-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicSimpleReplaceRule.java
@@ -19,7 +19,7 @@
  */
 package org.languagetool.rules.ar;
 
-import org.languagetool.language.Arabic;
+import org.languagetool.language.ar.Arabic;
 import org.languagetool.rules.AbstractSimpleReplaceRule2;
 import org.languagetool.rules.Categories;
 import org.languagetool.rules.Example;

diff --git a/...tool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicTransVerbRule.java b/...tool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicTransVerbRule.java
@@ -22,7 +22,7 @@
 import org.languagetool.AnalyzedSentence;
 import org.languagetool.AnalyzedToken;
 import org.languagetool.AnalyzedTokenReadings;
-import org.languagetool.language.Arabic;
+import org.languagetool.language.ar.Arabic;
 import org.languagetool.rules.*;
 import org.languagetool.synthesis.ar.ArabicSynthesizer;
 import org.languagetool.tagging.ar.ArabicTagManager;