Repository: incubator-ignite Updated Branches: refs/heads/ignite-908 [created] ab567ab8d
# IGNITE-908: Done. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab567ab8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab567ab8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab567ab8 Branch: refs/heads/ignite-908 Commit: ab567ab8d792ac22a52a15f6f518eecef01bd52b Parents: 15aa1cf Author: vozerov-gridgain <[email protected]> Authored: Fri May 15 18:03:01 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri May 15 18:03:01 2015 +0300 ---------------------------------------------------------------------- .../internal/interop/InteropBootstrap.java | 2 +- .../ignite/internal/interop/InteropHandle.java | 39 ++++++++++++++++++++ .../internal/interop/InteropIgnition.java | 2 +- .../internal/interop/InteropProcessor.java | 25 ------------- 4 files changed, 41 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab567ab8/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java index 820bef9..db90d0b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java @@ -30,5 +30,5 @@ public interface InteropBootstrap { * @param envPtr Environment pointer. * @return Ignite node. */ - public InteropProcessor start(IgniteConfiguration cfg, long envPtr); + public InteropHandle start(IgniteConfiguration cfg, long envPtr); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab567ab8/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropHandle.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropHandle.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropHandle.java new file mode 100644 index 0000000..f486dcc --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropHandle.java @@ -0,0 +1,39 @@ +/* + * 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.interop; + +import org.apache.ignite.*; + +/** + * Interop handle passed to platform for further cooperation. + */ +public interface InteropHandle { + /** + * Get Ignite instance associated with this handle. + * + * @return Ignite instance. + */ + public Ignite ignite(); + + /** + * Get environment pointer associated with this handle. + * + * @return Environment pointer. + */ + public long environmentPointer(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab567ab8/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java index f245122..65ffcf9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java @@ -43,7 +43,7 @@ public class InteropIgnition { * @param envPtr Environment pointer. * @return Ignite instance. */ - public static InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName, int factoryId, + public static InteropHandle start(@Nullable String springCfgPath, @Nullable String gridName, int factoryId, long envPtr) { IgniteConfiguration cfg = configuration(springCfgPath); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab567ab8/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java deleted file mode 100644 index 6c55296..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java +++ /dev/null @@ -1,25 +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.interop; - -/** - * Interop processor. - */ -public interface InteropProcessor { - // No-op. -}
