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:26:14 UTC
[isis-app-simpleapp] branch jpa updated: framework packages had
been renamed
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa by this push:
new aab8870 framework packages had been renamed
aab8870 is described below
commit aab88702d7bb98f570f241a16ed9d3850ee4298e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Feb 16 08:26:02 2021 +0100
framework packages had been renamed
---
.../integtests/metamodel/SwaggerExport_IntegTest.java | 5 +++--
.../metamodel/lockdown/LockDownMetaModel_IntegTest.java | 13 ++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
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 f6c97c1..391bc80 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()