ES 7.9.2

Author: dweiss

build.gradle

@@ -1,11 +1,11 @@
 
 // This plugin's version (typically must match that of ES).
-version = '7.8.1'
+version = '7.9.2'
 group = 'org.carrot2'
 
 buildscript {
   ext {
-    version_es = '7.8.1'
+    version_es = '7.9.2'
     version_c2 = 'org.carrot2:carrot2-core:4.0.4'
   }
 
@@ -19,9 +19,11 @@ buildscript {
   }
 }
 
-apply plugin: 'java-library'
-apply plugin: 'idea'
-apply plugin: 'elasticsearch.esplugin'
+plugins {
+  id 'java-library'
+  id 'idea'
+  id 'elasticsearch.esplugin'
+}
 
 repositories {
   mavenLocal()

src/main/java/org/carrot2/elasticsearch/ClusteringAction.java

@@ -992,7 +992,7 @@ protected SearchResponse filterMaxHits(SearchResponse response, int maxHits) {
 
          InternalAggregations _internalAggregations = null;
          if (response.getAggregations() != null) {
-            _internalAggregations = new InternalAggregations(toInternal(response.getAggregations().asList()));
+            _internalAggregations = new InternalAggregations(toInternal(response.getAggregations().asList()), null);
          }
 
          SearchHits _searchHits =

src/main/java/org/carrot2/elasticsearch/ClusteringPlugin.java

@@ -66,8 +66,8 @@ public ClusteringPlugin(Settings settings) {
       this.pluginEnabled = settings.getAsBoolean(DEFAULT_ENABLED_PROPERTY_NAME, true);
       this.transportClient = TransportClient.CLIENT_TYPE.equals(Client.CLIENT_TYPE_SETTING_S.get(settings));
 
-      // Invoke loadSPI on our own class loader to load default algorithms.
-      reloadSPI(getClass().getClassLoader());
+      // load our own class loader's extensions.
+      loadExtensions(getClass().getClassLoader());
    }
 
    @Override
@@ -136,22 +136,34 @@ private LinkedHashMap<String, ClusteringAlgorithmProvider> reorderAlgorithms(
    }
 
    @Override
-   public void reloadSPI(ClassLoader classLoader) {
-      ServiceLoader.load(ClusteringAlgorithmProvider.class, classLoader).forEach((provider) -> {
-         String name = provider.name();
-         if (algorithmProviders.containsKey(name)) {
-            throw new RuntimeException("More than one provider for algorithm " + name + "?");
-         }
-         algorithmProviders.put(name, provider);
-      });
-
-      for (LanguageComponentsProvider provider :
-          ServiceLoader.load(LanguageComponentsProvider.class, classLoader)) {
-         for (String lang : provider.languages()) {
-            languageComponentProviders
-                .computeIfAbsent(lang, (k) -> new ArrayList<>())
-                .add(provider);
-         }
-      }
+   public void loadExtensions(ExtensionLoader loader) {
+     loadExtensions(
+         loader.loadExtensions(ClusteringAlgorithmProvider.class),
+         loader.loadExtensions(LanguageComponentsProvider.class));
    }
+
+  private void loadExtensions(ClassLoader classLoader) {
+     loadExtensions(
+         ServiceLoader.load(ClusteringAlgorithmProvider.class, classLoader),
+         ServiceLoader.load(LanguageComponentsProvider.class, classLoader));
+  }
+
+  private void loadExtensions(Iterable<ClusteringAlgorithmProvider> clusteringAlgorithmProviders,
+                              Iterable<LanguageComponentsProvider> languageComponentsProviders) {
+    clusteringAlgorithmProviders.forEach((provider) -> {
+        String name = provider.name();
+        if (algorithmProviders.containsKey(name)) {
+           throw new RuntimeException("More than one provider for algorithm " + name + "?");
+        }
+        algorithmProviders.put(name, provider);
+     });
+
+    languageComponentsProviders.forEach(provider -> {
+        for (String lang : provider.languages()) {
+           languageComponentProviders
+               .computeIfAbsent(lang, (k) -> new ArrayList<>())
+               .add(provider);
+        }
+     });
+  }
 }