From 851cb3ae8aac7041e1a2b3838053d6c52011aa22 Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Wed, 3 Sep 2014 11:55:42 +0200
Subject: [PATCH] Internal: fix members visibility, remove unused constant and
 needless try catch in indexed scripts transport actions

---
 .../delete/TransportDeleteIndexedScriptAction.java  |  4 ++--
 .../get/TransportGetIndexedScriptAction.java        | 13 ++++---------
 .../put/TransportPutIndexedScriptAction.java        |  8 ++++----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/delete/TransportDeleteIndexedScriptAction.java b/src/main/java/org/elasticsearch/action/indexedscripts/delete/TransportDeleteIndexedScriptAction.java
index 65cdf59c146..0e78358ad78 100644
--- a/src/main/java/org/elasticsearch/action/indexedscripts/delete/TransportDeleteIndexedScriptAction.java
+++ b/src/main/java/org/elasticsearch/action/indexedscripts/delete/TransportDeleteIndexedScriptAction.java
@@ -36,8 +36,8 @@ import org.elasticsearch.transport.TransportService;
  */
 public class TransportDeleteIndexedScriptAction extends HandledTransportAction<DeleteIndexedScriptRequest,  DeleteIndexedScriptResponse> {
 
-    private ScriptService scriptService;
-    private Client client;
+    private final ScriptService scriptService;
+    private final Client client;
 
     @Inject
     public TransportDeleteIndexedScriptAction(Settings settings, ThreadPool threadPool, ScriptService scriptService,
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/get/TransportGetIndexedScriptAction.java b/src/main/java/org/elasticsearch/action/indexedscripts/get/TransportGetIndexedScriptAction.java
index 10d7ae74232..99b980a37ca 100644
--- a/src/main/java/org/elasticsearch/action/indexedscripts/get/TransportGetIndexedScriptAction.java
+++ b/src/main/java/org/elasticsearch/action/indexedscripts/get/TransportGetIndexedScriptAction.java
@@ -35,9 +35,8 @@ import org.elasticsearch.transport.TransportService;
  */
 public class TransportGetIndexedScriptAction extends HandledTransportAction<GetIndexedScriptRequest, GetIndexedScriptResponse> {
 
-    public static final boolean REFRESH_FORCE = false;
-    ScriptService scriptService;
-    Client client;
+    private final ScriptService scriptService;
+    private final Client client;
 
     @Inject
     public TransportGetIndexedScriptAction(Settings settings, ThreadPool threadPool, ScriptService scriptService,
@@ -54,11 +53,7 @@ public class TransportGetIndexedScriptAction extends HandledTransportAction<GetI
 
     @Override
     public void doExecute(GetIndexedScriptRequest request, ActionListener<GetIndexedScriptResponse> listener){
-        try {
-            GetResponse scriptResponse = scriptService.queryScriptIndex(client, request.scriptLang(), request.id(), request.version(), request.versionType());
-            listener.onResponse(new GetIndexedScriptResponse(scriptResponse));
-        } catch(Throwable e){
-            listener.onFailure(e);
-        }
+        GetResponse scriptResponse = scriptService.queryScriptIndex(client, request.scriptLang(), request.id(), request.version(), request.versionType());
+        listener.onResponse(new GetIndexedScriptResponse(scriptResponse));
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/put/TransportPutIndexedScriptAction.java b/src/main/java/org/elasticsearch/action/indexedscripts/put/TransportPutIndexedScriptAction.java
index cc544159b12..3c9a4325661 100644
--- a/src/main/java/org/elasticsearch/action/indexedscripts/put/TransportPutIndexedScriptAction.java
+++ b/src/main/java/org/elasticsearch/action/indexedscripts/put/TransportPutIndexedScriptAction.java
@@ -20,9 +20,9 @@
 package org.elasticsearch.action.indexedscripts.put;
 
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DelegatingActionListener;
-import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.inject.Inject;
@@ -36,8 +36,8 @@ import org.elasticsearch.transport.TransportService;
  */
 public class TransportPutIndexedScriptAction extends HandledTransportAction<PutIndexedScriptRequest, PutIndexedScriptResponse> {
 
-    private ScriptService scriptService;
-    private Client client;
+    private final ScriptService scriptService;
+    private final Client client;
 
     @Inject
     public TransportPutIndexedScriptAction(Settings settings, ThreadPool threadPool,
@@ -57,7 +57,7 @@ public class TransportPutIndexedScriptAction extends HandledTransportAction<PutI
     protected void doExecute(final PutIndexedScriptRequest request, final ActionListener<PutIndexedScriptResponse> listener) {
         scriptService.putScriptToIndex(client, request.safeSource(), request.scriptLang(), request.id(), null, request.opType().toString(), request.version(), request.versionType(), new DelegatingActionListener<IndexResponse,PutIndexedScriptResponse>(listener) {
             @Override
-                public PutIndexedScriptResponse getDelegatedFromInstigator(IndexResponse indexResponse){
+            public PutIndexedScriptResponse getDelegatedFromInstigator(IndexResponse indexResponse){
                 return new PutIndexedScriptResponse(indexResponse.getType(),indexResponse.getId(),indexResponse.getVersion(),indexResponse.isCreated());
             }
         });