Rename Action adaptor

Author: Jc2k

src/main/java/io/tinyauth/elasticsearch/actions/ActionIndexesAdaptor.java renamed to src/main/java/io/tinyauth/elasticsearch/ActionIndicesAdaptor.java

@@ -1,21 +1,21 @@
 /*
  * Copyright 2017 tinyauth.io
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  */
 
-package io.tinyauth.elasticsearch.actions;
+package io.tinyauth.elasticsearch;
 
 import java.util.Arrays;
 import java.util.List;
@@ -47,11 +47,11 @@
 import org.elasticsearch.common.logging.Loggers;
 
 
-public class ActionIndexesAdaptor {
-  private static final Logger logger = Loggers.getLogger(ActionIndexesAdaptor.class);
+public class ActionIndicesAdaptor {
+  private static final Logger logger = Loggers.getLogger(ActionIndicesAdaptor.class);
   private ArrayList<Method> methods;
 
-  public ActionIndexesAdaptor() {
+  public ActionIndicesAdaptor() {
     methods = new ArrayList<Method>();
 
     for (Method m: this.getClass().getMethods()) {
@@ -70,15 +70,15 @@ public ActionIndexesAdaptor() {
   public Set<String> extractIndices(SearchRequest req) {
     logger.error("SearchRequest");
     Set<String> idxs = new HashSet<String>();
-    Collections.addAll(idxs, req.indices()); 
+    Collections.addAll(idxs, req.indices());
     return idxs;
   }
 
   public Set<String> extractIndices(ActionRequest req) {
     logger.error("ActionRequest");
     return new HashSet<String>();
   }
-  
+
   public Set<String> getIndices(ActionRequest req) {
     for (Method m: methods) {
       Class<?>[] c = m.getParameterTypes();
@@ -102,7 +102,7 @@ public Set<String> getIndices(ActionRequest req) {
         }
       }
     }
-    
+
     logger.error("Unable to find adaptor for request");
     return new HashSet<String>();
   }

src/main/java/io/tinyauth/elasticsearch/Origin.java

@@ -19,6 +19,6 @@
 
 public class Origin {
   public static final String REST = "rest";
-  public static final String INTERNAL_REST = "rest";
+  public static final String INTERNAL_REST = "internal_rest";
   public static final String LOCAL = "local";
 }

src/main/java/io/tinyauth/elasticsearch/TinyauthActionFilter.java

@@ -81,7 +81,7 @@
 import io.tinyauth.elasticsearch.exceptions.ConnectionError;
 import io.tinyauth.elasticsearch.Constants;
 import io.tinyauth.elasticsearch.Origin;
-import io.tinyauth.elasticsearch.actions.*;
+import io.tinyauth.elasticsearch.ActionIndicesAdaptor;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.*;
 
@@ -90,7 +90,7 @@
 public class TinyauthActionFilter extends AbstractComponent implements ActionFilter {
 
   private static final Logger logger = Loggers.getLogger(TinyauthActionFilter.class);
-  private static final ActionIndexesAdaptor indexExtractor = new ActionIndexesAdaptor();
+  private static final ActionIndicesAdaptor indexExtractor = new ActionIndicesAdaptor();
 
   private final ThreadPool threadPool;