Repository: incubator-ignite Updated Branches: refs/heads/ignite-379-2 c99469f8a -> ae64cd755
# IGNITE-379 Remove Transaction.*meta*() methods. (cherry picked from commit 1ec04df) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4ddcd412 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ddcd412 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ddcd412 Branch: refs/heads/ignite-379-2 Commit: 4ddcd412f2db4815fb2d8fadb95353321a224f39 Parents: c99469f Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu Mar 5 14:19:57 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Mon Mar 23 11:36:03 2015 +0300 ---------------------------------------------------------------------- .../cache/transactions/TransactionEx.java | 54 ++++++++++++++++++++ .../transactions/TransactionProxyImpl.java | 2 +- .../apache/ignite/transactions/Transaction.java | 29 ----------- 3 files changed, 55 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ddcd412/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java new file mode 100644 index 0000000..7c21575 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java @@ -0,0 +1,54 @@ +/* + * 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.ignite.internal.processors.cache.transactions; + +import org.apache.ignite.transactions.*; + +/** + * + */ +public interface TransactionEx extends Transaction { + /** + * Removes metadata by name. + * + * @param name Name of the metadata to remove. + * @param <V> Type of the value. + * @return Value of removed metadata or {@code null}. + */ + public <V> V removeMeta(String name); + + /** + * Gets metadata by name. + * + * @param name Metadata name. + * @param <V> Type of the value. + * @return Metadata value or {@code null}. + */ + public <V> V meta(String name); + + /** + * Adds a new metadata. + * + * @param name Metadata name. + * @param val Metadata value. + * @param <V> Type of the value. + * @return Metadata previously associated with given name, or + * {@code null} if there was none. + */ + public <V> V addMeta(String name, V val); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ddcd412/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java index 266bd07..b52667b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java @@ -33,7 +33,7 @@ import java.util.*; /** * Cache transaction proxy. */ -public class TransactionProxyImpl<K, V> implements TransactionProxy, Externalizable { +public class TransactionProxyImpl<K, V> implements TransactionProxy, TransactionEx, Externalizable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ddcd412/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java b/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java index 8ccab34..cbb17e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/Transaction.java @@ -244,33 +244,4 @@ public interface Transaction extends AutoCloseable, IgniteAsyncSupport { */ @IgniteAsyncSupported public void rollback() throws IgniteException; - - /** - * Removes metadata by name. - * - * @param name Name of the metadata to remove. - * @param <V> Type of the value. - * @return Value of removed metadata or {@code null}. - */ - @Nullable public <V> V removeMeta(UUID name); - - /** - * Gets metadata by name. - * - * @param name Metadata name. - * @param <V> Type of the value. - * @return Metadata value or {@code null}. - */ - @Nullable public <V> V meta(UUID name); - - /** - * Adds a new metadata. - * - * @param name Metadata name. - * @param val Metadata value. - * @param <V> Type of the value. - * @return Metadata previously associated with given name, or - * {@code null} if there was none. - */ - @Nullable public <V> V addMeta(UUID name, V val); }
