Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DB71C18120 for ; Thu, 17 Dec 2015 12:54:22 +0000 (UTC) Received: (qmail 76672 invoked by uid 500); 17 Dec 2015 12:54:22 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 76635 invoked by uid 500); 17 Dec 2015 12:54:22 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 76548 invoked by uid 99); 17 Dec 2015 12:54:22 -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; Thu, 17 Dec 2015 12:54:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8345BE1083; Thu, 17 Dec 2015 12:54:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.apache.org Date: Thu, 17 Dec 2015 12:54:24 -0000 Message-Id: In-Reply-To: <2c392e2c2b2f413ab6e8af6506fe7028@git.apache.org> References: <2c392e2c2b2f413ab6e8af6506fe7028@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] incubator-brooklyn git commit: Adds CampYamlParser (accessible in core) Adds CampYamlParser (accessible in core) BrooklynCampPlatform registers a CampYamlParser with ManagementContext Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ea37bb64 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ea37bb64 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ea37bb64 Branch: refs/heads/master Commit: ea37bb641d0c44f829718ec1e14c6b714a6523bd Parents: ac8009e Author: Aled Sage Authored: Wed Dec 16 20:13:58 2015 +0000 Committer: Aled Sage Committed: Wed Dec 16 20:13:58 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/camp/spi/resolve/PdpProcessor.java | 2 +- .../interpret/PlanInterpretationContext.java | 2 +- .../core/mgmt/internal/CampYamlParser.java | 34 ++++++++++++++++++++ .../camp/brooklyn/BrooklynCampPlatform.java | 30 +++++++++++++++-- 4 files changed, 63 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ea37bb64/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java index 8716aa5..ae42ee7 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java @@ -177,7 +177,7 @@ public class PdpProcessor { * essentially a post-parse processing step before matching */ @SuppressWarnings("unchecked") @VisibleForTesting - public Map applyInterpreters(Map originalDeploymentPlan) { + public Map applyInterpreters(Map originalDeploymentPlan) { PlanInterpretationNode interpretation = new PlanInterpretationNode( new PlanInterpretationContext(originalDeploymentPlan, interpreters)); return (Map) interpretation.getNewValue(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ea37bb64/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java index 08053cb..26822aa 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java @@ -32,7 +32,7 @@ public class PlanInterpretationContext { private final List interpreters; private final PlanInterpreter allInterpreter; - public PlanInterpretationContext(Map originalDeploymentPlan, List interpreters) { + public PlanInterpretationContext(Map originalDeploymentPlan, List interpreters) { super(); this.originalDeploymentPlan = ImmutableMap.copyOf(originalDeploymentPlan); this.interpreters = ImmutableList.copyOf(interpreters); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ea37bb64/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/CampYamlParser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/CampYamlParser.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/CampYamlParser.java new file mode 100644 index 0000000..35841be --- /dev/null +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/CampYamlParser.java @@ -0,0 +1,34 @@ +/* + * 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.mgmt.internal; + +import java.util.Map; + +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.ConfigKeys; + +public interface CampYamlParser { + + ConfigKey YAML_PARSER_KEY = ConfigKeys.newConfigKey(CampYamlParser.class, "brooklyn.camp.yamlParser"); + + Map parse(Map map); + + Object parse(String val); + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ea37bb64/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java index f3dfd5c..7290c24 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java @@ -18,6 +18,10 @@ */ package org.apache.brooklyn.camp.brooklyn; +import static com.google.common.base.Preconditions.checkState; + +import java.util.Map; + import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.mgmt.ManagementContext.PropertiesReloadListener; import org.apache.brooklyn.camp.AggregatingCampPlatform; @@ -26,9 +30,12 @@ import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslInterpreter; import org.apache.brooklyn.camp.brooklyn.spi.platform.BrooklynImmutableCampPlatform; import org.apache.brooklyn.camp.spi.PlatformRootSummary; -import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.mgmt.HasBrooklynManagementContext; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; +import org.apache.brooklyn.core.mgmt.internal.CampYamlParser; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; /** {@link CampPlatform} implementation which includes Brooklyn entities * (via {@link BrooklynImmutableCampPlatform}) @@ -71,9 +78,26 @@ public class BrooklynCampPlatform extends AggregatingCampPlatform implements Has } public BrooklynCampPlatform setConfigKeyAtManagmentContext() { - ((ManagementContextInternal)bmc).getBrooklynProperties().put(BrooklynCampConstants.CAMP_PLATFORM, this); + ((ManagementContextInternal)bmc).getBrooklynProperties().put(CampYamlParser.YAML_PARSER_KEY, new YamlParserImpl(this)); return this; } - + + public static class YamlParserImpl implements CampYamlParser { + private final BrooklynCampPlatform platform; + + YamlParserImpl(BrooklynCampPlatform platform) { + this.platform = platform; + } + + public Map parse(Map map) { + return platform.pdp().applyInterpreters(map); + } + + public Object parse(String val) { + Map result = platform.pdp().applyInterpreters(ImmutableMap.of("dummyKey", val)); + checkState(result.keySet().equals(ImmutableSet.of("dummyKey")), "expected single result, but got %s", result); + return result.get("dummyKey"); + } + } }