Skip to content

Commit b409423

Browse files
committed
fix ambiguous/generics references w move to Java 8
1 parent 6869f7c commit b409423

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/yoml/BrooklynYomlTypeRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public Maybe<Object> newInstanceMaybe(String typeName, Yoml yoml, @Nonnull Regis
209209
// the create call will attach the loader of typeR
210210
nextContext.loader(null);
211211

212-
return Maybe.of(registry().create(typeR, nextContext.build(), null));
212+
return Maybe.of((Object) registry().create(typeR, nextContext.build(), null));
213213

214214
} else {
215215
// circular reference means load java, below

utils/common/src/test/java/org/apache/brooklyn/util/yoml/tests/TopLevelFieldsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void testAliasConflictNiceError() {
172172
protected static YomlTestFixture extended0TopLevelFieldFixture(List<? extends YomlSerializer> extras) {
173173
return commonTopLevelFieldFixtureKeyNameAlias(", defaultValue: { type: string, value: bob }").
174174
addType("shape-with-size", "{ type: \"java:"+ShapeWithSize.class.getName()+"\", interfaceTypes: [ shape ] }",
175-
MutableList.copyOf(extras).append(topLevelFieldSerializer("{ fieldName: size, alias: shape-size }")) );
175+
MutableList.<YomlSerializer>copyOf(extras).append(topLevelFieldSerializer("{ fieldName: size, alias: shape-size }")) );
176176
}
177177

178178
protected static YomlTestFixture extended1TopLevelFieldFixture() {

0 commit comments

Comments
 (0)