update for 5.6.3 & same location share one DynamicSynonymTokenFilterFactory

pom.xml

@@ -4,14 +4,14 @@
 
 	<groupId>com.bellszhu.elasticsearch</groupId>
 	<artifactId>elasticsearch-analysis-dynamic-synonym</artifactId>
-	<version>5.2.0</version>
+	<version>6.6.1</version>
 	<packaging>jar</packaging>
 	<name>elasticsearch-dynamic-synonym</name>
 	<description>Analysis-plugin for synonym</description>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<elasticsearch.version>5.2.0</elasticsearch.version>
+		<elasticsearch.version>6.6.1</elasticsearch.version>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<elasticsearch.plugin.name>analysis-dynamic-synonym</elasticsearch.plugin.name>
 		<elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
@@ -101,16 +101,13 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.3</version>
 				<configuration>
+					<appendAssemblyId>false</appendAssemblyId>
 					<outputDirectory>${project.build.directory}/releases/</outputDirectory>
 					<descriptors>
 						<descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor>
 					</descriptors>
-					<archive>
-						<manifest>
-							<mainClass>fully.qualified.MainClass</mainClass>
-						</manifest>
-					</archive>
 				</configuration>
 				<executions>
 					<execution>

src/main/assemblies/plugin.xml

@@ -8,21 +8,26 @@
     <files>
         <file>
             <source>${project.basedir}/src/main/resources/plugin-descriptor.properties</source>
-            <outputDirectory></outputDirectory>
+            <outputDirectory/>
+            <filtered>true</filtered>
+        </file>
+        <file>
+            <source>${project.basedir}/src/main/resources/plugin-security.policy</source>
+            <outputDirectory/>
             <filtered>true</filtered>
         </file>
     </files>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory/>
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <excludes>
                 <exclude>org.elasticsearch:elasticsearch</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory/>
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <includes>

src/main/java/com/bellszhu/elasticsearch/plugin/DynamicSynonymPlugin.java

@@ -3,13 +3,17 @@
  */
 package com.bellszhu.elasticsearch.plugin;
 
+import com.bellszhu.elasticsearch.plugin.synonym.analysis.DynamicSynonymGraphTokenFilterFactory;
 import com.bellszhu.elasticsearch.plugin.synonym.service.DynamicSynonymAnalysisService;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.component.LifecycleComponent;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.env.Environment;
+import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.analysis.AnalysisRegistry;
 import org.elasticsearch.index.analysis.TokenFilterFactory;
@@ -19,7 +23,6 @@
 
 import com.bellszhu.elasticsearch.plugin.synonym.analysis.DynamicSynonymTokenFilterFactory;
 import org.elasticsearch.script.ScriptService;
-import org.elasticsearch.search.SearchRequestParsers;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.watcher.ResourceWatcherService;
 
@@ -39,20 +42,31 @@ public class DynamicSynonymPlugin extends Plugin  implements AnalysisPlugin {
     private PluginComponent pluginComponent = new PluginComponent();
 
     @Override
-    public Collection<Object> createComponents(
-            Client client,
-            ClusterService clusterService,
-            ThreadPool threadPool,
-            ResourceWatcherService resourceWatcherService,
-            ScriptService scriptService,
-            SearchRequestParsers searchRequestParsers, 
-            NamedXContentRegistry xContentRegistry
-    ) {
+    public Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool,
+                                               ResourceWatcherService resourceWatcherService, ScriptService scriptService,
+                                               NamedXContentRegistry xContentRegistry, Environment environment,
+                                               NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry) {
+
         Collection<Object> components = new ArrayList<>();
         components.add(pluginComponent);
         return components;
     }
 
+
+//    @Override
+//    public Collection<Object> createComponents(
+//            Client client,
+//            ClusterService clusterService,
+//            ThreadPool threadPool,
+//            ResourceWatcherService resourceWatcherService,
+//            ScriptService scriptService,
+//            NamedXContentRegistry xContentRegistry
+//    ) {
+//        Collection<Object> components = new ArrayList<>();
+//        components.add(pluginComponent);
+//        return components;
+//    }
+
     @Override
     public Collection<Class<? extends LifecycleComponent>> getGuiceServiceClasses() {
         return singletonList(DynamicSynonymAnalysisService.class);
@@ -67,7 +81,7 @@ public Map<String, AnalysisModule.AnalysisProvider<TokenFilterFactory>> getToken
             @Override
             public TokenFilterFactory get(IndexSettings indexSettings, Environment environment, String name, Settings settings)
                     throws IOException {
-                return new DynamicSynonymTokenFilterFactory(indexSettings, environment, name, settings, pluginComponent.getAnalysisRegistry());
+                return DynamicSynonymGraphTokenFilterFactory.getInstance(indexSettings, environment, name, settings, pluginComponent.getAnalysisRegistry());
             }
 
             @Override

src/main/java/com/bellszhu/elasticsearch/plugin/synonym/analysis/DynamicSynonymFilter.java

@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.TokenStream;
@@ -25,7 +26,6 @@
 import org.apache.lucene.store.ByteArrayDataInput;
 import org.apache.lucene.util.*;
 import org.apache.lucene.util.fst.FST;
-import org.elasticsearch.common.logging.ESLoggerFactory;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -102,13 +102,14 @@
 
 public final class DynamicSynonymFilter extends TokenFilter {
 
-	public static Logger logger = ESLoggerFactory.getLogger("dynamic-synonym");
+	private final Logger logger = LogManager.getLogger("dynamic-synonym");
 
 	public static final String TYPE_SYNONYM = "SYNONYM";
 
 	private SynonymMap synonyms;
 
 	private final boolean ignoreCase;
+	private final boolean ignoreOffset;
 	private int rollBufferSize;
 
 	private int captureCount;
@@ -263,9 +264,12 @@ public void add(char[] output, int offset, int len, int endOffset,
 	 *            when you create the {@link SynonymMap}
 	 */
 	public DynamicSynonymFilter(TokenStream input, SynonymMap synonyms,
-			boolean ignoreCase) {
+			boolean ignoreCase
+			,boolean ignoreOffset
+		) {
 		super(input);
 		this.ignoreCase = ignoreCase;
+		this.ignoreOffset = ignoreOffset;
 		update(synonyms);
 	}
 
@@ -589,7 +593,11 @@ public boolean incrementToken() throws IOException {
 					if (endOffset == -1) {
 						endOffset = input.endOffset;
 					}
-					offsetAtt.setOffset(input.startOffset, endOffset);
+					if(!ignoreOffset){
+						offsetAtt.setOffset(input.startOffset, endOffset);
+					}else{
+						logger.info("dynamic synonym offset ignored");
+					}
 					posIncrAtt.setPositionIncrement(posIncr);
 					posLenAtt.setPositionLength(outputs.getLastPosLength());
 					if (outputs.count == 0) {
@@ -623,7 +631,11 @@ public boolean incrementToken() throws IOException {
 					}
 					clearAttributes();
 					// Keep offset from last input token:
-					offsetAtt.setOffset(lastStartOffset, lastEndOffset);
+                    if(!this.ignoreOffset){
+	                    offsetAtt.setOffset(lastStartOffset, lastEndOffset);
+                    }else{
+	                    logger.info("set offset ignored");
+                    }
 					termAtt.copyBuffer(output.chars, output.offset,
 							output.length);
 					typeAtt.setType(TYPE_SYNONYM);