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 2020/01/17 00:07:22 UTC
[isis] branch master updated: ISIS-2265: cleaning up and make
ValueTypeDefinition immutable
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 bd89918 ISIS-2265: cleaning up and make ValueTypeDefinition immutable
bd89918 is described below
commit bd8991847dd21f177228e4d465b4d8e027d64969
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 17 01:07:11 2020 +0100
ISIS-2265: cleaning up and make ValueTypeDefinition immutable
---
.../metamodel/services/classsubstitutor/ClassSubstitutor.java | 10 ----------
.../classsubstitutor/ClassSubstitutorForCollections.java | 1 +
.../isis/core/metamodel/valuetypes/ValueTypeDefinition.java | 4 ++--
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutor.java
index f6290cc..64a2351 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutor.java
@@ -19,20 +19,10 @@
package org.apache.isis.core.metamodel.services.classsubstitutor;
-import java.util.function.Supplier;
-
-import lombok.Value;
-
/**
* Provides capability to translate or ignore classes.
*/
public interface ClassSubstitutor {
- @Value
- static class Substitution<S> {
- Class<S> substitutedType;
- Supplier<S> factory;
- }
-
Class<?> getClass(@lombok.NonNull @org.springframework.lang.NonNull Class<?> cls);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
index b9a5996..f92162c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForCollections.java
@@ -40,6 +40,7 @@ public class ClassSubstitutorForCollections implements ClassSubstitutor {
@Override
public Class<?> getClass(@lombok.NonNull @org.springframework.lang.NonNull Class<?> cls) {
+
if(Container.class.isAssignableFrom(cls)) {
return Container.class;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeDefinition.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeDefinition.java
index 14a1975..18779e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeDefinition.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuetypes/ValueTypeDefinition.java
@@ -22,9 +22,9 @@ import java.util.Map;
import org.apache.isis.schema.common.v2.ValueType;
-import lombok.Data;
+import lombok.Value;
-@Data
+@Value
public class ValueTypeDefinition {
public static ValueTypeDefinition collection(Class<?> clazz) {