Skip to content

Commit 522804b

Browse files
JohannesRabauerJohannesRabauer
authored
Merge pull request #134 from xdev-software/composite-primary-keys
Composite primary keys
2 parents d994a2d + 1acd1b0 commit 522804b

30 files changed

Lines changed: 1068 additions & 53 deletions

File tree

‎.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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 2.1.0
2+
3+
* Implemented auto-id-generation for UUIDs.
4+
* Implemented composite primary keys.
5+
16
# 2.0.1
27

38
* 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.1'
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.1'
12-
maven-version: '2.0.1'
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/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.

‎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.1.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
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.1.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>spring-data-eclipse-store-benchmark</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>spring-data-eclipse-store-demo</artifactId>

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>spring-data-eclipse-store-jpa</artifactId>

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
}

0 commit comments

Comments
 (0)