You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/11/06 08:34:49 UTC
(causeway) branch master updated: CAUSEWAY-3641: convert MetaModelContext from interface to abstract class
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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new b602743728 CAUSEWAY-3641: convert MetaModelContext from interface to abstract class
b602743728 is described below
commit b602743728bda99df93ce6b0e757a437643be572
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Nov 6 09:34:44 2023 +0100
CAUSEWAY-3641: convert MetaModelContext from interface to abstract class
---
.../metamodel/_testing/MetaModelContext_forTesting.java | 2 +-
.../causeway/core/metamodel/context/MetaModelContext.java | 15 +++++++++------
.../metamodel/context/MetaModelContext_usingSpring.java | 2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
index 83d8cded61..32af2755b3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
@@ -112,7 +112,7 @@ import lombok.val;
@Builder @Getter
public final class MetaModelContext_forTesting
-implements MetaModelContext {
+extends MetaModelContext {
public static MetaModelContext_forTestingBuilder builder() {
return new MetaModelContext_forTestingBuilder() {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext.java
index 1d9e59c4ae..5e070ace91 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext.java
@@ -28,24 +28,27 @@ import org.apache.causeway.commons.internal.exceptions._Exceptions;
/**
* @since 2.0
*/
-public interface MetaModelContext extends HasMetaModelContext {
+public abstract class MetaModelContext implements HasMetaModelContext {
@Override
- default MetaModelContext getMetaModelContext() {
+ public final MetaModelContext getMetaModelContext() {
return this;
}
// -- INSTANCE (SINGLETON)
- static final AtomicReference<MetaModelContext> INSTANCE_HOLDER = new AtomicReference<>();
+ public static final AtomicReference<MetaModelContext> INSTANCE_HOLDER = new AtomicReference<>();
+
@Nullable
- static MetaModelContext instanceNullable() {
+ public static MetaModelContext instanceNullable() {
return INSTANCE_HOLDER.get();
}
- static Optional<MetaModelContext> instance() {
+
+ public static Optional<MetaModelContext> instance() {
return Optional.ofNullable(instanceNullable());
}
- static MetaModelContext instanceElseFail() {
+
+ public static MetaModelContext instanceElseFail() {
return instance()
.orElseThrow(()->_Exceptions.noSuchElement("MetaModelContext not yet or no longer available."));
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
index c08e0cab74..9b98f353a4 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
@@ -57,7 +57,7 @@ import lombok.Getter;
import lombok.val;
-class MetaModelContext_usingSpring implements MetaModelContext {
+class MetaModelContext_usingSpring extends MetaModelContext {
private final _IocContainer iocContainer;
public MetaModelContext_usingSpring(final _IocContainer iocContainer) {