This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3719 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 4b4fdab98b7f4dbeb2d30eac241ef1136620e0f2 Author: danhaywood <[email protected]> AuthorDate: Tue Apr 16 11:42:29 2024 +0100 CAUSEWAY-3719: reverts use of AutoConfiguration for BlobValueSemantics all that was required was a different bean name ... doh --- .../causeway/core/metamodel/CausewayModuleCoreMetamodel.java | 2 +- .../core/metamodel/valuesemantics/BlobValueSemantics.java | 10 ---------- .../test/scenarios/staff/Staff_lowlevel_v1_IntegTest.java | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/CausewayModuleCoreMetamodel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/CausewayModuleCoreMetamodel.java index bd6c9ad3c8..ad766a0cd2 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/CausewayModuleCoreMetamodel.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/CausewayModuleCoreMetamodel.java @@ -148,7 +148,7 @@ import lombok.NonNull; StringValueSemantics.AutoConfiguration.class, PasswordValueSemantics.AutoConfiguration.class, BufferedImageValueSemantics.AutoConfiguration.class, - BlobValueSemantics.AutoConfiguration.class, + BlobValueSemantics.class, ClobValueSemantics.AutoConfiguration.class, MarkupValueSemantics.AutoConfiguration.class, URLValueSemantics.AutoConfiguration.class, diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java index e128bb4002..94cb5f661b 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java @@ -45,16 +45,6 @@ extends ValueSemanticsAbstract<Blob> implements Renderer<Blob> { - @Configuration - public static class AutoConfiguration { - - @Bean - @ConditionalOnMissingBean(BlobValueSemantics.class) - public BlobValueSemantics defaultBlobValueSemantics() { - return new BlobValueSemantics(); - } - } - @Override public Class<Blob> getCorrespondingClass() { return Blob.class; diff --git a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/staff/Staff_lowlevel_v1_IntegTest.java b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/staff/Staff_lowlevel_v1_IntegTest.java index 399178c91f..da3cc287da 100644 --- a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/staff/Staff_lowlevel_v1_IntegTest.java +++ b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/staff/Staff_lowlevel_v1_IntegTest.java @@ -197,8 +197,8 @@ public class Staff_lowlevel_v1_IntegTest extends Abstract_IntegTest { } @Component - @Named("causeway.metamodel.value.BlobValueSemantics") - @Priority(PriorityPrecedence.EARLY) + @Named("causeway.metamodel.value.BlobValueSemanticsV1LegacyEncoding") // must have different name to original + @Priority(PriorityPrecedence.EARLY) // and earlier precedence to be picked up public static class BlobValueSemanticsV1LegacyEncoding extends BlobValueSemantics implements
