Merge branch 'master' into topic/miurahr/migrate-lucene-8.11.3

languagetool-org · Oct 21, 2024 · 86295a2 · 86295a2
2 parents 4edeeb2 + c382af0
commit 86295a2
Show file tree

Hide file tree

Showing 84 changed files with 7,734 additions and 5,362 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -46,7 +46,7 @@ jobs:
   security-scan:
     resource_class: medium
     executor:
-      name: docker-openjdk11
+      name: docker-openjdk17
     environment:
       MAVEN_OPTS: -Xmx3500m
     steps:
@@ -60,7 +60,7 @@ jobs:
   test-and-deploy-full:
     resource_class: medium+
     executor:
-      name: docker-openjdk11
+      name: docker-openjdk17
     environment:
       MAVEN_OPTS: -Xmx3500m
     steps:
@@ -82,7 +82,7 @@ jobs:
   test-and-deploy-partial:
     resource_class: medium+
     executor: 
-      name: docker-openjdk11
+      name: docker-openjdk17
     environment: 
       MAVEN_OPTS: -Xmx3500m
     steps:
@@ -196,6 +196,6 @@ commands:
           command: |
             cd $CIRCLE_WORKING_DIRECTORY && .circleci/kick_off_premium.sh
 executors:
-  docker-openjdk11:
+  docker-openjdk17:
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:17.0
diff --git a/languagetool-client-example/pom.xml b/languagetool-client-example/pom.xml
@@ -15,16 +15,16 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.languagetool</groupId>
             <artifactId>language-all</artifactId>
-            <version>5.9</version>
+            <version>6.5</version>
         </dependency>
         <!--
         <dependency>

diff --git a/languagetool-commandline/src/main/java/org/languagetool/commandline/CommandLineTools.java b/languagetool-commandline/src/main/java/org/languagetool/commandline/CommandLineTools.java
@@ -179,7 +179,7 @@ public static void printMatches(List<RuleMatch> ruleMatches,
       }
       if (verbose && rule instanceof AbstractPatternRule) {
         AbstractPatternRule pRule = (AbstractPatternRule) rule;
-        output += " line=" + pRule.getXmlLineNumber();
+        output += " (line " + pRule.getXmlLineNumber()+")";
       }
       System.out.println(output);
       String msg = lang.toAdvancedTypography(match.getMessage()); //.replaceAll("<suggestion>", lang.getOpeningDoubleQuote()).replaceAll("</suggestion>", lang.getClosingDoubleQuote())

diff --git a/languagetool-core/pom.xml b/languagetool-core/pom.xml
@@ -315,20 +315,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>jdk8</id>
-            <activation>
-                <jdk>(,8)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>pl.project13.maven</groupId>
-                        <artifactId>git-commit-id-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>protoc</id>
             <build>

diff --git a/languagetool-core/src/main/java/org/languagetool/grpc/SynthesizeServerGrpc.java b/languagetool-core/src/main/java/org/languagetool/grpc/SynthesizeServerGrpc.java
@@ -5,14 +5,14 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.50.2)",
+    value = "by gRPC proto compiler (version 1.68.0)",
     comments = "Source: synthesizer.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class SynthesizeServerGrpc {
 
   private SynthesizeServerGrpc() {}
 
-  public static final String SERVICE_NAME = "lt_ml_server.SynthesizeServer";
+  public static final java.lang.String SERVICE_NAME = "lt_ml_server.SynthesizeServer";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<org.languagetool.grpc.Synthesizer.SynthesizeRequest,
@@ -92,31 +92,32 @@ public SynthesizeServerFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO
 
   /**
    */
-  public static abstract class SynthesizeServerImplBase implements io.grpc.BindableService {
+  public interface AsyncService {
 
     /**
      */
-    public void synthesize(org.languagetool.grpc.Synthesizer.SynthesizeRequest request,
+    default void synthesize(org.languagetool.grpc.Synthesizer.SynthesizeRequest request,
         io.grpc.stub.StreamObserver<org.languagetool.grpc.Synthesizer.SynthesizeResponse> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSynthesizeMethod(), responseObserver);
     }
+  }
+
+  /**
+   * Base class for the server implementation of the service SynthesizeServer.
+   */
+  public static abstract class SynthesizeServerImplBase
+      implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
-      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-          .addMethod(
-            getSynthesizeMethod(),
-            io.grpc.stub.ServerCalls.asyncUnaryCall(
-              new MethodHandlers<
-                org.languagetool.grpc.Synthesizer.SynthesizeRequest,
-                org.languagetool.grpc.Synthesizer.SynthesizeResponse>(
-                  this, METHODID_SYNTHESIZE)))
-          .build();
+      return SynthesizeServerGrpc.bindService(this);
     }
   }
 
   /**
+   * A stub to allow clients to do asynchronous rpc calls to service SynthesizeServer.
    */
-  public static final class SynthesizeServerStub extends io.grpc.stub.AbstractAsyncStub<SynthesizeServerStub> {
+  public static final class SynthesizeServerStub
+      extends io.grpc.stub.AbstractAsyncStub<SynthesizeServerStub> {
     private SynthesizeServerStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -138,8 +139,10 @@ public void synthesize(org.languagetool.grpc.Synthesizer.SynthesizeRequest reque
   }
 
   /**
+   * A stub to allow clients to do synchronous rpc calls to service SynthesizeServer.
    */
-  public static final class SynthesizeServerBlockingStub extends io.grpc.stub.AbstractBlockingStub<SynthesizeServerBlockingStub> {
+  public static final class SynthesizeServerBlockingStub
+      extends io.grpc.stub.AbstractBlockingStub<SynthesizeServerBlockingStub> {
     private SynthesizeServerBlockingStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -160,8 +163,10 @@ public org.languagetool.grpc.Synthesizer.SynthesizeResponse synthesize(org.langu
   }
 
   /**
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service SynthesizeServer.
    */
-  public static final class SynthesizeServerFutureStub extends io.grpc.stub.AbstractFutureStub<SynthesizeServerFutureStub> {
+  public static final class SynthesizeServerFutureStub
+      extends io.grpc.stub.AbstractFutureStub<SynthesizeServerFutureStub> {
     private SynthesizeServerFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -189,10 +194,10 @@ private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
       io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
       io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
-    private final SynthesizeServerImplBase serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(SynthesizeServerImplBase serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -221,6 +226,18 @@ public io.grpc.stub.StreamObserver<Req> invoke(
     }
   }
 
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
+    return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+        .addMethod(
+          getSynthesizeMethod(),
+          io.grpc.stub.ServerCalls.asyncUnaryCall(
+            new MethodHandlers<
+              org.languagetool.grpc.Synthesizer.SynthesizeRequest,
+              org.languagetool.grpc.Synthesizer.SynthesizeResponse>(
+                service, METHODID_SYNTHESIZE)))
+        .build();
+  }
+
   private static abstract class SynthesizeServerBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
     SynthesizeServerBaseDescriptorSupplier() {}
@@ -244,9 +261,9 @@ private static final class SynthesizeServerFileDescriptorSupplier
   private static final class SynthesizeServerMethodDescriptorSupplier
       extends SynthesizeServerBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    SynthesizeServerMethodDescriptorSupplier(String methodName) {
+    SynthesizeServerMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }