fix ambiguous/generics references w move to Java 8

apache · Jun 5, 2017 · b409423 · b409423
1 parent 6869f7c
commit b409423
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/yoml/BrooklynYomlTypeRegistry.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/yoml/BrooklynYomlTypeRegistry.java
@@ -209,7 +209,7 @@ public Maybe<Object> newInstanceMaybe(String typeName, Yoml yoml, @Nonnull Regis
                 // the create call will attach the loader of typeR
                 nextContext.loader(null);
 
-                return Maybe.of(registry().create(typeR, nextContext.build(), null));
+                return Maybe.of((Object) registry().create(typeR, nextContext.build(), null));
 
             } else {
                 // circular reference means load java, below

diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/yoml/tests/TopLevelFieldsTests.java b/utils/common/src/test/java/org/apache/brooklyn/util/yoml/tests/TopLevelFieldsTests.java
@@ -172,7 +172,7 @@ public void testAliasConflictNiceError() {
     protected static YomlTestFixture extended0TopLevelFieldFixture(List<? extends YomlSerializer> extras) {
         return commonTopLevelFieldFixtureKeyNameAlias(", defaultValue: { type: string, value: bob }").
             addType("shape-with-size", "{ type: \"java:"+ShapeWithSize.class.getName()+"\", interfaceTypes: [ shape ] }", 
-                MutableList.copyOf(extras).append(topLevelFieldSerializer("{ fieldName: size, alias: shape-size }")) );
+                MutableList.<YomlSerializer>copyOf(extras).append(topLevelFieldSerializer("{ fieldName: size, alias: shape-size }")) );
     }
 
     protected static YomlTestFixture extended1TopLevelFieldFixture() {