This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch CAUSEWAY-3955 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 67bbbc09aafce8712ea297a985b98dbd822e7b47 Author: andi-huber <[email protected]> AuthorDate: Thu Jan 15 13:26:33 2026 +0100 CAUSEWAY-3955: [v2] refactors internally no longer to use deprecations in LogicalType --- .../java/org/apache/causeway/applib/id/LogicalType.java | 6 ++---- .../applib/services/appfeat/ApplicationFeatureId.java | 4 ++-- .../apache/causeway/applib/services/bookmark/Bookmark.java | 4 ++-- .../org/apache/causeway/applib/id/LogicalTypeTest.java | 14 +++++++------- .../causeway/core/config/beans/CausewayBeanMetaData.java | 4 ++-- .../config/beans/CausewayComponentScanInterceptorImpl.java | 2 +- .../core/config/progmodel/ProgrammingModelConstants.java | 2 +- .../metamodel/_testing/ServiceRegistry_forTesting.java | 2 +- .../domainobject/DomainObjectAnnotationFacetFactory.java | 4 ++-- .../object/logicaltype/LogicalTypeMalformedValidator.java | 2 +- .../classname/LogicalTypeFacetFromClassNameFactory.java | 2 +- .../core/metamodel/inspect/Object_inspectMetamodel.java | 2 +- .../apache/causeway/core/metamodel/object/MmSpecUtils.java | 2 +- .../appfeat/ApplicationFeatureRepositoryDefault.java | 2 +- .../metamodel/services/metamodel/_ObjectGraphFactory.java | 8 ++++---- .../services/registry/ServiceRegistryDefault.java | 2 +- .../metamodel/specloader/LogicalTypeResolverDefault.java | 4 ++-- .../core/metamodel/specloader/SpecificationLoader.java | 4 ++-- .../specloader/specimpl/_MixedInMemberNamingStrategy.java | 2 +- .../org/apache/causeway/core/metamodel/util/Facets.java | 2 +- .../DomainObjectAnnotationFacetFactoryTest.java | 2 +- .../domainobject/NamedAnnotationFacetFactoryTest.java | 2 +- .../object/logicaltype/LogicalTypeInferenceTest.java | 6 +++--- .../specloader/SpecificationCacheDefaultTest.java | 2 +- .../docgen/help/topics/welcome/WelcomeHelpPage.java | 2 +- .../jdo/metamodel/beans/JdoBeanTypeClassifier.java | 2 +- .../domainmodel/DomainModelTest_usingGoodDomain.java | 4 ++-- .../viewer/resources/_DomainResourceHelper.java | 2 +- .../org/apache/causeway/viewer/wicket/ui/util/Wkt.java | 2 +- 29 files changed, 48 insertions(+), 50 deletions(-) diff --git a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java index 5a57ad167a2..1da56ea794f 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java @@ -215,7 +215,7 @@ public String logicalName() { * @implNote the result is not memoized, to keep it simple */ public String getLogicalTypeSimpleName() { - val logicalTypeName = getLogicalTypeName(); + val logicalTypeName = logicalName(); final int lastDot = logicalTypeName.lastIndexOf('.'); return lastDot >= 0 ? logicalTypeName.substring(lastDot + 1) @@ -247,7 +247,7 @@ public String getNamespace() { public String getLogicalTypeNameFormatted( final @NonNull String root, final @NonNull String delimiter) { - val logicalTypeName = getLogicalTypeName(); + val logicalTypeName = logicalName(); final int lastDot = logicalTypeName.lastIndexOf('.'); if(lastDot > 0) { val namespace = logicalTypeName.substring(0, lastDot); @@ -325,7 +325,6 @@ private Object readResolve() { public final String getLogicalTypeName() { return logicalName(); } - /** * @deprecated use {@link #correspondingClass()} instead */ @@ -333,7 +332,6 @@ public final String getLogicalTypeName() { public final Class<?> getCorrespondingClass() { return correspondingClass(); } - /** * @deprecated use {@link #className()} instead */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java index b80aaf2b5ce..8f57cab929a 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java @@ -145,11 +145,11 @@ public static ApplicationFeatureId newType(final String logicalTypeName) { } public static ApplicationFeatureId newType(final LogicalType logicalType) { - return newType(logicalType.getLogicalTypeName()); + return newType(logicalType.logicalName()); } public static ApplicationFeatureId newMember(final LogicalType logicalType, final String memberLogicalName) { - return newMember(logicalType.getLogicalTypeName(), memberLogicalName); + return newMember(logicalType.logicalName(), memberLogicalName); } public static ApplicationFeatureId newMember(final String logicalTypeName, final String memberLogicalName) { diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java index f7e025a03ac..e76f574acb9 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java @@ -65,7 +65,7 @@ public final class Bookmark implements Oid { public static Bookmark empty( final @NonNull LogicalType logicalType) { - return emptyForLogicalTypeName(logicalType.getLogicalTypeName()); + return emptyForLogicalTypeName(logicalType.logicalName()); } public static Bookmark emptyForLogicalTypeName( @@ -89,7 +89,7 @@ public static Bookmark forLogicalTypeAndIdentifier( final @NonNull LogicalType logicalType, final @NonNull String urlSafeIdentifier) { return Bookmark.forLogicalTypeNameAndIdentifier( - logicalType.getLogicalTypeName(), + logicalType.logicalName(), urlSafeIdentifier); } diff --git a/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest.java b/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest.java index 775d412b3dd..cd15bbcbfe2 100644 --- a/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest.java +++ b/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest.java @@ -38,12 +38,12 @@ void eager() { _SerializationTester.assertEqualsOnRoundtrip(original); assertEquals( - original.getLogicalTypeName(), + original.logicalName(), SomeDomainClass.class.getName()); assertEquals( - _SerializationTester.roundtrip(original).getLogicalTypeName(), - original.getLogicalTypeName()); + _SerializationTester.roundtrip(original).logicalName(), + original.logicalName()); } @Test @@ -54,18 +54,18 @@ void lazy() { _SerializationTester.assertEqualsOnRoundtrip(original); assertEquals( - original.getLogicalTypeName(), + original.logicalName(), "hello"); assertEquals( - _SerializationTester.roundtrip(original).getLogicalTypeName(), - original.getLogicalTypeName()); + _SerializationTester.roundtrip(original).logicalName(), + original.logicalName()); } @Test void cannotBeEmpty() throws Exception { assertThrows(IllegalArgumentException.class, ()->LogicalType.eager(Object.class, "")); - assertThrows(IllegalArgumentException.class, ()->LogicalType.lazy(Object.class, ()->"").getLogicalTypeName()); + assertThrows(IllegalArgumentException.class, ()->LogicalType.lazy(Object.class, ()->"").logicalName()); } @Test diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanMetaData.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanMetaData.java index 6ba5cae8fa5..070fa42d07e 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanMetaData.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanMetaData.java @@ -66,11 +66,11 @@ public boolean isBeanNameOverride() { private @NonNull ManagedBy managedBy; public Class<?> getCorrespondingClass() { - return logicalType.getCorrespondingClass(); + return logicalType.correspondingClass(); } public String getBeanName() { - return logicalType.getLogicalTypeName(); + return logicalType.logicalName(); } // -- FACTORIES diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentScanInterceptorImpl.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentScanInterceptorImpl.java index 9228d07fb7f..8ec753d1d70 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentScanInterceptorImpl.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentScanInterceptorImpl.java @@ -82,7 +82,7 @@ public void intercept(final ScannedTypeMetaData scanMeta) { scanMeta.setVetoedForInjection(typeMeta.getManagedBy().isVetoedForInjection()); if(typeMeta.getManagedBy().isBeanNameOverride()) { - scanMeta.setBeanNameOverride(typeMeta.getLogicalType().getLogicalTypeName()); + scanMeta.setBeanNameOverride(typeMeta.getLogicalType().logicalName()); } val beanSort = typeMeta.getBeanSort(); diff --git a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java index c323f8d40ca..299766094db 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java @@ -528,7 +528,7 @@ public ViolationBuilder addVariable(final String name, final Number value) { * Populates 'type' and 'member' keys (for template variable resolution). */ public ViolationBuilder addVariablesFor(final Identifier featureIdentifier) { - addVariable("type", featureIdentifier.getLogicalType().getClassName()); + addVariable("type", featureIdentifier.getLogicalType().className()); addVariable("member", featureIdentifier.getMemberLogicalName()); return this; } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceRegistry_forTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceRegistry_forTesting.java index be0180dfc0b..7402b59b464 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceRegistry_forTesting.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceRegistry_forTesting.java @@ -95,7 +95,7 @@ public Stream<_SingletonBeanProvider> streamRegisteredBeans() { @Override public Optional<_SingletonBeanProvider> lookupRegisteredBeanById(final LogicalType id) { - return Optional.ofNullable(registeredBeanById.get(id.getLogicalTypeName())); + return Optional.ofNullable(registeredBeanById.get(id.logicalName())); } @Override diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java index faa4e62d640..92d539517b3 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java @@ -584,7 +584,7 @@ public void validateObjectEnter(final ObjectSpecification objSpec) { // also adding aliases to the multi-map objSpec.getAliases() .forEach(alias-> - specsByLogicalTypeName.putElement(alias.getLogicalTypeName(), objSpec)); + specsByLogicalTypeName.putElement(alias.logicalName(), objSpec)); } @Override @@ -640,7 +640,7 @@ private Can<ObjectSpecification> proxiesIn(final @Nullable List<ObjectSpecificat private boolean logicalTypeNameIsNotIncludedInAliased(final ObjectSpecification objectSpecification) { if (getConfiguration().getCore().getMetaModel().getValidator().isAllowLogicalTypeNameAsAlias()) { return objectSpecification.getAliases() - .map(LogicalType::getLogicalTypeName).stream() + .map(LogicalType::logicalName).stream() .noneMatch(name -> objectSpecification.getLogicalTypeName().equals(name)); } return true; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeMalformedValidator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeMalformedValidator.java index d0e37bae7fe..96bde26a24a 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeMalformedValidator.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeMalformedValidator.java @@ -47,7 +47,7 @@ public LogicalTypeMalformedValidator(final MetaModelContext metaModelContext) { public void validateObjectEnter(final ObjectSpecification spec) { val logicalType = spec.getLogicalType(); - val logicalTypeName = logicalType.getLogicalTypeName(); + val logicalTypeName = logicalType.logicalName(); val nameParts = _Strings.splitThenStream(logicalTypeName, ".") .collect(Can.toCan()); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java index 224cd3f2420..aa975599ecb 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java @@ -80,7 +80,7 @@ public void refineProgrammingModel(final ProgrammingModel programmingModel) { val logicalType = objectSpec.getLogicalType(); //XXX has a slight chance to be a false positive; would need to check whether annotated with @Named - if(logicalType.getClassName().equals(logicalType.getLogicalTypeName())) { + if(logicalType.className().equals(logicalType.logicalName())) { ValidationFailure.raiseFormatted( objectSpec, "%s: the object type must be specified explicitly ('%s' config property). " diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_inspectMetamodel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_inspectMetamodel.java index 26e3b554ceb..f7ad61cfdbc 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_inspectMetamodel.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_inspectMetamodel.java @@ -78,7 +78,7 @@ public static class ActionDomainEvent messageService.warnUser("Unknown class, unable to export"); return null; } - final String namespace = logicalTypeIfAny.get().getLogicalTypeName(); + final String namespace = logicalTypeIfAny.get().logicalName(); val config = Config.builder() .ignoreFallbackFacets(true) diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmSpecUtils.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmSpecUtils.java index 908af2e7f7e..d73c2ce2c33 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmSpecUtils.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmSpecUtils.java @@ -97,7 +97,7 @@ public String specificationsBySortAsYaml(final @NonNull Can<ObjectSpecification> .forEach((key, list)->{ sb.append(String.format(" %s:\n", key)); list.forEach(logicalType->{ - sb.append(String.format(" - %s(%s)\n", logicalType.getLogicalTypeName(), logicalType.getClassName())); + sb.append(String.format(" - %s(%s)\n", logicalType.logicalName(), logicalType.className())); }); }); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java index 026b6a00f97..55268068eee 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java @@ -166,7 +166,7 @@ void createApplicationFeaturesFor(final ObjectSpecification spec) { val logicalType = spec.getLogicalType(); - val logicalTypeName = logicalType.getLogicalTypeName(); + val logicalTypeName = logicalType.logicalName(); val typeFeatureId = ApplicationFeatureId.newType(logicalTypeName); // add class to our map diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/_ObjectGraphFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/_ObjectGraphFactory.java index c4744a05f15..d4d61a1ebfe 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/_ObjectGraphFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/_ObjectGraphFactory.java @@ -94,8 +94,8 @@ private ObjectGraph.Object registerObject(final ObjectSpecification objSpec) { // only register association relations if they don't cross namespace boundaries // in other words: only include, if they share the same namespace if(thisNs.equals(refNs)) { - val thisCls = thisType.getCorrespondingClass(); - val refCls = refType.getCorrespondingClass(); + val thisCls = thisType.correspondingClass(); + val refCls = refType.correspondingClass(); if(thisCls.equals(refCls) || !refCls.isAssignableFrom(thisCls)) { // we found a 1-x relation @@ -160,8 +160,8 @@ private Set<Relation> createInheritanceRelations() { val type1 = e1.getKey(); val type2 = e2.getKey(); if(type1.equals(type2)) continue; - val cls1 = type1.getCorrespondingClass(); - val cls2 = type2.getCorrespondingClass(); + val cls1 = type1.correspondingClass(); + val cls2 = type2.correspondingClass(); if(cls2.isAssignableFrom(cls1)) { val o1 = e1.getValue(); val o2 = e2.getValue(); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java index 76fd2f590c7..350551580c1 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java @@ -61,7 +61,7 @@ public final class ServiceRegistryDefault implements ServiceRegistry { @Override public Optional<_SingletonBeanProvider> lookupRegisteredBeanById(final LogicalType id) { - return Optional.ofNullable(contributingDomainServicesById.get().get(id.getLogicalTypeName())); + return Optional.ofNullable(contributingDomainServicesById.get().get(id.logicalName())); } @Override diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/LogicalTypeResolverDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/LogicalTypeResolverDefault.java index ff5a378ba56..25cbfcb5252 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/LogicalTypeResolverDefault.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/LogicalTypeResolverDefault.java @@ -68,7 +68,7 @@ public ObjectSpecification registerAliases(final @NonNull ObjectSpecification sp // adding aliases to the lookup map spec.getAliases() .forEach(alias->{ - putWithWarnOnOverride(alias.getLogicalTypeName(), spec); + putWithWarnOnOverride(alias.logicalName(), spec); }); return spec; @@ -96,7 +96,7 @@ private void putWithWarnOnOverride( + "with\n " + "%s -> %s\n " + "This will result in the meta-model validation to fail.", - logicalTypeName, previousMapping.getCorrespondingClass(), + logicalTypeName, previousMapping.correspondingClass(), logicalTypeName, spec.getCorrespondingClass()); log.warn(msg); } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java index ed2e70fe72d..d8066a1e9ee 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java @@ -164,7 +164,7 @@ default ObjectSpecification loadSpecification( } return lookupLogicalType(logicalTypeName) .map(logicalType-> - loadSpecification(logicalType.getCorrespondingClass(), introspectionState)) + loadSpecification(logicalType.correspondingClass(), introspectionState)) .orElse(null); } @@ -179,7 +179,7 @@ default Optional<ObjectSpecification> specForLogicalTypeName( default Optional<ObjectSpecification> specForLogicalType( final @Nullable LogicalType logicalType) { return Optional.ofNullable(logicalType) - .map(LogicalType::getCorrespondingClass) + .map(LogicalType::correspondingClass) .flatMap(this::specForType); } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java index f97a4a1d6a1..7f65cf0785d 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java @@ -55,7 +55,7 @@ String mixinMemberId(final @NonNull String mixinClassSimpleName) { // -- HELPER private String mixinClassSimpleName(final ObjectActionDefault mixinActionAsRegular) { - return mixinActionAsRegular.getFeatureIdentifier().getLogicalType().getCorrespondingClass().getSimpleName(); + return mixinActionAsRegular.getFeatureIdentifier().getLogicalType().correspondingClass().getSimpleName(); } private String lastWord(final String mixinClassSimpleName) { diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java index 4abe0826cf6..ec1cb0f2d08 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java @@ -371,7 +371,7 @@ public static Predicate<ObjectSpecification> valueTypeMatches(final Predicate<Cl return spec-> spec.valueFacet() .map(ValueFacet::getLogicalType) - .map(LogicalType::getCorrespondingClass) + .map(LogicalType::correspondingClass) .map(typeMatcher::test) .orElse(false); } diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java index cca90a69f79..879d70ca2d7 100644 --- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java +++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java @@ -547,7 +547,7 @@ public void setUp() throws Exception { @Test public void whenDomainObjectAndObjectTypeSetToTrue() { - assertThat(LogicalType.infer(CustomerWithDomainObjectAndObjectTypeSet.class).getLogicalTypeName(), + assertThat(LogicalType.infer(CustomerWithDomainObjectAndObjectTypeSet.class).logicalName(), is("CUS")); assertNoMethodsRemoved(); } diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/NamedAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/NamedAnnotationFacetFactoryTest.java index 278c45d3db0..4747ee76f9b 100644 --- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/NamedAnnotationFacetFactoryTest.java +++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/NamedAnnotationFacetFactoryTest.java @@ -40,7 +40,7 @@ void logicalTypeNameAnnotationPickedUpOnClass() { class Customer { } - assertThat(LogicalType.infer(Customer.class).getLogicalTypeName(), is("CUS")); + assertThat(LogicalType.infer(Customer.class).logicalName(), is("CUS")); } diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeInferenceTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeInferenceTest.java index e54b09dca98..be418db3228 100644 --- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeInferenceTest.java +++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeInferenceTest.java @@ -37,7 +37,7 @@ public static class Customer { @Test void installsFacet_passedThroughClassSubstitutor() { - assertThat(LogicalType.infer(Customer.class).getLogicalTypeName(), + assertThat(LogicalType.infer(Customer.class).logicalName(), is(Customer.class.getCanonicalName())); } @@ -47,7 +47,7 @@ public static class ValueExample1 { @Test void installsFacet_onValues() { - assertThat(LogicalType.infer(ValueExample1.class).getLogicalTypeName(), + assertThat(LogicalType.infer(ValueExample1.class).logicalName(), is(ValueExample1.class.getCanonicalName())); } @@ -58,7 +58,7 @@ static class ValueExample2 { @Test void installsFacet_onValuesUsingLogicalTypeName() { - assertThat(LogicalType.infer(ValueExample2.class).getLogicalTypeName(), + assertThat(LogicalType.infer(ValueExample2.class).logicalName(), is("xxx.ValueExample")); } diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/specloader/SpecificationCacheDefaultTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/specloader/SpecificationCacheDefaultTest.java index 39921e99374..63d9e8aaf6f 100644 --- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/specloader/SpecificationCacheDefaultTest.java +++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/specloader/SpecificationCacheDefaultTest.java @@ -97,7 +97,7 @@ public void allSpecs_whenCached() { @Test public void getByObjectType_whenNotSet() { - val type = logicalTypeResolver.lookup(cus.getLogicalTypeName()); + val type = logicalTypeResolver.lookup(cus.logicalName()); assertFalse(type.isPresent()); } diff --git a/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/welcome/WelcomeHelpPage.java b/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/welcome/WelcomeHelpPage.java index 46dc4849f43..312367dacdb 100644 --- a/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/welcome/WelcomeHelpPage.java +++ b/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/welcome/WelcomeHelpPage.java @@ -243,7 +243,7 @@ public void visit(final FieldSet fieldSet) { html.append(String.format("<li><b>%s</b>: %s.", member.getCanonicalFriendlyName(), describedAs)); - if (member.getElementType().getLogicalType().getCorrespondingClass() + if (member.getElementType().getLogicalType().correspondingClass() .isAnnotationPresent(DomainObject.class)) { html.append(String.format(" <i> See: <a href='#%s'>%s</a></i>", member.getElementType().getLogicalTypeName(), diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java index eb0dc0aead6..4d1b9667209 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java @@ -56,7 +56,7 @@ public CausewayBeanMetaData classify(final Class<?> type) { var logicalType = LogicalType.infer(type); // don't trample over the @Named(=...) if present - if(logicalType.getLogicalTypeName().equals(type.getName())) { + if(logicalType.logicalName().equals(type.getName())) { val schema = persistenceCapableAnnot.get().schema(); if(_Strings.isNotEmpty(schema)) { diff --git a/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java index 6232a094b5d..d933e63bba4 100644 --- a/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java +++ b/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java @@ -673,7 +673,7 @@ void aliasesOnDomainServices_shouldBeHonored() { assertEquals(Can.of( "testdomain.v1.ProperServiceWithAlias", "testdomain.v2.ProperServiceWithAlias"), - objectSpec.getAliases().map(LogicalType::getLogicalTypeName)); + objectSpec.getAliases().map(LogicalType::logicalName)); assertEquals(objectSpec, specificationLoader.specForLogicalTypeName("testdomain.v1.ProperServiceWithAlias") @@ -693,7 +693,7 @@ void aliasesOnDomainObjects_shouldBeHonored() { assertEquals(Can.of( "testdomain.v1.ProperObjectWithAlias", "testdomain.v2.ProperObjectWithAlias"), - objectSpec.getAliases().map(LogicalType::getLogicalTypeName)); + objectSpec.getAliases().map(LogicalType::logicalName)); assertEquals(objectSpec, specificationLoader.specForLogicalTypeName("testdomain.v1.ProperObjectWithAlias") diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java index 72d65cadd49..47b1f063090 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java @@ -321,7 +321,7 @@ static ManagedObject getServiceAdapter( final ManagedObject serviceAdapter = mmc.getSpecificationLoader() .lookupLogicalType(serviceIdOrAlias) - .map(LogicalType::getLogicalTypeName) + .map(LogicalType::logicalName) .map(mmc::lookupServiceAdapterById) .orElse(null); diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java index 4e6469a467e..a58e3625c1a 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java @@ -591,7 +591,7 @@ public <T extends Component> T cssReplace(final T component, final @Nullable Str public static String cssNormalize(final Identifier identifier) { val sb = new StringBuilder(); sb.append("causeway-"); - sb.append(identifier.getLogicalType().getLogicalTypeName()); + sb.append(identifier.getLogicalType().logicalName()); if(_Strings.isNullOrEmpty(identifier.getMemberLogicalName())) { sb.append("-"); sb.append(identifier.getMemberLogicalName());
