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 2021/12/23 14:28:57 UTC
[brooklyn-server] branch master updated: also accept guava prefix when mapping and deserializing inner classes
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 33c9aa2 also accept guava prefix when mapping and deserializing inner classes
33c9aa2 is described below
commit 33c9aa228154e5197bc45074bf97db0af0419798
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu Dec 23 14:28:30 2021 +0000
also accept guava prefix when mapping and deserializing inner classes
---
.../main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java | 1 +
.../org/apache/brooklyn/util/core/xstream/ConverterTestFixture.java | 2 +-
.../apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java
index c54a98e..e7ce42a 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlSerializer.java
@@ -133,6 +133,7 @@ public class XmlSerializer<T> {
// not ideal that we map both 7 and 9 to the value tansformer, but okay as 7 is not used for other serialized things
// (fortunately, as otherwise hard to deserialize!)
addAliasForInnerClass(xstream, "com.google.common.collect.Maps$7", valueTransformer);
+ addAliasForInnerClass(xstream, "com.google.guava:com.google.common.collect.Maps$7", valueTransformer);
// preferred alias
addAliasForInnerClass(xstream, "com.google.common.collect.Maps._inners.valueTransformer", valueTransformer);
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/xstream/ConverterTestFixture.java b/core/src/test/java/org/apache/brooklyn/util/core/xstream/ConverterTestFixture.java
index d794cba..b0023f0 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/xstream/ConverterTestFixture.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/xstream/ConverterTestFixture.java
@@ -55,7 +55,7 @@ public class ConverterTestFixture {
T outO = (T)xstream.fromXML(other);
if (!equals.test(outO, obj)) Asserts.fail("Objects not equal:\n"+outO+"\n---\n"+obj);
} catch (Throwable e) {
- Assert.fail("Deserializable output does not produce identical result:\n"+other, e);
+ Assert.fail("Expected deserialization fails or produces non-equal object:\n"+other, e);
}
}
return out1;
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java b/core/src/test/java/org/apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java
index f47b36c..d6617c1 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java
@@ -70,11 +70,12 @@ public class TransformedMapConverterTest extends ConverterTestFixture {
// IMPORTANT! for backwards compatibility
String guava18 = xml.apply("com.google.common.collect.Maps$7");
+ String guava18osgi = xml.apply("com.google.guava:com.google.common.collect.Maps$7");
// NOT IMPORTANT - for reference; should not be written, so if guava changes this can be changed
String guava27 = xml.apply("com.google.common.collect.Maps$9");
- assertX(out, preferred, guava18, guava27);
+ assertX(out, preferred, guava18, guava18osgi, guava27);
}
@Test