This is an automated email from the ASF dual-hosted git repository.
nizhikov 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 e6438eeaa87 IGNITE-14823 Session abbrevation (#11205)
e6438eeaa87 is described below
commit e6438eeaa8777acdb2164220d54247a8ba6e727e
Author: Nikolay <nizhi...@apache.org>
AuthorDate: Tue Jan 30 11:39:18 2024 +0300
IGNITE-14823 Session abbrevation (#11205)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../internal/processors/cache/GridCacheProcessor.java | 4 ++--
.../ignite/internal/processors/job/GridJobProcessor.java | 6 +++---
.../ignite/internal/processors/task/GridTaskProcessor.java | 8 ++++----
.../ignite/internal/websession/WebSessionSelfTest.java | 14 +++++++-------
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 1ef3b8caf6a..591ab9c475f 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -63,7 +63,7 @@ response,res
#returnValue,retVal
sender,snd
service,srvc
-#session,ses
+session,ses
#sequence,seq
#socket,sock
#source,src
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 4cae900bef5..99f5559febe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -593,10 +593,10 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
"(it is recommended that you change deployment mode and
restart): " + depMode);
}
- Collection<CacheStoreSessionListener> sessionListeners =
+ Collection<CacheStoreSessionListener> sesListeners =
CU.startStoreSessionListeners(ctx,
ctx.config().getCacheStoreSessionListenerFactories());
- sharedCtx = createSharedContext(ctx, sessionListeners);
+ sharedCtx = createSharedContext(ctx, sesListeners);
locCfgMgr = new GridLocalConfigManager(this, ctx);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 75708954230..2a1074636c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -1484,12 +1484,12 @@ public class GridJobProcessor extends
GridProcessorAdapter {
* @return Deployment.
*/
public GridDeployment currentDeployment() {
- GridJobSessionImpl session = currSess.get();
+ GridJobSessionImpl ses = currSess.get();
- if (session == null || session.deployment() == null)
+ if (ses == null || ses.deployment() == null)
return null;
- return session.deployment();
+ return ses.deployment();
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index d40938a3e88..8764d9e3eb8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -1195,16 +1195,16 @@ public class GridTaskProcessor extends
GridProcessorAdapter implements IgniteCha
if (worker.endTime() < Long.MAX_VALUE)
ctx.timeout().addTimeoutObject(worker);
- GridTaskSessionImpl session = worker.getSession();
+ GridTaskSessionImpl ses = worker.getSession();
- notifyTaskStatusMonitors(ComputeTaskStatus.snapshot(session),
false);
+ notifyTaskStatusMonitors(ComputeTaskStatus.snapshot(ses), false);
}
/** {@inheritDoc} */
@Override public void onJobsMapped(GridTaskWorker<?, ?> worker) {
- GridTaskSessionImpl session = worker.getSession();
+ GridTaskSessionImpl ses = worker.getSession();
- notifyTaskStatusMonitors(ComputeTaskStatus.snapshot(session),
false);
+ notifyTaskStatusMonitors(ComputeTaskStatus.snapshot(ses), false);
}
/** {@inheritDoc} */
diff --git
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index 1e138f24db0..04ea7435645 100644
---
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -458,13 +458,13 @@ public class WebSessionSelfTest extends
GridCommonAbstractTest {
if (!keepBinary()) {
IgniteCache<String, HttpSession> cache =
G.ignite().cache(getCacheName());
- HttpSession session = cache.get(sesId3);
+ HttpSession ses = cache.get(sesId3);
- assertNotNull(session);
+ assertNotNull(ses);
assertNotNull(cache);
- HttpSession ses = cache.get(sesId3);
+ ses = cache.get(sesId3);
assertNotNull(ses);
@@ -1071,7 +1071,7 @@ public class WebSessionSelfTest extends
GridCommonAbstractTest {
* @return sesId
*/
private String getSessionIdFromCookie(URLConnection conn) {
- String sessionCookieValue = null;
+ String sesCookieValue = null;
String sesId = null;
Map<String, List<String>> hdrFields = conn.getHeaderFields();
Set<String> hdrFieldsSet = hdrFields.keySet();
@@ -1085,9 +1085,9 @@ public class WebSessionSelfTest extends
GridCommonAbstractTest {
for (String hdrValue : hdrFieldValue) {
String[] fields = hdrValue.split(";");
- sessionCookieValue = fields[0];
- sesId =
sessionCookieValue.substring(sessionCookieValue.indexOf("=") + 1,
- sessionCookieValue.length());
+ sesCookieValue = fields[0];
+ sesId =
sesCookieValue.substring(sesCookieValue.indexOf("=") + 1,
+ sesCookieValue.length());
}
}
}
