Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-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 209F1C28F for ; Thu, 31 May 2012 08:18:54 +0000 (UTC) Received: (qmail 29965 invoked by uid 500); 31 May 2012 08:18:54 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 29909 invoked by uid 500); 31 May 2012 08:18:53 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 29878 invoked by uid 99); 31 May 2012 08:18:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 May 2012 08:18:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 May 2012 08:18:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D5022388860; Thu, 31 May 2012 08:18:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1344592 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit: CompositeCommitHook.java CompositeValidator.java CompositeValidatorProvider.java Date: Thu, 31 May 2012 08:18:26 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120531081827.3D5022388860@eris.apache.org> Author: mduerig Date: Thu May 31 08:18:26 2012 New Revision: 1344592 URL: http://svn.apache.org/viewvc?rev=1344592&view=rev Log: OAK-68 - Extension point for commit validation Add composite variants for CommitHook, Validator and ValidatorProvider Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidator.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidatorProvider.java Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java?rev=1344592&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java (added) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java Thu May 31 08:18:26 2012 @@ -0,0 +1,53 @@ +/* + * 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.jackrabbit.oak.spi.commit; + +import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.spi.state.NodeStore; + +import java.util.List; + +public class CompositeCommitHook implements CommitHook { + private final List hooks; + + public CompositeCommitHook(List hooks) { + this.hooks = hooks; + } + + @Override + public NodeState beforeCommit(NodeStore store, NodeState before, NodeState after) + throws CommitFailedException { + + NodeState oldState = before; + NodeState newState = after; + for (CommitHook hook : hooks) { + NodeState newOldState = newState; + newState = hook.beforeCommit(store, oldState, newState); + oldState = newOldState; + } + + return newState; + } + + @Override + public void afterCommit(NodeStore store, NodeState before, NodeState after) { + for (CommitHook hook : hooks) { + hook.afterCommit(store, before, after); + } + } +} Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidator.java?rev=1344592&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidator.java (added) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidator.java Thu May 31 08:18:26 2012 @@ -0,0 +1,82 @@ +/* + * 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.jackrabbit.oak.spi.commit; + +import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.api.PropertyState; +import org.apache.jackrabbit.oak.spi.state.NodeState; + +import java.util.ArrayList; +import java.util.List; + +public class CompositeValidator implements Validator { + private final List validators; + + public CompositeValidator(List validators) { + this.validators = validators; + } + + @Override + public void propertyAdded(PropertyState after) throws CommitFailedException { + for (Validator validator : validators) { + validator.propertyAdded(after); + } + } + + @Override + public void propertyChanged(PropertyState before, PropertyState after) + throws CommitFailedException { + + for (Validator validator : validators) { + validator.propertyChanged(before, after); + } + } + + @Override + public void propertyDeleted(PropertyState before) throws CommitFailedException { + for (Validator validator : validators) { + validator.propertyDeleted(before); + } + } + + @Override + public Validator childNodeAdded(String name, NodeState after) throws CommitFailedException { + List childValidators = new ArrayList(validators.size()); + for (Validator validator : validators) { + childValidators.add( + validator.childNodeAdded(name, after)); + } + return new CompositeValidator(childValidators); + } + + @Override + public Validator childNodeChanged(String name, NodeState before, NodeState after) throws CommitFailedException { + List childValidators = new ArrayList(validators.size()); + for (Validator validator : validators) { + childValidators.add( + validator.childNodeChanged(name, before, after)); + } + return new CompositeValidator(childValidators); + } + + @Override + public void childNodeDeleted(String name, NodeState before) throws CommitFailedException { + for (Validator validator : validators) { + validator.childNodeDeleted(name, before); + } + } +} Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidatorProvider.java?rev=1344592&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidatorProvider.java (added) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeValidatorProvider.java Thu May 31 08:18:26 2012 @@ -0,0 +1,42 @@ +/* + * 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.jackrabbit.oak.spi.commit; + +import org.apache.jackrabbit.oak.spi.state.NodeState; + +import java.util.ArrayList; +import java.util.List; + +public class CompositeValidatorProvider implements ValidatorProvider { + private final List providers; + + public CompositeValidatorProvider(List providers) { + this.providers = providers; + } + + @Override + public Validator getRootValidator(NodeState before, NodeState after) { + List rootValidators = new ArrayList(providers.size()); + + for (ValidatorProvider provider : providers) { + rootValidators.add(provider.getRootValidator(before, after)); + } + + return new CompositeValidator(rootValidators); + } + +}