brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [32/39] brooklyn-server git commit: Fix mistake in merge with master
Date Fri, 21 Apr 2017 22:55:51 GMT
Fix mistake in merge with master


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5c37de21
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5c37de21
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5c37de21

Branch: refs/heads/master
Commit: 5c37de215b569246ce054d4a0d044548056d507f
Parents: 10afaad
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Tue Dec 13 22:48:26 2016 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Thu Apr 20 11:20:36 2017 +0100

----------------------------------------------------------------------
 .../camp/brooklyn/catalog/CatalogYamlRebindTest.java      | 10 +++++-----
 .../brooklyn/core/mgmt/rebind/dto/MementosGenerators.java |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5c37de21/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
index c92181b..e391571 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
@@ -166,19 +166,19 @@ public class CatalogYamlRebindTest extends AbstractYamlRebindTest {
     }
 
     @Test(dataProvider = "dataProvider")
-    public void testRebindWithCatalogAndApp(RebindWithCatalogTestMode mode, boolean useOsgi)
throws Exception {
-        testRebindWithCatalogAndAppUsingOptions(mode, useOsgi, RebindOptions.create());
+    public void testRebindWithCatalogAndApp(RebindWithCatalogTestMode mode, OsgiMode osgiMode)
throws Exception {
+        testRebindWithCatalogAndAppUsingOptions(mode, osgiMode, RebindOptions.create());
     }
 
     // Re-run the same tests as testRebindWithCatalogAndApp but with the XML updated to mimic
state
     // persisted before <catalogItemId> was replaced with <catalogItemSuperIds>.
     @Test(dataProvider = "dataProvider")
-    public void testRebindWithCatalogAndAppRebindCatalogItemIds(RebindWithCatalogTestMode
mode, boolean useOsgi) throws Exception {
+    public void testRebindWithCatalogAndAppRebindCatalogItemIds(RebindWithCatalogTestMode
mode, OsgiMode osgiMode) throws Exception {
         final RebindOptions rebindOptions = RebindOptions.create();
         applyCompoundStateTransformer(rebindOptions, CompoundTransformer.builder()
             .xmlReplaceItem("//catalogItemSuperIds", "<catalogItemId><xsl:value-of
select=\"string\"/></catalogItemId>")
             .build());
-        testRebindWithCatalogAndAppUsingOptions(mode, useOsgi, rebindOptions);
+        testRebindWithCatalogAndAppUsingOptions(mode, osgiMode, rebindOptions);
     }
 
     private void applyCompoundStateTransformer(RebindOptions options, final CompoundTransformer
transformer) {
@@ -216,7 +216,7 @@ public class CatalogYamlRebindTest extends AbstractYamlRebindTest {
 
 
     @SuppressWarnings({ "deprecation", "unused" })
-    public void testRebindWithCatalogAndAppUsingOptions(RebindWithCatalogTestMode mode, boolean
useOsgi, RebindOptions options) throws Exception {
+    public void testRebindWithCatalogAndAppUsingOptions(RebindWithCatalogTestMode mode, OsgiMode
osgiMode, RebindOptions options) throws Exception {
         if (osgiMode != OsgiMode.NONE) {
             TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
         }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5c37de21/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java
b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java
index 305467f..eac89e0 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java
@@ -453,7 +453,6 @@ public class MementosGenerators {
         builder.displayName = instance.getDisplayName();
         builder.catalogItemSuperIds = instance.getCatalogItemSuperIds();
         builder.type = (typePrefix.isPresent() ? typePrefix.get() : "") + instance.getClass().getName();
-        builder.type = instance.getClass().getName();
         builder.typeClass = instance.getClass();
         if (instance instanceof EntityAdjunct) {
             builder.uniqueTag = ((EntityAdjunct)instance).getUniqueTag();


Mime
View raw message