More Cleanups
diff --git a/modules/spring-session-ext/pom.xml b/modules/spring-session-ext/pom.xml
index 07de412..1077de8 100644
--- a/modules/spring-session-ext/pom.xml
+++ b/modules/spring-session-ext/pom.xml
@@ -12,6 +12,18 @@
<artifactId>spring-session-ext</artifactId>
+ <properties>
+ <ignite.version>2.10.0</ignite.version>
+ <spring.version>5.3.8</spring.version>
+ <spring.session.version>2.5.0</spring.session.version>
+ <spring.security.version>5.5.0</spring.security.version>
+ <javax.annotation.version>1.3.2</javax.annotation.version>
+ <assertj.version>3.20.0</assertj.version>
+ <junit.jupiter.version>5.7.2</junit.jupiter.version>
+ <javax.servlet.version>3.0.1</javax.servlet.version>
+ <mockito.version>2.22.0</mockito.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.ignite</groupId>
@@ -23,54 +35,47 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version.for.sessions}</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>${spring.version.for.sessions}</version>
+ <version>${spring.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-core -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>5.5.0</version>
+ <version>${spring.security.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.session/spring-session-core -->
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-core</artifactId>
- <version>2.5.0</version>
+ <version>${spring.session.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework/spring-context -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version.for.sessions}</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-core</artifactId>
- <version>2.10.0</version>
- <scope>compile</scope>
+ <version>${javax.annotation.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.20.0</version>
+ <version>${assertj.version}</version>
<scope>test</scope>
</dependency>
@@ -78,7 +83,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.7.2</version>
+ <version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
@@ -86,22 +91,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version.for.sessions}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- https://mvnrepository.com/artifact/org.testcontainers/testcontainers -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>1.15.3</version>
+ <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>${javax.servlet.version}</version>
<scope>provided</scope>
</dependency>
@@ -109,26 +106,22 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version.for.sessions}</version>
+ <version>${spring.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.ignite/ignite-indexing -->
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
- <version>2.10.0</version>
+ <version>${ignite.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.22.0</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
-
-
</dependencies>
-
-
</project>
diff --git a/modules/spring-session-ext/src/main/java/org/apache/ignite/spring/sessions/SessionEventRegistry.java b/modules/spring-session-ext/src/main/java/org/apache/ignite/spring/sessions/SessionEventRegistry.java
deleted file mode 100644
index 0c0af0c..0000000
--- a/modules/spring-session-ext/src/main/java/org/apache/ignite/spring/sessions/SessionEventRegistry.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.apache.ignite.spring.sessions;
-
-/*
- * 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.
- */
-
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.springframework.context.ApplicationListener;
-import org.springframework.session.events.AbstractSessionEvent;
-
-/**
- *
- */
-class SessionEventRegistry implements ApplicationListener<AbstractSessionEvent> {
-
- /** */
- private Map<String, AbstractSessionEvent> events = new HashMap<>();
-
- /** */
- private ConcurrentMap<String, Object> locks = new ConcurrentHashMap<>();
-
- /** */
- @Override public void onApplicationEvent(AbstractSessionEvent event) {
- String sessionId = event.getSessionId();
- this.events.put(sessionId, event);
- Object lock = getLock(sessionId);
- synchronized (lock) {
- lock.notifyAll();
- }
- }
-
- /** */
- void clear() {
- this.events.clear();
- this.locks.clear();
- }
-
- /** */
- boolean receivedEvent(String sessionId) throws InterruptedException {
- return waitForEvent(sessionId) != null;
- }
-
- /** */
- <E extends AbstractSessionEvent> E getEvent(String sessionId) throws InterruptedException {
- return (E) waitForEvent(sessionId);
- }
-
- /** */
- private <E extends AbstractSessionEvent> E waitForEvent(String sessionId) throws InterruptedException {
- Object lock = getLock(sessionId);
- synchronized (lock) {
- if (!this.events.containsKey(sessionId))
- lock.wait(10000);
-
- }
- return (E) this.events.get(sessionId);
- }
-
- /** */
- private Object getLock(String sessionId) {
- return this.locks.computeIfAbsent(sessionId, (k) -> new Object());
- }
-}
-
diff --git a/parent/pom.xml b/parent/pom.xml
index 1adc04d..a94c273 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -129,7 +129,6 @@
<spark.version>2.3.0</spark.version>
<spring.data.version>1.13.23.RELEASE</spring.data.version> <!-- don't forget to update spring version -->
<spring.version>4.3.26.RELEASE</spring.version><!-- don't forget to update spring-data version -->
- <spring.version.for.sessions>5.3.8</spring.version.for.sessions><!-- don't forget to update spring-data version -->
<spring.data-2.0.version>2.0.13.RELEASE</spring.data-2.0.version> <!-- don't forget to update spring-5.0 version -->
<spring-5.0.version>5.0.16.RELEASE</spring-5.0.version><!-- don't forget to update spring-data-2.0 version -->
<spring.data-2.2.version>2.2.3.RELEASE</spring.data-2.2.version> <!-- don't forget to update spring-5.2 version -->
