From f2a0dc1c2fb8f94ab2fc8120827f3738fbf9cdb6 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 23 Nov 2017 12:06:44 +0100
Subject: Fix method/modifiers ordering to comply with JLS

Change-Id: I2b886a118ff5167df89a2922802b343ce5978c95
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../northbound/restconf/RestconfConfiguration.java | 66 +++++++++++-----------
 1 file changed, 32 insertions(+), 34 deletions(-)

(limited to 'infra/northbound/restconf/src')

diff --git a/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java b/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java
index a02429b26..78bc39dd6 100644
--- a/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java
+++ b/infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java
@@ -25,18 +25,6 @@ import net.jmob.guice.conf.core.Syntax;
 @BindConfig(value = "restconf", syntax = Syntax.JSON)
 public class RestconfConfiguration {
 
-    public boolean isRestconfHttpEnabled() {
-        return Boolean.valueOf(restconfHttp);
-    }
-
-    public boolean isRestconfHttpsEnabled() {
-        return Boolean.valueOf(restconfHttps);
-    }
-
-    public boolean isRestconfEnabled() {
-        return isRestconfHttpEnabled() || isRestconfHttpsEnabled();
-    }
-
     @InjectConfig("restconf-http-enabled")
     public String restconfHttp;
     @InjectConfig("restconf-binding-address")
@@ -49,7 +37,6 @@ public class RestconfConfiguration {
     public Optional<String> restconfHttpsBindingAddress;
     @InjectConfig("restconf-https-port")
     public Optional<Integer> restconfHttpsPort;
-
     /**
      * Restconf keystore file name. It will be loaded from the classpath so must be present in one of the folders
      * packaged with the distribution e.g. cert/
@@ -60,7 +47,6 @@ public class RestconfConfiguration {
     public Optional<String> keystorePassword;
     @InjectConfig("restconf-keystore-manager-password")
     public Optional<String> keystoreManagerPassword;
-
     /**
      * Restconf truststore file name. It will be loaded from the classpath so must be present in one of the folders
      * packaged with the distribution e.g. cert/
@@ -86,28 +72,40 @@ public class RestconfConfiguration {
     @InjectConfig("restconf-https-selectors-size")
     public Optional<Integer> httpsSelectorsSize = Optional.of(1);
 
+    public boolean isRestconfHttpEnabled() {
+        return Boolean.valueOf(restconfHttp);
+    }
+
+    public boolean isRestconfHttpsEnabled() {
+        return Boolean.valueOf(restconfHttps);
+    }
+
+    public boolean isRestconfEnabled() {
+        return isRestconfHttpEnabled() || isRestconfHttpsEnabled();
+    }
+
     @Override
     public String toString() {
         return "RestconfConfiguration{" +
-                "restconfHttp='" + restconfHttp + '\'' +
-                ", restconfBindingAddress=" + restconfBindingAddress +
-                ", restconfPort=" + restconfPort +
-                ", restconfHttps='" + restconfHttps + '\'' +
-                ", restconfHttpsBindingAddress=" + restconfHttpsBindingAddress +
-                ", restconfHttpsPort=" + restconfHttpsPort +
-                ", restconfKeystore=" + restconfKeystore +
-                ", keystorePassword=" + keystorePassword +
-                ", keystoreManagerPassword=" + keystoreManagerPassword +
-                ", restconfTruststore=" + restconfTruststore +
-                ", truststorePassword=" + truststorePassword +
-                ", restconfWebsocketPort=" + restconfWebsocketPort +
-                ", restconfRootPath=" + restconfRootPath +
-                ", restPoolMaxSize=" + restPoolMaxSize +
-                ", restPoolMinSize=" + restPoolMinSize +
-                ", acceptorsSize=" + acceptorsSize +
-                ", selectorsSize=" + selectorsSize +
-                ", httpsAcceptorsSize=" + httpsAcceptorsSize +
-                ", httpsSelectorsSize=" + httpsSelectorsSize +
-                '}';
+            "restconfHttp='" + restconfHttp + '\'' +
+            ", restconfBindingAddress=" + restconfBindingAddress +
+            ", restconfPort=" + restconfPort +
+            ", restconfHttps='" + restconfHttps + '\'' +
+            ", restconfHttpsBindingAddress=" + restconfHttpsBindingAddress +
+            ", restconfHttpsPort=" + restconfHttpsPort +
+            ", restconfKeystore=" + restconfKeystore +
+            ", keystorePassword=" + keystorePassword +
+            ", keystoreManagerPassword=" + keystoreManagerPassword +
+            ", restconfTruststore=" + restconfTruststore +
+            ", truststorePassword=" + truststorePassword +
+            ", restconfWebsocketPort=" + restconfWebsocketPort +
+            ", restconfRootPath=" + restconfRootPath +
+            ", restPoolMaxSize=" + restPoolMaxSize +
+            ", restPoolMinSize=" + restPoolMinSize +
+            ", acceptorsSize=" + acceptorsSize +
+            ", selectorsSize=" + selectorsSize +
+            ", httpsAcceptorsSize=" + httpsAcceptorsSize +
+            ", httpsSelectorsSize=" + httpsSelectorsSize +
+            '}';
     }
 }
-- 
cgit 1.2.3-korg