Fix tabs

Change-Id: I08c75946b4c52736b7e680a31c1adcc449c3e2cb
Signed-off-by: Rob Adams <readams@readams.net>

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/Connection.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/Connection.java
index d23c5a2c9fb688a0f5527b22a2b15cf326121ed0..7f88e43387cf9e2d8cf8bbc6ae112c62632bffa4 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/Connection.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/Connection.java
@@ -58,7 +58,7 @@ public class Connection {
     }
 
     public JsonRpcEndpoint getEndpoint() {
-       return this.endpoint;
+        return this.endpoint;
     }
 
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/OpflexConnectionService.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/OpflexConnectionService.java
index bde025abb6e27142343e491addc4dd28e3688fb6..1c9b6efa16dfeedc0a1ba1dcd9c9a6d37c7b2d4e 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/OpflexConnectionService.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/OpflexConnectionService.java
@@ -63,7 +63,7 @@ public class OpflexConnectionService {
 
     public void setDataProvider(DataBrokerService salDataProvider) {
         // TODO: use this for OpFlex configuration data changes
-       this.dataProvider = salDataProvider;
+        this.dataProvider = salDataProvider;
         
         // TODO: Get configuration for various servers,
         //       to be sent in OpFlex Identity message

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpoint.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpoint.java
index afbe0e61bdd24f92bdaed2fdff18dde9ac2fef3e..2ca4e955b3e4fd81f0efb280a1052f98c500ab39 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpoint.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpoint.java
@@ -65,9 +65,9 @@ public class JsonRpcEndpoint {
 
     // This implementation will change -- modified port for testing only
     public SettableFuture<Object> invoke(JsonRpcMessage message) throws Throwable {
-       if (messageMap.get(message.getName()) == null) {
-                       return null;
-       }
+        if (messageMap.get(message.getName()) == null) {
+                return null;
+        }
         JsonRpc10Request request = new JsonRpc10Request(UUID.randomUUID().toString());
         request.setMethod(message.getName());
         request.setParams(message);

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessage.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessage.java
index ead3b6a81dad8bc64044307e3e7faf169a814711..b37a6f214afa42ab6ea9994668433d8c86f67174 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessage.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessage.java
@@ -11,7 +11,7 @@ package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
 
 public abstract class JsonRpcMessage {
 
-       public abstract String getName();
-       public abstract void setName(String name);
-       public abstract void invoke();
+    public abstract String getName();
+    public abstract void setName(String name);
+    public abstract void invoke();
 }

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessageMap.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessageMap.java
index 6230a238dd9ab0cee38e72011834331aff46a674..756733dd6866fbfba680a096366afb69f4211f8f 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessageMap.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessageMap.java
@@ -17,7 +17,7 @@ public class JsonRpcMessageMap {
     private Map<String, JsonRpcMessage> messageMap;
     
     public JsonRpcMessageMap() {
-       messageMap = Maps.newHashMap();
+        messageMap = Maps.newHashMap();
     }
     
     public JsonRpcMessage get(String messageName) {
@@ -25,6 +25,6 @@ public class JsonRpcMessageMap {
     }
 
     public void add(JsonRpcMessage message) {
-       messageMap.put(message.getName(), message);
+        messageMap.put(message.getName(), message);
     }
 }

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandler.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandler.java
index 06aeefe70a1ca2852133d6b3adfe429762b72a62..665f8f12829753a4d232c54202fa63c443b985c4 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandler.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandler.java
@@ -33,7 +33,7 @@ public class JsonRpcServiceBinderHandler extends ChannelInboundHandlerAdapter {
 
     // Setter to facilitate unit testing
     public void setEndpoint(JsonRpcEndpoint endpoint) {
-       this.endpoint = endpoint;
+        this.endpoint = endpoint;
     }
 
     @Override
@@ -43,10 +43,10 @@ public class JsonRpcServiceBinderHandler extends ChannelInboundHandlerAdapter {
             JsonNode jsonNode = (JsonNode) msg;
 
             if (jsonNode.has("result")) {
-               endpoint.processResult(jsonNode);
+                endpoint.processResult(jsonNode);
             } else if (jsonNode.hasNonNull("method")) {
                 if (jsonNode.has("id") && !Strings.isNullOrEmpty(jsonNode.get("id").asText())) {
-                       endpoint.processRequest(jsonNode);
+                    endpoint.processRequest(jsonNode);
                 }
             }
 

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpointTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpointTest.java
index 555f0337f635c72751b40fbc557b35cc1bb3a1b0..3d21d28dc058fe26e51c0dbdd4b641fafd6b22bb 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpointTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpointTest.java
@@ -38,19 +38,19 @@ public class JsonRpcEndpointTest {
     static final String simpleMessage = "{\"otherstuff\": \"foobar\"}";
     // Used for testing valid incoming JSONRPC request messages
     static final String testRequest = 
-               "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
+            "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
             "\"method\":" + "\"" + TEST_JSON_CLASS_NAME + "\",\"params\":null}";
     // Used for testing invalid incoming JSONRPC request messages
     static final String testBadRequest = 
-               "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
+            "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
             "\"method\":\"foobar\",\"params\":[]}";
     // Used for testing valid incoming JSONRPC echo request messages
     static final String testEchoRequest = 
-               "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
+            "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
             "\"method\":\"echo\",\"params\":[]}";
     // Used for testing invalid incoming JSONRPC response messages
     static final String unknownResponse = 
-               "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
+            "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
             "\"result\":\"foobar\",\"error\":null}";
 
 
@@ -62,28 +62,28 @@ public class JsonRpcEndpointTest {
 
     @JsonDeserialize
     static final class OpflexTest extends JsonRpcMessage {
-       private String otherstuff;
+        private String otherstuff;
         @JsonIgnore
-       private String name;
+        private String name;
 
-       public OpflexTest() {
-       }
+        public OpflexTest() {
+        }
 
-       public void setOtherstuff ( String otherstuff ) {
-               this.otherstuff = otherstuff;
-       }
-       public String getOtherstuff() {
-               return this.otherstuff;
-       }
+        public void setOtherstuff ( String otherstuff ) {
+            this.otherstuff = otherstuff;
+        }
+        public String getOtherstuff() {
+            return this.otherstuff;
+        }
 
         @Override
         public String getName() {
-               return this.name;
+            return this.name;
         }
 
         @Override 
         public void setName(String name) {
-               this.name = name;
+            this.name = name;
         }
 
         @Override
@@ -102,17 +102,17 @@ public class JsonRpcEndpointTest {
          */
         messageMap = new JsonRpcMessageMap();
         JsonRpcEndpointTest.OpflexTest rpcMethod = 
-                       new JsonRpcEndpointTest.OpflexTest();
+                new JsonRpcEndpointTest.OpflexTest();
         rpcMethod.setName(TEST_JSON_CLASS_NAME);
         messageMap.add(rpcMethod);
 
         decoder = new JsonRpcDecoder(1000);
         JsonRpcServiceBinderHandler binderHandler = 
-                       new JsonRpcServiceBinderHandler(null);
+                new JsonRpcServiceBinderHandler(null);
         channel = new EmbeddedChannel(decoder, binderHandler);
         
-       endpoint = new JsonRpcEndpoint(objectMapper, channel, messageMap);
-       binderHandler.setEndpoint(endpoint);
+        endpoint = new JsonRpcEndpoint(objectMapper, channel, messageMap);
+        binderHandler.setEndpoint(endpoint);
     }
 
 
@@ -120,7 +120,7 @@ public class JsonRpcEndpointTest {
     public void testOutbound() throws Exception {
         ObjectMapper objectMapper = new ObjectMapper();
         JsonRpcEndpointTest.OpflexTest testRpc = objectMapper.
-                       readValue(simpleMessage, JsonRpcEndpointTest.OpflexTest.class);
+                readValue(simpleMessage, JsonRpcEndpointTest.OpflexTest.class);
         testRpc.setName(TEST_JSON_CLASS_NAME);
         try {
             endpoint.invoke(testRpc);
@@ -131,7 +131,7 @@ public class JsonRpcEndpointTest {
             assertTrue(result.toString().contains("params"));
             channel.finish();
         } catch ( Throwable e ) {
-               fail();
+            fail();
         }
     }
 
@@ -163,7 +163,7 @@ public class JsonRpcEndpointTest {
     public void testInboundResponseMatch() throws Exception {
         ObjectMapper objectMapper = new ObjectMapper();
         JsonRpcEndpointTest.OpflexTest testRpc = objectMapper.
-                       readValue(simpleMessage, JsonRpcEndpointTest.OpflexTest.class);
+                readValue(simpleMessage, JsonRpcEndpointTest.OpflexTest.class);
         testRpc.setName(TEST_JSON_CLASS_NAME);
         
         try {
@@ -172,13 +172,13 @@ public class JsonRpcEndpointTest {
             JsonNode node = objectMapper.readValue(result, JsonNode.class);
             String idValue = node.path("id").textValue();
             String foo = "{ \"id\":\"" + idValue + 
-                       "\",\"result\":\"foobar\",\"error\":null}";
+                    "\",\"result\":\"foobar\",\"error\":null}";
             testTriggerFlag = false;
             channel.writeInbound(copiedBuffer(foo, CharsetUtil.UTF_8));
             assertTrue(testTriggerFlag);
             channel.finish();
          } catch ( Throwable e ) {
-               fail();
+            fail();
         }            
     }
 

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java
index 30d1c0ef8c9b06c4eb309b1a3709f27408215f65..717c4996e8b3b91d75fa987401597225c7944942 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java
@@ -36,11 +36,11 @@ public class JsonRpcServiceBinderHandlerTest {
 
     // Used for testing incoming JSONRPC request messages
     static final String testRequest = 
-               "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
+            "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
             "\"method\":  \"test_foo\",\"params\":null}";
     // Used for testing incoming JSONRPC response messages
     static final String testResponse = 
-               "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
+            "{ \"id\":\"2da9e3d7-0bbe-4099-b343-12783777452f\"," +
             "\"result\":\"foobar\",\"error\":null}";
     
     private JsonRpcEndpoint mockEndpoint;
@@ -50,7 +50,7 @@ public class JsonRpcServiceBinderHandlerTest {
     
     @Before
     public void setUp() throws Exception {
-       
+        
         mockEndpoint = mock(JsonRpcEndpoint.class);
         decoder = new JsonRpcDecoder(1000);
         binderHandler = new JsonRpcServiceBinderHandler(mockEndpoint);