Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 98adbfa63 -> 30de91622
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java new file mode 100644 index 0000000..1d1e022 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxRollbackCheckedException.java @@ -0,0 +1,47 @@ +/* + * 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.transactions; + +import org.apache.ignite.*; + +/** + * Exception thrown whenever grid transactions has been automatically rolled back. + */ +public class IgniteTxRollbackCheckedException extends IgniteCheckedException { + /** */ + private static final long serialVersionUID = 0L; + + /** + * Creates new rollback exception with given error message. + * + * @param msg Error message. + */ + public IgniteTxRollbackCheckedException(String msg) { + super(msg); + } + + /** + * Creates new rollback exception with given error message and optional nested exception. + * + * @param msg Error message. + * @param cause Optional nested exception (can be <tt>null</tt>). + */ + public IgniteTxRollbackCheckedException(String msg, Throwable cause) { + super(msg, cause); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java new file mode 100644 index 0000000..451fb9e --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/transactions/IgniteTxTimeoutCheckedException.java @@ -0,0 +1,47 @@ +/* + * 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.transactions; + +import org.apache.ignite.*; + +/** + * Exception thrown whenever grid transactions time out. + */ +public class IgniteTxTimeoutCheckedException extends IgniteCheckedException { + /** */ + private static final long serialVersionUID = 0L; + + /** + * Creates new timeout exception with given error message. + * + * @param msg Error message. + */ + public IgniteTxTimeoutCheckedException(String msg) { + super(msg); + } + + /** + * Creates new timeout exception with given error message and optional nested exception. + * + * @param msg Error message. + * @param cause Optional nested exception (can be <tt>null</tt>). + */ + public IgniteTxTimeoutCheckedException(String msg, Throwable cause) { + super(msg, cause); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index de65dfc..e4c7f6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -29,6 +29,7 @@ import org.apache.ignite.internal.compute.*; import org.apache.ignite.internal.mxbean.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.portables.*; @@ -41,6 +42,7 @@ import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.worker.*; +import org.apache.ignite.transactions.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; import sun.misc.*; @@ -8223,9 +8225,14 @@ public abstract class IgniteUtils { * @throws IgniteCheckedException If {@link org.apache.ignite.lifecycle.LifecycleAware#start} fails. */ public static void startLifecycleAware(Iterable<?> objs) throws IgniteCheckedException { - for (Object obj : objs) { - if (obj instanceof LifecycleAware) - ((LifecycleAware)obj).start(); + try { + for (Object obj : objs) { + if (obj instanceof LifecycleAware) + ((LifecycleAware)obj).start(); + } + } + catch (Exception e) { + throw new IgniteCheckedException(e); } } @@ -8242,7 +8249,7 @@ public abstract class IgniteUtils { try { ((LifecycleAware)obj).stop(); } - catch (IgniteCheckedException e) { + catch (Exception e) { U.error(log, "Failed to stop component (ignoring): " + obj, e); } } @@ -9142,7 +9149,7 @@ public abstract class IgniteUtils { } /** - * @param e Ingite checked exception. + * @param e Ignite checked exception. * @return Ignite runtime exception. */ public static IgniteException convertException(IgniteCheckedException e) { @@ -9162,9 +9169,17 @@ public abstract class IgniteUtils { return new ComputeTaskTimeoutException(e.getMessage(), e.getCause()); else if (e instanceof ComputeTaskCancelledCheckedException) return new ComputeTaskCancelledException(e.getMessage(), e.getCause()); + else if (e instanceof IgniteTxRollbackCheckedException) + return new IgniteTxRollbackException(e.getMessage(), e.getCause()); + else if (e instanceof IgniteTxHeuristicCheckedException) + return new IgniteTxHeuristicException(e.getMessage(), e.getCause()); + else if (e instanceof IgniteTxTimeoutCheckedException) + return new IgniteTxTimeoutException(e.getMessage(), e.getCause()); + else if (e instanceof IgniteTxOptimisticCheckedException) + return new IgniteTxOptimisticException(e.getMessage(), e.getCause()); else if (e.getCause() instanceof IgniteException) return (IgniteException)e.getCause(); - return new IgniteException(e); + return new IgniteException(e.getMessage(), e.getCause() != null ? e.getCause() : e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java index 484b12b..22bf910 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.util.future; import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.lang.*; -import org.apache.ignite.transactions.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -332,7 +332,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> { throw e; } } - catch (IgniteTxOptimisticException e) { + catch (IgniteTxOptimisticCheckedException e) { if (log.isDebugEnabled()) log.debug("Optimistic failure [fut=" + GridCompoundFuture.this + ", err=" + e + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java index 87578ac..45e4eeb 100644 --- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java +++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java @@ -28,14 +28,14 @@ public interface LifecycleAware { /** * Starts grid component, called on grid start. * - * @throws IgniteCheckedException If failed. + * @throws IgniteException If failed. */ - public void start() throws IgniteCheckedException; + public void start() throws IgniteException; /** * Stops grid component, called on grid shutdown. * - * @throws IgniteCheckedException If failed. + * @throws IgniteException If failed. */ - public void stop() throws IgniteCheckedException; + public void stop() throws IgniteException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java index 2ccfe96..9132972 100644 --- a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java +++ b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java @@ -84,15 +84,15 @@ public class StreamerBoundedSizeBatchWindow<E> extends StreamerWindowAdapter<E> } /** {@inheritDoc} */ - @Override public void checkConfiguration() throws IgniteCheckedException { + @Override public void checkConfiguration() { if (batchSize <= 0) - throw new IgniteCheckedException("Failed to initialize window (batchSize size must be positive) " + + throw new IgniteException("Failed to initialize window (batchSize size must be positive) " + "[windowClass=" + getClass().getSimpleName() + ", maximumBatches=" + maxBatches + ", batchSize=" + batchSize + ']'); if (maxBatches < 0) - throw new IgniteCheckedException("Failed to initialize window (maximumBatches cannot be negative) " + + throw new IgniteException("Failed to initialize window (maximumBatches cannot be negative) " + "[windowClass=" + getClass().getSimpleName() + ", maximumBatches=" + maxBatches + ", batchSize=" + batchSize + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeWindowAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeWindowAdapter.java b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeWindowAdapter.java index ffc2fc2..ff54ad0 100644 --- a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeWindowAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeWindowAdapter.java @@ -73,9 +73,9 @@ abstract class StreamerBoundedSizeWindowAdapter<E, T> extends StreamerWindowAdap } /** {@inheritDoc} */ - @Override public void checkConfiguration() throws IgniteCheckedException { + @Override public void checkConfiguration() { if (maxSize < 0) - throw new IgniteCheckedException("Failed to initialize window (maximumSize cannot be negative) " + + throw new IgniteException("Failed to initialize window (maximumSize cannot be negative) " + "[windowClass=" + getClass().getSimpleName() + ", maxSize=" + maxSize + ", unique=" + unique + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java index d8ba614..a2aae67 100644 --- a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java +++ b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java @@ -105,16 +105,16 @@ public class StreamerBoundedTimeBatchWindow<E> extends StreamerWindowAdapter<E> } /** {@inheritDoc} */ - @Override public void checkConfiguration() throws IgniteCheckedException { + @Override public void checkConfiguration() { if (maxBatches < 0) - throw new IgniteCheckedException("Failed to initialize window (maximumBatches cannot be negative) " + + throw new IgniteException("Failed to initialize window (maximumBatches cannot be negative) " + "[windowClass=" + getClass().getSimpleName() + ", maximumBatches=" + maxBatches + ", batchSize=" + batchSize + ", batchTimeInterval=" + batchTimeInterval + ']'); if (batchSize < 0) - throw new IgniteCheckedException("Failed to initialize window (batchSize cannot be negative) " + + throw new IgniteException("Failed to initialize window (batchSize cannot be negative) " + "[windowClass=" + getClass().getSimpleName() + ", maximumBatches=" + maxBatches + ", batchSize=" + batchSize + @@ -123,7 +123,7 @@ public class StreamerBoundedTimeBatchWindow<E> extends StreamerWindowAdapter<E> batchSize = Integer.MAX_VALUE; if (batchTimeInterval <= 0) - throw new IgniteCheckedException("Failed to initialize window (batchTimeInterval must be positive) " + + throw new IgniteException("Failed to initialize window (batchTimeInterval must be positive) " + "[windowClass=" + getClass().getSimpleName() + ", maximumBatches=" + maxBatches + ", batchSize=" + batchSize + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeWindow.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeWindow.java b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeWindow.java index 457a345..46c582c 100644 --- a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeWindow.java +++ b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeWindow.java @@ -102,14 +102,14 @@ public class StreamerBoundedTimeWindow<E> extends StreamerWindowAdapter<E> { } /** {@inheritDoc} */ - @Override public void checkConfiguration() throws IgniteCheckedException { + @Override public void checkConfiguration() { if (timeInterval <= 0) - throw new IgniteCheckedException("Failed to initialize window (timeInterval must be positive): [windowClass=" + + throw new IgniteException("Failed to initialize window (timeInterval must be positive): [windowClass=" + getClass().getSimpleName() + ", maxSize=" + maxSize + ", timeInterval=" + timeInterval + ", unique=" + unique + ']'); if (maxSize < 0) - throw new IgniteCheckedException("Failed to initialize window (maximumSize cannot be negative): [windowClass=" + + throw new IgniteException("Failed to initialize window (maximumSize cannot be negative): [windowClass=" + getClass().getSimpleName() + ", maxSize=" + maxSize + ", timeInterval=" + timeInterval + ", unique=" + unique + ']'); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java index 3448f39..698c63a 100644 --- a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java @@ -255,7 +255,7 @@ public abstract class StreamerWindowAdapter<E> implements LifecycleAware, Stream protected abstract Collection<E> pollEvictedBatch0(); /** {@inheritDoc} */ - @Override public final void start() throws IgniteCheckedException { + @Override public final void start() { checkConfiguration(); if (idxs != null) { @@ -286,9 +286,9 @@ public abstract class StreamerWindowAdapter<E> implements LifecycleAware, Stream /** * Check window configuration. * - * @throws IgniteCheckedException If failed. + * @throws IgniteException If failed. */ - protected abstract void checkConfiguration() throws IgniteCheckedException; + protected abstract void checkConfiguration() throws IgniteException; /** * Reset routine. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java index 16b4826..adff002 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java @@ -55,7 +55,7 @@ import java.util.*; * Read access with this level happens the same way as with {@link IgniteTxIsolation#REPEATABLE_READ} level. * However, in {@link IgniteTxConcurrency#OPTIMISTIC} mode, if some transactions cannot be serially isolated * from each other, then one winner will be picked and the other transactions in conflict will result in - * {@link IgniteTxOptimisticException} being thrown. + * {@link org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException} being thrown. * </li> * </ul> * <p> @@ -190,7 +190,7 @@ public interface IgniteTx extends AutoCloseable, IgniteAsyncSupport { /** * Gets timeout value in milliseconds for this transaction. If transaction times - * out prior to it's completion, {@link IgniteTxTimeoutException} will be thrown. + * out prior to it's completion, {@link org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException} will be thrown. * * @return Transaction timeout value. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java index 09bfba8..9f1f2a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java @@ -1,18 +1,10 @@ -/* - * 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. +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ */ package org.apache.ignite.transactions; @@ -26,7 +18,7 @@ import org.apache.ignite.*; * integrity, by invalidating all values participating in this transaction * on remote nodes. */ -public class IgniteTxHeuristicException extends IgniteCheckedException { +public class IgniteTxHeuristicException extends IgniteException { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java index e253021..b945e52 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java @@ -1,18 +1,10 @@ -/* - * 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. +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ */ package org.apache.ignite.transactions; @@ -22,7 +14,7 @@ import org.apache.ignite.*; /** * Exception thrown whenever grid transactions fail optimistically. */ -public class IgniteTxOptimisticException extends IgniteCheckedException { +public class IgniteTxOptimisticException extends IgniteException { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java index 18b703c..57c22b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java @@ -1,18 +1,10 @@ -/* - * 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. +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ */ package org.apache.ignite.transactions; @@ -22,7 +14,7 @@ import org.apache.ignite.*; /** * Exception thrown whenever grid transactions has been automatically rolled back. */ -public class IgniteTxRollbackException extends IgniteCheckedException { +public class IgniteTxRollbackException extends IgniteException { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java index 19fb823..eda1b02 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java @@ -1,18 +1,10 @@ -/* - * 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. +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ */ package org.apache.ignite.transactions; @@ -22,7 +14,7 @@ import org.apache.ignite.*; /** * Exception thrown whenever grid transactions time out. */ -public class IgniteTxTimeoutException extends IgniteCheckedException { +public class IgniteTxTimeoutException extends IgniteException { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java index 2a0a4c1..f77f0f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailoverTaskWithPredicateSelfTest.java @@ -102,7 +102,7 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes compute(ignite1.cluster().forPredicate(p)).withTimeout(10000).execute(JobFailTask.class.getName(), "1"); } - catch (ClusterTopologyCheckedException ignored) { + catch (ClusterTopologyException ignored) { failed.set(true); } finally { @@ -138,7 +138,7 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes assert res == 1; } - catch (ClusterTopologyCheckedException ignored) { + catch (ClusterTopologyException ignored) { failed.set(true); } finally { @@ -181,7 +181,7 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes assert res == 1; } - catch (ClusterTopologyCheckedException ignored) { + catch (ClusterTopologyException ignored) { failed.set(true); } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java index 5f6487f..e627193 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java @@ -106,12 +106,12 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null); /** {@inheritDoc} */ - @Override public void start() throws IgniteCheckedException { + @Override public void start() { lifecycleAware.start(); } /** {@inheritDoc} */ - @Override public void stop() throws IgniteCheckedException { + @Override public void stop() { lifecycleAware.stop(); } @@ -130,12 +130,12 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null); /** {@inheritDoc} */ - @Override public void start() throws IgniteCheckedException { + @Override public void start() { lifecycleAware.start(); } /** {@inheritDoc} */ - @Override public void stop() throws IgniteCheckedException { + @Override public void stop() { lifecycleAware.stop(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java index a2d0589..6ea76be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskTimeoutSelfTest.java @@ -151,7 +151,7 @@ public class GridTaskTimeoutSelfTest extends GridCommonAbstractTest { assert false : "Task has not been timed out. Future: " + fut; } - catch (ComputeTaskTimeoutCheckedException ignored) { + catch (ComputeTaskTimeoutException ignored) { // Expected. } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java index 4bddd4a..d705052 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java @@ -25,6 +25,7 @@ import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.communication.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java index be7babc..a98d47b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -60,12 +60,12 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(CACHE_NAME); /** {@inheritDoc} */ - @Override public void start() throws IgniteCheckedException { + @Override public void start() { lifecycleAware.start(); } /** {@inheritDoc} */ - @Override public void stop() throws IgniteCheckedException { + @Override public void stop() { lifecycleAware.stop(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java index 3c987f8..c8d20e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.store.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; +import org.apache.ignite.testframework.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -33,6 +34,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; +import static junit.framework.Assert.assertTrue; + /** * Test store. */ @@ -324,7 +327,9 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { txs.add(tx); - IgniteTxEx tx0 = (IgniteTxEx)tx; + assertTrue("Unexpected tx class: " + tx.getClass(), tx instanceof IgniteTxProxy); + + IgniteTxEx tx0 = GridTestUtils.getFieldValue(tx, "tx"); if (!tx0.local()) throw new IgniteException("Tx is not local: " + tx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index 1d523ac..c16eaa6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -137,7 +138,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { tx.commit(); } - catch (IgniteTxOptimisticException e) { + catch (IgniteTxOptimisticCheckedException e) { info("Caught cache optimistic exception: " + e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java index a71dc54..386060a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -235,7 +236,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { if (isTestDebug()) debug("Committed transaction [i=" + i + ", tx=" + tx + ']'); } - catch (IgniteTxOptimisticException e) { + catch (IgniteTxOptimisticCheckedException e) { if (concurrency != OPTIMISTIC || isolation != SERIALIZABLE) { error("Received invalid optimistic failure.", e); @@ -360,7 +361,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { debug("Rolled back transaction: " + tx); } - catch (IgniteTxOptimisticException e) { + catch (IgniteTxOptimisticCheckedException e) { tx.rollback(); log.warning("Rolled back transaction due to optimistic exception [tx=" + tx + ", e=" + e + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index cecb254..06aeece 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.GridCache; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.indexing.*; import org.apache.ignite.transactions.*; @@ -37,7 +38,7 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests that transaction is invalidated in case of {@link IgniteTxHeuristicException}. + * Tests that transaction is invalidated in case of {@link org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException}. */ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstractSelfTest { /** Index SPI throwing exception. */ @@ -403,7 +404,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac return null; } - }, IgniteTxHeuristicException.class, null); + }, IgniteTxHeuristicCheckedException.class, null); checkEmpty(key); } @@ -444,7 +445,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac } }, CacheException.class, null); - assertTrue("Unexpected cause: " +e, e.getCause() instanceof IgniteTxHeuristicException); + assertTrue("Unexpected cause: " +e, e.getCause() instanceof IgniteTxHeuristicCheckedException); checkEmpty(key); } @@ -491,7 +492,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac return null; } - }, IgniteTxHeuristicException.class, null); + }, IgniteTxHeuristicCheckedException.class, null); for (Integer key : m.keySet()) checkEmpty(key); @@ -525,7 +526,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac return null; } - }, IgniteTxHeuristicException.class, null); + }, IgniteTxHeuristicCheckedException.class, null); checkEmpty(key); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java index 371c281..1fd33cd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.transactions.*; import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; @@ -238,7 +239,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract break; } - catch(IgniteTxOptimisticException e) { + catch(IgniteTxOptimisticCheckedException e) { log.info("Got error, will retry: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index ccd0b61..fdfb44d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; @@ -40,7 +41,7 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests that transaction is invalidated in case of {@link IgniteTxHeuristicException}. + * Tests that transaction is invalidated in case of {@link org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException}. */ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAbstractSelfTest { /** Index SPI throwing exception. */ @@ -331,7 +332,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb fail("Transaction should fail."); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.info("Expected exception: " + e); } @@ -349,7 +350,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Check key: " + key); for (int i = 0; i < gridCount(); i++) { - IgniteKernal grid = (IgniteKernal) grid(i); + IgniteKernal grid = (IgniteKernal)grid(i); GridCacheAdapter cache = grid.internalCache(null); @@ -412,7 +413,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb return null; } - }, IgniteTxRollbackException.class, null); + }, IgniteTxRollbackCheckedException.class, null); checkValue(key, putBefore); } @@ -453,7 +454,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb } }, CacheException.class, null); - assertTrue("Unexpected cause: " + e, e.getCause() instanceof IgniteTxRollbackException); + assertTrue("Unexpected cause: " + e, e.getCause() instanceof IgniteTxRollbackCheckedException); checkValue(key, putBefore); } @@ -500,7 +501,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb return null; } - }, IgniteTxRollbackException.class, null); + }, IgniteTxRollbackCheckedException.class, null); for (Integer key : m.keySet()) checkValue(key, putBefore); @@ -534,7 +535,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb return null; } - }, IgniteTxRollbackException.class, null); + }, IgniteTxRollbackCheckedException.class, null); checkValue(key, putBefore); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 26640c6..21c17bc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.cluster.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -503,7 +504,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs try { cache.put(key, Integer.toString(key)); } - catch (IgniteTxRollbackException | ClusterTopologyCheckedException ignored) { + catch (IgniteTxRollbackCheckedException | ClusterTopologyCheckedException ignored) { // It is ok if primary node leaves grid. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index 6418eed..8adef20 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -209,7 +209,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac checkCache.unlockAll(F.asList(KEY)); } } - catch (IgniteTxOptimisticException e) { + catch (IgniteTxOptimisticCheckedException e) { U.warn(log, "Optimistic transaction failure (will rollback) [msg=" + e.getMessage() + ", tx=" + tx + ']'); if (G.state(g.name()) == IgniteState.STARTED) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java index 80ba5f2..a996bfa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.transactions.*; import org.apache.ignite.testframework.junits.common.*; @@ -145,7 +146,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { assert false : "Timeout never happened for transaction: " + tx; } - catch (IgniteTxTimeoutException e) { + catch (IgniteTxTimeoutCheckedException e) { info("Received expected timeout exception [msg=" + e.getMessage() + ", tx=" + tx + ']'); } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index ddbb970..0dbdb7b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.transactions.*; import org.apache.log4j.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -264,7 +265,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { if (isTestDebug()) info("Committed transaction: " + tx); } - catch (IgniteTxOptimisticException e) { + catch (IgniteTxOptimisticCheckedException e) { if (concurrency != OPTIMISTIC || isolation != SERIALIZABLE) { error("Received invalid optimistic failure.", e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java index 824fe71..06062a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.spi.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.managers.communication.*; @@ -161,7 +162,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes tx.commit(); } - catch (IgniteTxOptimisticException e) { + catch (IgniteTxOptimisticCheckedException e) { log.warning("Optimistic transaction failure (will rollback) [msg=" + e.getMessage() + ", tx=" + tx + ']'); tx.rollback(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java index 64e10c7..4477f32 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java @@ -232,14 +232,14 @@ public abstract class IgniteCacheLoaderWriterAbstractTest extends IgniteCacheAbs private boolean startCalled; /** {@inheritDoc} */ - @Override public void start() throws IgniteCheckedException { + @Override public void start() { startCalled = true; assertNotNull(ignite); } /** {@inheritDoc} */ - @Override public void stop() throws IgniteCheckedException { + @Override public void stop() { // No-op. } @@ -291,14 +291,14 @@ public abstract class IgniteCacheLoaderWriterAbstractTest extends IgniteCacheAbs private boolean startCalled; /** {@inheritDoc} */ - @Override public void start() throws IgniteCheckedException { + @Override public void start() { startCalled = true; assertNotNull(ignite); } /** {@inheritDoc} */ - @Override public void stop() throws IgniteCheckedException { + @Override public void stop() { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index e422da0..a975b10 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.transactions.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -144,14 +145,14 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { tx.commit(); } - catch (IgniteTxOptimisticException e) { + catch (IgniteTxOptimisticCheckedException e) { info("Received expected optimistic exception: " + e.getMessage()); wasEx = true; tx.rollback(); } - catch (IgniteTxTimeoutException e) { + catch (IgniteTxTimeoutCheckedException e) { info("Received expected timeout exception: " + e.getMessage()); wasEx = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java index a9c5066..034ccca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java @@ -538,6 +538,6 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { return null; } - }, IgniteCheckedException.class, null); + }, IgniteException.class, null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java index 2630662..c5e72b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java @@ -1137,7 +1137,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes createCtr.incrementAndGet(); } - catch (IgniteCheckedException ignore) { + catch (IgniteInterruptedCheckedException | IgniteException ignore) { try { U.sleep(10); } @@ -1456,7 +1456,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes chunksCtr.incrementAndGet(); } - catch (IgniteCheckedException ignore) { + catch (IgniteInterruptedCheckedException | IgniteException ignore) { try { U.sleep(10); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java index 12f16d6..8ab1101 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java @@ -373,7 +373,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { try { startUp(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { errMsg = e.getCause().getMessage(); } @@ -439,7 +439,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { try { startUp(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { errMsg = e.getCause().getMessage(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java index 2de8e74..b110bcc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java @@ -951,7 +951,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return false; } - }, IgniteCheckedException.class, msg); + }, IgniteException.class, msg); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java index 81ab9e2..a364776 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java @@ -64,7 +64,7 @@ public class GridHibernateL2CacheTransactionalSelfTest extends GridHibernateL2Ca @SuppressWarnings("PublicInnerClass") public static class TestTmLookup implements CacheTmLookup { /** {@inheritDoc} */ - @Override public TransactionManager getTm() throws IgniteCheckedException { + @Override public TransactionManager getTm() { return jotm.getTransactionManager(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java index e3460bf..e529825 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/CacheTmLookup.java @@ -44,7 +44,7 @@ public interface CacheTmLookup { * Gets Transaction Manager (TM). * * @return TM or {@code null} if TM cannot be looked up. - * @throws IgniteCheckedException In case of error. + * @throws IgniteException In case of error. */ - @Nullable public TransactionManager getTm() throws IgniteCheckedException; + @Nullable public TransactionManager getTm() throws IgniteException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java index 2b20949..919b85f 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/CacheJndiTmLookup.java @@ -51,7 +51,7 @@ public class CacheJndiTmLookup implements CacheTmLookup { } /** {@inheritDoc} */ - @Nullable @Override public TransactionManager getTm() throws IgniteCheckedException { + @Nullable @Override public TransactionManager getTm() throws IgniteException { assert jndiNames != null; assert !jndiNames.isEmpty(); @@ -66,7 +66,7 @@ public class CacheJndiTmLookup implements CacheTmLookup { } } catch (NamingException e) { - throw new IgniteCheckedException("Unable to lookup TM by: " + jndiNames, e); + throw new IgniteException("Unable to lookup TM by: " + jndiNames, e); } return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java index 6549308..85ec4c6 100644 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/CacheReflectionTmLookup.java @@ -95,7 +95,7 @@ public class CacheReflectionTmLookup implements CacheTmLookup { } /** {@inheritDoc} */ - @Override public TransactionManager getTm() throws IgniteCheckedException { + @Override public TransactionManager getTm() throws IgniteException { assert cls != null; assert mtd != null; @@ -103,13 +103,13 @@ public class CacheReflectionTmLookup implements CacheTmLookup { return (TransactionManager)Class.forName(cls).getMethod(mtd).invoke(null); } catch (ClassNotFoundException e) { - throw new IgniteCheckedException("Failed to find class: " + cls, e); + throw new IgniteException("Failed to find class: " + cls, e); } catch (NoSuchMethodException e) { - throw new IgniteCheckedException("Failed to find method: " + mtd, e); + throw new IgniteException("Failed to find method: " + mtd, e); } catch (InvocationTargetException | IllegalAccessException e) { - throw new IgniteCheckedException("Failed to invoke method: " + mtd, e); + throw new IgniteException("Failed to invoke method: " + mtd, e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java index 3c0c1aa..52cf253 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java @@ -56,8 +56,14 @@ public class CacheJtaManager<K, V> extends CacheJtaManagerAdapter<K, V> { /** {@inheritDoc} */ @Override public void checkJta() throws IgniteCheckedException { - if (jtaTm == null) - jtaTm = tmLookup.getTm(); + if (jtaTm == null) { + try { + jtaTm = tmLookup.getTm(); + } + catch (Exception e) { + throw new IgniteCheckedException("Failed to get transaction manager: " + e, e); + } + } if (jtaTm != null) { GridCacheXAResource rsrc = xaRsrc.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java index efd6fd0..73552ad 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java @@ -67,7 +67,8 @@ public class GridCacheJtaConfigurationValidationSelfTest extends GridCommonAbstr */ @SuppressWarnings("PublicInnerClass") public static class TestTxLookup implements CacheTmLookup { - @Nullable @Override public TransactionManager getTm() throws IgniteCheckedException { + /** {@inheritDoc} */ + @Nullable @Override public TransactionManager getTm() { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java index abd82d9..614fc61 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java @@ -93,7 +93,7 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest { @SuppressWarnings("PublicInnerClass") public static class TestTmLookup implements CacheTmLookup { /** {@inheritDoc} */ - @Override public TransactionManager getTm() throws IgniteCheckedException { + @Override public TransactionManager getTm() { return jotm.getTransactionManager(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java index 0330aac..f296812 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java @@ -53,7 +53,7 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa } /** {@inheritDoc} */ - @Nullable @Override public TransactionManager getTm() throws IgniteCheckedException { + @Nullable @Override public TransactionManager getTm() { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java index cc6a4ba..366ee07 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java @@ -446,7 +446,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { return null; } }, - IgniteCheckedException.class, + IgniteException.class, null ); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/724ba118/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java index 6f742fc..62b7f60 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java @@ -139,7 +139,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme fail(); } catch (IgniteException e) { - assertTrue(e.getMessage().startsWith("Remote job threw user exception")); + assertTrue(e.getMessage().startsWith("Resource field is not assignable from the resource")); } } @@ -236,7 +236,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme fail(); } catch (IgniteException e) { - assertTrue(e.getMessage().startsWith("Remote job threw user exception")); + assertTrue(e.getMessage().startsWith("Setter does not have single parameter of required type")); } }
