From: Tony Tkacik Date: Wed, 10 Dec 2014 15:35:38 +0000 (+0000) Subject: Merge "BUG-2470: add trace of failed modification" X-Git-Tag: release/lithium~776 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=070893bfd87c7c45ecb4d19ed7848cc9698f37e8;hp=7c7b8183790456f9ac83489485122a49057c99db Merge "BUG-2470: add trace of failed modification" --- diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml index 6159922183..371d1675df 100644 --- a/features/mdsal/pom.xml +++ b/features/mdsal/pom.xml @@ -17,9 +17,93 @@ + - org.opendaylight.yangtools - features-yangtools + org.json + json + + + + + com.google.code.gson + gson + + + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-json-org + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-servlet + + + + + io.netty + netty-buffer + + + io.netty + netty-codec + + + io.netty + netty-codec-http + + + io.netty + netty-common + + + io.netty + netty-handler + + + io.netty + netty-transport + + + + + org.opendaylight.controller + features-akka + ${commons.opendaylight.version} features xml @@ -41,16 +125,19 @@ features xml + org.opendaylight.controller - features-akka - ${commons.opendaylight.version} - features + md-sal-config + ${mdsal.version} xml + config + org.opendaylight.controller - sal-core-api + sal-akka-raft + ${mdsal.version} org.opendaylight.controller @@ -60,21 +147,12 @@ org.opendaylight.controller sal-broker-impl - - org.opendaylight.controller - sal-dom-xsql - org.opendaylight.controller sal-karaf-xsql - - org.opendaylight.controller - sal-dom-xsql-config - config - xml - + org.opendaylight.controller sal-binding-api @@ -95,34 +173,22 @@ org.opendaylight.controller sal-connector-api + org.opendaylight.controller - sal-inmemory-datastore + sal-dom-xsql org.opendaylight.controller - md-sal-config - ${mdsal.version} - xml + sal-dom-xsql-config config + xml - - org.opendaylight.controller - sal-distributed-datastore - - - org.opendaylight.controller - sal-remoterpc-connector - + org.opendaylight.controller sal-clustering-commons - - org.opendaylight.controller - sal-akka-raft - ${mdsal.version} - org.opendaylight.controller sal-clustering-config @@ -151,72 +217,32 @@ xml config + org.opendaylight.controller - sal-netconf-connector - - - org.opendaylight.controller.model - model-inventory + sal-distributed-datastore + org.opendaylight.controller - netconf-config-dispatcher + sal-inmemory-datastore + org.opendaylight.controller - netconf-connector-config - ${netconf.version} - xml - config + sal-netconf-connector org.opendaylight.controller - sal-rest-connector - - - com.google.code.gson - gson - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-servlet - - - io.netty - netty-buffer - - - io.netty - netty-codec - - - io.netty - netty-codec-http - - - io.netty - netty-common - - - io.netty - netty-handler + sal-remote - io.netty - netty-transport + org.opendaylight.controller + sal-remoterpc-connector org.opendaylight.controller - sal-remote + sal-rest-connector org.opendaylight.controller @@ -226,34 +252,27 @@ config - org.opendaylight.controller.samples - sample-toaster - - - org.opendaylight.controller.samples - sample-toaster-provider + org.opendaylight.controller + sal-rest-docgen + - org.opendaylight.controller.samples - sample-toaster-consumer + org.opendaylight.controller + netconf-config-dispatcher - org.opendaylight.controller.samples - toaster-config - ${mdsal.version} + org.opendaylight.controller + netconf-connector-config + ${netconf.version} xml config + - org.opendaylight.controller.samples - clustering-it-model - ${mdsal.version} - - - org.opendaylight.controller.samples - clustering-it-provider - ${mdsal.version} + org.opendaylight.controller.model + model-inventory + org.opendaylight.controller.samples clustering-it-config @@ -266,51 +285,55 @@ clustering-it-config ${mdsal.version} xml - testmoduleshardconf + testmoduleconf org.opendaylight.controller.samples clustering-it-config ${mdsal.version} xml - testmoduleconf - - - org.opendaylight.controller - sal-rest-docgen - - - com.fasterxml.jackson.core - jackson-annotations + testmoduleshardconf - com.fasterxml.jackson.core - jackson-core + org.opendaylight.controller.samples + clustering-it-model + ${mdsal.version} - com.fasterxml.jackson.core - jackson-databind + org.opendaylight.controller.samples + clustering-it-provider + ${mdsal.version} + + - com.fasterxml.jackson.datatype - jackson-datatype-json-org + org.opendaylight.controller.samples + sample-toaster - com.fasterxml.jackson.module - jackson-module-jaxb-annotations + org.opendaylight.controller.samples + sample-toaster-consumer - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base + org.opendaylight.controller.samples + sample-toaster-provider - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + org.opendaylight.controller.samples + toaster-config + ${mdsal.version} + xml + config + + - org.json - json + org.opendaylight.yangtools + features-yangtools + features + xml + org.opendaylight.yangtools diff --git a/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java index e34eb32933..4febcd07c1 100644 --- a/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java +++ b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java @@ -457,7 +457,9 @@ public class ClusterManager implements IClusterServices { return null; } for (String cacheName : manager.getCacheNames()) { - if (!manager.isRunning(cacheName)) continue; + if (!manager.isRunning(cacheName)) { + continue; + } if (cacheName.startsWith("{" + containerName + "}_")) { String[] res = cacheName.split("[{}]"); if (res.length >= 4 && res[1].equals(containerName) diff --git a/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java index b8b54b45ba..a6314e0695 100644 --- a/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java +++ b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java @@ -42,18 +42,23 @@ public class IPHostId implements IHostId, Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } IPHostId other = (IPHostId) obj; if (ipAddress == null) { - if (other.ipAddress != null) + if (other.ipAddress != null) { return false; - } else if (!ipAddress.equals(other.ipAddress)) + } + } else if (!ipAddress.equals(other.ipAddress)) { return false; + } return true; } diff --git a/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java index e10c5d1a78..19f3f585b1 100644 --- a/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java +++ b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java @@ -56,23 +56,30 @@ public class IPMacHostId implements IHostId, Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } IPMacHostId other = (IPMacHostId) obj; if (ipAddress == null) { - if (other.ipAddress != null) + if (other.ipAddress != null) { return false; - } else if (!ipAddress.equals(other.ipAddress)) + } + } else if (!ipAddress.equals(other.ipAddress)) { return false; + } if (macAddr == null) { - if (other.macAddr != null) + if (other.macAddr != null) { return false; - } else if (!macAddr.equals(other.macAddr)) + } + } else if (!macAddr.equals(other.macAddr)) { return false; + } return true; } diff --git a/opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java b/opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java index a1d29dd27f..59b4a08464 100644 --- a/opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java +++ b/opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java @@ -44,8 +44,9 @@ public class HostTrackerCallable implements Callable { @Override public HostNodeConnector call() throws Exception { HostNodeConnector h = hostTracker.hostFind(trackedHost); - if (h != null) + if (h != null) { return h; + } hostTracker.setCallableOnPendingARP(trackedHost, this); Thread.sleep(2000); // wait 2sec to see if the host responds return hostTracker.hostQuery(trackedHost); diff --git a/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/Activator.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/Activator.java index 69c81242d9..abe8618d9b 100644 --- a/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/Activator.java +++ b/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/Activator.java @@ -38,7 +38,9 @@ public class Activator extends ComponentActivatorAbstractBase { @Override protected void configureGlobalInstance(Component c, Object imp) { - if (!imp.equals(BundleScanServiceImpl.class)) return; + if (!imp.equals(BundleScanServiceImpl.class)) { + return; + } // export service c.setInterface( new String[] { IBundleScanService.class.getName() }, diff --git a/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleInfo.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleInfo.java index 9cb1cb52ed..31c81dab7e 100644 --- a/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleInfo.java +++ b/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleInfo.java @@ -73,10 +73,14 @@ import org.slf4j.LoggerFactory; } private boolean matches(Pattern pattern, Set values) { - if (pattern == null) return true; + if (pattern == null) { + return true; + } //LOGGER.debug("Matching: {} {}", pattern.toString(), values); for (String s : values) { - if (pattern.matcher(s).find()) return true; + if (pattern.matcher(s).find()) { + return true; + } } return false; } @@ -130,7 +134,9 @@ import org.slf4j.LoggerFactory; Bundle initBundle, Set excludes) { for (BundleInfo other : bundlesToScan) { - if (other.getId() == target.getId()) continue; + if (other.getId() == target.getId()) { + continue; + } if (target.isDependantOn(other)) { if (!visited.contains(other)) { classes.addAll(BundleScanner.loadClasses( @@ -146,7 +152,9 @@ import org.slf4j.LoggerFactory; private boolean isDependantOn(BundleInfo other) { for (String pkg : importPkgs) { - if (other.exportPkgs.contains(pkg)) return true; + if (other.exportPkgs.contains(pkg)) { + return true; + } } return false; } @@ -154,14 +162,18 @@ import org.slf4j.LoggerFactory; public List getDependencies(Collection bundles) { List result = new ArrayList(); for(BundleInfo bundle : bundles) { - if (isDependantOn(bundle)) result.add(bundle); + if (isDependantOn(bundle)) { + result.add(bundle); + } } return result; } private static Set parsePackages(String packageString) { - if (packageString == null) return Collections.emptySet(); + if (packageString == null) { + return Collections.emptySet(); + } String[] packages = packageString.split(","); Set result = new HashSet(); for (int i=0; i> result = null; if (includeDependentBundleClasses) { @@ -254,7 +256,9 @@ import org.slf4j.LoggerFactory; StringBuilder errors = new StringBuilder(); for (String name : annotatedClasses) { try { - if (excludes != null && excludes.contains(name)) continue; + if (excludes != null && excludes.contains(name)) { + continue; + } result.add(initBundle.loadClass(name)); } catch (ClassNotFoundException e) { errors.append(name).append(", "); @@ -276,7 +280,9 @@ import org.slf4j.LoggerFactory; if (c.endsWith("*")) { c = c.substring(0, c.length() - 1); } - if (regex.length() > 0) regex.append("|"); + if (regex.length() > 0) { + regex.append("|"); + } regex.append("^"); if (convert2signature) { regex.append("L").append(c.replaceAll("\\.", "/")); @@ -291,12 +297,16 @@ import org.slf4j.LoggerFactory; } private void validate(List> classes) { - if (classes == null || classes.size() == 0) return; + if (classes == null || classes.size() == 0) { + return; + } Map names = new HashMap(); StringBuilder conflictsMsg = new StringBuilder(); for (Class c : classes) { XmlRootElement root = c.getAnnotation(XmlRootElement.class); - if (root == null) continue; + if (root == null) { + continue; + } String rootName = root.name(); if ("##default".equals(rootName)) { String clsName = c.getSimpleName(); diff --git a/opendaylight/adsal/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/ConnectionManagerNorthbound.java b/opendaylight/adsal/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/ConnectionManagerNorthbound.java index dde3210928..3f64b07ab6 100644 --- a/opendaylight/adsal/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/ConnectionManagerNorthbound.java +++ b/opendaylight/adsal/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/ConnectionManagerNorthbound.java @@ -62,7 +62,9 @@ public class ConnectionManagerNorthbound { } @Context public void setSecurityContext(SecurityContext context) { - if (context != null && context.getUserPrincipal() != null) username = context.getUserPrincipal().getName(); + if (context != null && context.getUserPrincipal() != null) { + username = context.getUserPrincipal().getName(); + } } protected String getUserName() { return username; diff --git a/opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthbound.java b/opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthbound.java index d7579c82e1..3769cc7818 100644 --- a/opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthbound.java +++ b/opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthbound.java @@ -83,7 +83,9 @@ public class HostTrackerNorthbound { @Context public void setSecurityContext(SecurityContext context) { - if (context != null && context.getUserPrincipal() != null) username = context.getUserPrincipal().getName(); + if (context != null && context.getUserPrincipal() != null) { + username = context.getUserPrincipal().getName(); + } } protected String getUserName() { diff --git a/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/src/main/java/org/opendaylight/controller/networkconfig/bridgedomain/northbound/BridgeDomainNorthbound.java b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/src/main/java/org/opendaylight/controller/networkconfig/bridgedomain/northbound/BridgeDomainNorthbound.java index 9ddba67e25..8aea7e57f8 100644 --- a/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/src/main/java/org/opendaylight/controller/networkconfig/bridgedomain/northbound/BridgeDomainNorthbound.java +++ b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/src/main/java/org/opendaylight/controller/networkconfig/bridgedomain/northbound/BridgeDomainNorthbound.java @@ -54,7 +54,9 @@ public class BridgeDomainNorthbound { @Context public void setSecurityContext(SecurityContext context) { - if (context != null && context.getUserPrincipal() != null) username = context.getUserPrincipal().getName(); + if (context != null && context.getUserPrincipal() != null) { + username = context.getUserPrincipal().getName(); + } } protected String getUserName() { return username; diff --git a/opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthbound.java b/opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthbound.java index 20f6cb40a5..de291d6d96 100644 --- a/opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthbound.java +++ b/opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthbound.java @@ -88,7 +88,9 @@ public class StaticRoutingNorthbound { @Context public void setSecurityContext(SecurityContext context) { - if (context != null && context.getUserPrincipal() != null) username = context.getUserPrincipal().getName(); + if (context != null && context.getUserPrincipal() != null) { + username = context.getUserPrincipal().getName(); + } } protected String getUserName() { return username; diff --git a/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java index 4175f1e3c4..ad9d1269e5 100644 --- a/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java +++ b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java @@ -70,7 +70,9 @@ public class StatisticsNorthbound { } @Context public void setSecurityContext(SecurityContext context) { - if (context != null && context.getUserPrincipal() != null) username = context.getUserPrincipal().getName(); + if (context != null && context.getUserPrincipal() != null) { + username = context.getUserPrincipal().getName(); + } } protected String getUserName() { diff --git a/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java index c5a9de3032..439519fa41 100644 --- a/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java +++ b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java @@ -11,45 +11,44 @@ import org.opendaylight.controller.sal.core.ConstructionException; import org.opendaylight.controller.sal.utils.INodeFactory; import org.opendaylight.controller.sal.core.Node; -public class StubNodeFactory implements INodeFactory - { - void init() { - } +public class StubNodeFactory implements INodeFactory { + void init() { + } - /** - * Function called by the dependency manager when at least one dependency - * become unsatisfied or when the component is shutting down because for - * example bundle is being stopped. - * - */ - void destroy() { - } + /** + * Function called by the dependency manager when at least one dependency + * become unsatisfied or when the component is shutting down because for + * example bundle is being stopped. + * + */ + void destroy() { + } - /** - * Function called by dependency manager after "init ()" is called and after - * the services provided by the class are registered in the service registry - * - */ - void start() { - } + /** + * Function called by dependency manager after "init ()" is called and after + * the services provided by the class are registered in the service registry + * + */ + void start() { + } - /** - * Function called by the dependency manager before the services exported by - * the component are unregistered, this will be followed by a "destroy ()" - * calls - * - */ - void stop() { - } + /** + * Function called by the dependency manager before the services exported by + * the component are unregistered, this will be followed by a "destroy ()" + * calls + * + */ + void stop() { + } - public Node fromString(String nodeType, String nodeId){ - if(nodeType.equals("STUB")) - try{ - return new Node("STUB", Integer.parseInt(nodeId)); - } catch(ConstructionException e) - { - return null; - } - return null; - } + public Node fromString(String nodeType, String nodeId){ + if(nodeType.equals("STUB")) { + try { + return new Node("STUB", Integer.parseInt(nodeId)); + } catch(ConstructionException e) { + return null; + } + } + return null; + } } diff --git a/opendaylight/adsal/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java b/opendaylight/adsal/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java index 5a637b7999..c73607ae83 100644 --- a/opendaylight/adsal/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java +++ b/opendaylight/adsal/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java @@ -103,7 +103,9 @@ public class ConnectionService implements IPluginOutConnectionService, IConnecti @Override public ConnectionLocality getLocalityStatus(Node node) { - if (this.connectionListener == null) return ConnectionLocality.NOT_CONNECTED; + if (this.connectionListener == null) { + return ConnectionLocality.NOT_CONNECTED; + } return connectionListener.getLocalityStatus(node); } @@ -133,7 +135,9 @@ public class ConnectionService implements IPluginOutConnectionService, IConnecti @Override public Status disconnect(Node node) { IPluginInConnectionService s = pluginService.get(node.getType()); - if (s != null) return s.disconnect(node); + if (s != null) { + return s.disconnect(node); + } return new Status(StatusCode.NOTFOUND); } diff --git a/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java index 77d03aa122..e7b261c8a2 100644 --- a/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java +++ b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java @@ -176,17 +176,19 @@ public class ConfigManager implements IConfigManager{ @Override public boolean memberExists(String name, String poolName) { - if(this.pools.containsKey(poolName)){ - if(this.pools.get(poolName).getMember(name) != null ) + if (this.pools.containsKey(poolName)) { + if (this.pools.get(poolName).getMember(name) != null) { return true; + } } return false; } @Override - public boolean memberExists(String name, String memberIP,String poolName){ - if(!this.pools.containsKey(poolName)) + public boolean memberExists(String name, String memberIP,String poolName) { + if (!this.pools.containsKey(poolName)) { return false; + } return this.pools.get(poolName).poolMemberExists(new PoolMember(name, memberIP, poolName)); } diff --git a/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java index e1a997b44c..b4836e9f17 100644 --- a/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java +++ b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java @@ -146,8 +146,9 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager { * requires */ public String getContainerName() { - if (containerName == null) + if (containerName == null) { return GlobalConstants.DEFAULT.toString(); + } return containerName; } diff --git a/opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java b/opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java index 3f6ac4a8c7..e7394f9262 100644 --- a/opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java +++ b/opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java @@ -278,7 +278,9 @@ public class UserManager implements IUserManager, IObjectReader, private String checkPasswordRecovery() { final String fileDescription = "Default Network Administrator password recovery file"; File recoveryFile = new File(UserManager.RECOVERY_FILE); - if (!recoveryFile.exists()) return null; + if (!recoveryFile.exists()) { + return null; + } // read the recovery file String pwd = null; try { diff --git a/opendaylight/adsal/web/root/pom.xml b/opendaylight/adsal/web/root/pom.xml index faede10e2d..3d633b6c65 100644 --- a/opendaylight/adsal/web/root/pom.xml +++ b/opendaylight/adsal/web/root/pom.xml @@ -24,6 +24,10 @@ junit junit + + commons-io + commons-io + org.opendaylight.controller clustering.services @@ -90,6 +94,7 @@ javax.servlet.resources, javax.xml.parsers, javax.xml.transform, + org.apache.commons.io, org.apache.commons.logging, org.apache.taglibs.standard.functions, org.apache.taglibs.standard.resources, diff --git a/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java index ca37f4b7c1..090efec31e 100644 --- a/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java +++ b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2013, 2014 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -9,6 +9,7 @@ package org.opendaylight.controller.web; import java.io.FileInputStream; +import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -18,6 +19,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.io.IOUtils; import org.opendaylight.controller.configuration.IConfigurationContainerService; import org.opendaylight.controller.configuration.IConfigurationService; import org.opendaylight.controller.containermanager.IContainerAuthorization; @@ -65,11 +67,17 @@ public class DaylightWeb { @ResponseBody public String getVersion(HttpServletRequest request, @PathVariable("property") String property) { Properties prop = new Properties(); + FileInputStream propertiesFile = null; try { - prop.load(new FileInputStream("version.properties")); + propertiesFile = new FileInputStream("version.properties"); + prop.load(propertiesFile); return prop.getProperty(property+".version"); - } catch (Exception e) { + } catch (IOException e) { + // TODO: We should be logging the exception here + // "Failed to open version.properties." return null; + } finally { + IOUtils.closeQuietly(propertiesFile); } } @RequestMapping(value = "web.json") diff --git a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java index 3eae43212f..fc515e109d 100644 --- a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java +++ b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java @@ -359,8 +359,9 @@ public abstract class BitBufferHelper { int value = 0; for (int i = 0; i < length; i++) { value = array[i]; - if (value < 0) + if (value < 0) { value += 256; + } ret = ret | (long) ((long) value << ((length - i - 1) * NetUtils.NumBitsInAByte)); } @@ -390,8 +391,9 @@ public abstract class BitBufferHelper { for (int i = startOffset; i < array.length; i++) { value = array[i]; - if (value < 0) + if (value < 0) { value += 256; + } ret = ret | (long) ((long) value << ((array.length - i - 1) * NetUtils.NumBitsInAByte)); } @@ -637,8 +639,9 @@ public abstract class BitBufferHelper { } } else { for (i = 0; i < numBytes; i++) { - if (i != 0) + if (i != 0) { InputLSBbits = (inputdata[i - 1] & getLSBMask(extraOffsetBits)); + } InputMSBbits = (byte) (inputdata[i] & (getMSBMask(NetUtils.NumBitsInAByte - extraOffsetBits))); InputMSBbits = (InputMSBbits >= 0) ? InputMSBbits @@ -648,16 +651,18 @@ public abstract class BitBufferHelper { InputMSBbits = InputLSBbits = 0; } if (RestBits < (NetUtils.NumBitsInAByte - extraOffsetBits)) { - if (numBytes != 0) + if (numBytes != 0) { InputLSBbits = (inputdata[i - 1] & getLSBMask(extraOffsetBits)); + } InputMSBbits = (byte) (inputdata[i] & (getMSBMask(RestBits))); InputMSBbits = (InputMSBbits >= 0) ? InputMSBbits : InputMSBbits + 256; data[startByteOffset + i] = (byte) ((data[startByteOffset + i]) | (InputLSBbits << (NetUtils.NumBitsInAByte - extraOffsetBits)) | (InputMSBbits >> extraOffsetBits)); } else if (RestBits == (NetUtils.NumBitsInAByte - extraOffsetBits)) { - if (numBytes != 0) + if (numBytes != 0) { InputLSBbits = (inputdata[i - 1] & getLSBMask(extraOffsetBits)); + } InputMSBbits = (byte) (inputdata[i] & (getMSBMask(NetUtils.NumBitsInAByte - extraOffsetBits))); InputMSBbits = (InputMSBbits >= 0) ? InputMSBbits @@ -665,8 +670,9 @@ public abstract class BitBufferHelper { data[startByteOffset + i] = (byte) (data[startByteOffset + i] | (InputLSBbits << (NetUtils.NumBitsInAByte - extraOffsetBits)) | (InputMSBbits >> extraOffsetBits)); } else { - if (numBytes != 0) + if (numBytes != 0) { InputLSBbits = (inputdata[i - 1] & getLSBMask(extraOffsetBits)); + } InputMSBbits = (byte) (inputdata[i] & (getMSBMask(NetUtils.NumBitsInAByte - extraOffsetBits))); InputMSBbits = (InputMSBbits >= 0) ? InputMSBbits diff --git a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java index d617c05a5a..cf56aebe60 100644 --- a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java +++ b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java @@ -74,18 +74,23 @@ abstract public class DataLinkAddress implements Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } DataLinkAddress other = (DataLinkAddress) obj; if (name == null) { - if (other.name != null) + if (other.name != null) { return false; - } else if (!name.equals(other.name)) + } + } else if (!name.equals(other.name)) { return false; + } return true; } diff --git a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java index b7b72cbffd..8c5f8b9ffd 100644 --- a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java +++ b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java @@ -99,15 +99,19 @@ public class EthernetAddress extends DataLinkAddress { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (!super.equals(obj)) + } + if (!super.equals(obj)) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } EthernetAddress other = (EthernetAddress) obj; - if (!Arrays.equals(macAddress, other.macAddress)) + if (!Arrays.equals(macAddress, other.macAddress)) { return false; + } return true; } diff --git a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/XmlFileStorageAdapter.java b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/XmlFileStorageAdapter.java index 7badc4b294..8bd420865c 100644 --- a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/XmlFileStorageAdapter.java +++ b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/XmlFileStorageAdapter.java @@ -52,8 +52,9 @@ public class XmlFileStorageAdapter implements StorageAdapter, Persister { LOG.debug("Storage file does not exist, creating empty file"); try { boolean result = storage.createNewFile(); - if (result == false) + if (result == false) { throw new RuntimeException("Unable to create storage file " + storage); + } } catch (IOException e) { throw new RuntimeException("Unable to create storage file " + storage, e); } diff --git a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/Config.java b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/Config.java index 354c8c0540..e629d20db5 100644 --- a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/Config.java +++ b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/Config.java @@ -65,8 +65,9 @@ public final class Config { } public static Config fromXml(File from) { - if(isEmpty(from)) + if(isEmpty(from)) { return new Config(); + } try { JAXBContext jaxbContext = JAXBContext.newInstance(Config.class); diff --git a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackStatusListener.java b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackStatusListener.java index 8111136cfc..720f33d794 100644 --- a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackStatusListener.java +++ b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackStatusListener.java @@ -106,8 +106,9 @@ public class LogbackStatusListener implements StatusListener, LogbackRuntimeMXBe @Override public void close() throws IOException { - if (reg != null) + if (reg != null) { reg.close(); + } unregisterFromLogback(); } diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java index 3cbbb28ab4..9ad8d2826f 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java @@ -253,9 +253,10 @@ public class JMXGenerator implements CodeGenerator { public void setMavenProject(MavenProject project) { this.projectBaseDir = project.getBasedir(); - if (LOG != null) + if (LOG != null) { LOG.debug(getClass().getCanonicalName(), " project base dir: ", projectBaseDir); + } } @VisibleForTesting diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/GeneralClassTemplate.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/GeneralClassTemplate.java index 1576c9ddb0..3f4917f2ff 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/GeneralClassTemplate.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/GeneralClassTemplate.java @@ -38,9 +38,10 @@ public class GeneralClassTemplate extends AbstractFtlTemplate { } static List checkCardinality(List extendedClass) { - if (extendedClass.size() > 1) + if (extendedClass.size() > 1) { throw new IllegalArgumentException( "Class cannot have more than one super " + "class"); + } return extendedClass; } diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/TemplateFactory.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/TemplateFactory.java index 942def02c0..53ab4ef335 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/TemplateFactory.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/TemplateFactory.java @@ -166,10 +166,11 @@ public class TemplateFactory { Lists. newArrayList()); sieTemplate.setJavadoc(sie.getNullableDescription()); - if (sie.getNullableDescription() != null) + if (sie.getNullableDescription() != null) { sieTemplate.getAnnotations().add( Annotation.createDescriptionAnnotation(sie .getNullableDescription())); + } sieTemplate.getAnnotations().addAll(Annotation.createSieAnnotations(sie)); return sieTemplate; @@ -223,10 +224,11 @@ public class TemplateFactory { attrProcessor.getMethods(), generateRuntime, registratorFullyQualifiedName); - if (mbe.getNullableDescription() != null) + if (mbe.getNullableDescription() != null) { abstractModuleTemplate.getAnnotations().add( Annotation.createDescriptionAnnotation(mbe .getNullableDescription())); + } return abstractModuleTemplate; } @@ -687,8 +689,9 @@ public class TemplateFactory { private static boolean needsDepResolver(AttributeIfc value) { - if(value instanceof TOAttribute) + if(value instanceof TOAttribute) { return true; + } if(value instanceof ListAttribute) { AttributeIfc innerAttribute = ((ListAttribute) value).getInnerAttribute(); return needsDepResolver(innerAttribute); diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/Dependency.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/Dependency.java index 6ea2ea1724..fd07e269f4 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/Dependency.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/Dependency.java @@ -28,17 +28,21 @@ public class Dependency { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Dependency that = (Dependency) o; - if (mandatory != that.mandatory) + if (mandatory != that.mandatory) { return false; - if (!sie.equals(that.sie)) + } + if (!sie.equals(that.sie)) { return false; + } return true; } diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/JavaAttribute.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/JavaAttribute.java index e13c22a2ab..f6ce92d506 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/JavaAttribute.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/JavaAttribute.java @@ -281,8 +281,9 @@ public class JavaAttribute extends AbstractAttribute implements TypedAttribute { // TODO verify private boolean isPrimitive(String innerTypeFullyQName) { - if (innerTypeFullyQName.contains(".")) + if (innerTypeFullyQName.contains(".")) { return false; + } return true; } diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/util/FullyQualifiedNameHelper.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/util/FullyQualifiedNameHelper.java index 966aff96a0..7c3ebb5916 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/util/FullyQualifiedNameHelper.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/util/FullyQualifiedNameHelper.java @@ -14,8 +14,9 @@ public class FullyQualifiedNameHelper { public static String getFullyQualifiedName(String packageName, String className) { - if (packageName.isEmpty()) + if (packageName.isEmpty()) { return className; + } return packageName + "." + className; } } diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml index f6d7dbab1a..35fa535da6 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -9,49 +9,78 @@ sal-clustering-commons - bundle - - + + - com.typesafe.akka - akka-actor_${scala.version} + junit + junit + test - - com.typesafe.akka - akka-cluster_${scala.version} + xmlunit + xmlunit - com.typesafe.akka - akka-persistence-experimental_${scala.version} + org.mockito + mockito-all + test - - com.typesafe.akka - akka-remote_${scala.version} + org.slf4j + slf4j-simple + test + - com.typesafe.akka - akka-testkit_${scala.version} + commons-lang + commons-lang - + - org.scala-lang - scala-library + com.typesafe.akka + akka-actor_${scala.version} - - - com.typesafe.akka - akka-slf4j_${scala.version} + com.typesafe.akka + akka-cluster_${scala.version} + + + com.typesafe.akka + akka-osgi_${scala.version} + + + com.typesafe.akka + akka-persistence-experimental_${scala.version} + + + com.typesafe.akka + akka-remote_${scala.version} + + + com.typesafe.akka + akka-slf4j_${scala.version} + + + com.typesafe.akka + akka-testkit_${scala.version} + + + com.codahale.metrics + metrics-core + + + com.codahale.metrics + metrics-graphite + + com.google.code.findbugs jsr305 @@ -65,9 +94,17 @@ protobuf-java 2.5.0 + + - commons-lang - commons-lang + org.scala-lang + scala-library + + + + + org.opendaylight.controller + netconf-util org.opendaylight.yangtools @@ -97,121 +134,13 @@ org.opendaylight.yangtools yang-model-util - org.opendaylight.yangtools yang-parser-impl - - org.opendaylight.controller - netconf-util - - - - xmlunit - xmlunit - - - junit - junit - test - - - junit - junit - test - - - org.mockito - mockito-all - test - - - org.slf4j - slf4j-simple - test - - - org.opendaylight.yangtools - util - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools - yang-data-api - - - org.opendaylight.yangtools - yang-data-impl - - - org.opendaylight.yangtools - yang-model-api - - - org.opendaylight.yangtools - yang-model-util - - - org.opendaylight.yangtools - yang-binding - - - - - com.typesafe.akka - akka-osgi_${scala.version} - - - com.typesafe.akka - akka-actor_${scala.version} - - - com.google.guava - guava - - - junit - junit - test - - - - xmlunit - xmlunit - - - - org.opendaylight.yangtools - yang-parser-impl - - - commons-lang - commons-lang - - - org.slf4j - slf4j-simple - test - - - com.google.code.findbugs - jsr305 - - - com.codahale.metrics - metrics-core - - - com.codahale.metrics - metrics-graphite - - + org.jacoco diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java index 8950b3c849..1d3967f94d 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java @@ -104,8 +104,9 @@ public abstract class AbstractDataModification

, D> implements } private final void checkMutable() { - if (!NEW.equals(this.getStatus())) + if (!NEW.equals(this.getStatus())) { throw new IllegalStateException("Transaction was already submitted"); + } } @Override diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/RoutingUtils.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/RoutingUtils.java index 9001aaa4de..0672ba2b6d 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/RoutingUtils.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/RoutingUtils.java @@ -80,16 +80,19 @@ public class RoutingUtils { } RouteChangeImpl other = (RouteChangeImpl) obj; if (announcement == null) { - if (other.announcement != null) + if (other.announcement != null) { return false; - } else if (!announcement.equals(other.announcement)) + } + } else if (!announcement.equals(other.announcement)) { return false; + } if (removal == null) { if (other.removal != null) { return false; } - } else if (!removal.equals(other.removal)) + } else if (!removal.equals(other.removal)) { return false; + } return true; } } diff --git a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Arguments.java b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Arguments.java index a4017c23a8..17ce5dffcf 100644 --- a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Arguments.java +++ b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Arguments.java @@ -23,8 +23,9 @@ public final class Arguments { */ @SuppressWarnings("unchecked") public static T checkInstanceOf(Object value, Class type) { - if(!type.isInstance(value)) + if(!type.isInstance(value)) { throw new IllegalArgumentException(String.format("Value %s is not of type %s", value, type)); + } return (T) value; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index cbaf278a87..0c3387a5f8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -10,161 +10,143 @@ bundle + - com.google.guava - guava + junit + junit + test + + + org.mockito + mockito-all + test + + + org.slf4j + slf4j-simple + test + + + + org.osgi + org.osgi.core + com.typesafe.akka akka-actor_${scala.version} - com.typesafe.akka akka-cluster_${scala.version} - + + com.typesafe.akka + akka-osgi_${scala.version} + com.typesafe.akka akka-persistence-experimental_${scala.version} - com.typesafe.akka akka-remote_${scala.version} - + + com.typesafe.akka + akka-slf4j_${scala.version} + com.typesafe.akka akka-testkit_${scala.version} + - com.typesafe.akka - akka-slf4j_${scala.version} + com.codahale.metrics + metrics-core + + + com.codahale.metrics + metrics-graphite + - com.typesafe.akka - akka-osgi_${scala.version} + com.google.guava + guava - + + + org.scala-lang + scala-library + + org.opendaylight.controller config-api - + + org.opendaylight.controller + sal-akka-raft + 1.2.0-SNAPSHOT + org.opendaylight.controller sal-binding-api - org.opendaylight.controller sal-binding-config - - - org.opendaylight.yangtools - yang-data-api - - - - org.opendaylight.yangtools - yang-data-impl - - org.opendaylight.controller - sal-inmemory-datastore + sal-clustering-commons - org.opendaylight.controller sal-common-api - org.opendaylight.controller sal-common-util - org.opendaylight.controller sal-core-spi + + org.opendaylight.controller + sal-inmemory-datastore + org.opendaylight.yangtools concepts - org.opendaylight.yangtools yang-binding - org.opendaylight.yangtools yang-common - - - org.osgi - org.osgi.core - - - - org.scala-lang - scala-library - - - org.opendaylight.controller - sal-clustering-commons - - - - org.opendaylight.controller - sal-akka-raft - 1.2.0-SNAPSHOT - - - - com.codahale.metrics - metrics-core - - - - com.codahale.metrics - metrics-graphite - - - - junit - junit - test - - - org.mockito - mockito-all - test + org.opendaylight.yangtools + yang-data-api - - org.slf4j - slf4j-simple - test + org.opendaylight.yangtools + yang-data-impl - - org.apache.felix maven-bundle-plugin diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrint.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrint.java index 867c7a47b5..a9c0f69fc6 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrint.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrint.java @@ -114,8 +114,9 @@ public class XSQLBluePrint implements DatabaseMetaData, Serializable { String odlTableName) { Map map = this.odlNameToBluePrint .get(odlTableName); - if (map == null) + if (map == null) { return null; + } return map.values().toArray(new XSQLBluePrintNode[map.size()]); } diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintNode.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintNode.java index 8e9ed3a26b..4a56545238 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintNode.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintNode.java @@ -240,12 +240,15 @@ public class XSQLBluePrintNode implements Serializable { XSQLBluePrintNode other = (XSQLBluePrintNode) obj; if (odlNode != null) { return getBluePrintNodeName().equals(other.getBluePrintNodeName()); - } else if (this.odlTableName == null && other.odlTableName != null) + } else if (this.odlTableName == null && other.odlTableName != null) { return false; - if (this.odlTableName != null && other.odlTableName == null) + } + if (this.odlTableName != null && other.odlTableName == null) { return false; - else + } + else { return this.odlTableName.equals(other.odlTableName); + } } @Override diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCConnection.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCConnection.java index bf1244f2e3..137631f611 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCConnection.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCConnection.java @@ -73,8 +73,9 @@ public class JDBCConnection implements Connection, Runnable { } private void init() throws Exception { - if (addr.startsWith("http://")) + if (addr.startsWith("http://")) { addr = addr.substring(7); + } System.err.print("Address is:" + addr); socket = new Socket(addr, 40004); try { diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java index 37eacd5595..d37fdb8819 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java @@ -66,16 +66,18 @@ public class JDBCResultSet implements Serializable, ResultSet, } public JDBCResultSet addSubQuery(String _sql,String logicalName) { - if(subQueries == null) + if (subQueries == null) { subQueries = new HashMap(); + } JDBCResultSet rs = new JDBCResultSet(_sql); this.subQueries.put(logicalName,rs); return rs; } public Map getSubQueries() { - if(this.subQueries==null) + if (this.subQueries==null) { this.subQueries = new HashMap<>(); + } return this.subQueries; } @@ -381,13 +383,15 @@ public class JDBCResultSet implements Serializable, ResultSet, for (Object child : children) { String odlNodeName = XSQLODLUtils.getNodeIdentiofier(child); - if (odlNodeName == null) + if (odlNodeName == null) { continue; + } XSQLBluePrintNode eNodes[] = bluePrint .getBluePrintNodeByODLTableName(odlNodeName); - if (eNodes == null) + if (eNodes == null) { continue; + } boolean match = false; for (XSQLBluePrintNode enode : eNodes) { @@ -397,8 +401,9 @@ public class JDBCResultSet implements Serializable, ResultSet, } } - if (!match) + if (!match) { continue; + } if (child.getClass().getName().endsWith("ImmutableContainerNode")) { result.add(child); @@ -466,8 +471,9 @@ public class JDBCResultSet implements Serializable, ResultSet, for (XSQLBluePrintNode eNode : eNodes) { bpn = this.tablesInQueryMap.get(eNode .getBluePrintNodeName()); - if (bpn != null) + if (bpn != null) { break; + } } boolean isObjectInCriteria = true; if (bpn != null) { @@ -482,8 +488,9 @@ public class JDBCResultSet implements Serializable, ResultSet, if (isObjectInCriteria) { if (root) { - if (!rec.data.isEmpty()) + if (!rec.data.isEmpty()) { addRecord(rec.data); + } } else { result.add(rec); } diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java index b348d8fda8..7b2733ccf7 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java @@ -193,10 +193,12 @@ public class JDBCServer extends Thread { int braketCount = 0; int endSubQuery = startSubQuery; do { - if (sql.charAt(endSubQuery) == '(') + if (sql.charAt(endSubQuery) == '(') { braketCount++; - else if (sql.charAt(endSubQuery) == ')') + } + else if (sql.charAt(endSubQuery) == ')') { braketCount--; + } endSubQuery++; } while (braketCount > 0 || endSubQuery == sql.length()); String subQuerySQL = sql.substring(startSubQuery + 1,endSubQuery - 1); @@ -338,8 +340,9 @@ public class JDBCServer extends Thread { whereTo = order; } - if(whereTo==-1) + if(whereTo==-1) { whereTo=lowSQL.length(); + } String whereStatement = rs.getSQL().substring(where + 5, whereTo) .trim(); diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java index e0b774f53c..d758073a8e 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfStateSchemas.java @@ -213,12 +213,18 @@ public final class NetconfStateSchemas { @Override public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } final RemoteYangSchema that = (RemoteYangSchema) o; - if (!qname.equals(that.qname)) return false; + if (!qname.equals(that.qname)) { + return false; + } return true; } diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/util/RemoteDeviceId.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/util/RemoteDeviceId.java index 175cb8e207..333b42e1c5 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/util/RemoteDeviceId.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/util/RemoteDeviceId.java @@ -71,13 +71,21 @@ public class RemoteDeviceId { @Override public boolean equals(final Object o) { - if (this == o) return true; - if (!(o instanceof RemoteDeviceId)) return false; + if (this == o) { + return true; + } + if (!(o instanceof RemoteDeviceId)) { + return false; + } final RemoteDeviceId that = (RemoteDeviceId) o; - if (!name.equals(that.name)) return false; - if (!bindingPath.equals(that.bindingPath)) return false; + if (!name.equals(that.name)) { + return false; + } + if (!bindingPath.equals(that.bindingPath)) { + return false; + } return true; } diff --git a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/DocProvider.java b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/DocProvider.java index 9442ca0c07..c07e9c78be 100644 --- a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/DocProvider.java +++ b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/DocProvider.java @@ -76,11 +76,13 @@ public class DocProvider implements BundleActivator, ServiceTrackerCustomizer
reference, Broker service) { - if (session != null) + if (session != null) { session.close(); + } Broker broker = bundleContext.getService(reference); session = broker.registerProvider(this, bundleContext); diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/impl/helper/FlowComparator.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/impl/helper/FlowComparator.java index c6205cb13c..ded3197f0f 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/impl/helper/FlowComparator.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/impl/helper/FlowComparator.java @@ -94,8 +94,12 @@ public final class FlowComparator { if (statsFlow == storedFlow) { return true; } - if (storedFlow == null && statsFlow != null) return false; - if (statsFlow == null && storedFlow != null) return false; + if (storedFlow == null && statsFlow != null) { + return false; + } + if (statsFlow == null && storedFlow != null) { + return false; + } if (storedFlow.getEthernetMatch() == null) { if (statsFlow.getEthernetMatch() != null) { return false; diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/transactions/TransactionProvider.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/transactions/TransactionProvider.java index 2967cf04c4..b2ee63a987 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/transactions/TransactionProvider.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/transactions/TransactionProvider.java @@ -77,8 +77,9 @@ public class TransactionProvider implements AutoCloseable { public synchronized ObjectName getOrCreateTransaction() { Optional ta = getTransaction(); - if (ta.isPresent()) + if (ta.isPresent()) { return ta.get(); + } transaction = configRegistryClient.beginConfig(); allOpenedTransactions.add(transaction); return transaction; diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java index 7618807a0e..fe7b3da770 100644 --- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java +++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java @@ -80,8 +80,9 @@ class ConfigPersisterNotificationListener implements NotificationListener { @Override public void handleNotification(final Notification notification, final Object handback) { - if (!(notification instanceof NetconfJMXNotification)) + if (!(notification instanceof NetconfJMXNotification)) { return; + } // Socket should not be closed at this point // Activator unregisters this as JMX listener before close is called diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusherImpl.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusherImpl.java index b06219c978..c20007d397 100644 --- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusherImpl.java +++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusherImpl.java @@ -78,17 +78,9 @@ public class ConfigPusherImpl implements ConfigPusher { synchronized (autoCloseables) { autoCloseables.add(jmxNotificationHandler); } - /* - * We have completed initial configuration. At this point - * it is good idea to perform garbage collection to prune - * any garbage we have accumulated during startup. - */ - LOG.debug("Running post-initialization garbage collection..."); - System.gc(); - LOG.debug("Post-initialization garbage collection completed."); - LOG.debug("ConfigPusher has pushed configs {}, gc completed", configs); - } - catch (NetconfDocumentedException e) { + + LOG.debug("ConfigPusher has pushed configs {}", configs); + } catch (NetconfDocumentedException e) { LOG.error("Error pushing configs {}",configs); throw new IllegalStateException(e); }