Refactor JPA-Demo with writing to H2

Author: JohannesRabauer

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

@@ -49,6 +49,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>software.xdev</groupId>
 			<artifactId>spring-data-eclipse-store</artifactId>

spring-data-eclipse-store-jpa/src/main/java/software/xdev/spring/data/eclipse/store/jpa/Customer.java renamed to spring-data-eclipse-store-jpa/src/main/java/software/xdev/spring/data/eclipse/store/jpa/CustomerInEclipseStore.java

@@ -1,22 +1,28 @@
 package software.xdev.spring.data.eclipse.store.jpa;
 
-import org.springframework.data.annotation.Id;
+import jakarta.persistence.Id;
 
 
-public class Customer
+public class CustomerInEclipseStore
 {
 	@Id
 	private String id;
 
-	private final String firstName;
-	private final String lastName;
+	private String firstName;
+	private String lastName;
 
-	public Customer(final String firstName, final String lastName)
+	public CustomerInEclipseStore(final String id, final String firstName, final String lastName)
 	{
+		this.id = id;
 		this.firstName = firstName;
 		this.lastName = lastName;
 	}
 
+	public CustomerInEclipseStore()
+	{
+	
+	}
+	
 	@Override
 	public String toString()
 	{

spring-data-eclipse-store-jpa/src/main/java/software/xdev/spring/data/eclipse/store/jpa/CustomerInEclipseStoreRepository.java

@@ -0,0 +1,12 @@
+package software.xdev.spring.data.eclipse.store.jpa;
+
+import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCrudRepository;
+
+
+/**
+ * To be able to properly coexist with JPA in one project, the repositories must be declared as specific JPA- or
+ * EclipseStore-Repositories.
+ */
+public interface CustomerInEclipseStoreRepository extends EclipseStoreCrudRepository<CustomerInEclipseStore, String>
+{
+}

spring-data-eclipse-store-jpa/src/main/java/software/xdev/spring/data/eclipse/store/jpa/CustomerInJpa.java

@@ -0,0 +1,35 @@
+package software.xdev.spring.data.eclipse.store.jpa;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+
+@Entity
+public class CustomerInJpa
+{
+	@Id
+	private String id;
+	
+	private String firstName;
+	private String lastName;
+	
+	public CustomerInJpa(final String id, final String firstName, final String lastName)
+	{
+		this.id = id;
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+	
+	public CustomerInJpa()
+	{
+	
+	}
+	
+	@Override
+	public String toString()
+	{
+		return String.format(
+			"Customer[id=%s, firstName='%s', lastName='%s']",
+			this.id, this.firstName, this.lastName);
+	}
+}

spring-data-eclipse-store-jpa/src/main/java/software/xdev/spring/data/eclipse/store/jpa/CustomerInJpaRepository.java

@@ -0,0 +1,12 @@
+package software.xdev.spring.data.eclipse.store.jpa;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+/**
+ * To be able to properly coexist with JPA in one project, the repositories must be declared as specific JPA- or
+ * EclipseStore-Repositories.
+ */
+public interface CustomerInJpaRepository extends JpaRepository<CustomerInJpa, String>
+{
+}

spring-data-eclipse-store-jpa/src/main/java/software/xdev/spring/data/eclipse/store/jpa/CustomerRepository.java

@@ -21,9 +21,6 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 
 import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
@@ -33,25 +30,22 @@
  * In this example we want to coexist with Spring data JPA. This is possible by using
  * {@link software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository}s instead of the generic
  * {@link org.springframework.data.repository.Repository}s of the Spring framework.
- * <p>
- * The {@code exclude} in {@link SpringBootApplication} prevents JPA from getting configured.
- * </p>
  */
-@SpringBootApplication(
-	exclude = {
-		DataSourceAutoConfiguration.class,
-		DataSourceTransactionManagerAutoConfiguration.class,
-		HibernateJpaAutoConfiguration.class
-	})
+@SpringBootApplication
 @EnableEclipseStoreRepositories
 public class JpaDemoApplication implements CommandLineRunner
 {
 	private static final Logger LOG = LoggerFactory.getLogger(JpaDemoApplication.class);
-	private final CustomerRepository customerRepository;
+	private final CustomerInEclipseStoreRepository eclipseStoreRepository;
+	private final CustomerInJpaRepository jpaRepository;
 
-	public JpaDemoApplication(final CustomerRepository customerRepository)
+	public JpaDemoApplication(
+		final CustomerInEclipseStoreRepository eclipseStoreRepository,
+		final CustomerInJpaRepository jpaRepository
+	)
 	{
-		this.customerRepository = customerRepository;
+		this.eclipseStoreRepository = eclipseStoreRepository;
+		this.jpaRepository = jpaRepository;
 	}
 
 	public static void main(final String[] args)
@@ -63,14 +57,35 @@ public static void main(final String[] args)
 	@Override
 	public void run(final String... args)
 	{
-		this.customerRepository.deleteAll();
+		this.saveEntityInEclipseStoreRepository();
+		this.saveEntityInJpaRepository();
+	}
+	
+	private void saveEntityInEclipseStoreRepository()
+	{
+		LOG.info("-------- EclipseStore-Actions --------");
+		this.eclipseStoreRepository.deleteAll();
+		
+		// save a couple of customers
+		this.eclipseStoreRepository.save(new CustomerInEclipseStore("1", "Stevie", "Nicks"));
+		this.eclipseStoreRepository.save(new CustomerInEclipseStore("2", "Mick", "Fleetwood"));
+		
+		// fetch all customers
+		LOG.info("Customers found with findAll() in EclipseStore:");
+		this.eclipseStoreRepository.findAll().forEach(c -> LOG.info(c.toString()));
+	}
+	
+	private void saveEntityInJpaRepository()
+	{
+		LOG.info("-------- JPA-Actions --------");
+		this.jpaRepository.deleteAll();
 
 		// save a couple of customers
-		this.customerRepository.save(new Customer("Stevie", "Nicks"));
-		this.customerRepository.save(new Customer("Mick", "Fleetwood"));
+		this.jpaRepository.save(new CustomerInJpa("1", "Stevie", "Nicks"));
+		this.jpaRepository.save(new CustomerInJpa("2", "Mick", "Fleetwood"));
 
 		// fetch all customers
-		LOG.info("Customers found with findAll():");
-		this.customerRepository.findAll().forEach(c -> LOG.info(c.toString()));
+		LOG.info("Customers found with findAll() in JPA:");
+		this.jpaRepository.findAll().forEach(c -> LOG.info(c.toString()));
 	}
 }

spring-data-eclipse-store-jpa/src/main/java/software/xdev/spring/data/eclipse/store/jpa/JpaDemoApplication.java

@@ -16,10 +16,12 @@
 package software.xdev.spring.data.eclipse.store.repository.interfaces;
 
 import org.springframework.data.repository.NoRepositoryBean;
-import org.springframework.data.repository.Repository;
 
 
 @NoRepositoryBean
-public interface EclipseStoreRepository<T, ID> extends Repository<T, ID>
+public interface EclipseStoreRepository<T, ID>
+	extends
+	EclipseStoreListCrudRepository<T, ID>,
+	EclipseStoreListPagingAndSortingRepositoryRepository<T, ID>
 {
 }

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreRepository.java

@@ -34,6 +34,7 @@
 import software.xdev.spring.data.eclipse.store.integration.repositories.interfaces.CustomerListCrud;
 import software.xdev.spring.data.eclipse.store.integration.repositories.interfaces.CustomerListPagingAndSorting;
 import software.xdev.spring.data.eclipse.store.integration.repositories.interfaces.CustomerPagingAndSorting;
+import software.xdev.spring.data.eclipse.store.integration.repositories.interfaces.CustomerSimple;
 import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
 
 
@@ -54,6 +55,22 @@ class SpecificInterfacesTest
 	@Autowired
 	private EclipseStoreStorage storage;
 
+	@Test
+	void testSimple()
+	{
+		final CustomerSimple customer = new CustomerSimple(TestData.FIRST_NAME, TestData.LAST_NAME);
+		this.repository.save(customer);
+		
+		TestUtil.doBeforeAndAfterRestartOfDatastore(
+			this.storage,
+			() -> {
+				final List<CustomerSimple> customers = this.repository.findAll();
+				Assertions.assertEquals(1, customers.size());
+				Assertions.assertEquals(customer, customers.get(0));
+			}
+		);
+	}
+	
 	@Test
 	void testCrud()
 	{
@@ -79,7 +96,7 @@ void testListCrud()
 		TestUtil.doBeforeAndAfterRestartOfDatastore(
 			this.storage,
 			() -> {
-				final List<CustomerListCrud> customers = TestUtil.iterableToList(this.listCrudRepository.findAll());
+				final List<CustomerListCrud> customers = this.listCrudRepository.findAll();
 				Assertions.assertEquals(1, customers.size());
 				Assertions.assertEquals(customer, customers.get(0));
 			}