summaryrefslogtreecommitdiffstats
path: root/infra/northbound
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-11-23 12:06:44 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-11-23 12:06:44 +0100
commitf2a0dc1c2fb8f94ab2fc8120827f3738fbf9cdb6 (patch)
tree8ef9a1d00c96d8539349f37d30a06fb11bdc0f57 /infra/northbound
parentf1c1e241b48997397616d9ac011647e2ac636397 (diff)
Fix method/modifiers ordering to comply with JLS
Change-Id: I2b886a118ff5167df89a2922802b343ce5978c95 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'infra/northbound')
-rw-r--r--infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpConfiguration.java13
-rw-r--r--infra/northbound/common/src/main/java/io/fd/honeycomb/northbound/NetconfConfiguration.java44
-rw-r--r--infra/northbound/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java66
3 files changed, 61 insertions, 62 deletions
diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpConfiguration.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpConfiguration.java
index 56a00ecb0..b651c4c0a 100644
--- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpConfiguration.java
+++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpConfiguration.java
@@ -23,18 +23,14 @@ import net.jmob.guice.conf.core.InjectConfig;
import net.jmob.guice.conf.core.Syntax;
/**
- * This is the Java equivalent for bgp.json file. We use guice-config library to load all the config attributes
- * into this class instance.
+ * This is the Java equivalent for bgp.json file. We use guice-config library to load all the config attributes into
+ * this class instance.
*
* The BindConfig annotation tells that bgp.json file should be looked up on classpath root.
*/
@BindConfig(value = "bgp", syntax = Syntax.JSON)
public class BgpConfiguration {
- public boolean isBgpMultiplePathsEnabled() {
- return Boolean.valueOf(bgpMultiplePaths.get());
- }
-
@InjectConfig("bgp-binding-address")
public Optional<String> bgpBindingAddress;
@InjectConfig("bgp-port")
@@ -51,6 +47,11 @@ public class BgpConfiguration {
public Optional<String> bgpProtocolInstanceName;
@InjectConfig("bgp-netty-threads")
public Integer bgpNettyThreads;
+
+ public boolean isBgpMultiplePathsEnabled() {
+ return Boolean.valueOf(bgpMultiplePaths.get());
+ }
+
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
diff --git a/infra/northbound/common/src/main/java/io/fd/honeycomb/northbound/NetconfConfiguration.java b/infra/northbound/common/src/main/java/io/fd/honeycomb/northbound/NetconfConfiguration.java
index 98d64d017..b015e355c 100644
--- a/infra/northbound/common/src/main/java/io/fd/honeycomb/northbound/NetconfConfiguration.java
+++ b/infra/northbound/common/src/main/java/io/fd/honeycomb/northbound/NetconfConfiguration.java
@@ -24,18 +24,6 @@ import net.jmob.guice.conf.core.Syntax;
@BindConfig(value = "netconf", syntax = Syntax.JSON)
public class NetconfConfiguration {
- public boolean isNetconfTcpEnabled() {
- return Boolean.valueOf(netconfTcp);
- }
-
- public boolean isNetconfSshEnabled() {
- return Boolean.valueOf(netconfSsh);
- }
-
- public boolean isNetconfEnabled() {
- return isNetconfTcpEnabled() || isNetconfSshEnabled();
- }
-
@InjectConfig("netconf-netty-threads")
public Integer netconfNettyThreads;
@InjectConfig("netconf-tcp-enabled")
@@ -53,17 +41,29 @@ public class NetconfConfiguration {
@InjectConfig("netconf-notification-stream-name")
public Optional<String> netconfNotificationStreamName = Optional.of("honeycomb");
+ public boolean isNetconfTcpEnabled() {
+ return Boolean.valueOf(netconfTcp);
+ }
+
+ public boolean isNetconfSshEnabled() {
+ return Boolean.valueOf(netconfSsh);
+ }
+
+ public boolean isNetconfEnabled() {
+ return isNetconfTcpEnabled() || isNetconfSshEnabled();
+ }
+
@Override
public String toString() {
- return "NetconfConfiguration{" +
- "netconfNettyThreads=" + netconfNettyThreads +
- ", netconfTcp='" + netconfTcp + '\'' +
- ", netconfTcpBindingAddress=" + netconfTcpBindingAddress +
- ", netconfTcpBindingPort=" + netconfTcpBindingPort +
- ", netconfSsh='" + netconfSsh + '\'' +
- ", netconfSshBindingAddress=" + netconfSshBindingAddress +
- ", netconfSshBindingPort=" + netconfSshBindingPort +
- ", netconfNotificationStreamName=" + netconfNotificationStreamName +
- '}';
+ return "NetconfConfiguration{"
+ + "netconfNettyThreads=" + netconfNettyThreads
+ + ", netconfTcp='" + netconfTcp + '\''
+ + ", netconfTcpBindingAddress=" + netconfTcpBindingAddress
+ + ", netconfTcpBindingPort=" + netconfTcpBindingPort
+ + ", netconfSsh='" + netconfSsh + '\''
+ + ", netconfSshBindingAddress=" + netconfSshBindingAddress
+ + ", netconfSshBindingPort=" + netconfSshBindingPort
+ + ", netconfNotificationStreamName=" + netconfNotificationStreamName
+ + '}';
}
}
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 +
+ '}';
}
}