You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/05 00:01:32 UTC
[isis] 01/04: ISIS-2213: reorgs classes in isis-schema
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a75ea855422df3f7d011a8079655a8e88d64679e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 23:48:28 2019 +0000
ISIS-2213: reorgs classes in isis-schema
and adds IsisSchemaModule
---
.../src/main/java/org/apache/isis/applib/IsisApplibModule.java | 5 +++++
.../conmap/command/ContentMappingServiceForCommandDto.java | 2 +-
.../org/apache/isis/applib/services/iactn/Interaction.java | 2 +-
.../org/apache/isis/applib/util/schema/CommonDtoUtils.java | 10 +++++-----
.../isis/runtime/services/publish/PublishedObjectsDefault.java | 2 +-
.../{utils/jaxbadapters/Strings.java => IsisSchemaModule.java} | 10 +++++-----
.../JavaSqlTimestampXmlGregorianCalendarAdapter.java | 2 +-
.../{utils => }/jaxbadapters/JodaDateTimeStringAdapter.java | 2 +-
.../jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java | 2 +-
.../{utils => }/jaxbadapters/JodaLocalDateStringAdapter.java | 2 +-
.../jaxbadapters/JodaLocalDateTimeStringAdapter.java | 2 +-
.../JodaLocalDateTimeXMLGregorianCalendarAdapter.java | 2 +-
.../jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java | 2 +-
.../{utils => }/jaxbadapters/JodaLocalTimeStringAdapter.java | 2 +-
.../jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java | 2 +-
.../apache/isis/schema/{utils => }/jaxbadapters/Strings.java | 2 +-
.../schema/{utils => }/jaxbadapters/XmlCalendarFactory.java | 2 +-
17 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index 45533c7..64a7033 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -18,10 +18,15 @@
*/
package org.apache.isis.applib;
+import org.apache.isis.schema.IsisSchemaModule;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
@Configuration
+@Import({
+ IsisSchemaModule.class
+})
@ComponentScan
public class IsisApplibModule {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
index 84fecd7..0e52ae5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.common.v1.PeriodDto;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
@DomainService(nature = NatureOfService.DOMAIN)
public class ContentMappingServiceForCommandDto implements ContentMappingService {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index f8a8704..5b1b4e4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -52,7 +52,7 @@ import org.apache.isis.schema.ixn.v1.MetricsDto;
import org.apache.isis.schema.ixn.v1.ObjectCountsDto;
import org.apache.isis.schema.ixn.v1.PropertyEditDto;
import org.apache.isis.applib.util.schema.MemberExecutionDtoUtils;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
/**
* Represents an action invocation or property modification, resulting in some state change of the system. It captures
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java b/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
index 57e9839..16c618f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
@@ -51,11 +51,11 @@ import org.apache.isis.schema.common.v1.OidDto;
import org.apache.isis.schema.common.v1.ValueDto;
import org.apache.isis.schema.common.v1.ValueType;
import org.apache.isis.schema.common.v1.ValueWithTypeDto;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.JodaDateTimeXMLGregorianCalendarAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.JodaLocalDateTimeXMLGregorianCalendarAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.JodaLocalDateXMLGregorianCalendarAdapter;
-import org.apache.isis.schema.utils.jaxbadapters.JodaLocalTimeXMLGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JodaDateTimeXMLGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JodaLocalDateTimeXMLGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JodaLocalDateXMLGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JodaLocalTimeXMLGregorianCalendarAdapter;
import static org.apache.isis.commons.internal.collections._Maps.entry;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
index e0514ce..1647af4 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
@@ -39,7 +39,7 @@ import org.apache.isis.schema.chg.v1.ChangesDto;
import org.apache.isis.schema.chg.v1.ObjectsDto;
import org.apache.isis.schema.common.v1.OidDto;
import org.apache.isis.schema.common.v1.OidsDto;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
+import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
import lombok.ToString;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java b/core/schema/src/main/java/org/apache/isis/schema/IsisSchemaModule.java
similarity index 80%
copy from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java
copy to core/schema/src/main/java/org/apache/isis/schema/IsisSchemaModule.java
index 617dd51..bb6acf2 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/IsisSchemaModule.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.isis.schema;
-package org.apache.isis.schema.utils.jaxbadapters;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
-class Strings {
+@Configuration
+public class IsisSchemaModule {
- public static boolean isNullOrEmpty(String x) {
- return x == null || x.isEmpty();
- }
}
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
similarity index 98%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
index 38673c2..ce32e0e 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import java.sql.Timestamp;
import java.util.GregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeStringAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
index bdc8c52..facaa11 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
index f2d919d..d1313fe 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import java.util.Date;
import java.util.GregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateStringAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
index af6e513..b708493 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeStringAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
index 9bbb079..ec7fb21 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
index bc30291..17fa65e 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
index dd627dc..3103614 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeStringAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
index e57de01..ebbc743 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
similarity index 97%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
index f30f9e3..9fa1c7d 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
similarity index 94%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
index 617dd51..780960d 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/Strings.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
class Strings {
diff --git a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/XmlCalendarFactory.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
similarity index 98%
rename from core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/XmlCalendarFactory.java
rename to core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
index c28843c..ab3358a 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/utils/jaxbadapters/XmlCalendarFactory.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.schema.utils.jaxbadapters;
+package org.apache.isis.schema.jaxbadapters;
import java.util.function.Function;