You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/06/19 13:10:08 UTC

[1/2] brooklyn-library git commit: Fix use of deprecated Objects.toStringHelper

Repository: brooklyn-library
Updated Branches:
  refs/heads/master f7268b7bc -> 32a97ca79


Fix use of deprecated Objects.toStringHelper

Instead use MoreObjects.toStringHelper

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/23f028ac
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/23f028ac
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/23f028ac

Branch: refs/heads/master
Commit: 23f028ac1ec08219687fa813dd4c47b871485b1d
Parents: f7268b7
Author: Aled Sage <al...@gmail.com>
Authored: Mon Jun 19 13:10:23 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Jun 19 13:10:23 2017 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/brooklyn/qa/longevity/MonitorPrefs.java | 4 ++--
 .../main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java | 4 ++--
 .../apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/23f028ac/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorPrefs.java
----------------------------------------------------------------------
diff --git a/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorPrefs.java b/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorPrefs.java
index 4d74045..0ea3edd 100644
--- a/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorPrefs.java
+++ b/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorPrefs.java
@@ -21,7 +21,7 @@ package org.apache.brooklyn.qa.longevity;
 import java.io.File;
 import java.net.URL;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.Range;
 
 public class MonitorPrefs {
@@ -39,7 +39,7 @@ public class MonitorPrefs {
     
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("webUrl", webUrl)
                 .add("brooklynPid", brooklynPid)
                 .add("logFile", logFile)

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/23f028ac/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
----------------------------------------------------------------------
diff --git a/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java b/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
index 39ef14a..9584fc9 100644
--- a/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
+++ b/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
@@ -41,7 +41,7 @@ import org.apache.brooklyn.util.stream.StreamGobbler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
@@ -209,7 +209,7 @@ public class MonitorUtils {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this)
+            return MoreObjects.toStringHelper(this)
                     .add("totalInstances", totalInstances)
                     .add("totalMemoryBytes", totalMemoryBytes)
                     .add("instanceCounts", instanceCounts)

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/23f028ac/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java
index 35b60e8..326e07c 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Functions;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.net.HostAndPort;
 
 public class MongoDBServerImpl extends SoftwareProcessImpl implements MongoDBServer {
@@ -218,7 +218,7 @@ public class MongoDBServerImpl extends SoftwareProcessImpl implements MongoDBSer
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("id", getId())
                 .add("hostname", sensors().get(HOSTNAME))
                 .add("port", sensors().get(PORT))


[2/2] brooklyn-library git commit: This closes #120

Posted by dr...@apache.org.
This closes #120


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/32a97ca7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/32a97ca7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/32a97ca7

Branch: refs/heads/master
Commit: 32a97ca79a88521ecee5d09e86c6ab6f64362a55
Parents: f7268b7 23f028a
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Mon Jun 19 14:09:58 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Mon Jun 19 14:09:58 2017 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/brooklyn/qa/longevity/MonitorPrefs.java | 4 ++--
 .../main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java | 4 ++--
 .../apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------