This is an automated email from the ASF dual-hosted git repository.
aledsage pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 5c22839eeb63f6e9c1de16d6b1c6c7defa3a12b1
Author: Paul Campbell <pcampb...@kemitix.net>
AuthorDate: Wed Jan 16 14:55:53 2019 +0000
Changes requested on PR
---
.../catalog/internal/CatalogUpgradeScanner.java | 16 +++++----
.../internal/CatalogUpgradeScannerTest.java | 24 ++++++-------
.../RebindWithDeserializingClassRenamesTest.java | 6 ++--
...ogUpgradesGetBundleUpgradedIfNecessaryTest.java | 2 +-
parent/pom.xml | 40 +++++++++++-----------
pom.xml | 2 --
.../javalang/ReflectionsFindMappedNameTest.java | 4 ---
.../brooklyn/util/javalang/ReflectionsTest.java | 4 +--
8 files changed, 48 insertions(+), 50 deletions(-)
diff --git
a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java
b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java
index efe902d..a51c594 100644
---
a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java
+++
b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java
@@ -33,6 +33,8 @@ import java.util.Collection;
import java.util.function.BiFunction;
import java.util.function.Function;
+import static java.util.Objects.requireNonNull;
+
/**
* Scans managed bundles and other jar bundles to find upgrades for installed
bundles.
*/
@@ -49,10 +51,12 @@ class CatalogUpgradeScanner {
final Function<OsgiBundleWithUrl, Predicate<? super
RegisteredType>> managedBundlePredicateSupplier,
final Function<String, Predicate<? super RegisteredType>>
unmanagedBundlePredicateSupplier
) {
- this.managementContext = managementContext;
- this.bundleUpgradeParser = bundleUpgradeParser;
- this.managedBundlePredicateSupplier = managedBundlePredicateSupplier;
- this.unmanagedBundlePredicateSupplier =
unmanagedBundlePredicateSupplier;
+ this.managementContext = requireNonNull(managementContext,
"managementContext");
+ this.bundleUpgradeParser = requireNonNull(bundleUpgradeParser,
"bundleUpgradeParser");
+ this.managedBundlePredicateSupplier =
+ requireNonNull(managedBundlePredicateSupplier,
"managedBundlePredicateSupplier");
+ this.unmanagedBundlePredicateSupplier =
+ requireNonNull(unmanagedBundlePredicateSupplier,
"unmanagedBundlePredicateSupplier");
}
public CatalogUpgrades scan(
@@ -62,7 +66,7 @@ class CatalogUpgradeScanner {
) {
final CatalogUpgrades.Builder catalogUpgradesBuilder =
CatalogUpgrades.builder();
scanManagedBundles(osgiManager, catalogUpgradesBuilder, rebindLogger);
- scanUnmanagedBundles(catalogUpgradesBuilder, bundleContext);
+ scanAllBundles(catalogUpgradesBuilder, bundleContext);
return catalogUpgradesBuilder.build();
}
@@ -84,7 +88,7 @@ class CatalogUpgradeScanner {
}
}
- private void scanUnmanagedBundles(
+ private void scanAllBundles(
final CatalogUpgrades.Builder catalogUpgradesBuilder,
final BundleContext bundleContext
) {
diff --git
a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScannerTest.java
b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScannerTest.java
index 5eba4f1..a91dca6 100644
---
a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScannerTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScannerTest.java
@@ -190,12 +190,12 @@ public class CatalogUpgradeScannerTest implements
WithAssertions {
final OsgiManager osgiManager,
final BiFunction<Bundle, RegisteredTypesSupplier,
CatalogUpgrades> bundleUpgradeParser
) {
- final Map<String, ManagedBundle> managedBundlesWithNoUpgrades =
+ final Map<String, ManagedBundle> bundles =
ImmutableMap.of(
"managed1", findableManagedBundle(osgiManager,
CatalogUpgrades.EMPTY, bundleUpgradeParser),
"managed2", findableManagedBundle(osgiManager,
CatalogUpgrades.EMPTY, bundleUpgradeParser)
);
-
doReturn(managedBundlesWithNoUpgrades).when(osgiManager).getManagedBundles();
+ doReturn(bundles).when(osgiManager).getManagedBundles();
}
static void givenManagedBundlesWithUpgrades(
@@ -203,9 +203,9 @@ public class CatalogUpgradeScannerTest implements
WithAssertions {
final OsgiManager osgiManager,
final BiFunction<Bundle, RegisteredTypesSupplier,
CatalogUpgrades> bundleUpgradeParser
) {
- final Map<String, ManagedBundle> managedBundlesWithNoUpgrades =
+ final Map<String, ManagedBundle> bundles =
ImmutableMap.of("managed",
findableManagedBundle(osgiManager, upgrades, bundleUpgradeParser));
-
doReturn(managedBundlesWithNoUpgrades).when(osgiManager).getManagedBundles();
+ doReturn(bundles).when(osgiManager).getManagedBundles();
}
static void givenManagedBundleWithNoUpgrades(
@@ -215,20 +215,20 @@ public class CatalogUpgradeScannerTest implements
WithAssertions {
) {
final ManagedBundle managedBundle =
findableManagedBundle(osgiManager, CatalogUpgrades.EMPTY,
bundleUpgradeParser);
- final Map<String, ManagedBundle> managedBundlesWithNoUpgrades =
+ final Map<String, ManagedBundle> bundles =
ImmutableMap.of(bundleName, managedBundle);
-
doReturn(managedBundlesWithNoUpgrades).when(osgiManager).getManagedBundles();
+ doReturn(bundles).when(osgiManager).getManagedBundles();
}
static void givenUnmanagedBundlesWithNoUpgrades(
final BundleContext bundleContext,
final BiFunction<Bundle, RegisteredTypesSupplier,
CatalogUpgrades> bundleUpgradeParser
) {
- final Bundle[] unmanagedBundlesWithNoUpgrades = new Bundle[]{
+ final Bundle[] bundles = new Bundle[]{
unmanagedBundle(bundleName("unmanaged1", "1.1.0"),
CatalogUpgrades.EMPTY, bundleUpgradeParser),
unmanagedBundle(bundleName("unmanaged2", "1.1.0"),
CatalogUpgrades.EMPTY, bundleUpgradeParser)
};
-
doReturn(unmanagedBundlesWithNoUpgrades).when(bundleContext).getBundles();
+ doReturn(bundles).when(bundleContext).getBundles();
}
static void givenUnmanagedBundleWithNoUpgrades(
@@ -236,10 +236,10 @@ public class CatalogUpgradeScannerTest implements
WithAssertions {
final BundleContext bundleContext,
final BiFunction<Bundle, RegisteredTypesSupplier,
CatalogUpgrades> bundleUpgradeParser
) {
- final Bundle[] unmanagedBundlesWithNoUpgrades = new Bundle[]{
+ final Bundle[] bundles = new Bundle[]{
unmanagedBundle(bundleName, CatalogUpgrades.EMPTY,
bundleUpgradeParser)
};
-
doReturn(unmanagedBundlesWithNoUpgrades).when(bundleContext).getBundles();
+ doReturn(bundles).when(bundleContext).getBundles();
}
static void givenUnmanagedBundleWithUpgrades(
@@ -247,10 +247,10 @@ public class CatalogUpgradeScannerTest implements
WithAssertions {
final BundleContext bundleContext,
final BiFunction<Bundle, RegisteredTypesSupplier,
CatalogUpgrades> bundleUpgradeParser
) {
- final Bundle[] unmanagedBundlesWithNoUpgrades = new Bundle[]{
+ final Bundle[] bundles = new Bundle[]{
unmanagedBundle(bundleName("unmanaged", "1.1.0"),
upgrades, bundleUpgradeParser)
};
-
doReturn(unmanagedBundlesWithNoUpgrades).when(bundleContext).getBundles();
+ doReturn(bundles).when(bundleContext).getBundles();
}
}
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindWithDeserializingClassRenamesTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindWithDeserializingClassRenamesTest.java
index 40b4a3f..6e3b74e 100644
---
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindWithDeserializingClassRenamesTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindWithDeserializingClassRenamesTest.java
@@ -142,10 +142,10 @@ public class RebindWithDeserializingClassRenamesTest
extends RebindTestFixtureWi
}
static Transform of(final String legacyClassName,
- final ConfigInheritance configInheritance,
+ final ConfigInheritance inheritanceMode,
final String configKey) {
- final Class<? extends ConfigInheritance> configInheritanceClass =
configInheritance.getClass();
- return new Transform(legacyClassName,
configInheritanceClass.getName(), configInheritance, configKey);
+ final Class<? extends ConfigInheritance> configInheritanceClass =
inheritanceMode.getClass();
+ return new Transform(legacyClassName,
configInheritanceClass.getName(), inheritanceMode, configKey);
}
}
}
diff --git
a/core/src/test/java/org/apache/brooklyn/core/typereg/CatalogUpgradesGetBundleUpgradedIfNecessaryTest.java
b/core/src/test/java/org/apache/brooklyn/core/typereg/CatalogUpgradesGetBundleUpgradedIfNecessaryTest.java
index 126a1ef..5799804 100644
---
a/core/src/test/java/org/apache/brooklyn/core/typereg/CatalogUpgradesGetBundleUpgradedIfNecessaryTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/typereg/CatalogUpgradesGetBundleUpgradedIfNecessaryTest.java
@@ -58,7 +58,7 @@ public class CatalogUpgradesGetBundleUpgradedIfNecessaryTest
implements WithAsse
private CatalogUpgrades.Builder catalogUpgradesBuilder;
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp() {
Mockito.reset(managementContext, osgiManager, managedBundle,
typeRegistry);
catalogUpgradesBuilder = CatalogUpgrades.builder();
diff --git a/parent/pom.xml b/parent/pom.xml
index e0e2633..2b94015 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -561,34 +561,34 @@
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>kubernetes-client</artifactId>
- <version>${kubernetes-client.version}</version>
- <exclusions>
- <exclusion>
-
<groupId>com.squareup.okio</groupId>
- <artifactId>okio</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>openshift-client</artifactId>
- <version>${kubernetes-client.version}</version>
- </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client</artifactId>
+ <version>${kubernetes-client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-client</artifactId>
+ <version>${kubernetes-client.version}</version>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-spi</artifactId>
<version>${pax-web.version}</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
- </dependencies>
- </dependencyManagement>
+ </dependencies>
+ </dependencyManagement>
<build>
<testSourceDirectory>src/test/java</testSourceDirectory>
diff --git a/pom.xml b/pom.xml
index ed1ad6e..1b776da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,8 +188,6 @@
<assertj.version>3.11.1</assertj.version>
<cobertura.plugin.version>2.7</cobertura.plugin.version>
<surefire.version>2.19.1</surefire.version>
- <testng.version>6.10</testng.version>
- <mockito.version>2.7.12</mockito.version>
<hamcrest.version>1.1</hamcrest.version>
<mockwebserver.version>20121111</mockwebserver.version>
diff --git
a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsFindMappedNameTest.java
b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsFindMappedNameTest.java
index 76642df..6e88977 100644
---
a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsFindMappedNameTest.java
+++
b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsFindMappedNameTest.java
@@ -25,10 +25,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-/**
- * Tests for {@link Reflections#findMappedNameAndLog(Map, String)} and
- * {@link Reflections#findMappedNameMaybe(Map, String)} methods.
- */
public class ReflectionsFindMappedNameTest implements WithAssertions {
@Test
diff --git
a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java
b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java
index a46f6ee..3c628a9 100644
---
a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java
+++
b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/ReflectionsTest.java
@@ -24,12 +24,12 @@ import static org.testng.Assert.assertTrue;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
import org.apache.brooklyn.util.javalang.coerce.CommonAdaptorTypeCoercions;
import org.apache.brooklyn.util.javalang.coerce.TypeCoercer;
import org.apache.brooklyn.util.javalang.coerce.TypeCoercerExtensible;
-import org.assertj.core.api.WithAssertions;
import org.testng.Assert;
import org.testng.annotations.Test;
