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/11/21 12:48:25 UTC
[isis] branch master updated (3792cbc -> 62b85aa)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 3792cbc ISIS-2882: test fixes (for prev. commit)
add cca6298 ISIS-2882: purge all the wicket temporal conversion stuff
add 1213fb1 Merge branch 'master' into 2882_temporal_from_scratch
add 8a04257 ISIS-2882: use 'runtime' module to import 'joda time integration' module
add 1cf7268 ISIS-2882: housekeeping around joda time
add 43ba880 ISIS-2882: fixes prev. commmit
add 70f70c3 ISIS-2882: restore IsisConfiguration from 'master' branch
add 71ed587 ISIS-2877: schema: introduce composite type
add 2b12fff ISIS-2882: rename 'applib' ValueSemantics related package
add 62b85aa Merge pull request #780 from apache/2882_temporal_from_scratch
No new revisions were added by this update.
Summary of changes:
.../isis/applib/annotation/ValueSemantics.java | 2 +-
.../isis/applib/jaxb/JodaTimeJaxbAdapters.java | 174 -----------
.../org/apache/isis/applib/spec/package-info.java | 2 +-
.../org/apache/isis/applib/util/package-info.java | 2 +-
.../isis/applib/util/schema/CommonDtoUtils.java | 27 +-
.../applib/util/schema/InteractionDtoUtils.java | 2 +-
.../schema/_JodaTimeHelper.java} | 26 +-
.../org/apache/isis/applib/value/package-info.java | 2 +-
.../semantics}/DefaultsProvider.java | 2 +-
.../semantics}/EncoderDecoder.java | 2 +-
.../semantics}/EncodingException.java | 2 +-
.../{adapters => value/semantics}/Parser.java | 8 +-
.../semantics}/ParsingException.java | 2 +-
.../{adapters => value/semantics}/Renderer.java | 2 +-
.../value/semantics}/TemporalValueSemantics.java | 10 +-
.../semantics}/ValueSemanticsAbstract.java | 110 ++++++-
.../semantics}/ValueSemanticsProvider.java | 2 +-
.../semantics/ValueSemanticsResolver.java} | 16 +-
.../semantics}/package-info.java | 8 +-
.../apache/isis/applib/util/schema/Roundtrip.java | 26 +-
.../org/apache/isis/schema/cmd/cmd-2.0.xsd | 3 +-
.../org/apache/isis/schema/common/common-2.0.xsd | 28 +-
.../apache/isis/core/config/IsisConfiguration.java | 7 +
.../core/config/beans/IsisBeanTypeRegistry.java | 2 +-
.../config/valuetypes/ValueSemanticsRegistry.java | 2 +-
core/metamodel/pom.xml | 2 +-
.../core/metamodel/IsisModuleCoreMetamodel.java | 9 -
.../_testing/MetaModelContext_forTesting.java | 2 +-
.../metamodel/commons/ScalarRepresentation.java | 4 +-
.../isis/core/metamodel/facetapi/FacetHolder.java | 2 +-
.../object/defaults/DefaultedFacetAbstract.java | 2 +-
.../DefaultedFacetUsingDefaultsProvider.java | 2 +-
.../facets/object/encodeable/EncodableFacet.java | 2 +-
.../object/encodeable/EncoderDecoderUtil.java | 2 +-
.../encoder/EncodableFacetUsingEncoderDecoder.java | 2 +-
.../title/parser/TitleFacetUsingValueFacet.java | 2 +-
.../object/value/MaxLengthFacetUsingParser.java | 2 +-
.../value/TypicalLengthFacetUsingParser.java | 2 +-
.../metamodel/facets/object/value/ValueFacet.java | 10 +-
.../facets/object/value/ValueFacetAbstract.java | 10 +-
...ionOrAnyMatchingValueSemanticsFacetFactory.java | 8 +-
.../vsp/ValueFacetUsingSemanticsProvider.java | 2 +-
.../value/vsp/ValueSemanticsFacetAbstract.java | 8 +-
.../interactions/managed/_BindingUtil.java | 4 +-
.../identify/ObjectBookmarker_builtinHandlers.java | 2 +-
.../core/metamodel/spec/ObjectSpecification.java | 2 +-
.../valuesemantics/BigDecimalValueSemantics.java | 12 +-
.../valuesemantics/BigIntegerValueSemantics.java | 10 +-
.../valuesemantics/BlobValueSemantics.java | 8 +-
.../valuesemantics/BookmarkValueSemantics.java | 10 +-
.../valuesemantics/BooleanValueSemantics.java | 12 +-
.../BufferedImageValueSemantics.java | 4 +-
.../valuesemantics/ByteValueSemantics.java | 10 +-
.../valuesemantics/ChangesDtoValueSemantics.java | 6 +-
.../valuesemantics/CharacterValueSemantics.java | 10 +-
.../valuesemantics/ClobValueSemantics.java | 8 +-
.../valuesemantics/CommandDtoValueSemantics.java | 6 +-
.../valuesemantics/DoubleValueSemantics.java | 10 +-
.../valuesemantics/EnumValueSemanticsAbstract.java | 12 +-
.../valuesemantics/FloatValueSemantics.java | 10 +-
.../valuesemantics/IntValueSemantics.java | 10 +-
.../InteractionDtoValueSemantics.java | 6 +-
.../LocalResourcePathValueSemantics.java | 8 +-
.../valuesemantics/LongValueSemantics.java | 10 +-
.../valuesemantics/MarkupValueSemantics.java | 10 +-
.../valuesemantics/OidDtoValueSemantics.java | 10 +-
.../valuesemantics/PasswordValueSemantics.java | 8 +-
.../valuesemantics/ShortValueSemantics.java | 10 +-
.../valuesemantics/StringValueSemantics.java | 8 +-
.../valuesemantics/TreeNodeValueSemantics.java | 6 +-
.../valuesemantics/URLValueSemantics.java | 10 +-
.../valuesemantics/UUIDValueSemantics.java | 10 +-
.../temporal/LocalDateTimeValueSemantics.java | 35 +--
.../temporal/LocalDateValueSemantics.java | 27 +-
.../temporal/LocalTimeValueSemantics.java | 32 +-
.../temporal/OffsetDateTimeValueSemantics.java | 33 +--
.../temporal/OffsetTimeValueSemantics.java | 30 +-
.../temporal/TemporalValueSemanticsProvider.java | 161 ++++-------
.../temporal/ZonedDateTimeValueSemantics.java | 33 +--
.../temporal/legacy/JavaSqlDateValueSemantics.java | 130 +--------
.../legacy/JavaSqlTimeStampValueSemantics.java | 110 +------
.../temporal/legacy/JavaSqlTimeValueSemantics.java | 128 +-------
.../legacy/JavaUtilDateValueSemantics.java | 130 ++-------
.../LegacyTemporalValueSemanticsAbstract.java | 322 ---------------------
.../legacy/joda/JodaDateTimeValueSemantics.java | 182 ------------
.../joda/JodaLocalDateTimeValueSemantics.java | 230 ---------------
.../legacy/joda/JodaLocalDateValueSemantics.java | 232 ---------------
.../temporal/legacy/joda/_JodaFunctions.java | 42 ---
.../legacy/joda/_JodaLocalDateTimeUtil.java | 119 --------
.../temporal/legacy/joda/_JodaLocalDateUtil.java | 128 --------
.../valuetypes/ValueSemanticsAdapter.java | 110 +++++++
.../valuetypes/ValueSemanticsRegistryDefault.java | 2 +-
.../object/mixin/MixinIntendedAsActionTest.java | 67 +++--
.../value/BooleanValueSemanticsProviderTest.java | 2 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 32 +-
.../JavaSqlTimeValueSemanticsProviderTest.java | 48 +--
.../JavaUtilDateValueSemanticsProviderTest.java | 68 ++---
.../ValueSemanticsProviderAbstractTestCase.java | 4 +-
core/runtime/pom.xml | 6 +
.../isis/core/runtime/IsisModuleCoreRuntime.java | 4 +
.../AsciiDocValueSemanticsWithPreprocessing.java | 2 +-
.../jdo/ComplexNumberJdoValueSemantics.java | 12 +-
.../jpa/ComplexNumberJpaValueSemantics.java | 12 +-
.../renderDay/PropertyLayoutRenderDayVm.java | 15 +-
.../jodatime/jodadatetime/vm/JodaDateTimeVm.java | 11 +-
.../jodatime/jodalocaldate/vm/JodaLocalDateVm.java | 11 +-
.../jodalocaldatetime/vm/JodaLocalDateTimeVm.java | 11 +-
.../jodatime/jodalocaltime/vm/JodaLocalTimeVm.java | 9 +-
.../value/CalendarEventSemanticsProvider.java | 8 +-
.../components/temporal/TemporalFieldFactory.java | 6 +-
.../components/temporal/TemporalFieldFactory.java | 6 +-
.../semantics/AsciiDocValueSemantics.java | 10 +-
.../semantics/XmlValueSemanticsAbstract.java | 8 +-
...JaxbAdapters.java => JodaTimeJaxbAdapters.java} | 4 +-
.../JodaTimeXMLGregorianCalendarMarshalling.java | 20 +-
valuetypes/jodatime/{ => integration}/pom.xml | 33 ++-
.../IsisModuleValJodatimeIntegration.java | 32 +-
.../valuesemantics/JodaDateTimeValueSemantics.java | 67 +++++
.../JodaLocalDateTimeValueSemantics.java | 65 +++++
.../JodaLocalDateValueSemantics.java | 65 +++++
.../JodaLocalTimeValueSemantics.java | 7 +-
...odaLocalDateTimeValueSemanticsProviderTest.java | 29 +-
valuetypes/jodatime/pom.xml | 1 +
.../semantics/MarkdownValueSemantics.java | 8 +-
valuetypes/pom.xml | 7 +-
.../rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../converter/ConverterBasedOnValueSemantics.java | 11 +-
viewers/wicket/ui/pom.xml | 2 +-
.../ui/components/scalars/DateConverter.java | 44 ---
.../components/scalars/DateConverterAbstract.java | 76 -----
.../ui/components/scalars/DateFormatSettings.java | 86 ------
...arPanelTextFieldWithTemporalPickerAbstract.java | 95 ++----
...arPanelTextFieldWithValueSemanticsAbstract.java | 2 +-
...ConverterPlugin.java => TemporalConverter.java} | 22 +-
.../datepicker/TextFieldWithDateTimePicker.java | 54 ++--
.../jdk8time/DateConverterForJdk8Abstract.java | 64 ----
.../jdk8time/DateConverterForJdk8LocalDate.java | 66 -----
.../DateConverterForJdk8LocalDateTime.java | 77 -----
.../DateConverterForJdk8OffsetDateTime.java | 94 ------
.../scalars/jdk8time/Jdk8LocalDatePanel.java | 1 -
.../scalars/jdk8time/Jdk8LocalDateTimePanel.java | 1 -
.../scalars/jdk8time/Jdk8OffsetDateTimePanel.java | 1 -
.../jdkdates/DateConverterForJavaAbstract.java | 105 -------
.../jdkdates/DateConverterForJavaSqlDate.java | 58 ----
.../jdkdates/DateConverterForJavaSqlTimestamp.java | 60 ----
.../jdkdates/DateConverterForJavaUtilDate.java | 59 ----
.../scalars/jdkdates/JavaSqlDatePanel.java | 1 -
.../scalars/jdkdates/JavaSqlTimestampPanel.java | 6 -
.../scalars/jdkdates/JavaUtilDatePanel.java | 8 -
.../jodatime/DateConverterForJodaAbstract.java | 57 ----
.../jodatime/DateConverterForJodaDateTime.java | 63 ----
.../jodatime/DateConverterForJodaLocalDate.java | 63 ----
.../DateConverterForJodaLocalDateTime.java | 64 ----
.../scalars/jodatime/JodaDateTimePanel.java | 1 -
.../scalars/jodatime/JodaLocalDatePanel.java | 1 -
.../scalars/jodatime/JodaLocalDateTimePanel.java | 1 -
.../scalars/value/compound/ValueCompoundPanel.java | 2 +-
.../scalars/value/fallback/ValueFallbackPanel.java | 2 +-
.../entitysimplelink/EntityLinkSimplePanel.java | 2 +-
.../ui/components/scalars/ConverterTester.java | 43 ++-
.../jdkdates/DateConverterForJavaSqlDateTest.java | 77 -----
.../jdkdates/DateConverterForJavaUtilDateTest.java | 101 -------
.../scalars/jdkdates/JavaSqlDateConverterTest.java | 75 +++++
.../jdkdates/JavaUtilDateConverterTest.java | 77 +++++
...Converter.java => BigDecimalConverterTest.java} | 2 +-
.../jodatime/DateConverterForJodaDateTimeTest.java | 97 -------
.../DateConverterForJodaLocalDateTest.java | 73 -----
.../DateConverterForJodaLocalDateTimeTest.java | 96 ------
.../jodatime/JodaDateTimeConverterTest.java | 78 +++++
.../jodatime/JodaLocalDateConverterTest.java | 76 +++++
.../jodatime/JodaLocalDateTimeConverterTest.java | 77 +++++
.../DateConverterForJdk8LocalDateTest.java | 75 -----
.../DateConverterForJdk8LocalDateTimeTest.java | 98 -------
.../DateConverterForJdk8OffsetDateTimeTest.java | 108 -------
.../jodatime/jdk8time/LocalDateConverterTest.java | 74 +++++
.../jdk8time/LocalDateTimeConverterTest.java | 74 +++++
.../jdk8time/OffsetDateTimeConverterTest.java | 81 ++++++
177 files changed, 1799 insertions(+), 4524 deletions(-)
delete mode 100644 api/applib/src/main/java/org/apache/isis/applib/jaxb/JodaTimeJaxbAdapters.java
copy api/applib/src/main/java/org/apache/isis/applib/{jaxb/JodaTimeXMLGregorianCalendarMarshalling.java => util/schema/_JodaTimeHelper.java} (82%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/DefaultsProvider.java (97%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/EncoderDecoder.java (98%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/EncodingException.java (96%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/Parser.java (93%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/ParsingException.java (96%)
copy api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/Renderer.java (95%)
rename {core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal => api/applib/src/main/java/org/apache/isis/applib/value/semantics}/TemporalValueSemantics.java (88%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/ValueSemanticsAbstract.java (57%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/ValueSemanticsProvider.java (98%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters/Renderer.java => value/semantics/ValueSemanticsResolver.java} (72%)
rename api/applib/src/main/java/org/apache/isis/applib/{adapters => value/semantics}/package-info.java (86%)
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/legacy/LegacyTemporalValueSemanticsAbstract.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/legacy/joda/JodaDateTimeValueSemantics.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/legacy/joda/JodaLocalDateTimeValueSemantics.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/legacy/joda/JodaLocalDateValueSemantics.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/legacy/joda/_JodaFunctions.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/legacy/joda/_JodaLocalDateTimeUtil.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/legacy/joda/_JodaLocalDateUtil.java
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueSemanticsAdapter.java
rename valuetypes/jodatime/applib/src/main/java/org/apache/isis/valuetypes/jodatime/applib/jaxb/{JodatimeJaxbAdapters.java => JodaTimeJaxbAdapters.java} (98%)
rename {api/applib/src/main/java/org/apache/isis => valuetypes/jodatime/applib/src/main/java/org/apache/isis/valuetypes/jodatime}/applib/jaxb/JodaTimeXMLGregorianCalendarMarshalling.java (85%)
copy valuetypes/jodatime/{ => integration}/pom.xml (56%)
copy core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java => valuetypes/jodatime/integration/src/main/java/org/apache/isis/valuetypes/jodatime/integration/IsisModuleValJodatimeIntegration.java (58%)
create mode 100644 valuetypes/jodatime/integration/src/main/java/org/apache/isis/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java
create mode 100644 valuetypes/jodatime/integration/src/main/java/org/apache/isis/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java
create mode 100644 valuetypes/jodatime/integration/src/main/java/org/apache/isis/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java
rename {core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/legacy/joda => valuetypes/jodatime/integration/src/main/java/org/apache/isis/valuetypes/jodatime/integration/valuesemantics}/JodaLocalTimeValueSemantics.java (82%)
rename {core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal => valuetypes/jodatime/integration/src/test/java/org/apache/isis/valuetypes/jodatime/integration}/JodaLocalDateTimeValueSemanticsProviderTest.java (62%)
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java
rename viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/{DateConverterPlugin.java => TemporalConverter.java} (64%)
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java
delete mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java
delete mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
delete mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
create mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDateConverterTest.java
create mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDateConverterTest.java
rename viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/{BigDecimalConverter.java => BigDecimalConverterTest.java} (99%)
delete mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
delete mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
delete mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
create mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimeConverterTest.java
create mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateConverterTest.java
create mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java
delete mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
delete mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
delete mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
create mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/LocalDateConverterTest.java
create mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/LocalDateTimeConverterTest.java
create mode 100644 viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/OffsetDateTimeConverterTest.java