You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/12/21 13:10:52 UTC
[02/12] incubator-brooklyn git commit: Forbid all imports from
com.google.api.client
Forbid all imports from com.google.api.client
Rather than com.google.api.client.repackaged.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c8ec662f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c8ec662f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c8ec662f
Branch: refs/heads/master
Commit: c8ec662fa548d3e4b54ed8fc4b9b53b1c7dc4d98
Parents: 548eaba
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Dec 16 11:27:24 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Dec 17 12:28:01 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/core/catalog/internal/CatalogUtils.java | 4 ++--
.../main/java/org/apache/brooklyn/core/config/Sanitizer.java | 2 +-
.../apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java | 3 +--
.../org/apache/brooklyn/enricher/stock/reducer/Reducer.java | 2 +-
parent/pom.xml | 2 +-
.../base/test/location/WinRmMachineLocationLiveTest.java | 3 +--
.../java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java | 5 ++---
.../java/org/apache/brooklyn/test/framework/TestSensorImpl.java | 2 +-
8 files changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c8ec662f/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
index ef455c6..c6eb076 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
@@ -50,9 +50,9 @@ import org.apache.brooklyn.util.time.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.api.client.util.Preconditions;
import com.google.common.annotations.Beta;
import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
import com.google.common.base.Stopwatch;
public class CatalogUtils {
@@ -287,7 +287,7 @@ public class CatalogUtils {
/** @deprecated since it was introduced in 0.9.0; TBD where this should live */
public static void setDeprecated(ManagementContext mgmt, String symbolicNameAndOptionalVersion, boolean newValue) {
RegisteredType item = mgmt.getTypeRegistry().get(symbolicNameAndOptionalVersion);
- Preconditions.checkNotNull(item, "No such item: "+symbolicNameAndOptionalVersion);
+ Preconditions.checkNotNull(item, "No such item: " + symbolicNameAndOptionalVersion);
setDeprecated(mgmt, item.getSymbolicName(), item.getVersion(), newValue);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c8ec662f/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java b/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java
index f9b5de5..59ca6af 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/Sanitizer.java
@@ -24,9 +24,9 @@ import java.util.Set;
import org.apache.brooklyn.util.core.config.ConfigBag;
-import com.google.api.client.util.Lists;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
+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/c8ec662f/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java
index b36be34..5e3555d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java
@@ -34,7 +34,6 @@ import org.apache.brooklyn.api.typereg.RegisteredTypeLoadingContext;
import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
import org.apache.brooklyn.core.catalog.internal.CatalogItemBuilder;
import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
-import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.collections.MutableSet;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.guava.Maybe;
@@ -42,7 +41,7 @@ import org.apache.brooklyn.util.text.Identifiers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.api.client.util.Preconditions;
+import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c8ec662f/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
index db3a72d..558d50a 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
@@ -39,12 +39,12 @@ import org.apache.brooklyn.util.text.StringFunctions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.api.client.util.Lists;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import com.google.common.reflect.TypeToken;
@SuppressWarnings("serial")
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c8ec662f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2e9a91c..a09d168 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -929,7 +929,7 @@
</module>
<module name="TreeWalker">
<module name="IllegalImport">
- <property name="illegalPkgs" value="com.google.api.client.repackaged,org.python.google"/>
+ <property name="illegalPkgs" value="com.google.api.client,org.python.google"/>
</module>
</module>
</module>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c8ec662f/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java
index ad16403..884da19 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java
@@ -35,7 +35,6 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
-import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.core.test.entity.TestApplication;
import org.apache.brooklyn.location.winrm.WinRmMachineLocation;
@@ -48,7 +47,7 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.google.api.client.util.Charsets;
+import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.base.Stopwatch;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c8ec662f/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java
index ff7e0d4..2ef13ca 100644
--- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java
+++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java
@@ -33,7 +33,6 @@ import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.core.test.entity.TestApplication;
import org.apache.brooklyn.core.test.entity.TestApplicationImpl;
import org.apache.brooklyn.core.test.entity.TestEntity;
-import org.apache.brooklyn.launcher.BrooklynLauncher;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
@@ -61,9 +60,9 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation;
-import com.google.api.client.util.Preconditions;
import com.google.common.base.Charsets;
import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -339,7 +338,7 @@ public class BrooklynLauncherTest {
}
private BrooklynLauncher newLauncherForTests(boolean minimal) {
- Preconditions.checkArgument(launcher==null, "can only be used if no launcher yet");
+ Preconditions.checkArgument(launcher == null, "can only be used if no launcher yet");
BrooklynLauncher launcher = BrooklynLauncher.newInstance();
if (minimal)
launcher.brooklynProperties(LocalManagementContextForTests.builder(true).buildProperties());
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c8ec662f/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java
----------------------------------------------------------------------
diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java
index f368cf5..d042991 100644
--- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java
+++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.brooklyn.test.framework;
-import com.google.api.client.util.Objects;
+import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap;