Github user sjcorbett commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/955#discussion_r42049457
--- Diff:
core/src/main/java/org/apache/brooklyn/core/resolve/JavaServiceSpecResolver.java
---
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.core.resolve;
+
+import java.util.List;
+import java.util.Set;
+
+import org.apache.brooklyn.api.entity.Application;
+import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.entity.EntitySpec;
+import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
+import
org.apache.brooklyn.core.mgmt.classloading.BrooklynClassLoadingContext;
+import org.apache.brooklyn.util.guava.Maybe;
+import org.apache.brooklyn.util.javalang.Reflections;
+
+public class JavaServiceSpecResolver extends AbstractServiceSpecResolver{
+ private static final String RESOLVER_NAME = "java";
+
+ public JavaServiceSpecResolver() {
+ super(RESOLVER_NAME);
+ }
+
+ @Override
+ protected boolean canResolve(String type, BrooklynClassLoadingContext
loader) {
+ String localType = getLocalType(type);
+ Maybe<?> javaType = tryLoadJavaType(localType, loader);
+ return javaType.isPresent();
+ }
+
+ @Override
+ public EntitySpec<?> resolve(String type, BrooklynClassLoadingContext
loader, Set<String> encounteredTypes) {
+ String localType = getLocalType(type);
+ try {
+ return resolveInternal(localType, loader);
+ } catch (Exception e) {
+ boolean firstOccurrence = encounteredTypes.add(localType);
+ boolean recursiveButTryJava = !firstOccurrence;
+ if (recursiveButTryJava) {
+ throw new IllegalStateException("Recursive reference to "
+ localType + " (and cannot be resolved as a Java type)", e);
+ } else {
+ throw e;
+ }
+ }
+ }
+
+ private EntitySpec<?> resolveInternal(String localType,
BrooklynClassLoadingContext loader) {
+ Maybe<Class<? extends Entity>> javaTypeMaybe =
tryLoadJavaType(localType, loader);
+ if (javaTypeMaybe.isAbsent())
+ throw new IllegalStateException("Could not find "+localType,
((Maybe.Absent<?>)javaTypeMaybe).getException());
+ Class<? extends Entity> javaType = javaTypeMaybe.get();
--- End diff --
Is `isAbsent` sufficient or should we check `isAbsentOrNull`?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
