You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/01/22 17:56:53 UTC
[25/50] [abbrv] isis git commit: ISIS-970: unit tests for
@DomainObject, @ViewModel; also @DomainObjectLayout and @ViewModelLayout
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
index af22933..1763293 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForDomainObjectLayoutAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
public class NamedFacetForDomainObjectLayoutAnnotation extends NamedFacetAbstract {
- public static NamedFacet create(DomainObjectLayout domainObjectLayout, FacetHolder holder) {
+ public static NamedFacet create(final DomainObjectLayout domainObjectLayout, final FacetHolder holder) {
if(domainObjectLayout == null) {
return null;
}
@@ -36,7 +36,7 @@ public class NamedFacetForDomainObjectLayoutAnnotation extends NamedFacetAbstrac
return named != null ? new NamedFacetForDomainObjectLayoutAnnotation(named, holder) : null;
}
- private NamedFacetForDomainObjectLayoutAnnotation(String value, FacetHolder holder) {
+ private NamedFacetForDomainObjectLayoutAnnotation(final String value, final FacetHolder holder) {
super(value, /*escaped*/ true, holder);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
new file mode 100644
index 0000000..2577da7
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/NamedFacetForViewModelLayoutAnnotation.java
@@ -0,0 +1,42 @@
+/*
+ * 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.facets.object.domainobjectlayout;
+
+
+import com.google.common.base.Strings;
+import org.apache.isis.applib.annotation.ViewModelLayout;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
+
+
+public class NamedFacetForViewModelLayoutAnnotation extends NamedFacetAbstract {
+
+ public static NamedFacet create(final ViewModelLayout viewModelLayout, final FacetHolder holder) {
+ if(viewModelLayout == null) {
+ return null;
+ }
+ final String named = Strings.emptyToNull(viewModelLayout.named());
+ return named != null ? new NamedFacetForViewModelLayoutAnnotation(named, holder) : null;
+ }
+
+ private NamedFacetForViewModelLayoutAnnotation(final String value, final FacetHolder holder) {
+ super(value, /*escaped*/ true, holder);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
index 85f81fb..2735b50 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
public class PagedFacetForDomainObjectLayoutAnnotation extends PagedFacetAbstract {
- public static PagedFacet create(DomainObjectLayout domainObjectLayout, FacetHolder holder) {
+ public static PagedFacet create(final DomainObjectLayout domainObjectLayout, final FacetHolder holder) {
if(domainObjectLayout == null) {
return null;
}
@@ -35,7 +35,7 @@ public class PagedFacetForDomainObjectLayoutAnnotation extends PagedFacetAbstrac
return paged > 1 ? new PagedFacetForDomainObjectLayoutAnnotation(paged, holder) : null;
}
- private PagedFacetForDomainObjectLayoutAnnotation(int value, FacetHolder holder) {
+ private PagedFacetForDomainObjectLayoutAnnotation(final int value, final FacetHolder holder) {
super(value, holder);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForViewModelLayoutAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForViewModelLayoutAnnotation.java
new file mode 100644
index 0000000..c667deb
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PagedFacetForViewModelLayoutAnnotation.java
@@ -0,0 +1,41 @@
+/*
+ * 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.facets.object.domainobjectlayout;
+
+
+import org.apache.isis.applib.annotation.ViewModelLayout;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
+import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
+
+
+public class PagedFacetForViewModelLayoutAnnotation extends PagedFacetAbstract {
+
+ public static PagedFacet create(final ViewModelLayout viewModelLayout, final FacetHolder holder) {
+ if(viewModelLayout == null) {
+ return null;
+ }
+ final int paged = viewModelLayout.paged();
+ return paged > 1 ? new PagedFacetForViewModelLayoutAnnotation(paged, holder) : null;
+ }
+
+ private PagedFacetForViewModelLayoutAnnotation(final int value, final FacetHolder holder) {
+ super(value, holder);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectLayoutAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectLayoutAnnotation.java
index 4cb5dee..33a97d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForDomainObjectLayoutAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.facets.object.plural.PluralFacetAbstract;
public class PluralFacetForDomainObjectLayoutAnnotation extends PluralFacetAbstract {
- public static PluralFacet create(DomainObjectLayout domainObjectLayout, FacetHolder holder) {
+ public static PluralFacet create(final DomainObjectLayout domainObjectLayout, final FacetHolder holder) {
if(domainObjectLayout == null) {
return null;
}
@@ -36,7 +36,7 @@ public class PluralFacetForDomainObjectLayoutAnnotation extends PluralFacetAbstr
return plural != null ? new PluralFacetForDomainObjectLayoutAnnotation(plural, holder) : null;
}
- private PluralFacetForDomainObjectLayoutAnnotation(String value, FacetHolder holder) {
+ private PluralFacetForDomainObjectLayoutAnnotation(final String value, final FacetHolder holder) {
super(value, holder);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
new file mode 100644
index 0000000..be0842a
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/PluralFacetForViewModelLayoutAnnotation.java
@@ -0,0 +1,42 @@
+/*
+ * 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.facets.object.domainobjectlayout;
+
+
+import com.google.common.base.Strings;
+import org.apache.isis.applib.annotation.ViewModelLayout;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
+import org.apache.isis.core.metamodel.facets.object.plural.PluralFacetAbstract;
+
+
+public class PluralFacetForViewModelLayoutAnnotation extends PluralFacetAbstract {
+
+ public static PluralFacet create(final ViewModelLayout viewModelLayout, final FacetHolder holder) {
+ if(viewModelLayout == null) {
+ return null;
+ }
+ final String plural = Strings.emptyToNull(viewModelLayout.plural());
+ return plural != null ? new PluralFacetForViewModelLayoutAnnotation(plural, holder) : null;
+ }
+
+ private PluralFacetForViewModelLayoutAnnotation(final String value, final FacetHolder holder) {
+ super(value, holder);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotation.java
deleted file mode 100644
index 586a4ad..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.facets.object.immutable.immutableannot;
-
-import org.apache.isis.applib.annotation.When;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacetAbstract;
-
-public class ImmutableFacetAnnotation extends ImmutableFacetAbstract {
-
- public ImmutableFacetAnnotation(final When value, final FacetHolder holder) {
- super(value, holder);
- }
-
- @Override
- public void copyOnto(final FacetHolder holder) {
- final Facet facet = new ImmutableFacetAnnotation(this.when(), holder);
- FacetUtil.addFacet(facet);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java
index 017d6dd..a16d4be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetAnnotationFactory.java
@@ -53,7 +53,7 @@ public class ImmutableFacetAnnotationFactory extends FacetFactoryAbstract {
}
private ImmutableFacet create(final Immutable annotation, final FacetHolder holder) {
- return annotation == null ? null : new ImmutableFacetAnnotation(annotation.value(), holder);
+ return annotation == null ? null : new ImmutableFacetForImmutableAnnotation(annotation.value(), holder);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java
new file mode 100644
index 0000000..b392c66
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/immutableannot/ImmutableFacetForImmutableAnnotation.java
@@ -0,0 +1,41 @@
+/*
+ * 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.facets.object.immutable.immutableannot;
+
+import org.apache.isis.applib.annotation.When;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacetAbstract;
+
+@Deprecated
+public class ImmutableFacetForImmutableAnnotation extends ImmutableFacetAbstract {
+
+ public ImmutableFacetForImmutableAnnotation(final When value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+ @Override
+ public void copyOnto(final FacetHolder holder) {
+ final Facet facet = new ImmutableFacetForImmutableAnnotation(this.when(), holder);
+ FacetUtil.addFacet(facet);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
index fe5aa8b..de259dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/PublishedObjectFacetAbstract.java
@@ -30,8 +30,8 @@ public abstract class PublishedObjectFacetAbstract extends SingleValueFacetAbstr
return PublishedObjectFacet.class;
}
- public PublishedObjectFacetAbstract(final PublishedObject.PayloadFactory eventCanonicalizer, final FacetHolder holder) {
- super(type(), eventCanonicalizer, holder);
+ public PublishedObjectFacetAbstract(final PublishedObject.PayloadFactory payloadFactory, final FacetHolder holder) {
+ super(type(), payloadFactory, holder);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetAnnotation.java
deleted file mode 100644
index 0d279d4..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetAnnotation.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.facets.object.publishedobject.annotation;
-
-import org.apache.isis.applib.annotation.PublishedObject;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
-import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
-
-public class PublishedObjectFacetAnnotation extends PublishedObjectFacetAbstract {
-
- public static PublishedObjectFacet create(
- final PublishedObject publishedObject,
- final FacetHolder holder) {
-
- if (publishedObject == null) {
- return null;
- }
-
- else return new PublishedObjectFacetAnnotation(newPayloadFactory(publishedObject.value()), holder);
- }
-
- private PublishedObjectFacetAnnotation(final PublishedObject.PayloadFactory payloadFactory, final FacetHolder holder) {
- super(payloadFactory, holder);
- }
-
- private static PublishedObject.PayloadFactory newPayloadFactory(final Class<? extends PublishedObject.PayloadFactory> value) {
- if(value == null) {
- return null;
- }
- try {
- return value.newInstance();
- } catch (final InstantiationException e) {
- return null;
- } catch (final IllegalAccessException e) {
- return null;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetForPublishedObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetForPublishedObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetForPublishedObjectAnnotation.java
new file mode 100644
index 0000000..21f1a0b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publishedobject/annotation/PublishedObjectFacetForPublishedObjectAnnotation.java
@@ -0,0 +1,58 @@
+/*
+ * 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.facets.object.publishedobject.annotation;
+
+import org.apache.isis.applib.annotation.PublishedObject;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
+
+@Deprecated
+public class PublishedObjectFacetForPublishedObjectAnnotation extends PublishedObjectFacetAbstract {
+
+ public static PublishedObjectFacet create(
+ final PublishedObject publishedObject,
+ final FacetHolder holder) {
+
+ if (publishedObject == null) {
+ return null;
+ }
+
+ else return new PublishedObjectFacetForPublishedObjectAnnotation(newPayloadFactory(publishedObject.value()), holder);
+ }
+
+ private PublishedObjectFacetForPublishedObjectAnnotation(final PublishedObject.PayloadFactory payloadFactory, final FacetHolder holder) {
+ super(payloadFactory, holder);
+ }
+
+ private static PublishedObject.PayloadFactory newPayloadFactory(final Class<? extends PublishedObject.PayloadFactory> value) {
+ if(value == null) {
+ return null;
+ }
+ try {
+ return value.newInstance();
+ } catch (final InstantiationException e) {
+ return null;
+ } catch (final IllegalAccessException e) {
+ return null;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java
index 9db0ba4..5cc87f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java
@@ -24,6 +24,7 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
public class DisabledFacetOnCollectionDerivedFromRecreatableObject extends DisabledFacetAbstract {
@@ -33,7 +34,7 @@ public class DisabledFacetOnCollectionDerivedFromRecreatableObject extends Disab
@Override
public String disabledReason(final ObjectAdapter target) {
- final RecreatableObjectFacet facet = target.getSpecification().getFacet(RecreatableObjectFacet.class);
+ final ViewModelFacet facet = target.getSpecification().getFacet(ViewModelFacet.class);
final boolean cloneable = facet.isCloneable(target.getObject());
return !cloneable ? "Non-cloneable view models are read-only" : null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory.java
index a6223f9..5c297de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory.java
@@ -24,6 +24,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory extends FacetFactoryAbstract {
@@ -38,7 +39,7 @@ public class DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory e
final Class<?> declaringClass = method.getDeclaringClass();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass);
- if (!spec.containsDoOpFacet(RecreatableObjectFacet.class)) {
+ if (!spec.containsDoOpFacet(ViewModelFacet.class)) {
return;
}
final FacetedMethod facetHolder = processMethodContext.getFacetHolder();
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java
index 1dd8ae6..e002900 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java
@@ -24,6 +24,7 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
public class DisabledFacetOnPropertyDerivedFromRecreatableObject extends DisabledFacetAbstract {
@@ -33,7 +34,7 @@ public class DisabledFacetOnPropertyDerivedFromRecreatableObject extends Disable
@Override
public String disabledReason(final ObjectAdapter target) {
- final RecreatableObjectFacet facet = target.getSpecification().getFacet(RecreatableObjectFacet.class);
+ final ViewModelFacet facet = target.getSpecification().getFacet(ViewModelFacet.class);
final boolean cloneable = facet.isCloneable(target.getObject());
return !cloneable ? "Non-cloneable view models are read-only" : null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
index 0525faa..c03b65c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory.java
@@ -24,6 +24,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory extends FacetFactoryAbstract {
@@ -38,7 +39,7 @@ public class DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory ext
final Class<?> declaringClass = method.getDeclaringClass();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass);
- if (!spec.containsDoOpFacet(RecreatableObjectFacet.class)) {
+ if (!spec.containsDoOpFacet(ViewModelFacet.class)) {
return;
}
final FacetedMethod facetHolder = processMethodContext.getFacetHolder();
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacet.java
deleted file mode 100644
index 10c5834..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacet.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.facets.object.recreatable;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-
-/**
- * Indicates that this class is either a view model (for the UI/application layer) or a recreatable domain object of some sort (for the domain layer, that is: an external or synthetic entity).
- *
- * <p>
- * In the standard Apache Isis Programming Model, corresponds to
- * applying either {@link org.apache.isis.applib.annotation.ViewModel} annotation or {@link org.apache.isis.applib.ViewModel} interface (for a view model), or by annotating
- */
-public interface RecreatableObjectFacet extends Facet {
-
- void initialize(Object pojo, String memento);
-
- String memento(Object pojo);
-
- /**
- * Whether {@link #clone(Object)} can be called.
- */
- boolean isCloneable(Object pojo);
-
- Object clone(Object pojo);
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
index 007283e..0b20717 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetAbstract.java
@@ -23,15 +23,21 @@ import org.apache.isis.applib.ViewModel;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
-public abstract class RecreatableObjectFacetAbstract extends MarkerFacetAbstract implements RecreatableObjectFacet {
+public abstract class RecreatableObjectFacetAbstract extends MarkerFacetAbstract implements ViewModelFacet {
+
+ private final ArchitecturalLayer architecturalLayer;
public static Class<? extends Facet> type() {
- return RecreatableObjectFacet.class;
+ return ViewModelFacet.class;
}
- public RecreatableObjectFacetAbstract(final FacetHolder holder) {
+ public RecreatableObjectFacetAbstract(
+ final FacetHolder holder,
+ final ArchitecturalLayer architecturalLayer) {
super(type(), holder);
+ this.architecturalLayer = architecturalLayer;
}
@Override
@@ -45,5 +51,8 @@ public abstract class RecreatableObjectFacetAbstract extends MarkerFacetAbstract
return viewModelCloneable.clone();
}
-
+ @Override
+ public ArchitecturalLayer getArchitecturalLayer() {
+ return architecturalLayer;
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java
index a51df9d..0f9badf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java
@@ -46,10 +46,11 @@ public abstract class RecreatableObjectFacetDeclarativeAbstract extends Recreata
public RecreatableObjectFacetDeclarativeAbstract(
final FacetHolder holder,
+ final ArchitecturalLayer architecturalLayer,
final SpecificationLoader specificationLoader,
final AdapterManager adapterManager,
final ServicesInjector servicesInjector) {
- super(holder);
+ super(holder, architecturalLayer);
this.specificationLoader = specificationLoader;
this.servicesInjector = servicesInjector;
this.adapterManager = adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index ef09a9e..86c2e62 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -71,7 +72,7 @@ public class RecreatableObjectFacetFactory extends FacetFactoryAbstract implemen
// DomainObject(nature=VIEW_MODEL) is managed by the DomainObjectFacetFactory
}
- private RecreatableObjectFacet create(final org.apache.isis.applib.annotation.ViewModel annotation, final FacetHolder holder) {
+ private ViewModelFacet create(final org.apache.isis.applib.annotation.ViewModel annotation, final FacetHolder holder) {
return annotation != null ? new RecreatableObjectFacetForViewModelAnnotation(holder, getSpecificationLoader(), adapterManager, servicesInjector) : null;
}
@@ -83,7 +84,7 @@ public class RecreatableObjectFacetFactory extends FacetFactoryAbstract implemen
@Override
public boolean visit(final ObjectSpecification objectSpec, final ValidationFailures validationFailures) {
- final RecreatableObjectFacet facet = objectSpec.getFacet(RecreatableObjectFacet.class);
+ final ViewModelFacet facet = objectSpec.getFacet(ViewModelFacet.class);
final Facet underlyingFacet = facet != null ? facet.getUnderlyingFacet() : null;
if(underlyingFacet != null) {
validationFailures.add(
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java
index 147e2ed..3ad3280 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableDomainObjectInterface.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class RecreatableObjectFacetForRecreatableDomainObjectInterface extends RecreatableObjectFacetAbstract {
public RecreatableObjectFacetForRecreatableDomainObjectInterface(final FacetHolder holder) {
- super(holder);
+ super(holder, ArchitecturalLayer.DOMAIN);
}
@Override
@@ -36,8 +36,8 @@ public class RecreatableObjectFacetForRecreatableDomainObjectInterface extends R
@Override
public String memento(final Object pojo) {
- final RecreatableDomainObject viewModel = (RecreatableDomainObject)pojo;
- return viewModel.__isis_memento();
+ final RecreatableDomainObject recreatableDomainObject = (RecreatableDomainObject)pojo;
+ return recreatableDomainObject.__isis_memento();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java
index d85718b..17ba51f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java
@@ -31,7 +31,7 @@ public class RecreatableObjectFacetForViewModelAnnotation extends RecreatableObj
final SpecificationLoader specificationLoader,
final AdapterManager adapterManager,
final ServicesInjector servicesInjector) {
- super(holder, specificationLoader, adapterManager, servicesInjector);
+ super(holder, ArchitecturalLayer.APPLICATION, specificationLoader, adapterManager, servicesInjector);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelInterface.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelInterface.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelInterface.java
index 2c9ff3c..b503d69 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelInterface.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelInterface.java
@@ -25,19 +25,18 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class RecreatableObjectFacetForViewModelInterface extends RecreatableObjectFacetAbstract {
public RecreatableObjectFacetForViewModelInterface(final FacetHolder holder) {
- super(holder);
+ super(holder, ArchitecturalLayer.APPLICATION);
}
@Override
public void initialize(Object pojo, String memento) {
- final ViewModel viewModel = (ViewModel)pojo;
+ final ViewModel viewModel = (ViewModel) pojo;
viewModel.viewModelInit(memento);
}
-
+
@Override
public String memento(Object pojo) {
- final ViewModel viewModel = (ViewModel)pojo;
+ final ViewModel viewModel = (ViewModel) pojo;
return viewModel.viewModelMemento();
}
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
new file mode 100644
index 0000000..78fbb3b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
@@ -0,0 +1,58 @@
+/*
+ * 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.facets.object.viewmodel;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+
+/**
+ * Indicates that this class is either a view model (for the UI/application layer) or a recreatable domain object of
+ * some sort (for the domain layer, that is: an external or synthetic entity).
+ *
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to
+ * applying either {@link org.apache.isis.applib.annotation.ViewModel} annotation or
+ * {@link org.apache.isis.applib.ViewModel} interface (for a view model), or by annotating
+ *
+ * <p>
+ * Note: this facet is called "ViewModelFacet" for historical reasons; a better name would be
+ * "RecreatableObjectFacet". The old name has been retained only to avoid unnecessarily breaking
+ * some add-ons (eg Isis Addons Excel Module) that use this facet.
+ * </p>
+ */
+public interface ViewModelFacet extends Facet {
+
+ public enum ArchitecturalLayer {
+ APPLICATION,
+ DOMAIN
+ }
+
+ void initialize(Object pojo, String memento);
+
+ String memento(Object pojo);
+
+ /**
+ * Whether {@link #clone(Object)} can be called.
+ */
+ boolean isCloneable(Object pojo);
+
+ Object clone(Object pojo);
+
+ ArchitecturalLayer getArchitecturalLayer();
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyClearFacetForInteractionAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyClearFacetForInteractionAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyClearFacetForInteractionAbstract.java
index 16d5b87..234e415 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyClearFacetForInteractionAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyClearFacetForInteractionAbstract.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.properties.interaction;
import com.google.common.base.Objects;
import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.AbstractInteractionEvent;
import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -95,7 +94,7 @@ public abstract class PropertyClearFacetForInteractionAbstract
// ... and post the event (reusing existing event if available)
final PropertyDomainEvent<?, ?> event = propertyDomainEventFacet.currentInteraction.get();
- interactionHelper.postEventForProperty(value(), verify(event), AbstractInteractionEvent.Phase.EXECUTED, getIdentified(), targetAdapter, oldValue, actualNewValue);
+ interactionHelper.postEventForProperty(value(), verify(event), AbstractDomainEvent.Phase.EXECUTED, getIdentified(), targetAdapter, oldValue, actualNewValue);
} finally {
// clean up
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyInteractionFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyInteractionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyInteractionFacetAbstract.java
index b435ec9..0911633 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyInteractionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertyInteractionFacetAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.facets.properties.interaction;
import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.applib.events.ValidityEvent;
import org.apache.isis.applib.events.VisibilityEvent;
-import org.apache.isis.applib.services.eventbus.AbstractInteractionEvent;
+import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -67,7 +67,7 @@ public abstract class PropertyInteractionFacetAbstract
final PropertyDomainEvent<?, ?> event =
interactionHelper.postEventForProperty(
- eventType(), null, AbstractInteractionEvent.Phase.HIDE, getIdentified(), ic.getTarget(), null, null);
+ eventType(), null, AbstractDomainEvent.Phase.HIDE, getIdentified(), ic.getTarget(), null, null);
if (event != null && event.isHidden()) {
return "Hidden by subscriber";
}
@@ -85,7 +85,7 @@ public abstract class PropertyInteractionFacetAbstract
final PropertyDomainEvent<?, ?> event =
interactionHelper.postEventForProperty(
- eventType(), null, AbstractInteractionEvent.Phase.DISABLE, getIdentified(), ic.getTarget(), null, null);
+ eventType(), null, AbstractDomainEvent.Phase.DISABLE, getIdentified(), ic.getTarget(), null, null);
if (event != null && event.isDisabled()) {
return event.getDisabledReason();
}
@@ -106,7 +106,7 @@ public abstract class PropertyInteractionFacetAbstract
final PropertyDomainEvent<?, ?> event =
interactionHelper.postEventForProperty(
- eventType(), null, AbstractInteractionEvent.Phase.VALIDATE, getIdentified(), ic.getTarget(), oldValue, proposedValue);
+ eventType(), null, AbstractDomainEvent.Phase.VALIDATE, getIdentified(), ic.getTarget(), oldValue, proposedValue);
if (event != null && event.isInvalid()) {
return event.getInvalidityReason();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertySetterFacetForInteractionAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertySetterFacetForInteractionAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertySetterFacetForInteractionAbstract.java
index 8acd6a7..74cc0d5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertySetterFacetForInteractionAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/interaction/PropertySetterFacetForInteractionAbstract.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.properties.interaction;
import com.google.common.base.Objects;
import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.AbstractInteractionEvent;
import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -80,7 +79,7 @@ public abstract class PropertySetterFacetForInteractionAbstract
final Object newValue = ObjectAdapter.Util.unwrap(newValueAdapter);
interactionHelper.postEventForProperty(
- value(), existingEvent, AbstractInteractionEvent.Phase.EXECUTING,
+ value(), existingEvent, AbstractDomainEvent.Phase.EXECUTING,
getIdentified(), targetAdapter, oldValue, newValue);
// ... perform the property modification
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 7bc1e1a..f864ac6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -52,7 +52,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.consent.InteractionResult;
-import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.services.container.query.QueryFindByPattern;
import org.apache.isis.core.metamodel.services.container.query.QueryFindByTitle;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -98,7 +98,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer, Que
@Override
public <T> T newViewModelInstance(Class<T> ofClass, String memento) {
final ObjectSpecification spec = getSpecificationLookup().loadSpecification(ofClass);
- if (!spec.containsFacet(RecreatableObjectFacet.class)) {
+ if (!spec.containsFacet(ViewModelFacet.class)) {
throw new IsisException("Type must be a ViewModel: " + ofClass);
}
final ObjectAdapter adapter = doCreateViewModelInstance(spec, memento);
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 910684a..0a1c7c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -50,7 +50,7 @@ import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.object.wizard.WizardFacet;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.*;
@@ -299,12 +299,12 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
@Override
public boolean isViewModel() {
- return containsFacet(RecreatableObjectFacet.class);
+ return containsFacet(ViewModelFacet.class);
}
@Override
public boolean isViewModelCloneable(ObjectAdapter targetAdapter) {
- final RecreatableObjectFacet facet = getFacet(RecreatableObjectFacet.class);
+ final ViewModelFacet facet = getFacet(ViewModelFacet.class);
if(facet == null) {
return false;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailures.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailures.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailures.java
index 87080ec..7b0acaa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailures.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailures.java
@@ -21,18 +21,27 @@ package org.apache.isis.core.metamodel.specloader.validator;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
-
import com.google.common.collect.Sets;
public final class ValidationFailures implements Iterable<String> {
private final Set<String> messages = Sets.newLinkedHashSet();
- public void add(String pattern, Object... arguments) {
+ public void add(final String pattern, final Object... arguments) {
final String message = String.format(pattern, arguments);
messages.add(message);
}
+ public void addAll(final Iterable<String> messages) {
+ for (final String message : messages) {
+ this.messages.add(message);
+ }
+ }
+
+ public void add(final ValidationFailures validationFailures) {
+ addAll(validationFailures.getMessages());
+ }
+
public void assertNone() {
if (!occurred()) {
return;
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableFacetAnnotationInJdoApplib.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableFacetAnnotationInJdoApplib.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableFacetAnnotationInJdoApplib.java
index 280aec5..44604af 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableFacetAnnotationInJdoApplib.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableFacetAnnotationInJdoApplib.java
@@ -20,11 +20,11 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.object.auditable;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.audit.annotation.AuditableFacetAuditedAnnotation;
+import org.apache.isis.core.metamodel.facets.object.audit.annotation.AuditableFacetForAuditedAnnotation;
@Deprecated
-public class AuditableFacetAnnotationInJdoApplib extends AuditableFacetAuditedAnnotation {
+public class AuditableFacetAnnotationInJdoApplib extends AuditableFacetForAuditedAnnotation {
public AuditableFacetAnnotationInJdoApplib(final FacetHolder facetHolder) {
super(facetHolder, Enablement.ENABLED);
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 8ea541b..8d9e632 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -73,6 +73,7 @@ import org.apache.isis.core.metamodel.facets.members.named.annotprop.NamedFacetO
import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetFactory;
import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetOrResolveFactory;
+import org.apache.isis.core.metamodel.facets.object.ViewModelSemanticCheckingFacetFactory;
import org.apache.isis.core.metamodel.facets.object.actionorder.annotation.ActionOrderFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.audit.annotation.AuditableFacetFromAuditedAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.audit.configuration.AuditableFacetFromConfigurationFactory;
@@ -90,7 +91,7 @@ import org.apache.isis.core.metamodel.facets.object.choices.boundedmarkerifc.Cho
import org.apache.isis.core.metamodel.facets.object.choices.enums.EnumFacetUsingValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.object.cssclass.annotation.CssClassFacetOnTypeAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.cssclass.method.CssClassFacetMethodFactory;
-import org.apache.isis.core.metamodel.facets.object.cssclassfa.annotation.annotation.CssClassFaFacetOnTypeAnnotationFactory;
+import org.apache.isis.core.metamodel.facets.object.cssclassfa.annotation.CssClassFaFacetOnTypeAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.describedas.annotation.DescribedAsFacetOnTypeAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.dirty.method.DirtyMethodsFacetFactory;
@@ -136,6 +137,8 @@ import org.apache.isis.core.metamodel.facets.object.parseable.annotcfg.Parseable
import org.apache.isis.core.metamodel.facets.object.plural.annotation.PluralAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.plural.staticmethod.PluralFacetMethodFactory;
import org.apache.isis.core.metamodel.facets.object.publishedobject.annotation.PublishedObjectFacetAnnotationFactory;
+import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory;
import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacetFactory;
import org.apache.isis.core.metamodel.facets.object.regex.annotation.RegExFacetOnTypeAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
@@ -144,8 +147,6 @@ import org.apache.isis.core.metamodel.facets.object.typicallen.annotation.Typica
import org.apache.isis.core.metamodel.facets.object.validating.mustsatisfyspec.MustSatisfySpecificationOnTypeFacetFactory;
import org.apache.isis.core.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethodFactory;
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
-import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnCollectionDerivedFromRecreatableObjectFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory;
import org.apache.isis.core.metamodel.facets.param.autocomplete.method.ActionParameterAutoCompleteFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.param.bigdecimal.javaxvaldigits.BigDecimalFacetOnParameterFromJavaxValidationAnnotationFactory;
import org.apache.isis.core.metamodel.facets.param.choices.enums.ActionParameterChoicesFacetDerivedFromChoicesFacetFactory;
@@ -419,7 +420,7 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(MultiLineFacetOnParameterAnnotationFactory.class);
- // ISIS-970
+ // must come after RecreatableObjectFacetFactory
addFactory(DomainObjectAnnotationFacetFactory.class);
addFactory(PropertyAnnotationFacetFactory.class);
addFactory(CollectionAnnotationFacetFactory.class);
@@ -557,5 +558,7 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(PublishedObjectFacetAnnotationFactory.class);
addFactory(FacetsFacetAnnotationFactory.class);
+
+ addFactory(ViewModelSemanticCheckingFacetFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index 3cb415f..9f1f40d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -21,18 +21,16 @@ package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
import java.util.List;
-
import org.jmock.auto.Mock;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facets.object.domainobject.AutoCompleteFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -56,7 +54,7 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
@Mock
protected IsisConfiguration mockConfiguration;
- protected FacetHolder facetHolderImpl;
+ protected FacetHolder facetHolder;
@Mock
protected ObjectSpecification mockObjSpec;
@@ -72,14 +70,14 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
@Before
public void setUpFacetedMethodAndParameter() throws Exception {
- facetHolderImpl = new FacetHolderImpl();
+ facetHolder = new FacetHolderImpl();
facetedMethod = FacetedMethod.createForProperty(AbstractFacetFactoryTest.Customer.class, "firstName");
facetedMethodParameter = new FacetedMethodParameter(String.class);
}
@After
public void tearDown() throws Exception {
- facetHolderImpl = null;
+ facetHolder = null;
facetedMethod = null;
facetedMethodParameter = null;
}
@@ -104,8 +102,9 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
return Utils.findMethod(type, methodName);
}
- protected void expectNoMethodsRemoved() {
+ protected AutoCompleteFacetForDomainObjectAnnotation expectNoMethodsRemoved() {
context.never(mockMethodRemover);
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
new file mode 100644
index 0000000..256424b
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -0,0 +1,178 @@
+package org.apache.isis.core.metamodel.facets.object;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.apache.isis.applib.RecreatableDomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
+import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class ViewModelSemanticCheckingFacetFactoryTest {
+
+ private ViewModelSemanticCheckingFacetFactory facetFactory;
+
+ private ValidationFailures processThenRefine(final Class<?> cls) {
+ facetFactory.process(new FacetFactory.ProcessClassContext(cls, null, null));
+ final MetaModelValidatorComposite metaModelValidator = new MetaModelValidatorComposite();
+ facetFactory.refineMetaModelValidator(metaModelValidator, null);
+
+ final ValidationFailures validationFailures = new ValidationFailures();
+ metaModelValidator.validate(validationFailures);
+ return validationFailures;
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ facetFactory = new ViewModelSemanticCheckingFacetFactory();
+ }
+
+ @Test
+ public void whenValidAnnotatedWithViewModelAndViewModelLayout() throws Exception {
+
+ @org.apache.isis.applib.annotation.ViewModel
+ @org.apache.isis.applib.annotation.ViewModelLayout
+ class ValidAnnotatedWithViewModelAndViewModelLayout {
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(ValidAnnotatedWithViewModelAndViewModelLayout.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(0));
+ }
+
+ @Test
+ public void whenValidAnnotatedDomainObjectAndDomainObjectLayout() throws Exception {
+
+ @org.apache.isis.applib.annotation.DomainObject
+ @org.apache.isis.applib.annotation.DomainObjectLayout
+ class ValidAnnotatedDomainObjectAndDomainObjectLayout {
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(ValidAnnotatedDomainObjectAndDomainObjectLayout.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(0));
+ }
+
+ @Test
+ public void whenInvalidAnnotatedViewModelAndDomainObjectLayout() throws Exception {
+
+ @org.apache.isis.applib.annotation.ViewModel
+ @org.apache.isis.applib.annotation.DomainObjectLayout
+ class InvalidAnnotatedViewModelAndDomainObjectLayout {
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(InvalidAnnotatedViewModelAndDomainObjectLayout.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(1));
+ assertThat(validationFailures.getMessages().iterator().next(), containsString("should not be annotated with both @ViewModel and @DomainObjectLayout (annotate with @ViewModelLayout instead of @DomainObjectLayout, or annotate with @DomainObject instead of @ViewModel)"));
+ }
+
+ @Test
+ public void whenInvalidAnnotatedDomainObjectAndViewModelLayout() throws Exception {
+
+ @org.apache.isis.applib.annotation.DomainObject
+ @org.apache.isis.applib.annotation.ViewModelLayout
+ class InvalidAnnotatedDomainObjectAndViewModelLayout {
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(InvalidAnnotatedDomainObjectAndViewModelLayout.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(1));
+ assertThat(validationFailures.getMessages().iterator().next(), containsString("should not be annotated with @ViewModelLayout and also be annotated with @DomainObject (annotate with @ViewModel instead of @DomainObject, or instead annotate with @DomainObjectLayout instead of @ViewModelLayout)"));
+ }
+
+ @Test
+ public void whenValidDomainObjectWithViewModelNatureImplementingRecreatableDomainObject() throws Exception {
+
+ @org.apache.isis.applib.annotation.DomainObject(nature = Nature.VIEW_MODEL)
+ class ValidDomainObjectWithViewModelNatureImplementingRecreatableDomainObject implements RecreatableDomainObject {
+ @Override
+ public String __isis_memento() {
+ return null;
+ }
+ @Override
+ public void __isis_recreate(final String memento) {
+ }
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(ValidDomainObjectWithViewModelNatureImplementingRecreatableDomainObject.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(0));
+ }
+
+ @Test
+ public void whenValidDomainObjectWithNatureExternalEntityImplementingRecreatableDomainObject() throws Exception {
+
+ @org.apache.isis.applib.annotation.DomainObject(nature = Nature.EXTERNAL_ENTITY)
+ class ValidDomainObjectWithNatureExternalEntityImplementingRecreatableDomainObject implements RecreatableDomainObject {
+ @Override
+ public String __isis_memento() {
+ return null;
+ }
+ @Override
+ public void __isis_recreate(final String memento) {
+ }
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(ValidDomainObjectWithNatureExternalEntityImplementingRecreatableDomainObject.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(0));
+ }
+
+ @Test
+ public void whenValidDomainObjectWithNatureInmemoryEntityImplementingRecreatableDomainObject() throws Exception {
+
+ @org.apache.isis.applib.annotation.DomainObject(nature = Nature.INMEMORY_ENTITY)
+ class ValidDomainObjectWithNatureInmemoryEntityImplementingRecreatableDomainObject implements RecreatableDomainObject {
+ @Override
+ public String __isis_memento() {
+ return null;
+ }
+ @Override
+ public void __isis_recreate(final String memento) {
+ }
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(ValidDomainObjectWithNatureInmemoryEntityImplementingRecreatableDomainObject.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(0));
+ }
+
+ @Test
+ public void whenInvalidDomainObjectWithNatureNotSpecifiedImplementingRecreatableDomainObject() throws Exception {
+
+ @org.apache.isis.applib.annotation.DomainObject(nature = Nature.NOT_SPECIFIED)
+ class InvalidDomainObjectWithNatureNotSpecifiedImplementingRecreatableDomainObject implements RecreatableDomainObject {
+ @Override
+ public String __isis_memento() {
+ return null;
+ }
+ @Override
+ public void __isis_recreate(final String memento) {
+ }
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(InvalidDomainObjectWithNatureNotSpecifiedImplementingRecreatableDomainObject.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(1));
+ assertThat(validationFailures.getMessages().iterator().next(), containsString("should not be annotated with @DomainObject with nature of NOT_SPECIFIED and also implement RecreatableDomainObject (specify a nature of EXTERNAL_ENTITY, INMEMORY_ENTITY or VIEW_MODEL)"));
+ }
+
+ @Test
+ public void whenInvalidDomainObjectWithNatureJdoEntityImplementingRecreatableDomainObject() throws Exception {
+
+ @org.apache.isis.applib.annotation.DomainObject(nature = Nature.JDO_ENTITY)
+ class InvalidDomainObjectWithNatureJdoEntityImplementingRecreatableDomainObject implements RecreatableDomainObject {
+ @Override
+ public String __isis_memento() {
+ return null;
+ }
+ @Override
+ public void __isis_recreate(final String memento) {
+ }
+ }
+
+ final ValidationFailures validationFailures = processThenRefine(InvalidDomainObjectWithNatureJdoEntityImplementingRecreatableDomainObject.class);
+ assertThat(validationFailures.getNumberOfMessages(), is(1));
+ assertThat(validationFailures.getMessages().iterator().next(), containsString("should not be annotated with @DomainObject with nature of JDO_ENTITY and also implement RecreatableDomainObject (specify a nature of EXTERNAL_ENTITY, INMEMORY_ENTITY or VIEW_MODEL)"));
+ }
+
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/audited/annotation/DomainObjectAnnotationFacetFactoryTest_forAuditable.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/audited/annotation/DomainObjectAnnotationFacetFactoryTest_forAuditable.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/audited/annotation/DomainObjectAnnotationFacetFactoryTest_forAuditable.java
index 87575e0..d023fbc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/audited/annotation/DomainObjectAnnotationFacetFactoryTest_forAuditable.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/audited/annotation/DomainObjectAnnotationFacetFactoryTest_forAuditable.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
-import org.apache.isis.core.metamodel.facets.object.audit.annotation.AuditableFacetAuditedAnnotation;
+import org.apache.isis.core.metamodel.facets.object.audit.annotation.AuditableFacetForAuditedAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
public class DomainObjectAnnotationFacetFactoryTest_forAuditable extends AbstractFacetFactoryTest {
@@ -54,7 +54,7 @@ public class DomainObjectAnnotationFacetFactoryTest_forAuditable extends Abstrac
final Facet facet = facetHolder.getFacet(AuditableFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof AuditableFacetAuditedAnnotation);
+ assertTrue(facet instanceof AuditableFacetForAuditedAnnotation);
assertNoMethodsRemoved();
}