You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sk...@apache.org on 2020/03/19 10:08:04 UTC
[ignite] branch master updated: IGNITE-12799 Fixed wrong SpEL
expression.
This is an automated email from the ASF dual-hosted git repository.
sk0x50 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 3928bb3 IGNITE-12799 Fixed wrong SpEL expression.
3928bb3 is described below
commit 3928bb3a13ed8cedd09344cc5554179c04dec6cd
Author: Sergey Chernolyas <se...@gmail.com>
AuthorDate: Thu Mar 19 13:07:16 2020 +0300
IGNITE-12799 Fixed wrong SpEL expression.
Signed-off-by: Slava Koptilin <sl...@gmail.com>
---
.../IgniteSpringDataCrudSelfExpressionTest.java | 21 +++++++++++++++++++++
.../springdata/misc/PersonExpressionRepository.java | 2 +-
.../IgniteSpringDataCrudSelfExpressionTest.java | 21 +++++++++++++++++++++
.../springdata/misc/PersonExpressionRepository.java | 2 +-
4 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfExpressionTest.java b/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfExpressionTest.java
index c572ef0..f6c609f 100644
--- a/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfExpressionTest.java
+++ b/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfExpressionTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.ignite.springdata;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
import org.apache.ignite.springdata.misc.ApplicationConfiguration;
import org.apache.ignite.springdata.misc.Person;
import org.apache.ignite.springdata.misc.PersonExpressionRepository;
@@ -88,6 +90,9 @@ public class IgniteSpringDataCrudSelfExpressionTest extends GridCommonAbstractTe
ctx.destroy();
}
+ /**
+ * Tests put & get operations.
+ */
@Test
public void testPutGet() {
Person person = new Person("some_name", "some_surname");
@@ -109,4 +114,20 @@ public class IgniteSpringDataCrudSelfExpressionTest extends GridCommonAbstractTe
//excepted
}
}
+
+ /**
+ * Tests SpEL exphression.
+ */
+ @Test
+ public void testCacheCount() {
+ Ignite ignite = ctx.getBean(Ignite.class);
+
+ Collection<String> cacheNames = ignite.cacheNames();
+
+ assertFalse("The SpEL \"#{cacheNames.personCacheName}\" isn't processed!",
+ cacheNames.contains("#{cacheNames.personCacheName}"));
+
+ assertTrue("Cache \"PersonCache\" isn't found!",
+ cacheNames.contains("PersonCache"));
+ }
}
diff --git a/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/misc/PersonExpressionRepository.java b/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/misc/PersonExpressionRepository.java
index d8b89c5..4264a38 100644
--- a/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/misc/PersonExpressionRepository.java
+++ b/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/misc/PersonExpressionRepository.java
@@ -23,6 +23,6 @@ import org.apache.ignite.springdata20.repository.config.RepositoryConfig;
/**
*
*/
-@RepositoryConfig(cacheName = "@cacheNames.personCacheName")
+@RepositoryConfig(cacheName = "#{cacheNames.personCacheName}")
public interface PersonExpressionRepository extends IgniteRepository<Person, Integer> {
}
diff --git a/modules/spring-data-2.2/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfExpressionTest.java b/modules/spring-data-2.2/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfExpressionTest.java
index c572ef0..f6c609f 100644
--- a/modules/spring-data-2.2/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfExpressionTest.java
+++ b/modules/spring-data-2.2/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfExpressionTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.ignite.springdata;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
import org.apache.ignite.springdata.misc.ApplicationConfiguration;
import org.apache.ignite.springdata.misc.Person;
import org.apache.ignite.springdata.misc.PersonExpressionRepository;
@@ -88,6 +90,9 @@ public class IgniteSpringDataCrudSelfExpressionTest extends GridCommonAbstractTe
ctx.destroy();
}
+ /**
+ * Tests put & get operations.
+ */
@Test
public void testPutGet() {
Person person = new Person("some_name", "some_surname");
@@ -109,4 +114,20 @@ public class IgniteSpringDataCrudSelfExpressionTest extends GridCommonAbstractTe
//excepted
}
}
+
+ /**
+ * Tests SpEL exphression.
+ */
+ @Test
+ public void testCacheCount() {
+ Ignite ignite = ctx.getBean(Ignite.class);
+
+ Collection<String> cacheNames = ignite.cacheNames();
+
+ assertFalse("The SpEL \"#{cacheNames.personCacheName}\" isn't processed!",
+ cacheNames.contains("#{cacheNames.personCacheName}"));
+
+ assertTrue("Cache \"PersonCache\" isn't found!",
+ cacheNames.contains("PersonCache"));
+ }
}
diff --git a/modules/spring-data-2.2/src/test/java/org/apache/ignite/springdata/misc/PersonExpressionRepository.java b/modules/spring-data-2.2/src/test/java/org/apache/ignite/springdata/misc/PersonExpressionRepository.java
index 5917cfa..689f856 100644
--- a/modules/spring-data-2.2/src/test/java/org/apache/ignite/springdata/misc/PersonExpressionRepository.java
+++ b/modules/spring-data-2.2/src/test/java/org/apache/ignite/springdata/misc/PersonExpressionRepository.java
@@ -23,6 +23,6 @@ import org.apache.ignite.springdata22.repository.config.RepositoryConfig;
/**
*
*/
-@RepositoryConfig(cacheName = "@cacheNames.personCacheName")
+@RepositoryConfig(cacheName = "#{cacheNames.personCacheName}")
public interface PersonExpressionRepository extends IgniteRepository<Person, Integer> {
}