Return-Path: X-Original-To: apmail-brooklyn-dev-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BD0917749 for ; Tue, 17 Nov 2015 10:19:44 +0000 (UTC) Received: (qmail 2394 invoked by uid 500); 17 Nov 2015 10:19:44 -0000 Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org Received: (qmail 2363 invoked by uid 500); 17 Nov 2015 10:19:44 -0000 Mailing-List: contact dev-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list dev@brooklyn.incubator.apache.org Received: (qmail 2352 invoked by uid 99); 17 Nov 2015 10:19:44 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2015 10:19:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id B5BA9C6D62 for ; Tue, 17 Nov 2015 10:19:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.399 X-Spam-Level: X-Spam-Status: No, score=0.399 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.582, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id yRiNEgnq_4aB for ; Tue, 17 Nov 2015 10:19:35 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id E924C441BB for ; Tue, 17 Nov 2015 10:19:34 +0000 (UTC) Received: (qmail 1969 invoked by uid 99); 17 Nov 2015 10:19:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2015 10:19:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 500D1DFDCC; Tue, 17 Nov 2015 10:19:34 +0000 (UTC) From: ahgittin To: dev@brooklyn.incubator.apache.org Reply-To: dev@brooklyn.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-brooklyn pull request: Flesh out type creation using the... Content-Type: text/plain Message-Id: <20151117101934.500D1DFDCC@git1-us-west.apache.org> Date: Tue, 17 Nov 2015 10:19:34 +0000 (UTC) Github user ahgittin commented on a diff in the pull request: https://github.com/apache/incubator-brooklyn/pull/1017#discussion_r45042299 --- Diff: core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java --- @@ -0,0 +1,130 @@ +/* + * 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.typereg; + +import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec; +import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.api.typereg.RegisteredType; +import org.apache.brooklyn.api.typereg.RegisteredTypeLoadingContext; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Convenience supertype for {@link BrooklynTypePlanTransformer} instances. + */ +public abstract class AbstractTypePlanTransformer implements BrooklynTypePlanTransformer { + + private static final Logger log = LoggerFactory.getLogger(AbstractTypePlanTransformer.class); + + protected ManagementContext mgmt; + + @Override + public void injectManagementContext(ManagementContext mgmt) { + this.mgmt = mgmt; + } + + private final String format; + private final String formatName; + private final String formatDescription; + + protected AbstractTypePlanTransformer(String format, String formatName, String formatDescription) { + this.format = format; + this.formatName = formatName; + this.formatDescription = formatDescription; + } + + @Override + public String getFormatCode() { + return format; + } + + @Override + public String getFormatName() { + return formatName; + } + + @Override + public String getFormatDescription() { + return formatDescription; + } + + @Override + public String toString() { + return getFormatCode()+":"+JavaClassNames.simpleClassName(this); + } + + @Override + public double scoreForType(RegisteredType type, RegisteredTypeLoadingContext context) { + if (getFormatCode().equals(type.getPlan().getPlanFormat())) return 1; + if (type.getPlan().getPlanFormat()==null) + return scoreForNullFormat(type.getPlan().getPlanData(), type, context); + else + return scoreForNonmatchingNonnullFormat(type.getPlan().getPlanFormat(), type.getPlan().getPlanData(), type, context); + } + + protected abstract double scoreForNullFormat(Object planData, RegisteredType type, RegisteredTypeLoadingContext context); + protected abstract double scoreForNonmatchingNonnullFormat(String planFormat, Object planData, RegisteredType type, RegisteredTypeLoadingContext context); + + /** delegates to more specific abstract create methods, + * and performs common validation and customisation of the items created. + *

+ * this includes: + *

  • setting the {@link AbstractBrooklynObjectSpec#catalogItemId(String)} + */ + @Override + public Object create(final RegisteredType type, final RegisteredTypeLoadingContext context) { + try { + return validate(new RegisteredTypeKindVisitor() { + @Override protected Object visitSpec(RegisteredType type) { + try { + AbstractBrooklynObjectSpec result = createSpec(type, context); + result.catalogItemId(type.getId()); + return result; + } catch (Exception e) { throw Exceptions.propagate(e); } + } + @Override protected Object visitBean(RegisteredType type) { + try { + return createBean(type, context); + } catch (Exception e) { throw Exceptions.propagate(e); } + } + + }.visit(type), type, context); + } catch (UnsupportedTypePlanException e) { + // no logging + throw Exceptions.propagate(e); --- End diff -- correct. have combined, with type check to keep same logging behaviour. --- 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 infrastructure@apache.org or file a JIRA ticket with INFRA. ---