From c912a67e60d46bbfd47fa09da5953ec8ed5caa6b Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Sat, 6 Jun 2015 21:45:12 +0200
Subject: [PATCH] Migrate to MoreObjects

Objects is overloaded with JDK7, use the MoreObjects class.

Change-Id: I73f9ba24e990df8160b45b6fb0763a1b2ac231d6
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 .../md/sal/binding/impl/AbstractForwardedDataBroker.java   | 4 ++--
 .../netconf/listener/NetconfSessionPreferences.java        | 4 ++--
 .../netconf/client/conf/NetconfClientConfiguration.java    | 7 ++++---
 .../conf/NetconfReconnectingClientConfiguration.java       | 4 ++--
 .../controller/netconf/mapping/api/HandlingPriority.java   | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
index 7e63e54f4b..4bbeaebf55 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.md.sal.binding.impl;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import java.util.Collections;
 import java.util.HashMap;
@@ -218,7 +218,7 @@ public abstract class AbstractForwardedDataBroker implements Delegator<DOMDataBr
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(TranslatedDataChangeEvent.class) //
+            return MoreObjects.toStringHelper(TranslatedDataChangeEvent.class) //
                     .add("created", getCreatedData()) //
                     .add("updated", getUpdatedData()) //
                     .add("removed", getRemovedPaths()) //
diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionPreferences.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionPreferences.java
index 9493f977e0..ac86e1da6b 100644
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionPreferences.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionPreferences.java
@@ -1,6 +1,6 @@
 package org.opendaylight.controller.sal.connect.netconf.listener;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
@@ -83,7 +83,7 @@ public final class NetconfSessionPreferences {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("capabilities", nonModuleCaps)
                 .add("moduleBasedCapabilities", moduleBasedCaps)
                 .add("rollback", isRollbackSupported())
diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfiguration.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfiguration.java
index 37dae69f35..e740bb35b4 100644
--- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfiguration.java
+++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfClientConfiguration.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.controller.netconf.client.conf;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import java.net.InetSocketAddress;
@@ -96,8 +97,8 @@ public class NetconfClientConfiguration {
         return buildToStringHelper().toString();
     }
 
-    protected Objects.ToStringHelper buildToStringHelper() {
-        return Objects.toStringHelper(this)
+    protected ToStringHelper buildToStringHelper() {
+        return MoreObjects.toStringHelper(this)
                 .add("address", address)
                 .add("connectionTimeoutMillis", connectionTimeoutMillis)
                 .add("additionalHeader", additionalHeader)
diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfiguration.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfiguration.java
index f618ea5ab9..1c0b6008d5 100644
--- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfiguration.java
+++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/conf/NetconfReconnectingClientConfiguration.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.netconf.client.conf;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.base.Preconditions;
 import java.net.InetSocketAddress;
 import org.opendaylight.controller.netconf.client.NetconfClientSessionListener;
@@ -39,7 +39,7 @@ public final class NetconfReconnectingClientConfiguration extends NetconfClientC
     }
 
     @Override
-    protected Objects.ToStringHelper buildToStringHelper() {
+    protected ToStringHelper buildToStringHelper() {
         return super.buildToStringHelper().add("connectStrategyFactory", connectStrategyFactory);
     }
 }
diff --git a/opendaylight/netconf/netconf-mapping-api/src/main/java/org/opendaylight/controller/netconf/mapping/api/HandlingPriority.java b/opendaylight/netconf/netconf-mapping-api/src/main/java/org/opendaylight/controller/netconf/mapping/api/HandlingPriority.java
index 1f7eed250f..0f5de553aa 100644
--- a/opendaylight/netconf/netconf-mapping-api/src/main/java/org/opendaylight/controller/netconf/mapping/api/HandlingPriority.java
+++ b/opendaylight/netconf/netconf-mapping-api/src/main/java/org/opendaylight/controller/netconf/mapping/api/HandlingPriority.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.controller.netconf.mapping.api;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 
@@ -100,7 +100,7 @@ public final class HandlingPriority implements Comparable<HandlingPriority> {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("priority", priority)
                 .toString();
     }
-- 
2.36.6