You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/13 17:15:17 UTC
[isis] branch master updated: ISIS-2033: some cleanup of prev.
commit
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1ca4600 ISIS-2033: some cleanup of prev. commit
1ca4600 is described below
commit 1ca46009f3010c5e793529ccdacd92880f58ded0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 13 18:15:06 2021 +0100
ISIS-2033: some cleanup of prev. commit
---
.../isis/testdomain/conf/Configuration_usingSpringDataJpa.java | 7 -------
.../java/org/apache/isis/testdomain/jpa/springdata/Employee.java | 2 +-
.../apache/isis/testdomain/jpa/springdata/EmployeeManager.java | 3 +--
.../isis/testdomain/jpa/springdata/SpringDataJpaTestModule.java | 8 +++++---
.../jpa/springdata/SpringDataJpaBootstrappingTest.java | 2 --
5 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java
index 8253a19..2dc5afb 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java
@@ -20,18 +20,14 @@ package org.apache.isis.testdomain.conf;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipseLink;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.testdomain.jpa.springdata.Employee;
-import org.apache.isis.testdomain.jpa.springdata.EmployeeRepository;
import org.apache.isis.testdomain.jpa.springdata.SpringDataJpaTestModule;
import org.apache.isis.testdomain.model.stereotypes.MyService;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
@@ -51,9 +47,6 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
,IsisModuleTestingFixturesApplib.class
,KVStoreForTesting.class, // Helper for JUnit Tests
})
-@EnableJpaRepositories(basePackageClasses = EmployeeRepository.class)
-@EntityScan(basePackageClasses = Employee.class)
-
@PropertySources({
@PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
@PropertySource(IsisPresets.NoTranslations),
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
index a637c68..5b35d5a 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
@@ -33,7 +33,7 @@ import lombok.Setter;
import lombok.ToString;
@Entity
-@DomainObject(nature=Nature.JPA_ENTITY, objectType = "isisLab.Employee")
+@DomainObject(nature=Nature.JPA_ENTITY, objectType = "testdomain.jpa.springdata.Employee")
@Getter @Setter @ToString @EqualsAndHashCode
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Employee {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager.java
index 0dec371..0590f77 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager.java
@@ -26,8 +26,7 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-@DomainObject(nature=Nature.VIEW_MODEL, objectType = "isisLab.EmployeeManager")
-//@RequiredArgsConstructor(onConstructor_ = {@Inject}) //XXX not supported for view models yet
+@DomainObject(nature=Nature.VIEW_MODEL, objectType = "testdomain.jpa.springdata.EmployeeManager")
public class EmployeeManager {
@Inject private EmployeeRepository employeeRepo;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/SpringDataJpaTestModule.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/SpringDataJpaTestModule.java
index 5d39718..d1853da 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/SpringDataJpaTestModule.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/SpringDataJpaTestModule.java
@@ -18,17 +18,19 @@
*/
package org.apache.isis.testdomain.jpa.springdata;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.apache.isis.applib.services.factory.FactoryService;
@Configuration
@Import({
- Employee.class,
- EmployeeManager.class,
- //EmployeeRepository.class,
+
})
+@EnableJpaRepositories(basePackageClasses = EmployeeRepository.class)
+@EntityScan(basePackageClasses = Employee.class)
public class SpringDataJpaTestModule {
public static void setupEmployeeFixture(final EmployeeRepository repository) {
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
index cc798a2..0407834 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
@@ -26,9 +26,7 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;