brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [6/8] git commit: Use guava instead of com.beust Lists
Date Fri, 25 Jul 2014 16:45:43 GMT
Use guava instead of com.beust Lists 

Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0b8a639d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0b8a639d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0b8a639d

Branch: refs/heads/master
Commit: 0b8a639d6350a59504f91961a27cc7a8c6efc75a
Parents: e315de3
Author: Aled Sage <aled.sage@gmail.com>
Authored: Tue Jul 22 12:52:37 2014 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Tue Jul 22 12:52:37 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/internal/storage/impl/BrooklynStorageImplTest.java  | 4 ++--
 .../java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java   | 2 +-
 .../brooklyn/policy/loadbalancing/MockContainerEntityImpl.java   | 2 +-
 .../test/java/brooklyn/entity/database/VogellaExampleAccess.java | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0b8a639d/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java
b/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java
index 6fb396d..50b7ba3 100644
--- a/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java
+++ b/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java
@@ -28,18 +28,18 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import brooklyn.internal.storage.impl.inmemory.InmemoryDatagrid;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import brooklyn.internal.storage.BrooklynStorage;
 import brooklyn.internal.storage.DataGrid;
 import brooklyn.internal.storage.Reference;
+import brooklyn.internal.storage.impl.inmemory.InmemoryDatagrid;
 
-import com.beust.jcommander.internal.Lists;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 
 public class BrooklynStorageImplTest {
     

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0b8a639d/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java b/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java
index 9914e0b..886e473 100644
--- a/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java
+++ b/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java
@@ -42,11 +42,11 @@ import brooklyn.util.config.ConfigBag;
 import brooklyn.util.text.Identifiers;
 import brooklyn.util.time.Time;
 
-import com.beust.jcommander.internal.Lists;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0b8a639d/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
index 85a5893..13baec5 100644
--- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
+++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
@@ -37,10 +37,10 @@ import brooklyn.location.Location;
 import brooklyn.util.collections.MutableList;
 import brooklyn.util.time.Time;
 
-import com.beust.jcommander.internal.Lists;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0b8a639d/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java
b/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java
index a8c1d4c..962a294 100644
--- a/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java
+++ b/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java
@@ -18,10 +18,11 @@
  */
 package brooklyn.entity.database;
 
-import com.beust.jcommander.internal.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.Lists;
+
 import java.sql.*;
 import java.util.List;
 


Mime
View raw message