Skip to content

Commit 92932e8

Browse files
JohannesRabauerJohannesRabauer
authored
Merge pull request #138 from xdev-software/develop
v2.1.0
2 parents f7263f4 + c3d8396 commit 92932e8

File tree

62 files changed

+3616
-622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3616
-622
lines changed

‎.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ hs_err_pid*
6262
.tern-project
6363

6464
# EclipseStore
65-
storage
66-
storage-person
67-
storage-invoice
68-
storage-complex
69-
storage-eclipsestore
65+
spring-data-eclipse-store/storage
66+
spring-data-eclipse-store-demo/storage
67+
spring-data-eclipse-store-demo/storage-person
68+
spring-data-eclipse-store-demo/storage-invoice
69+
spring-data-eclipse-store-demo/storage-complex
70+
spring-data-eclipse-store-jpa/storage-eclipsestore
7071
spring-data-eclipse-store-jpa/storage-h2.mv.db
7172
spring-data-eclipse-store-jpa/storage-h2.trace.db
7273

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 2.1.0
2+
3+
* Implemented auto-id-generation for UUIDs.
4+
* Implemented composite primary keys.
5+
* Keyword "ignoreCase" now available for queries.
6+
* Implemented ``@Query`` annotation with simple SQL-Selects
7+
18
# 2.0.1
29

310
* Fix for Issue [#131](https://github.com/xdev-software/spring-data-eclipse-store/issues/131)

‎docs/antora.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: ROOT
22
title: Spring-Data-Eclipse-Store
33
version: master
4-
display_version: '2.0.0'
4+
display_version: '2.1.0'
55
start_page: index.adoc
66
nav:
77
- modules/ROOT/nav.adoc
88
asciidoc:
99
attributes:
1010
product-name: 'Spring-Data-Eclipse-Store'
11-
display-version: '2.0.0'
12-
maven-version: '2.0.0'
11+
display-version: '2.1.0'
12+
maven-version: '2.1.0'
1313
page-editable: false
1414
page-out-of-support: false

‎docs/modules/ROOT/nav.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
* xref:configuration.adoc[Configuration]
44
* xref:working-copies.adoc[Working Copies]
55
* xref:features/features.adoc[Features]
6+
** xref:features/ids.adoc[IDs]
67
** xref:features/lazies.adoc[Lazy References]
8+
** xref:features/queries.adoc[Queries]
79
** xref:features/transactions.adoc[Transactions]
810
** xref:features/versions.adoc[Versions]
9-
* xref:migration.adoc[Migration]
11+
* xref:migration.adoc[Migration from JPA]
1012
* xref:known-issues.adoc[Known issues]

‎docs/modules/ROOT/pages/features/features.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
= Features
22

3+
* xref:features/ids.adoc[IDs]
34
* xref:features/lazies.adoc[Lazy References]
5+
* xref:features/queries.adoc[Queries]
46
* xref:features/transactions.adoc[Transactions]
57
* xref:features/versions.adoc[Versions]

‎docs/modules/ROOT/pages/features/ids.adoc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
= IDs
2+
3+
{product-name} supports the following types with auto generating (``GenerationType.AUTO``) values:
4+
5+
* ``int`` / ``Integer``
6+
* ``long`` / ``Long``
7+
* ``String``
8+
* ``UUID``
9+
10+
Other generation types are currently not supported.
11+
12+
== Composite keys
13+
14+
It is possible to use **any class as https://jakarta.ee/specifications/persistence/3.2/apidocs/jakarta.persistence/jakarta/persistence/id[``@Id``]** but without any auto generation.
15+
Most importantly the used class **must have a valid ``hashCode``** since a ``HashMap`` is used to store and manage entities.
16+
17+
{product-name} can also handle https://jakarta.ee/specifications/persistence/3.2/apidocs/jakarta.persistence/jakarta/persistence/embeddedid[``@EmbeddedId``] which results in the same behavior as ``@Id`` but the id-class must then implement ``Serializable``.
18+
19+
Multiple Ids for a single entity and https://jakarta.ee/specifications/persistence/3.2/apidocs/jakarta.persistence/jakarta/persistence/idclass[``@IdClass``] are **not** supported.

‎docs/modules/ROOT/pages/features/queries.adoc

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
= Queries
2+
3+
== Keywords
4+
5+
It is possible to use **most of the standard query keywords** for repositories defined in Spring Data JPA: https://docs.spring.io/spring-data/jpa/reference/repositories/query-keywords-reference.html[Spring Data JPA - Repository query keywords].
6+
7+
Here are a few examples:
8+
9+
[source,java]
10+
----
11+
@Repository
12+
public interface UserRepository extends EclipseStoreRepository<User, Long>
13+
{
14+
List<User> findByFirstName(String firstName, String lastName);
15+
List<User> findByFirstNameAndLastName(String firstName, String lastName);
16+
List<User> findByDateOfBirthBefore(LocalDate date);
17+
List<User> findByAgeIn(List<Integer> ages);
18+
List<User> findByIsActiveFalse();
19+
}
20+
----
21+
22+
More examples are in the https://github.com/xdev-software/spring-data-eclipse-store/blob/develop/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/query/by/string/UserRepository.java[test-cases].
23+
24+
== Query by Example
25+
26+
Developers can also use https://docs.spring.io/spring-data/jpa/reference/repositories/query-by-example.html[Query by Example] if preferred.
27+
28+
An example:
29+
30+
[source,java]
31+
----
32+
public List<User> findAllUsersNamedMick()
33+
{
34+
final User probe = new User(1, "Mick", BigDecimal.TEN);
35+
return userRepository.findAll(Example.of(probe));
36+
}
37+
----
38+
39+
More examples are in the https://github.com/xdev-software/spring-data-eclipse-store/blob/develop/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/query/by/example/QueryByExampleTest.java[test-cases].
40+
41+
== @Query annotation
42+
43+
The support for a ``@Query``-Annotation is currently quite limited, but useful nonetheless.
44+
45+
To keep parse and execute SQL-Queries we use the https://github.com/npgall/cqengine[cqengine] by https://github.com/npgall[Niall Gallagher].
46+
It offers rudimentary support of some SQL-Queries, but not all.
47+
48+
[NOTE]
49+
====
50+
https://github.com/npgall/cqengine[cqengine] parses the SQL String as a SQLite-SQL-String and is therefore different from the https://docs.spring.io/spring-data/jpa/reference/jpa/query-methods.html#jpa.query-methods.at-query[HQL or JPQL] of Spring Data JPA.
51+
====
52+
53+
Here are some working examples:
54+
55+
[source,java]
56+
----
57+
public interface MyEntityRepository extends ListCrudRepository<MyEntity, Long>
58+
{
59+
@Query("SELECT * FROM MyEntity WHERE name = '?1'")
60+
List<MyEntity> findByName(String name);
61+
62+
@Query("SELECT * FROM MyEntity WHERE (name = '?1' AND age > ?2)")
63+
List<MyEntity> findByNameAndAgeGreaterThan(String name, int age);
64+
65+
@Query("SELECT * FROM MyEntity WHERE 'name' LIKE '%?1%'")
66+
List<MyEntity> findByNameContaining(String keyword);
67+
68+
@Query("SELECT * FROM MyEntity WHERE otherEntity IS NOT NULL")
69+
List<MyEntity> findWhereOtherEntityIsNotNull();
70+
}
71+
----
72+
73+
More examples are in the https://github.com/xdev-software/spring-data-eclipse-store/blob/develop/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/query/hsql/MyEntityRepository.java[test-cases].

‎docs/modules/ROOT/pages/known-issues.adoc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
= Known issues
22

3-
== Query annotations
4-
5-
In Spring-Data-JPA you can write a Query over methods of repositories like this:
6-
7-
[source,java,title="From https://github.com/spring-projects/spring-petclinic/blob/main/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java[spring-petclinic]"]
8-
----
9-
@Query("SELECT ptype FROM PetType ptype ORDER BY ptype.name")
10-
List<PetType> findPetTypes();
11-
----
12-
13-
We created https://github.com/xdev-software/spring-data-eclipse-store/issues/32[an issue] for that but right now we *do not support Query annotations*.
14-
153
== Data changes
164

175
There are two basic ways to keep your data up to date.

‎docs/modules/ROOT/pages/migration.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= Migration
1+
= Migration from JPA
22

33
Migrating from Spring Data JPA is very easy.
44
We implemented a https://github.com/xdev-software/spring-data-eclipse-store-migration[OpenRewrite recipe] for that.

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>spring-data-eclipse-store-root</artifactId>
9-
<version>2.0.2-SNAPSHOT</version>
9+
<version>2.2.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>

‎spring-data-eclipse-store-benchmark/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<groupId>software.xdev</groupId>
77
<artifactId>spring-data-eclipse-store-root</artifactId>
8-
<version>2.0.2-SNAPSHOT</version>
8+
<version>2.2.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>spring-data-eclipse-store-benchmark</artifactId>
12-
<version>2.0.2-SNAPSHOT</version>
12+
<version>2.1.0-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414

1515
<inceptionYear>2023</inceptionYear>

‎spring-data-eclipse-store-demo/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>software.xdev</groupId>
99
<artifactId>spring-data-eclipse-store-root</artifactId>
10-
<version>2.0.2-SNAPSHOT</version>
10+
<version>2.2.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>spring-data-eclipse-store-demo</artifactId>
14-
<version>2.0.2-SNAPSHOT</version>
14+
<version>2.1.0-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>

‎spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/dual/storage/DualStorageDemoApplicationTest.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package software.xdev.spring.data.eclipse.store.demo.dual.storage;
2+
3+
import java.io.File;
4+
5+
import org.junit.jupiter.api.BeforeAll;
6+
import org.junit.jupiter.api.Test;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.boot.test.context.SpringBootTest;
9+
10+
import software.xdev.spring.data.eclipse.store.demo.TestUtil;
11+
import software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice.PersistenceInvoiceConfiguration;
12+
import software.xdev.spring.data.eclipse.store.demo.dual.storage.person.PersistencePersonConfiguration;
13+
14+
15+
@SpringBootTest(classes = DualStorageDemoApplication.class)
16+
class DualStorageDemoApplicationTest
17+
{
18+
private final PersistenceInvoiceConfiguration invoiceConfiguration;
19+
private final PersistencePersonConfiguration personConfiguration;
20+
21+
@Autowired
22+
public DualStorageDemoApplicationTest(
23+
final PersistenceInvoiceConfiguration invoiceConfiguration,
24+
final PersistencePersonConfiguration personConfiguration)
25+
{
26+
this.invoiceConfiguration = invoiceConfiguration;
27+
this.personConfiguration = personConfiguration;
28+
}
29+
30+
@BeforeAll
31+
static void clearPreviousData()
32+
{
33+
TestUtil.deleteDirectory(new File("./" + PersistenceInvoiceConfiguration.STORAGE_PATH));
34+
TestUtil.deleteDirectory(new File("./" + PersistencePersonConfiguration.STORAGE_PATH));
35+
}
36+
37+
@Test
38+
void checkPossibilityToSimplyStartAndRestartApplication()
39+
{
40+
this.invoiceConfiguration.getStorageInstance().stop();
41+
this.personConfiguration.getStorageInstance().stop();
42+
DualStorageDemoApplication.main(new String[]{});
43+
}
44+
}

‎spring-data-eclipse-store-jpa/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>software.xdev</groupId>
99
<artifactId>spring-data-eclipse-store-root</artifactId>
10-
<version>2.0.2-SNAPSHOT</version>
10+
<version>2.2.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>spring-data-eclipse-store-jpa</artifactId>
14-
<version>2.0.2-SNAPSHOT</version>
14+
<version>2.1.0-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<inceptionYear>2023</inceptionYear>

‎spring-data-eclipse-store/pom.xml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>spring-data-eclipse-store</artifactId>
9-
<version>2.0.2-SNAPSHOT</version>
9+
<version>2.1.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>spring-data-eclipse-store</name>
@@ -47,6 +47,7 @@
4747
<maven.compiler.release>${javaVersion}</maven.compiler.release>
4848

4949
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
50+
5051
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5152

5253
<!-- Should be in sync with org.eclipse.store:integrations-spring-boot3 -->
@@ -163,6 +164,26 @@
163164
</exclusion>
164165
</exclusions>
165166
</dependency>
167+
168+
<dependency>
169+
<groupId>com.googlecode.cqengine</groupId>
170+
<artifactId>cqengine</artifactId>
171+
<version>3.6.0</version>
172+
<exclusions>
173+
<exclusion>
174+
<artifactId>kryo</artifactId>
175+
<groupId>com.esotericsoftware</groupId>
176+
</exclusion>
177+
<exclusion>
178+
<artifactId>kryo-serializers</artifactId>
179+
<groupId>de.javakaffee</groupId>
180+
</exclusion>
181+
<exclusion>
182+
<artifactId>sqlite-jdbc</artifactId>
183+
<groupId>org.xerial</groupId>
184+
</exclusion>
185+
</exclusions>
186+
</dependency>
166187

167188
<dependency>
168189
<groupId>org.junit.jupiter</groupId>

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/exceptions/IdFieldFinalException.java renamed to ‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/exceptions/IdFieldException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package software.xdev.spring.data.eclipse.store.exceptions;
1717

18-
public class IdFieldFinalException extends RuntimeException
18+
public class IdFieldException extends RuntimeException
1919
{
20-
public IdFieldFinalException(final String message)
20+
public IdFieldException(final String message)
2121
{
2222
super(message);
2323
}

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/Query.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
@QueryAnnotation
4141
public @interface Query
4242
{
43-
@SuppressWarnings("unused") String value() default "";
43+
String value() default "";
4444
}

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/EclipseStoreQueryCreator.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ private AbstractCriteriaNode<T> from(
126126
{
127127
Objects.requireNonNull(criteria);
128128
final Part.Type type = Objects.requireNonNull(part).getType();
129+
final Part.IgnoreCaseType ignoreCaseType = part.shouldIgnoreCase();
130+
final boolean doIgnoreCase =
131+
ignoreCaseType == Part.IgnoreCaseType.ALWAYS || ignoreCaseType == Part.IgnoreCaseType.WHEN_POSSIBLE;
129132

130133
switch(type)
131134
{
@@ -169,27 +172,27 @@ private AbstractCriteriaNode<T> from(
169172
}
170173
case LIKE ->
171174
{
172-
return criteria.like((String)Objects.requireNonNull(parameters).next());
175+
return criteria.like((String)Objects.requireNonNull(parameters).next(), doIgnoreCase);
173176
}
174177
case STARTING_WITH ->
175178
{
176-
return criteria.startWith((String)Objects.requireNonNull(parameters).next());
179+
return criteria.startWith((String)Objects.requireNonNull(parameters).next(), doIgnoreCase);
177180
}
178181
case ENDING_WITH ->
179182
{
180-
return criteria.endWith((String)Objects.requireNonNull(parameters).next());
183+
return criteria.endWith((String)Objects.requireNonNull(parameters).next(), doIgnoreCase);
181184
}
182185
case CONTAINING ->
183186
{
184-
return criteria.containing((String)Objects.requireNonNull(parameters).next());
187+
return criteria.containing((String)Objects.requireNonNull(parameters).next(), doIgnoreCase);
185188
}
186189
case NOT_LIKE ->
187190
{
188-
return criteria.notLike((String)Objects.requireNonNull(parameters).next());
191+
return criteria.notLike((String)Objects.requireNonNull(parameters).next(), doIgnoreCase);
189192
}
190193
case NOT_CONTAINING ->
191194
{
192-
return criteria.notContaining((String)Objects.requireNonNull(parameters).next());
195+
return criteria.notContaining((String)Objects.requireNonNull(parameters).next(), doIgnoreCase);
193196
}
194197
case EXISTS ->
195198
{

0 commit comments

Comments
 (0)