preliminary support 6.1.0

Author: sscarduzio

commons/src/main/java/tech/beshu/ror/commons/settings/BasicSettings.java

@@ -21,6 +21,7 @@
 import tech.beshu.ror.commons.Constants;
 import tech.beshu.ror.commons.Verbosity;
 import tech.beshu.ror.commons.shims.es.LoggerShim;
+import tech.beshu.ror.commons.utils.ReflecUtils;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -123,6 +124,10 @@ private static String slurpFile(LoggerShim logger, String filePath) {
     return slurped[0];
   }
 
+  public static BasicSettings fromFileObj(LoggerShim logger, Path configPath, Object settingsObject) {
+    return fromFile(logger, configPath, (Map<String, ?>) ReflecUtils.invokeMethodCached(settingsObject, settingsObject.getClass(), "getAsStructuredMap"));
+  }
+
   public static BasicSettings fromFile(LoggerShim logger, Path configPath, Map<String, ?> fallback) {
     try {
       final String baseConfigDirPath = configPath.toAbsolutePath().toString();

commons/src/main/java/tech/beshu/ror/commons/utils/ReflecUtils.java

@@ -28,6 +28,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 
@@ -40,25 +41,26 @@ public class ReflecUtils {
   private static final HashMap<String, Method> methodsCache = new HashMap<>(128);
 
   public static Object invokeMethodCached(Object o, Class c, String method) {
+    System.out.println(c.getSimpleName());
     final Object[] result = new Object[1];
-    String cacheKey = c.getName() + method;
+    String cacheKey = c.getName() + "#" + method;
 
-    AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+    return AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
       try {
         Method m = methodsCache.get(cacheKey);
         if (m != null) {
           result[0] = m.invoke(o);
           return null;
         }
-        m = c.getMethod(method);
+        m = c.getDeclaredMethod(method);
+        m.setAccessible(true);
         methodsCache.put(cacheKey, m);
-        result[0] = m.invoke(o);
+        return  m.invoke(o);
       } catch (Exception e) {
         e.printStackTrace();
+        return null;
       }
-      return null;
     });
-    return result[0];
   }
 
   public static String[] extractStringArrayFromPrivateMethod(String methodName, Object o, ESContext context) {

es61x/build.gradle

@@ -0,0 +1,127 @@
+/*
+ *    This file is part of ReadonlyREST.
+ *
+ *    ReadonlyREST is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    ReadonlyREST is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with ReadonlyREST.  If not, see http://www.gnu.org/licenses/
+ */
+
+buildscript {
+    ext {
+        publishedPluginVersion = rootProject.properties['pluginVersion']
+        pluginVersion = rootProject.properties['pluginVersion']
+        esVersion = project.properties['esVersion']
+        pluginName = rootProject.properties['pluginName']
+    }
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.10.0'
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+group = 'org.elasticsearch.plugin'
+version = pluginVersion + '_es' + esVersion
+def pluginFullName = pluginName + '-' + version
+
+apply plugin: 'java'
+apply plugin: 'idea'
+apply plugin: 'maven'
+apply plugin: 'license'
+
+dependencies {
+    compile project(':core')
+   // compile project(':core2')
+    compile project(':commons')
+    compile 'org.elasticsearch:elasticsearch:' + esVersion
+    compile 'org.elasticsearch.plugin:transport-netty4-client:' + esVersion
+}
+
+license {
+    header rootProject.file('ReadonlyRESTLicenseHeader.txt')
+    skipExistingHeaders true
+    useDefaultMappings = false
+    mapping {
+        java = 'SLASHSTAR_STYLE'
+    }
+}
+
+tasks.withType(Zip) { task ->
+    task.doLast {
+        ant.checksum file: it.archivePath, algorithm: 'sha1'
+    }
+}
+
+configurations {
+    wagon
+    distJars {
+        extendsFrom runtime
+        exclude group: 'org.elasticsearch'
+        exclude group: 'lucene-core'
+        exclude group: 'org.apache.logging.log4j'
+        exclude group: 'lucene-analyzers-common'
+        exclude group: 'org.apache.commons'
+        exclude group: 'org.yaml'
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
+    }
+}
+
+task cleanOldData {
+    doLast {
+        delete 'build/tmp/' + pluginFullName
+    }
+}
+
+task jarHellCheck(type: JavaExec) {
+    outputs.upToDateWhen { false }
+    main = "org.elasticsearch.bootstrap.JarHell"
+    classpath = project.sourceSets.main.compileClasspath.filter { it.exists() }
+}
+
+task configureEsVersion() {
+    doLast {
+        if (project.hasProperty('esVersion')) {
+            esVersion = project.properties['esVersion']
+        }
+    }
+}
+
+task resolvePluginDescriptorTemplate(type: Copy, dependsOn: configureEsVersion) {
+    outputs.upToDateWhen { false }
+    from '../plugin-metadata'
+    into 'build/tmp/' + pluginFullName
+    expand([
+            'descriptor': [
+                    'name'         : pluginName,
+                    'pluginVersion': project.properties['pluginVersion'],
+                    'esVersion'    : project.properties['esVersion']
+            ]
+    ])
+}
+
+task ror(type: Zip, dependsOn: [cleanOldData, jarHellCheck, jar, resolvePluginDescriptorTemplate]) {
+    outputs.upToDateWhen { false }
+    archivesBaseName = pluginName
+    into('elasticsearch') {
+        from configurations.distJars
+        from 'build/libs/' + pluginFullName + '.jar'
+        from 'build/tmp/' + pluginFullName
+    }
+}

es61x/gradle.properties

@@ -0,0 +1 @@
+esVersion=6.1.0

es61x/licenses/accessors-smart-1.2.jar.sha1

@@ -0,0 +1 @@
+c592b500269bfde36096641b01238a8350f8aa31

es61x/licenses/accessors-smart-LICENSE.txt

@@ -0,0 +1 @@
+0da08b8cce7bbf903602a25a3a163ae252435795

es61x/licenses/accessors-smart-NOTICE.txt

@@ -0,0 +1 @@
+4b95f4897fa13f2cd904aee711aeafc0c5295cd8

es61x/licenses/asm-5.0.4.jar.sha1

@@ -0,0 +1 @@
+f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f

es61x/licenses/asm-LICENSE.txt

@@ -0,0 +1 @@
+3c85bc3679f3f2187101c349134b84d46e7fc4da

es61x/licenses/asm-NOTICE.txt

@@ -0,0 +1 @@
+3a3d111be1be1b745edfa7d91678a12d7ed38709

es61x/licenses/commons-codec-1.10.jar.sha1

@@ -0,0 +1 @@
+95aa3e6fb520191a0970a73cf09f62948ee614be

es61x/licenses/commons-codec-LICENSE.txt

@@ -0,0 +1 @@
+733db77aa8d9b2d68015189df76ab06304406e50

es61x/licenses/commons-codec-NOTICE.txt

@@ -0,0 +1 @@
+e7501a1b34325abb00d17dde96150604a0658b54

es61x/licenses/commons-logging-1.1.3.jar.sha1

@@ -0,0 +1 @@
+f4be009e7505f6ceddf21e7960c759f413f15056

es61x/licenses/commons-logging-LICENSE.txt

@@ -0,0 +1 @@
+45b426f7796b741035581a176744d91090e2e6fb

es61x/licenses/commons-logging-NOTICE.txt

@@ -0,0 +1 @@
+1f12816593c1422be957471c98a80bfbace60fa2

es61x/licenses/core-1.15.0.jar.sha1

@@ -0,0 +1 @@
+598244f595db5c5fb713731eddbb1c91a58d959b

es61x/licenses/core-LICENSE.txt

@@ -0,0 +1 @@
+f042fe2676bfdc2091545152e47d77e11999946d

es61x/licenses/core-NOTICE.txt

@@ -0,0 +1 @@
+ea41cf9e2020fd655a734d1d6fe91ee6533d64b9

es61x/licenses/guava-21.0.jar.sha1

@@ -0,0 +1 @@
+22290d17944bd239fabf5ac69005a60a7ecbbbcb

es61x/licenses/guava-LICENSE.txt

@@ -0,0 +1 @@
+007396407491352ce4fa30de92efb158adb76b5b

es61x/licenses/guava-NOTICE.txt

@@ -0,0 +1 @@
+65e89b4d0737cf1ed3eac2916ebf365f5312294c

es61x/licenses/httpasyncclient-4.1.2.jar.sha1

@@ -0,0 +1 @@
+b3ecd69e7ab0eb2054b26ad3efb13c34204ffe19

es61x/licenses/httpasyncclient-LICENSE.txt

@@ -0,0 +1 @@
+9f957998c651e7b73d6dc878f704d81b4c085387

es61x/licenses/httpasyncclient-NOTICE.txt

@@ -0,0 +1 @@
+06766071efa0426fb33101d1758a8d0e09d16ac7

es61x/licenses/httpclient-4.5.2.jar.sha1

@@ -0,0 +1 @@
+6f7dfa01c1af4280c154213b6d548405df352df9

es61x/licenses/httpclient-LICENSE.txt

@@ -0,0 +1 @@
+077734f94029b47887f6f9392d1fc62729e155aa

es61x/licenses/httpclient-NOTICE.txt

@@ -0,0 +1 @@
+469e86d4dda1dca8b88d2b1faa8e0f078243ba12

es61x/licenses/httpcore-4.4.5.jar.sha1

@@ -0,0 +1 @@
+4c686033d918ec1727e329b7222fcb020152e32b

es61x/licenses/httpcore-LICENSE.txt

@@ -0,0 +1 @@
+7cb6a2759c02f89c79546046c643c0ece0764f07

es61x/licenses/httpcore-NOTICE.txt

@@ -0,0 +1 @@
+139535a69a4239db087de9bab0bee568bf8e0b70

es61x/licenses/httpcore-nio-4.4.5.jar.sha1

@@ -0,0 +1 @@
+b628afefa7dc39ccb8f401fee27631d3a39d6709

es61x/licenses/httpcore-nio-LICENSE.txt

@@ -0,0 +1 @@
+f76725e5a215ea468ecda06a8d66a809281e685f