Skip to content

Commit

Permalink
update to es 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@bells
bells committed Jun 1, 2016
1 parent 39eb894 commit 38bfa86
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 82 deletions.
154 changes: 77 additions & 77 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,40 @@

<groupId>com.bellszhu.elasticsearch</groupId>
<artifactId>elasticsearch-analysis-dynamic-synonym</artifactId>
<version>2.0.0</version>
<version>2.1.0</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>2.0.0</elasticsearch.version>
<elasticsearch.version>2.1.0</elasticsearch.version>
<maven.compiler.target>1.7</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>
<elasticsearch.plugin.classname>com.bellszhu.elasticsearch.plugin.DynamicSynonymPlugin</elasticsearch.plugin.classname>
<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
<elasticsearch.plugin.name>analysis-dynamic-synonym</elasticsearch.plugin.name>
<elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
<elasticsearch.plugin.classname>com.bellszhu.elasticsearch.plugin.DynamicSynonymPlugin</elasticsearch.plugin.classname>
<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
</properties>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>

<scm>
<connection>scm:git:git@github.com:bells/elasticsearch-analysis-dynamic-synonym.git</connection>
<developerConnection>scm:git:git@github.com:bells/elasticsearch-analysis-dynamic-synonym.git</developerConnection>
<url>https://github.com/bells/elasticsearch-analysis-dynamic-synonym</url>
</scm>
<connection>scm:git:git@github.com:bells/elasticsearch-analysis-dynamic-synonym.git</connection>
<developerConnection>scm:git:git@github.com:bells/elasticsearch-analysis-dynamic-synonym.git</developerConnection>
<url>https://github.com/bells/elasticsearch-analysis-dynamic-synonym</url>
</scm>

<dependencies>
<dependency>
Expand All @@ -57,63 +57,63 @@
<version>4.4.1</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.11</version>
<configuration>
<includes>
<include>**/*Tests.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<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>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.11</version>
<configuration>
<includes>
<include>**/*Tests.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<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>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
12 changes: 7 additions & 5 deletions .../com/bellszhu/elasticsearch/plugin/synonym/analysis/DynamicSynonymTokenFilterFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.elasticsearch.index.analysis.AnalysisSettingsRequired;
import org.elasticsearch.index.analysis.TokenizerFactory;
import org.elasticsearch.index.analysis.TokenizerFactoryFactory;
import org.elasticsearch.index.settings.IndexSettings;
import org.elasticsearch.index.settings.IndexSettingsService;
import org.elasticsearch.indices.IndicesLifecycle;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.indices.analysis.IndicesAnalysisService;
Expand Down Expand Up @@ -58,12 +58,12 @@ public class DynamicSynonymTokenFilterFactory extends

@Inject
public DynamicSynonymTokenFilterFactory(Index index,
@IndexSettings Settings indexSettings, Environment env,
IndexSettingsService indexSettingsService, Environment env,
IndicesAnalysisService indicesAnalysisService,
Map<String, TokenizerFactoryFactory> tokenizerFactories,
@Assisted String name, @Assisted Settings settings,
IndicesService indicesService) {
super(index, indexSettings, name, settings);
super(index, indexSettingsService.getSettings(), name, settings);

this.indexName = index.getName();

Expand Down Expand Up @@ -93,8 +93,10 @@ public DynamicSynonymTokenFilterFactory(Index index,
}

final TokenizerFactory tokenizerFactory = tokenizerFactoryFactory
.create(tokenizerName, Settings.builder().put(indexSettings)
.put(settings).build());
.create(
tokenizerName,
Settings.builder().put(indexSettingsService.getSettings()).put(settings).build()
);

Analyzer analyzer = new Analyzer() {
@Override
Expand Down

0 comments on commit 38bfa86

Please sign in to comment.