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/02/16 07:25:58 UTC
[isis-app-simpleapp] branch jdo updated: framework packages had
been renamed
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jdo by this push:
new 26c285d framework packages had been renamed
26c285d is described below
commit 26c285dbf1e6abe2b3f954485384e9aee55ad7b1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Feb 16 08:25:46 2021 +0100
framework packages had been renamed
---
.../java/domainapp/modules/simple/dom/so/SimpleObjects.java | 11 +++++++++--
.../domainapp/modules/simple/dom/so/SimpleObjects_Test.java | 7 +++----
.../integtests/metamodel/SwaggerExport_IntegTest.java | 5 +++--
.../metamodel/lockdown/LockDownMetaModel_IntegTest.java | 13 ++++++-------
4 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
index b5d9496..4e7e1b6 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
@@ -5,9 +5,16 @@ import java.util.List;
import javax.inject.Inject;
import javax.jdo.JDOQLTypedQuery;
-import org.apache.isis.applib.annotation.*;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.persistence.jdo.applib.integration.JdoSupportService;
+import org.apache.isis.persistence.jdo.applib.services.JdoSupportService;
import domainapp.modules.simple.SimpleModule;
import domainapp.modules.simple.types.Name;
diff --git a/module-simple/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java b/module-simple/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
index 547f402..60be5fa 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import org.apache.isis.persistence.jdo.applib.integration.JdoSupportService;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -15,12 +13,13 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
-import org.apache.isis.applib.services.repository.RepositoryService;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.when;
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.persistence.jdo.applib.services.JdoSupportService;
+
@ExtendWith(MockitoExtension.class)
class SimpleObjects_Test {
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
index f622c73..d27c0b9 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
@@ -8,7 +8,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.applib.services.swagger.SwaggerService;
+import org.apache.isis.applib.services.swagger.Format;
+import org.apache.isis.applib.services.swagger.Visibility;
import org.apache.isis.testing.integtestsupport.applib.swagger.SwaggerExporter;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
@@ -26,6 +27,6 @@ class SwaggerExport_IntegTest extends ApplicationIntegTestAbstract {
@Test
void export() throws IOException {
val swaggerExporter = new SwaggerExporter(serviceRegistry);
- swaggerExporter.export(SwaggerService.Visibility.PRIVATE, SwaggerService.Format.JSON);
+ swaggerExporter.export(Visibility.PRIVATE, Format.JSON);
}
}
\ No newline at end of file
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
index f22ffeb..97dc0b9 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
@@ -12,17 +12,16 @@ import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.approvaltests.Approvals.getReporter;
+import static org.approvaltests.Approvals.verify;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
import org.apache.isis.applib.services.jaxb.JaxbService;
+import org.apache.isis.applib.services.metamodel.Config;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.schema.metamodel.v2.DomainClassDto;
import org.apache.isis.schema.metamodel.v2.MetamodelDto;
-import static org.approvaltests.Approvals.getReporter;
-import static org.approvaltests.Approvals.verify;
-import static org.assertj.core.api.Assumptions.assumeThat;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-
import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
import domainapp.webapp.util.CurrentVsApprovedApprovalTextWriter;
@@ -43,7 +42,7 @@ class LockDownMetaModel_IntegTest extends ApplicationIntegTestAbstract {
// when
MetamodelDto metamodelDto =
metaModelService.exportMetaModel(
- new MetaModelService.Config()
+ new Config()
.withIgnoreNoop()
.withIgnoreAbstractClasses()
.withIgnoreBuiltInValueTypes()