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/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1b52eb5f21 ISIS-3167: partly activates ManagedObject for MIXIN
1b52eb5f21 is described below
commit 1b52eb5f2198243d3f2d5bb56557bd08e265a6f0
Author: Andi Huber <[email protected]>
AuthorDate: Wed Aug 31 13:08:24 2022 +0200
ISIS-3167: partly activates ManagedObject for MIXIN
---
.../isis/core/metamodel/object/ManagedObject.java | 6 +-
.../core/metamodel/object/_ManagedObjectMixin.java | 78 ++++++++++++++++++++++
.../metamodel/object/_ManagedObjectSpecified.java | 2 +-
.../object/_ManagedObjectWithEagerSpec.java | 1 +
4 files changed, 82 insertions(+), 5 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObject.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObject.java
index 4707fd5b2d..cb120a4912 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObject.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObject.java
@@ -489,10 +489,8 @@ public interface ManagedObject extends HasMetaModelContext
{
*/
static ManagedObject mixin(
final @NonNull ObjectSpecification spec,
- final @Nullable Object pojo) {
- return pojo != null
- ? new _ManagedObjectWithEagerSpec(spec, pojo) //FIXME
- : empty(spec);
+ final @NonNull Object pojo) {
+ return new _ManagedObjectMixin(spec, pojo);
}
/**
* OTHER
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectMixin.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectMixin.java
new file mode 100644
index 0000000000..b4c13a3e99
--- /dev/null
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectMixin.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.metamodel.object;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import org.apache.isis.applib.services.bookmark.Bookmark;
+import org.apache.isis.commons.internal.assertions._Assert;
+import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.experimental.Accessors;
+
+/**
+ * (package private) specialization corresponding to {@link
Specialization#MIXIN}
+ * @see ManagedObject.Specialization#MIXIN
+ */
+@Getter
+final class _ManagedObjectMixin
+extends _ManagedObjectSpecified {
+
+ @Getter(onMethod_ = {@Override}) @Accessors(makeFinal = true)
+ private final @NonNull Object pojo;
+
+ _ManagedObjectMixin(
+ final ObjectSpecification spec,
+ final Object pojo) {
+ super(ManagedObject.Specialization.MIXIN, spec);
+ _Assert.assertTrue(spec.isMixin());
+ this.pojo = assertCompliance(pojo);
+ }
+
+ @Override
+ public Optional<Bookmark> getBookmark() {
+ return Optional.empty(); // bookmark n/a for mixins
+ }
+
+ @Override
+ public Optional<Bookmark> getBookmarkRefreshed() {
+ return Optional.empty(); // bookmark n/a for mixins
+ }
+
+ @Override
+ public void refreshViewmodel(final Supplier<Bookmark> bookmarkSupplier) {
+ // no-op for mixins
+ }
+
+ @Override
+ public boolean isBookmarkMemoized() {
+ return false;
+ }
+
+ @Override
+ public final String getTitle() {
+ // mixins have no title
+ throw _Exceptions.unexpectedCodeReach();
+ }
+
+}
\ No newline at end of file
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectSpecified.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectSpecified.java
index 0dd2265db0..65d1d0871c 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectSpecified.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectSpecified.java
@@ -71,7 +71,7 @@ implements ManagedObject {
}
@Override
- public final String getTitle() {
+ public String getTitle() {
return _InternalTitleUtil.titleString(
TitleRenderRequest.forObject(this));
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectWithEagerSpec.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectWithEagerSpec.java
index a7fc080e5b..fdf49ed4f3 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectWithEagerSpec.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectWithEagerSpec.java
@@ -62,6 +62,7 @@ extends _ManagedObjectWithBookmark {
super(ManagedObject.Specialization.inferFrom(spec, pojo));
//_Assert.assertFalse(getSpecialization().isValue()); // VALUE already
migrated
_Assert.assertFalse(getSpecialization().isService()); // SERVICE
already migrated
+ _Assert.assertFalse(getSpecialization().isMixin()); // MIXIN already
migrated
this.specification = spec;
this.pojo = pojo;
