Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 834F517C6C for ; Mon, 2 Feb 2015 21:57:28 +0000 (UTC) Received: (qmail 54603 invoked by uid 500); 2 Feb 2015 21:57:23 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 54570 invoked by uid 500); 2 Feb 2015 21:57:23 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 54561 invoked by uid 99); 2 Feb 2015 21:57:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 21:57:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Feb 2015 21:57:05 +0000 Received: (qmail 51145 invoked by uid 99); 2 Feb 2015 21:56:44 -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; Mon, 02 Feb 2015 21:56:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 861CDE0542; Mon, 2 Feb 2015 21:56:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Feb 2015 21:56:57 -0000 Message-Id: <16800dc3323f40f3b90b77480ef6c9d5@git.apache.org> In-Reply-To: <68ae071830224259adff89d3ee84e7a9@git.apache.org> References: <68ae071830224259adff89d3ee84e7a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] incubator-ignite git commit: #ignite-16: WIP. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-16: WIP. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0444b79 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0444b79 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0444b79 Branch: refs/heads/ignite-132 Commit: d0444b79c5028074128f56f555b0414041dc878d Parents: 9ea9607 Author: vozerov-gridgain Authored: Fri Jan 30 17:05:00 2015 +0300 Committer: vozerov-gridgain Committed: Fri Jan 30 17:05:00 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 22 ---- .../ignite/internal/GridKernalContext.java | 8 -- .../ignite/internal/GridKernalContextImpl.java | 12 -- .../org/apache/ignite/internal/IgniteEx.java | 8 -- .../apache/ignite/internal/IgniteKernal.java | 7 -- .../org/apache/ignite/internal/IgnitionEx.java | 1 - .../processors/cache/GridCacheStoreManager.java | 1 - .../cache/GridCacheWriteBehindStore.java | 1 - .../processors/interop/GridInteropAware.java | 49 --------- .../interop/GridInteropProcessor.java | 82 -------------- .../interop/GridInteropProcessorAdapter.java | 31 ------ .../processors/interop/GridInteropTarget.java | 109 ------------------- .../interop/os/GridOsInteropProcessor.java | 80 -------------- .../internal/processors/interop/os/package.html | 23 ---- .../internal/processors/interop/package.html | 23 ---- .../plugin/IgnitePluginProcessor.java | 10 +- 16 files changed, 6 insertions(+), 461 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 778ca62..e6d513b 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -389,9 +389,6 @@ public class IgniteConfiguration { /** Transactions configuration. */ private TransactionsConfiguration txCfg = new TransactionsConfiguration(); - /** Interop configuration. */ - private InteropConfiguration interopCfg; - /** */ private Collection pluginCfgs; @@ -585,7 +582,6 @@ public class IgniteConfiguration { hadoopCfg = cfg.getHadoopConfiguration(); inclEvtTypes = cfg.getIncludeEventTypes(); includeProps = cfg.getIncludeProperties(); - interopCfg = cfg.getInteropConfiguration() != null ? cfg.getInteropConfiguration().copy() : null; jettyPath = cfg.getRestJettyPath(); licUrl = cfg.getLicenseUrl(); lifecycleBeans = cfg.getLifecycleBeans(); @@ -3117,24 +3113,6 @@ public class IgniteConfiguration { } /** - * Gets interop configuration. - * - * @return Interop configuration. - */ - @Nullable public InteropConfiguration getInteropConfiguration() { - return interopCfg; - } - - /** - * Sets interop configuration. - * - * @param interopCfg Interop configuration. - */ - public void setInteropConfiguration(@Nullable InteropConfiguration interopCfg) { - this.interopCfg = interopCfg; - } - - /** * Gets transactions configuration. * * @return Transactions configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java index 17f3ec8..58923b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java @@ -43,7 +43,6 @@ import org.apache.ignite.internal.processors.continuous.*; import org.apache.ignite.internal.processors.dataload.*; import org.apache.ignite.internal.processors.email.*; import org.apache.ignite.internal.processors.hadoop.*; -import org.apache.ignite.internal.processors.interop.*; import org.apache.ignite.internal.processors.job.*; import org.apache.ignite.internal.processors.jobmetrics.*; import org.apache.ignite.internal.processors.license.*; @@ -330,13 +329,6 @@ public interface GridKernalContext extends Iterable { public GridPortableProcessor portable(); /** - * Gets interop processor. - * - * @return Interop processor. - */ - public GridInteropProcessor interop(); - - /** * Gets query processor. * * @return Query processor. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 88dbef6..13eb341 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -46,7 +46,6 @@ import org.apache.ignite.internal.processors.continuous.*; import org.apache.ignite.internal.processors.dataload.*; import org.apache.ignite.internal.processors.email.*; import org.apache.ignite.internal.processors.hadoop.*; -import org.apache.ignite.internal.processors.interop.*; import org.apache.ignite.internal.processors.job.*; import org.apache.ignite.internal.processors.jobmetrics.*; import org.apache.ignite.internal.processors.license.*; @@ -255,10 +254,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable /** */ @GridToStringExclude - private GridInteropProcessor interopProc; - - /** */ - @GridToStringExclude private IgniteSpringProcessor spring; /** */ @@ -444,8 +439,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable hadoopProc = (IgniteHadoopProcessorAdapter)comp; else if (comp instanceof GridPortableProcessor) portableProc = (GridPortableProcessor)comp; - else if (comp instanceof GridInteropProcessor) - interopProc = (GridInteropProcessor)comp; else if (comp instanceof IgnitePluginProcessor) pluginProc = (IgnitePluginProcessor)comp; else if (comp instanceof GridQueryProcessor) @@ -697,11 +690,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable } /** {@inheritDoc} */ - @Override public GridInteropProcessor interop() { - return interopProc; - } - - /** {@inheritDoc} */ @Override public GridQueryProcessor query() { return qryProc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java index 6aa8bf5..aa94560 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; -import org.apache.ignite.internal.processors.interop.*; import org.jetbrains.annotations.*; import java.util.*; @@ -133,11 +132,4 @@ public interface IgniteEx extends Ignite, ClusterGroupEx, IgniteCluster { * @return GGFS. */ @Nullable public IgniteFs ggfsx(@Nullable String name); - - /** - * Gets interop processor. - * - * @return Interop processor. - */ - public GridInteropProcessor interop(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 7854bd9..0df86f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -56,7 +56,6 @@ import org.apache.ignite.internal.processors.closure.*; import org.apache.ignite.internal.processors.continuous.*; import org.apache.ignite.internal.processors.dataload.*; import org.apache.ignite.internal.processors.email.*; -import org.apache.ignite.internal.processors.interop.*; import org.apache.ignite.internal.processors.job.*; import org.apache.ignite.internal.processors.jobmetrics.*; import org.apache.ignite.internal.processors.license.*; @@ -742,7 +741,6 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit startProcessor(ctx, new GridTaskProcessor(ctx), attrs); startProcessor(ctx, (GridProcessor)SCHEDULE.createOptional(ctx), attrs); startProcessor(ctx, createComponent(GridPortableProcessor.class, ctx), attrs); - startProcessor(ctx, createComponent(GridInteropProcessor.class, ctx), attrs); startProcessor(ctx, new GridRestProcessor(ctx), attrs); startProcessor(ctx, new GridDataLoaderProcessor(ctx), attrs); startProcessor(ctx, new GridStreamProcessor(ctx), attrs); @@ -3104,11 +3102,6 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit } /** {@inheritDoc} */ - @Override public GridInteropProcessor interop() { - return ctx.interop(); - } - - /** {@inheritDoc} */ @Override public Map> mapKeysToNodes(String cacheName, @Nullable Collection keys) throws IgniteCheckedException { if (F.isEmpty(keys)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index d962de0..3857851 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1418,7 +1418,6 @@ public class IgnitionEx { myCfg.setSecurityCredentialsProvider(cfg.getSecurityCredentialsProvider()); myCfg.setServiceConfiguration(cfg.getServiceConfiguration()); myCfg.setWarmupClosure(cfg.getWarmupClosure()); - myCfg.setInteropConfiguration(cfg.getInteropConfiguration()); myCfg.setPluginConfigurations(cfg.getPluginConfigurations()); myCfg.setTransactionsConfiguration(new TransactionsConfiguration(cfg.getTransactionsConfiguration())); myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java index 61408cb..f7fe02e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.transactions.*; -import org.apache.ignite.internal.processors.interop.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java index a31d3b5..4999ce0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java @@ -24,7 +24,6 @@ import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.thread.*; -import org.apache.ignite.internal.processors.interop.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropAware.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropAware.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropAware.java deleted file mode 100644 index 81035d8..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropAware.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.interop; - -import org.apache.ignite.*; -import org.apache.ignite.internal.*; - -/** - * Interface for interop-aware components. - */ -public interface GridInteropAware { - /** - * Sets configuration parameters. - * - * @param params Configuration parameters. - */ - public void configure(Object... params); - - /** - * Initializes interop-aware component. - * - * @param ctx Context. - * @throws IgniteCheckedException In case of error. - */ - public void initialize(GridKernalContext ctx) throws IgniteCheckedException; - - /** - * Destroys interop-aware component. - * - * @param ctx Context. - * @throws IgniteCheckedException In case of error. - */ - public void destroy(GridKernalContext ctx) throws IgniteCheckedException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropProcessor.java deleted file mode 100644 index 33c841a..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropProcessor.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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.interop; - -import org.apache.ignite.*; -import org.apache.ignite.internal.processors.*; -import org.jetbrains.annotations.*; - -/** - * Interop processor. - */ -public interface GridInteropProcessor extends GridProcessor { - /** - * Release start latch. - */ - public void releaseStart(); - - /** - * Await start on native side. - * - * @throws IgniteCheckedException If failed. - */ - public void awaitStart() throws IgniteCheckedException; - - /** - * @return Environment pointer. - */ - public long environmentPointer() throws IgniteCheckedException; - - /** - * @return Grid name. - */ - public String gridName(); - - /** - * Gets native wrapper for default Grid projection. - * - * @return Native compute wrapper. - * @throws IgniteCheckedException If failed. - */ - public GridInteropTarget projection() throws IgniteCheckedException; - - /** - * Gets native wrapper for cache with the given name. - * - * @param name Cache name ({@code null} for default cache). - * @return Native cache wrapper. - * @throws IgniteCheckedException If failed. - */ - public GridInteropTarget cache(@Nullable String name) throws IgniteCheckedException; - - /** - * Gets native wrapper for data loader for cache with the given name. - * - * @param cacheName Cache name ({@code null} for default cache). - * @return Native data loader wrapper. - * @throws IgniteCheckedException If failed. - */ - public GridInteropTarget dataLoader(@Nullable String cacheName) throws IgniteCheckedException; - - /** - * Stops grid. - * - * @param cancel Cancel flag. - */ - public void close(boolean cancel); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropProcessorAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropProcessorAdapter.java deleted file mode 100644 index 91ea27e..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropProcessorAdapter.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.interop; - -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.*; - -/** - * Interop processor adapter. - */ -public abstract class GridInteropProcessorAdapter extends GridProcessorAdapter implements GridInteropProcessor { - /** {@inheritDoc} */ - protected GridInteropProcessorAdapter(GridKernalContext ctx) { - super(ctx); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropTarget.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropTarget.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropTarget.java deleted file mode 100644 index af8b5d2..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/GridInteropTarget.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * 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.interop; - -import org.apache.ignite.*; -import org.apache.ignite.internal.processors.portable.*; -import org.jetbrains.annotations.*; - -/** - * Interop target abstraction. - */ -public interface GridInteropTarget { - /** - * Synchronous IN operation. - * - * @param type Operation type. - * @param stream Input stream. - * @return Value specific for the given operation otherwise. - * @throws IgniteCheckedException In case of failure. - */ - public int inOp(int type, GridPortableInputStream stream) throws IgniteCheckedException; - - /** - * Synchronous IN operation which returns managed object as result. - * - * @param type Operation type. - * @param stream Input stream. - * @return Managed result. - * @throws IgniteCheckedException If case of failure. - */ - public Object inOpObject(int type, GridPortableInputStream stream) throws IgniteCheckedException; - - /** - * Synchronous OUT operation. - * - * @param type Operation type. - * @param stream Native stream address. - * @param arr Native array address. - * @param cap Capacity. - * @throws IgniteCheckedException In case of failure. - */ - public void outOp(int type, long stream, long arr, int cap) throws IgniteCheckedException; - - /** - * Synchronous IN-OUT operation. - * - * @param type Operation type. - * @param inStream Input stream. - * @param outStream Native stream address. - * @param outArr Native array address. - * @param outCap Capacity. - * @throws IgniteCheckedException In case of failure. - */ - public void inOutOp(int type, GridPortableInputStream inStream, long outStream, long outArr, int outCap) - throws IgniteCheckedException; - - /** - * Synchronous IN-OUT operation with optional argument. - * - * @param type Operation type. - * @param inStream Input stream. - * @param outStream Native stream address. - * @param outArr Native array address. - * @param outCap Capacity. - * @param arg Argument (optional). - * @throws IgniteCheckedException In case of failure. - */ - public void inOutOp(int type, GridPortableInputStream inStream, long outStream, long outArr, int outCap, - @Nullable Object arg) throws IgniteCheckedException; - - /** - * Asynchronous IN operation. - * - * @param type Operation type. - * @param futId Future ID. - * @param in Input stream. - * @throws IgniteCheckedException In case of failure. - */ - public void inOpAsync(int type, long futId, GridPortableInputStream in) throws IgniteCheckedException; - - /** - * Asynchronous IN-OUT operation. - * - * @param type Operation type. - * @param futId Future ID. - * @param in Input stream. - * @param outStream Native stream address. - * @param outArr Native array address. - * @param outCap Capacity. - * @throws IgniteCheckedException In case of failure. - */ - public void inOutOpAsync(int type, long futId, GridPortableInputStream in, long outStream, long outArr, int outCap) - throws IgniteCheckedException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/os/GridOsInteropProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/os/GridOsInteropProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/os/GridOsInteropProcessor.java deleted file mode 100644 index 6a592d1..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/os/GridOsInteropProcessor.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * 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.interop.os; - -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.interop.*; -import org.jetbrains.annotations.*; - -/** - * OS interop processor. - */ -public class GridOsInteropProcessor extends GridInteropProcessorAdapter { - /** Common error message. */ - private static final String ERR_MSG = "Interop feature is not supported in OS edition."; - - /** - * Constructor. - * - * @param ctx Context. - */ - public GridOsInteropProcessor(GridKernalContext ctx) { - super(ctx); - } - - /** {@inheritDoc} */ - @Override public void releaseStart() { - throw new UnsupportedOperationException(ERR_MSG); - } - - /** {@inheritDoc} */ - @Override public void awaitStart() throws IgniteCheckedException { - throw new UnsupportedOperationException(ERR_MSG); - } - - /** {@inheritDoc} */ - @Override public long environmentPointer() throws IgniteCheckedException { - throw new UnsupportedOperationException(ERR_MSG); - } - - /** {@inheritDoc} */ - @Override public String gridName() { - throw new UnsupportedOperationException(ERR_MSG); - } - - /** {@inheritDoc} */ - @Override public void close(boolean cancel) { - throw new UnsupportedOperationException(ERR_MSG); - } - - /** {@inheritDoc} */ - @Override public GridInteropTarget projection() throws IgniteCheckedException { - throw new UnsupportedOperationException(ERR_MSG); - } - - /** {@inheritDoc} */ - @Override public GridInteropTarget cache(@Nullable String name) throws IgniteCheckedException { - throw new UnsupportedOperationException(ERR_MSG); - } - - /** {@inheritDoc} */ - @Override public GridInteropTarget dataLoader(@Nullable String cacheName) throws IgniteCheckedException { - throw new UnsupportedOperationException(ERR_MSG); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/os/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/os/package.html b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/os/package.html deleted file mode 100644 index 20815a0..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/os/package.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - No-op implementation of interop processor. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/package.html b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/package.html deleted file mode 100644 index 57a4e47..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/package.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Interop processor. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0444b79/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java index 5d3ad42..9cd7943 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java @@ -132,8 +132,9 @@ public class IgnitePluginProcessor extends GridProcessorAdapter { * @param name Plugin name. * @return Plugin provider. */ - @Nullable public PluginProvider pluginProvider(String name) { - return plugins.get(name); + @SuppressWarnings("unchecked") + @Nullable public T pluginProvider(String name) { + return (T)plugins.get(name); } /** @@ -147,8 +148,9 @@ public class IgnitePluginProcessor extends GridProcessorAdapter { * @param provider Plugin context. * @return Plugin context. */ - public PluginContext pluginContextForProvider(PluginProvider provider) { - return pluginCtxMap.get(provider); + @SuppressWarnings("unchecked") + public T pluginContextForProvider(PluginProvider provider) { + return (T)pluginCtxMap.get(provider); } /**