From b40942324774589533e1348c3730704be1011129 Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Mon, 5 Jun 2017 14:54:17 +0100
Subject: [PATCH] fix ambiguous/generics references w move to Java 8

---
 .../org/apache/brooklyn/camp/yoml/BrooklynYomlTypeRegistry.java | 2 +-
 .../apache/brooklyn/util/yoml/tests/TopLevelFieldsTests.java    | 2 +-
 2 files changed, 2 insertions(+), 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
index cb0946220b..291e27764a 100644
--- 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
index b16bd93a08..fcfbfa6e50 100644
--- 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() {