Revert Elasticsearch 7.10 changes and Updated version to '1.11.1.0' (#14)

* Revert "upgrade for Elasticsearch 7.10.0 (#10)"

This reverts commit 71a6b49

* Updated version to '1.11.1.0'

Author: akbhatta

build.gradle

@@ -16,8 +16,8 @@
 buildscript {
     ext {
         es_group = "org.elasticsearch"
-        es_version = '7.10.0'
-        opendistroVersion = '1.12.0'
+        es_version = '7.9.1'
+        opendistroVersion = '1.11.1'
     }
 
     repositories {
@@ -48,7 +48,7 @@ group 'com.amazon.opendistroforelasticsearch.commons'
 
 sourceCompatibility = 1.8
 
-version = "${opendistroVersion}.2"
+version = "${opendistroVersion}.0"
 
 apply plugin: 'java'
 apply plugin: 'jacoco'

src/main/java/com/amazon/opendistroforelasticsearch/commons/authuser/User.java

@@ -126,7 +126,7 @@ public static User parse(XContentParser parser) throws IOException {
         List<String> customAttNames = new ArrayList<>();
         String requestedTenant = null;
 
-        ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser);
+        ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser::getTokenLocation);
         while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
             String fieldName = parser.currentName();
             parser.nextToken();
@@ -135,19 +135,19 @@ public static User parse(XContentParser parser) throws IOException {
                     name = parser.text();
                     break;
                 case BACKEND_ROLES_FIELD:
-                    ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.currentToken(), parser);
+                    ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.currentToken(), parser::getTokenLocation);
                     while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
                         backendRoles.add(parser.text());
                     }
                     break;
                 case ROLES_FIELD:
-                    ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.currentToken(), parser);
+                    ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.currentToken(), parser::getTokenLocation);
                     while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
                         roles.add(parser.text());
                     }
                     break;
                 case CUSTOM_ATTRIBUTE_NAMES_FIELD:
-                    ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.currentToken(), parser);
+                    ensureExpectedToken(XContentParser.Token.START_ARRAY, parser.currentToken(), parser::getTokenLocation);
                     while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
                         customAttNames.add(parser.text());
                     }