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/31 09:29:47 UTC

[isis] branch master updated: ISIS-2504: rename config option isis.persistence.jpa -> isis.persistence.schema

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 45cabc1  ISIS-2504: rename config option isis.persistence.jpa -> isis.persistence.schema
45cabc1 is described below

commit 45cabc103bcd9ab0ae34a2402781652e716ca248
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 31 10:28:58 2021 +0100

    ISIS-2504: rename config option
    isis.persistence.jpa -> isis.persistence.schema
    
    in preparation to also use it with JDO
---
 .../org/apache/isis/core/config/IsisConfiguration.java     |  4 ++--
 .../jpa/eclipselink/IsisModuleJpaEclipselink.java          | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index b7b6626..e8af218 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -1875,9 +1875,9 @@ public class IsisConfiguration {
             }
         }
         
-        private final Jpa jpa = new Jpa();
+        private final Schema schema = new Schema();
         @Data
-        public static class Jpa {
+        public static class Schema {
             
             /**
              * List of additional schemas to be auto-created.
diff --git a/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.java b/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.java
index 1e8c657..469e6be 100644
--- a/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.java
+++ b/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.java
@@ -109,18 +109,18 @@ public class IsisModuleJpaEclipselink extends JpaBaseConfiguration {
             final DataSource dataSource,
             final IsisConfiguration isisConfiguration) {
         
-        val isisJpaConf = isisConfiguration.getPersistence().getJpa();
+        val persistenceSchemaConf = isisConfiguration.getPersistence().getSchema();
         
-        if(!isisJpaConf.getAutoCreateSchemas().isEmpty()) {
+        if(!persistenceSchemaConf.getAutoCreateSchemas().isEmpty()) {
             
-            log.info("about to create db schema(s) {}", isisJpaConf.getAutoCreateSchemas());
+            log.info("about to create db schema(s) {}", persistenceSchemaConf.getAutoCreateSchemas());
             
             try(val con = dataSource.getConnection()){
                 
                 val s = con.createStatement();
                 
-                for(val schema : isisJpaConf.getAutoCreateSchemas()) {
-                    s.execute(String.format(isisJpaConf.getCreateSchemaSqlTemplate(), schema));
+                for(val schema : persistenceSchemaConf.getAutoCreateSchemas()) {
+                    s.execute(String.format(persistenceSchemaConf.getCreateSchemaSqlTemplate(), schema));
                 }
                 
             }
@@ -136,9 +136,9 @@ public class IsisModuleJpaEclipselink extends JpaBaseConfiguration {
             JpaProperties properties,
             IsisConfiguration isisConfiguration) {
 
-        val isisJpaConf = isisConfiguration.getPersistence().getJpa();
+        val persistenceSchemaConf = isisConfiguration.getPersistence().getSchema();
         
-        isisJpaConf.getAdditionalOrmFiles()
+        persistenceSchemaConf.getAdditionalOrmFiles()
         .forEach(schema->properties.getMappingResources()
                 .add(String.format("META-INF/orm-%s.xml", schema)));