IGNITE-1341: Refactored platform exceptions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/66504a08 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/66504a08 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/66504a08 Branch: refs/heads/ignite-843 Commit: 66504a08c5db4e7cc03bfcb3336a00650d5f2375 Parents: 465348e Author: vozerov-gridgain <[email protected]> Authored: Tue Sep 1 17:15:35 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Sep 1 17:15:35 2015 +0300 ---------------------------------------------------------------------- .../processors/platform/PlatformContext.java | 4 +- .../processors/platform/PlatformException.java | 71 ++++++++++++++++++ .../platform/PlatformExtendedException.java | 57 +++++++++++++++ .../platform/PlatformNativeException.java | 77 ++++++++++++++++++++ .../platform/PlatformNoCallbackException.java | 50 +++++++++++++ .../platform/PlatformContextImpl.java | 4 +- .../processors/platform/PlatformException.java | 71 ------------------ .../platform/PlatformExtendedException.java | 39 ---------- .../platform/PlatformNoCallbackException.java | 50 ------------- .../platform/cache/PlatformCache.java | 2 +- .../PlatformCachePartialUpdateException.java | 15 +--- .../platform/compute/PlatformAbstractTask.java | 1 + .../compute/PlatformNativeException.java | 77 -------------------- .../platform/utils/PlatformUtils.java | 2 +- 14 files changed, 262 insertions(+), 258 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java index 218ae6b..a9b7d02 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.platform; -import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cluster.ClusterMetrics; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.events.Event; @@ -216,8 +215,7 @@ public interface PlatformContext { * @param cause Native cause. * @return Exception. */ - // TODO: Some common interface must be used here. - public IgniteCheckedException createNativeException(Object cause); + public PlatformNativeException createNativeException(Object cause); /** * Create job. http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformException.java new file mode 100644 index 0000000..4334d93 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformException.java @@ -0,0 +1,71 @@ +/* + * 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.platform; + +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; + +/** + * Interop checked exception. + */ +public class PlatformException extends IgniteCheckedException { + /** */ + private static final long serialVersionUID = 0L; + + /** + * Create empty exception. + */ + public PlatformException() { + // No-op. + } + + /** + * Creates new exception with given error message. + * + * @param msg Error message. + */ + public PlatformException(String msg) { + super(msg); + } + + /** + * Creates new grid exception with given throwable as a cause and + * source of error message. + * + * @param cause Non-null throwable cause. + */ + public PlatformException(Throwable cause) { + this(cause.getMessage(), cause); + } + + /** + * Creates new exception with given error message and optional nested exception. + * + * @param msg Error message. + * @param cause Optional nested exception (can be {@code null}). + */ + public PlatformException(String msg, @Nullable Throwable cause) { + super(msg, cause); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(PlatformException.class, this); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java new file mode 100644 index 0000000..825db6c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java @@ -0,0 +1,57 @@ +/* + * 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.platform; + +import org.apache.ignite.internal.portable.PortableRawWriterEx; + +/** + * Denotes an exception which has some data to be written in a special manner. + */ +public abstract class PlatformExtendedException extends PlatformException { + /** */ + private static final long serialVersionUID = 0L; + + /** Platform context. */ + protected final PlatformContext ctx; + + /** + * Constructor. + * + * @param cause Root cause. + * @param ctx Platform context. + */ + protected PlatformExtendedException(Throwable cause, PlatformContext ctx) { + super(cause); + + this.ctx = ctx; + } + + /** + * @return Platform context. + */ + public PlatformContext context() { + return ctx; + } + + /** + * Write data. + * + * @param writer Writer. + */ + public abstract void writeData(PortableRawWriterEx writer); +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNativeException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNativeException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNativeException.java new file mode 100644 index 0000000..a99664a --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNativeException.java @@ -0,0 +1,77 @@ +/* + * 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.platform; + +import org.apache.ignite.internal.util.typedef.internal.S; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + +/** + * Exception occurred on native side. + */ +public class PlatformNativeException extends PlatformException implements Externalizable { + /** */ + private static final long serialVersionUID = 0L; + + /** Native cause. */ + protected Object cause; + + /** + * {@link java.io.Externalizable} support. + */ + @SuppressWarnings("UnusedDeclaration") + public PlatformNativeException() { + // No-op. + } + + /** + * Constructor. + * + * @param cause Native cause. + */ + public PlatformNativeException(Object cause) { + super("Native platform exception occurred."); + + this.cause = cause; + } + + /** + * @return Native cause. + */ + public Object cause() { + return cause; + } + + /** {@inheritDoc} */ + @Override public void writeExternal(ObjectOutput out) throws IOException { + out.writeObject(cause); + } + + /** {@inheritDoc} */ + @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + cause = in.readObject(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(PlatformNativeException.class, this, "cause", cause); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoCallbackException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoCallbackException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoCallbackException.java new file mode 100644 index 0000000..f706bbd --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoCallbackException.java @@ -0,0 +1,50 @@ +/* + * 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.platform; + +import org.apache.ignite.internal.util.typedef.internal.S; + +/** + * Exception raised when interop callback is not set in native platform. + */ +@SuppressWarnings("UnusedDeclaration") +public class PlatformNoCallbackException extends PlatformException { + /** */ + private static final long serialVersionUID = 0L; + + /** + * Constructor. + */ + public PlatformNoCallbackException() { + // No-op. + } + + /** + * Constructor. + * + * @param msg Message. + */ + public PlatformNoCallbackException(String msg) { + super(msg); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(PlatformNoCallbackException.class, this); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java index 6d1d7a7..3895506 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.platform; -import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.cluster.ClusterMetrics; import org.apache.ignite.cluster.ClusterNode; @@ -54,7 +53,6 @@ import org.apache.ignite.internal.processors.platform.compute.PlatformAbstractTa import org.apache.ignite.internal.processors.platform.compute.PlatformClosureJob; import org.apache.ignite.internal.processors.platform.compute.PlatformFullJob; import org.apache.ignite.internal.processors.platform.compute.PlatformJob; -import org.apache.ignite.internal.processors.platform.compute.PlatformNativeException; import org.apache.ignite.internal.processors.platform.datastreamer.PlatformStreamReceiver; import org.apache.ignite.internal.processors.platform.datastreamer.PlatformStreamReceiverImpl; import org.apache.ignite.internal.processors.platform.events.PlatformEventFilterListenerImpl; @@ -587,7 +585,7 @@ public class PlatformContextImpl implements PlatformContext { } /** {@inheritDoc} */ - @Override public IgniteCheckedException createNativeException(Object cause) { + @Override public PlatformNativeException createNativeException(Object cause) { return new PlatformNativeException(cause); } http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformException.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformException.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformException.java deleted file mode 100644 index 4334d93..0000000 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformException.java +++ /dev/null @@ -1,71 +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.platform; - -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.util.typedef.internal.S; -import org.jetbrains.annotations.Nullable; - -/** - * Interop checked exception. - */ -public class PlatformException extends IgniteCheckedException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * Create empty exception. - */ - public PlatformException() { - // No-op. - } - - /** - * Creates new exception with given error message. - * - * @param msg Error message. - */ - public PlatformException(String msg) { - super(msg); - } - - /** - * Creates new grid exception with given throwable as a cause and - * source of error message. - * - * @param cause Non-null throwable cause. - */ - public PlatformException(Throwable cause) { - this(cause.getMessage(), cause); - } - - /** - * Creates new exception with given error message and optional nested exception. - * - * @param msg Error message. - * @param cause Optional nested exception (can be {@code null}). - */ - public PlatformException(String msg, @Nullable Throwable cause) { - super(msg, cause); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(PlatformException.class, this); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java deleted file mode 100644 index 8c33729..0000000 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java +++ /dev/null @@ -1,39 +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.platform; - -import org.apache.ignite.internal.portable.PortableRawWriterEx; - -/** - * Denotes an exception which has some data to be written in a special manner. - */ -public interface PlatformExtendedException { - /** - * Gets platform context. - * - * @return Platform context. - */ - public PlatformContext context(); - - /** - * Write data. - * - * @param writer Writer. - */ - public void writeData(PortableRawWriterEx writer); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoCallbackException.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoCallbackException.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoCallbackException.java deleted file mode 100644 index f706bbd..0000000 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoCallbackException.java +++ /dev/null @@ -1,50 +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.platform; - -import org.apache.ignite.internal.util.typedef.internal.S; - -/** - * Exception raised when interop callback is not set in native platform. - */ -@SuppressWarnings("UnusedDeclaration") -public class PlatformNoCallbackException extends PlatformException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * Constructor. - */ - public PlatformNoCallbackException() { - // No-op. - } - - /** - * Constructor. - * - * @param msg Message. - */ - public PlatformNoCallbackException(String msg) { - super(msg); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(PlatformNoCallbackException.class, this); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java index e579be7..184aa33 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java @@ -39,7 +39,7 @@ import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery; import org.apache.ignite.internal.processors.platform.cache.query.PlatformFieldsQueryCursor; import org.apache.ignite.internal.processors.platform.cache.query.PlatformQueryCursor; -import org.apache.ignite.internal.processors.platform.compute.PlatformNativeException; +import org.apache.ignite.internal.processors.platform.PlatformNativeException; import org.apache.ignite.internal.processors.platform.utils.PlatformFutureUtils; import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; import org.apache.ignite.internal.util.GridConcurrentFactory; http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java index 58dfa4c..ef17a06 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.platform.cache; import org.apache.ignite.internal.portable.PortableRawWriterEx; import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException; import org.apache.ignite.internal.processors.platform.PlatformContext; -import org.apache.ignite.internal.processors.platform.PlatformException; import org.apache.ignite.internal.processors.platform.PlatformExtendedException; import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; @@ -29,13 +28,10 @@ import java.util.Collection; /** * Interop cache partial update exception. */ -public class PlatformCachePartialUpdateException extends PlatformException implements PlatformExtendedException { +public class PlatformCachePartialUpdateException extends PlatformExtendedException { /** */ private static final long serialVersionUID = 0L; - /** Platform context. */ - private final PlatformContext ctx; - /** Keep portable flag. */ private final boolean keepPortable; @@ -48,18 +44,11 @@ public class PlatformCachePartialUpdateException extends PlatformException imple */ public PlatformCachePartialUpdateException(CachePartialUpdateCheckedException cause, PlatformContext ctx, boolean keepPortable) { - super(cause); - - this.ctx = ctx; + super(cause, ctx); this.keepPortable = keepPortable; } /** {@inheritDoc} */ - @Override public PlatformContext context() { - return ctx; - } - - /** {@inheritDoc} */ @Override public void writeData(PortableRawWriterEx writer) { Collection keys = ((CachePartialUpdateCheckedException)getCause()).failedKeys(); http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java index 0152713..b17dd97 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java @@ -26,6 +26,7 @@ import org.apache.ignite.compute.ComputeJobResultPolicy; import org.apache.ignite.compute.ComputeTask; import org.apache.ignite.internal.portable.PortableRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; +import org.apache.ignite.internal.processors.platform.PlatformNativeException; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream; import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformNativeException.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformNativeException.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformNativeException.java deleted file mode 100644 index 106abb9..0000000 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformNativeException.java +++ /dev/null @@ -1,77 +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.platform.compute; - -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import org.apache.ignite.internal.processors.platform.PlatformException; -import org.apache.ignite.internal.util.typedef.internal.S; - -/** - * Exception occurred on native side. - */ -public class PlatformNativeException extends PlatformException implements Externalizable { - /** */ - private static final long serialVersionUID = 0L; - - /** Native cause. */ - protected Object cause; - - /** - * {@link Externalizable} support. - */ - @SuppressWarnings("UnusedDeclaration") - public PlatformNativeException() { - // No-op. - } - - /** - * Constructor. - * - * @param cause Native cause. - */ - public PlatformNativeException(Object cause) { - super("Native platform exception occurred."); - - this.cause = cause; - } - - /** - * @return Native cause. - */ - public Object cause() { - return cause; - } - - /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(cause); - } - - /** {@inheritDoc} */ - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - cause = in.readObject(); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(PlatformNativeException.class, this, "cause", cause); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/66504a08/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java index ab2a5eb..2e1da0b 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java @@ -36,8 +36,8 @@ import org.apache.ignite.internal.portable.PortableRawReaderEx; import org.apache.ignite.internal.portable.PortableRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformExtendedException; +import org.apache.ignite.internal.processors.platform.PlatformNativeException; import org.apache.ignite.internal.processors.platform.PlatformProcessor; -import org.apache.ignite.internal.processors.platform.compute.PlatformNativeException; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryUtils;
