This is an automated email from the ASF dual-hosted git repository.
mpetrov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 72513ad592c IGNITE-26795 GridInternalWrapper renamed and moved to
ignite-commons (#12444)
72513ad592c is described below
commit 72513ad592cf6fdecdce9c7f93c3e00490f07ee7
Author: Mikhail Petrov <[email protected]>
AuthorDate: Wed Oct 22 10:29:07 2025 +0300
IGNITE-26795 GridInternalWrapper renamed and moved to ignite-commons
(#12444)
---
.../org/apache/ignite/internal/IgniteInternalWrapper.java} | 14 ++++----------
.../org/apache/ignite/internal/IgniteSchedulerImpl.java | 4 ++--
.../internal/managers/communication/GridIoManager.java | 3 ---
.../internal/processors/closure/GridClosureProcessor.java | 14 +++++++-------
.../processors/resource/GridResourceProcessor.java | 10 +++++-----
.../security/AbstractSecurityAwareExternalizable.java | 6 +++---
.../ignite/internal/processors/security/SecurityUtils.java | 12 ++++++------
7 files changed, 27 insertions(+), 36 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridInternalWrapper.java
b/modules/commons/src/main/java/org/apache/ignite/internal/IgniteInternalWrapper.java
similarity index 76%
rename from
modules/core/src/main/java/org/apache/ignite/internal/GridInternalWrapper.java
rename to
modules/commons/src/main/java/org/apache/ignite/internal/IgniteInternalWrapper.java
index 76563e7029c..61248fe7811 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridInternalWrapper.java
+++
b/modules/commons/src/main/java/org/apache/ignite/internal/IgniteInternalWrapper.java
@@ -17,14 +17,8 @@
package org.apache.ignite.internal;
-/**
- * Internal wrapper interface for custom resource injection logic.
- */
-public interface GridInternalWrapper<T> {
- /**
- * Get user object where resources must be injected.
- *
- * @return User object.
- */
- public T userObject();
+/** Represents wrapper over arbitrary object. */
+public interface IgniteInternalWrapper<T> {
+ /** @return Wrapped object. */
+ public T delegate();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java
index 51e46b96698..2092e1256ad 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteSchedulerImpl.java
@@ -183,7 +183,7 @@ public class IgniteSchedulerImpl implements
IgniteScheduler, Externalizable {
}
/** */
- private class SecurityAwareClosure<T> implements GridPlainRunnable,
GridPlainCallable<T>, GridInternalWrapper<Object> {
+ private class SecurityAwareClosure<T> implements GridPlainRunnable,
GridPlainCallable<T>, IgniteInternalWrapper<Object> {
/** Security subject id. */
private final UUID secSubjId;
@@ -226,7 +226,7 @@ public class IgniteSchedulerImpl implements
IgniteScheduler, Externalizable {
}
/** {@inheritDoc} */
- @Override public Object userObject() {
+ @Override public Object delegate() {
return runnable != null ? runnable : call;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 280f4fb1e77..661e023febe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -375,7 +375,6 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Object>>
/**
* @param ctx Grid kernal context.
*/
- @SuppressWarnings("deprecation")
public GridIoManager(GridKernalContext ctx) {
super(ctx, ctx.config().getCommunicationSpi());
@@ -916,7 +915,6 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Object>>
}
/** {@inheritDoc} */
- @SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter"})
@Override public void onKernalStart0() throws IgniteCheckedException {
discoLsnr = new GridLocalEventListener() {
@Override public void onEvent(Event evt) {
@@ -3766,7 +3764,6 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Object>>
}
/** {@inheritDoc} */
- @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
@Override public void onTimeout() {
GridMessageListener lsnr = listenerGet0(topic);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
index 5596a0553c7..1ffb85f32ae 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@ -42,9 +42,9 @@ import org.apache.ignite.compute.ComputeLoadBalancer;
import org.apache.ignite.compute.ComputeTaskSession;
import org.apache.ignite.internal.ComputeTaskInternalFuture;
import org.apache.ignite.internal.GridClosureCallMode;
-import org.apache.ignite.internal.GridInternalWrapper;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInternalWrapper;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.managers.communication.GridIoPolicy;
import org.apache.ignite.internal.processors.GridProcessorAdapter;
@@ -1575,7 +1575,7 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
*
*/
public static class C1<T, R> implements ComputeJob, Binarylizable,
GridNoImplicitInjection,
- GridInternalWrapper<IgniteClosure> {
+ IgniteInternalWrapper<IgniteClosure> {
/** */
private static final long serialVersionUID = 0L;
@@ -1630,7 +1630,7 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteClosure userObject() {
+ @Override public IgniteClosure delegate() {
return job;
}
@@ -1677,7 +1677,7 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
*
*/
public static class C2<R> implements ComputeJob, Binarylizable,
GridNoImplicitInjection,
- GridInternalWrapper<Callable> {
+ IgniteInternalWrapper<Callable> {
/** */
private static final long serialVersionUID = 0L;
@@ -1725,7 +1725,7 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
}
/** {@inheritDoc} */
- @Override public Callable userObject() {
+ @Override public Callable delegate() {
return c;
}
@@ -1769,7 +1769,7 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
/**
*/
- public static class C4 implements ComputeJob, Binarylizable,
GridNoImplicitInjection, GridInternalWrapper<Runnable> {
+ public static class C4 implements ComputeJob, Binarylizable,
GridNoImplicitInjection, IgniteInternalWrapper<Runnable> {
/** */
private static final long serialVersionUID = 0L;
@@ -1814,7 +1814,7 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
}
/** {@inheritDoc} */
- @Override public Runnable userObject() {
+ @Override public Runnable delegate() {
return r;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
index 7d6af1896b0..e1c187ad967 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java
@@ -28,10 +28,10 @@ import org.apache.ignite.compute.ComputeLoadBalancer;
import org.apache.ignite.compute.ComputeTask;
import org.apache.ignite.compute.ComputeTaskContinuousMapper;
import org.apache.ignite.compute.ComputeTaskSession;
-import org.apache.ignite.internal.GridInternalWrapper;
import org.apache.ignite.internal.GridJobContextImpl;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.GridTaskSessionImpl;
+import org.apache.ignite.internal.IgniteInternalWrapper;
import org.apache.ignite.internal.IgnitionEx;
import org.apache.ignite.internal.managers.deployment.GridDeployment;
import org.apache.ignite.internal.processors.GridProcessorAdapter;
@@ -260,8 +260,8 @@ public class GridResourceProcessor extends
GridProcessorAdapter {
inject(obj, annSet, null, null, params);
- if (obj instanceof GridInternalWrapper) {
- Object usrObj = ((GridInternalWrapper<?>)obj).userObject();
+ if (obj instanceof IgniteInternalWrapper) {
+ Object usrObj = ((IgniteInternalWrapper<?>)obj).delegate();
if (usrObj != null)
inject(usrObj, annSet, null, null, params);
@@ -414,8 +414,8 @@ public class GridResourceProcessor extends
GridProcessorAdapter {
injectToJob(dep, taskCls, obj, ses, jobCtx);
- if (obj instanceof GridInternalWrapper) {
- Object usrObj = ((GridInternalWrapper<?>)obj).userObject();
+ if (obj instanceof IgniteInternalWrapper) {
+ Object usrObj = ((IgniteInternalWrapper<?>)obj).delegate();
if (usrObj != null)
injectToJob(dep, taskCls, usrObj, ses, jobCtx);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/AbstractSecurityAwareExternalizable.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/AbstractSecurityAwareExternalizable.java
index 8d85cc9d131..0e5b93a70eb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/AbstractSecurityAwareExternalizable.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/AbstractSecurityAwareExternalizable.java
@@ -23,8 +23,8 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.security.AccessControlException;
import java.util.UUID;
-import org.apache.ignite.internal.GridInternalWrapper;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteInternalWrapper;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.resources.IgniteInstanceResource;
@@ -33,7 +33,7 @@ import static java.util.Objects.requireNonNull;
/**
* Abstract security aware Externalizable.
*/
-public abstract class AbstractSecurityAwareExternalizable<T> implements
Externalizable, GridInternalWrapper<T> {
+public abstract class AbstractSecurityAwareExternalizable<T> implements
Externalizable, IgniteInternalWrapper<T> {
/** Security subject id. */
protected UUID subjectId;
@@ -71,7 +71,7 @@ public abstract class AbstractSecurityAwareExternalizable<T>
implements External
}
/** {@inheritDoc} */
- @Override public T userObject() {
+ @Override public T delegate() {
return original;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
index 0bb26afac20..24dfa4ca012 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityUtils.java
@@ -40,8 +40,8 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.internal.GridInternalWrapper;
import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalWrapper;
import org.apache.ignite.internal.IgniteNodeAttributes;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
@@ -245,7 +245,7 @@ public class SecurityUtils {
/** */
public static Object unwrap(Object target) {
- return target instanceof GridInternalWrapper ?
((GridInternalWrapper<?>)target).userObject() : target;
+ return target instanceof IgniteInternalWrapper ?
((IgniteInternalWrapper<?>)target).delegate() : target;
}
/**
@@ -293,8 +293,8 @@ public class SecurityUtils {
/** Array of proxy classes. */
private static <T> Class[] proxyClasses(Class cls, T instance) {
- return instance instanceof GridInternalWrapper
- ? new Class[] {cls, GridInternalWrapper.class}
+ return instance instanceof IgniteInternalWrapper
+ ? new Class[] {cls, IgniteInternalWrapper.class}
: new Class[] {cls};
}
@@ -315,8 +315,8 @@ public class SecurityUtils {
/** {@inheritDoc} */
@Override public Object invoke(Object proxy, Method mtd, Object[]
args) throws Throwable {
try {
- if (proxy instanceof GridInternalWrapper &&
- GridInternalWrapper.class.getMethod(mtd.getName(),
mtd.getParameterTypes()) != null)
+ if (proxy instanceof IgniteInternalWrapper &&
+ IgniteInternalWrapper.class.getMethod(mtd.getName(),
mtd.getParameterTypes()) != null)
return mtd.invoke(original, args);
}
catch (NoSuchMethodException ignore) {
