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 2017/10/03 14:01:04 UTC
[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated
(94f4c00 -> fb9c4d1)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 94f4c00 ISIS-1742: deletes @FieldOrder and corresponding facet and facet factory. Also:
new 54bebe8 ISIS-1742: removes @Render annotation, replaces Render.Type enum with RenderType enum
new fb9c4d1 ISIS-1742: deletes @Resolve annotation and supporting facets.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/isis/applib/annotation/Render.java | 59 --------
.../apache/isis/applib/annotation/RenderType.java | 18 ---
.../org/apache/isis/applib/annotation/Resolve.java | 70 ---------
.../RenderFacetForCollectionLayoutAnnotation.java | 2 +-
...enderFacetOnCollectionFromLayoutProperties.java | 2 +-
.../facets/members/render/RenderFacet.java | 8 +-
.../facets/members/render/RenderFacetAbstract.java | 6 +-
.../render/annotprop/RenderFacetAnnotation.java | 36 -----
.../annotprop/RenderFacetOrResolveFactory.java | 35 +----
.../render/annotprop/RenderFacetProperties.java | 9 +-
.../annotprop/RenderFacetViaResolveAnnotation.java | 36 -----
.../metamodel/layoutmetadata/RenderFacetRepr.java | 4 +-
.../json/LayoutMetadataReaderFromJson.java | 5 +-
...ationFacetFactoryTest_withRenderAnnotation.java | 161 ---------------------
...tionFacetFactoryTest_withResolveAnnotation.java | 160 --------------------
...outMetadataReaderFromJsonTest_readMetadata.java | 4 +-
.../restfulobjects/rendering/RendererContext.java | 1 -
.../ObjectCollectionReprRenderer.java | 8 +-
.../domainobjects/ObjectPropertyReprRenderer.java | 4 +-
.../selector/CollectionSelectorHelper.java | 4 +-
20 files changed, 27 insertions(+), 605 deletions(-)
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/Render.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetAnnotation.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetViaResolveAnnotation.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].
[isis] 01/02: ISIS-1742: removes @Render annotation,
replaces Render.Type enum with RenderType enum
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 54bebe8e4084e402b64f1674f3d6985241517d08
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 14:56:37 2017 +0100
ISIS-1742: removes @Render annotation, replaces Render.Type enum with RenderType enum
---
.../org/apache/isis/applib/annotation/Render.java | 59 ----------------------
.../apache/isis/applib/annotation/RenderType.java | 18 -------
.../org/apache/isis/applib/annotation/Resolve.java | 10 ++--
.../RenderFacetForCollectionLayoutAnnotation.java | 2 +-
...enderFacetOnCollectionFromLayoutProperties.java | 2 +-
.../facets/members/render/RenderFacet.java | 4 +-
.../facets/members/render/RenderFacetAbstract.java | 6 +--
.../render/annotprop/RenderFacetAnnotation.java | 4 +-
.../annotprop/RenderFacetOrResolveFactory.java | 12 -----
.../render/annotprop/RenderFacetProperties.java | 9 ++--
.../metamodel/layoutmetadata/RenderFacetRepr.java | 4 +-
.../json/LayoutMetadataReaderFromJson.java | 5 +-
...ationFacetFactoryTest_withRenderAnnotation.java | 29 ++++-------
...tionFacetFactoryTest_withResolveAnnotation.java | 22 ++++----
...outMetadataReaderFromJsonTest_readMetadata.java | 4 +-
.../restfulobjects/rendering/RendererContext.java | 1 -
.../ObjectCollectionReprRenderer.java | 8 +--
.../domainobjects/ObjectPropertyReprRenderer.java | 4 +-
.../selector/CollectionSelectorHelper.java | 4 +-
19 files changed, 55 insertions(+), 152 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Render.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Render.java
deleted file mode 100644
index 336cf1b..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Render.java
+++ /dev/null
@@ -1,59 +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.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @deprecated - use instead {@link CollectionLayout#render()}
- */
-@Inherited
-@Target( ElementType.METHOD )
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface Render {
-
- /**
- * @deprecated - use {@link RenderType} instead.
- */
- @Deprecated
- public enum Type {
- /**
- * @deprecated - use {@link RenderType#EAGERLY} instead.
- */
- @Deprecated
- EAGERLY,
- /**
- * @deprecated - use {@link RenderType#LAZILY} instead.
- */
- @Deprecated
- LAZILY
- }
-
- /**
- * @deprecated - use instead {@link CollectionLayout#render()}
- */
- @Deprecated
- Type value() default Type.EAGERLY;
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java
index cbcd200..9998dde 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/RenderType.java
@@ -30,22 +30,4 @@ import javax.xml.bind.annotation.XmlType;
public enum RenderType {
EAGERLY,
LAZILY;
-
- @Deprecated
- public static Render.Type typeOf(final RenderType renderType) {
- if(renderType == null) return null;
- if(renderType == EAGERLY) return Render.Type.EAGERLY;
- if(renderType == LAZILY) return Render.Type.LAZILY;
- // shouldn't happen
- throw new IllegalArgumentException("Unrecognized renderType: " + renderType);
- }
-
- @Deprecated
- public static RenderType typeOf(final Render.Type renderType) {
- if(renderType == null) return null;
- if (renderType == Render.Type.EAGERLY) return RenderType.EAGERLY;
- if (renderType == Render.Type.LAZILY) return RenderType.LAZILY;
- // shouldn't happen
- throw new IllegalArgumentException("Unrecognized renderType: " + renderType);
- }
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
index df159b5..16959a0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
@@ -43,21 +43,21 @@ public @interface Resolve {
* @deprecated - use {@link RenderType#EAGERLY} instead.
*/
@Deprecated
- EAGERLY(Render.Type.EAGERLY),
+ EAGERLY(RenderType.EAGERLY),
/**
* @deprecated - use {@link RenderType#LAZILY} instead.
*/
@Deprecated
- LAZILY(Render.Type.LAZILY);
+ LAZILY(RenderType.LAZILY);
- private final org.apache.isis.applib.annotation.Render.Type renderType;
+ private final org.apache.isis.applib.annotation.RenderType renderType;
- private Type(Render.Type renderType) {
+ private Type(RenderType renderType) {
this.renderType = renderType;
}
@Deprecated
- public org.apache.isis.applib.annotation.Render.Type getRenderType() {
+ public org.apache.isis.applib.annotation.RenderType getRenderType() {
return renderType;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/RenderFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/RenderFacetForCollectionLayoutAnnotation.java
index 9f2df39..149281f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/RenderFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/RenderFacetForCollectionLayoutAnnotation.java
@@ -36,7 +36,7 @@ public class RenderFacetForCollectionLayoutAnnotation extends RenderFacetAbstrac
}
private RenderFacetForCollectionLayoutAnnotation(final RenderType renderType, final FacetHolder holder) {
- super(RenderType.typeOf(renderType), holder);
+ super(renderType, holder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/RenderFacetOnCollectionFromLayoutProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/RenderFacetOnCollectionFromLayoutProperties.java
index e9173c2..bc3105d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/RenderFacetOnCollectionFromLayoutProperties.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/RenderFacetOnCollectionFromLayoutProperties.java
@@ -34,7 +34,7 @@ public class RenderFacetOnCollectionFromLayoutProperties extends RenderFacetAbst
}
private RenderFacetOnCollectionFromLayoutProperties(RenderType renderType, FacetHolder holder) {
- super(RenderType.typeOf(renderType), holder);
+ super(renderType, holder);
}
private static RenderType render(Properties properties) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacet.java
index bfb17e6..cf25f54 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacet.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.members.render;
-import org.apache.isis.applib.annotation.Render;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.applib.annotation.Resolve;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
@@ -30,6 +30,6 @@ import org.apache.isis.core.metamodel.facets.SingleValueFacet;
* <p>
* @see Resolve
*/
-public interface RenderFacet extends SingleValueFacet<Render.Type> {
+public interface RenderFacet extends SingleValueFacet<RenderType> {
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacetAbstract.java
index 73a2e51..2935f26 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacetAbstract.java
@@ -19,18 +19,18 @@
package org.apache.isis.core.metamodel.facets.members.render;
-import org.apache.isis.applib.annotation.Render;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleValueFacetAbstract;
-public abstract class RenderFacetAbstract extends SingleValueFacetAbstract<Render.Type> implements RenderFacet {
+public abstract class RenderFacetAbstract extends SingleValueFacetAbstract<RenderType> implements RenderFacet {
public static Class<? extends Facet> type() {
return RenderFacet.class;
}
- public RenderFacetAbstract(Render.Type value, final FacetHolder holder) {
+ public RenderFacetAbstract(RenderType value, final FacetHolder holder) {
super(type(), value, holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetAnnotation.java
index b88904c..9605808 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetAnnotation.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facets.members.render.annotprop;
-import org.apache.isis.applib.annotation.Render;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.render.RenderFacetAbstract;
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facets.members.render.RenderFacetAbstract;
@Deprecated
public class RenderFacetAnnotation extends RenderFacetAbstract {
- public RenderFacetAnnotation(final FacetHolder holder, Render.Type value) {
+ public RenderFacetAnnotation(final FacetHolder holder, RenderType value) {
super(value, holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
index 2e44e3f..41ea403 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.members.render.annotprop;
import java.util.Properties;
-import org.apache.isis.applib.annotation.Render;
import org.apache.isis.applib.annotation.Resolve;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -39,7 +38,6 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
- private final MetaModelValidatorForDeprecatedAnnotation renderValidator = new MetaModelValidatorForDeprecatedAnnotation(Render.class);
private final MetaModelValidatorForDeprecatedAnnotation resolveValidator = new MetaModelValidatorForDeprecatedAnnotation(Resolve.class);
public RenderFacetOrResolveFactory() {
@@ -51,9 +49,6 @@ public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
RenderFacet renderFacet = createFromMetadataPropertiesIfPossible(processMethodContext);
if(renderFacet == null) {
- renderFacet = renderValidator.flagIfPresent(createFromRenderAnnotationIfPossible(processMethodContext), processMethodContext);
- }
- if(renderFacet == null) {
renderFacet = resolveValidator.flagIfPresent(createFromResolveAnnotationIfPossible(processMethodContext), processMethodContext);
}
@@ -77,11 +72,6 @@ public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
return properties != null ? new RenderFacetProperties(properties, holder) : null;
}
- private static RenderFacet createFromRenderAnnotationIfPossible(final ProcessMethodContext processMethodContext) {
- final Render renderAnnotation = Annotations.getAnnotation(processMethodContext.getMethod(), Render.class);
- return renderAnnotation == null ? null : new RenderFacetAnnotation(processMethodContext.getFacetHolder(), renderAnnotation.value());
- }
-
// @Render was originally called @Resolve, so look for that annotation instead.
@SuppressWarnings("deprecation")
private static RenderFacet createFromResolveAnnotationIfPossible(final ProcessMethodContext processMethodContext) {
@@ -93,7 +83,6 @@ public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
@Override
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(renderValidator);
metaModelValidator.add(resolveValidator);
}
@@ -102,7 +91,6 @@ public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- renderValidator.setConfiguration(configuration);
resolveValidator.setConfiguration(configuration);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetProperties.java
index aa263ab..30b1188 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetProperties.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetProperties.java
@@ -21,8 +21,7 @@ package org.apache.isis.core.metamodel.facets.members.render.annotprop;
import java.util.Properties;
-import org.apache.isis.applib.annotation.Render;
-import org.apache.isis.applib.annotation.Render.Type;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.render.RenderFacetAbstract;
@@ -32,10 +31,10 @@ public class RenderFacetProperties extends RenderFacetAbstract {
super(renderTypeFrom(properties), holder);
}
- private static Type renderTypeFrom(Properties properties) {
+ private static RenderType renderTypeFrom(Properties properties) {
String value = properties.getProperty("value");
- // same default as in Render.Type.value()
- return value != null? Render.Type.valueOf(value): Render.Type.EAGERLY;
+ // same default as in RenderType.value()
+ return value != null? RenderType.valueOf(value): RenderType.EAGERLY;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/RenderFacetRepr.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/RenderFacetRepr.java
index 0daf872..ca2e77d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/RenderFacetRepr.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/RenderFacetRepr.java
@@ -16,8 +16,8 @@
*/
package org.apache.isis.core.metamodel.layoutmetadata;
-import org.apache.isis.applib.annotation.Render;
+import org.apache.isis.applib.annotation.RenderType;
public class RenderFacetRepr {
- public Render.Type value;
+ public RenderType value;
}
\ No newline at end of file
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
index 3b48d1e..7d333f0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
@@ -38,8 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.MemberGroupLayout.ColumnSpans;
-import org.apache.isis.applib.annotation.Render;
-import org.apache.isis.applib.annotation.Render.Type;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
@@ -316,7 +315,7 @@ public class LayoutMetadataReaderFromJson implements LayoutMetadataReader2, Serv
final RenderFacetRepr render = memberRepr.render;
if(render != null) {
// same default as in Render.Type.value()
- final Type renderType = render.value!=null?render.value: Render.Type.EAGERLY;
+ final RenderType renderType = render.value!=null?render.value: RenderType.EAGERLY;
props.setProperty("member." + memberName + ".render.value", renderType.toString());
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
index 9265793..7901e83 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
@@ -19,20 +19,19 @@
package org.apache.isis.core.metamodel.facets.members.resolve;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Collection;
-import org.apache.isis.applib.annotation.Render;
-import org.apache.isis.applib.annotation.Render.Type;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.render.RenderFacet;
import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetAnnotation;
import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetOrResolveFactory;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation extends AbstractFacetFactoryTest {
@@ -55,7 +54,6 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
class Customer {
@SuppressWarnings("unused")
- @Render
public int getNumberOfOrders() {
return 0;
}
@@ -68,7 +66,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
assertNotNull(facet);
assertTrue(facet instanceof RenderFacetAnnotation);
RenderFacet resolveFacet = (RenderFacet) facet;
- assertThat(resolveFacet.value(), is(Render.Type.EAGERLY));
+ assertThat(resolveFacet.value(), is(RenderType.EAGERLY));
assertNoMethodsRemoved();
}
@@ -77,7 +75,6 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
class Customer {
@SuppressWarnings("unused")
- @Render(Type.EAGERLY)
public int getNumberOfOrders() {
return 0;
}
@@ -87,14 +84,13 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(Render.Type.EAGERLY));
+ assertThat(facet.value(), is(RenderType.EAGERLY));
}
public void testAnnotationForLazilyPickedUpOnProperty() {
class Customer {
@SuppressWarnings("unused")
- @Render(Type.LAZILY)
public int getNumberOfOrders() {
return 0;
}
@@ -104,13 +100,12 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(Render.Type.LAZILY));
+ assertThat(facet.value(), is(RenderType.LAZILY));
}
public void testAnnotationNoHintPickedUpOnCollection() {
class Customer {
@SuppressWarnings("unused")
- @Render
public Collection<?> getOrders() {
return null;
}
@@ -122,7 +117,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
assertNotNull(facet);
assertTrue(facet instanceof RenderFacetAnnotation);
RenderFacet resolveFacet = (RenderFacet) facet;
- assertThat(resolveFacet.value(), is(Render.Type.EAGERLY));
+ assertThat(resolveFacet.value(), is(RenderType.EAGERLY));
assertNoMethodsRemoved();
}
@@ -130,7 +125,6 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
public void testAnnotationEagerlyHintPickedUpOnCollection() {
class Customer {
@SuppressWarnings("unused")
- @Render(Type.EAGERLY)
public Collection<?> getOrders() {
return null;
}
@@ -139,13 +133,12 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(Render.Type.EAGERLY));
+ assertThat(facet.value(), is(RenderType.EAGERLY));
}
public void testAnnotationWithLazilyHintPickedUpOnCollection() {
class Customer {
@SuppressWarnings("unused")
- @Render(Type.LAZILY)
public Collection<?> getOrders() {
return null;
}
@@ -154,7 +147,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation exte
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(Render.Type.LAZILY));
+ assertThat(facet.value(), is(RenderType.LAZILY));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
index 8277612..ec71f5d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
@@ -19,19 +19,19 @@
package org.apache.isis.core.metamodel.facets.members.resolve;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Collection;
-import org.apache.isis.applib.annotation.Render;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.render.RenderFacet;
import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetOrResolveFactory;
import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetViaResolveAnnotation;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation extends AbstractFacetFactoryTest {
@@ -67,7 +67,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
assertNotNull(facet);
assertTrue(facet instanceof RenderFacetViaResolveAnnotation);
RenderFacet resolveFacet = (RenderFacet) facet;
- assertThat(resolveFacet.value(), is(Render.Type.EAGERLY));
+ assertThat(resolveFacet.value(), is(RenderType.EAGERLY));
assertNoMethodsRemoved();
}
@@ -86,7 +86,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(Render.Type.EAGERLY));
+ assertThat(facet.value(), is(RenderType.EAGERLY));
}
public void testAnnotationForLazilyPickedUpOnProperty() {
@@ -103,7 +103,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(Render.Type.LAZILY));
+ assertThat(facet.value(), is(RenderType.LAZILY));
}
public void testAnnotationNoHintPickedUpOnCollection() {
@@ -121,7 +121,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
assertNotNull(facet);
assertTrue(facet instanceof RenderFacetViaResolveAnnotation);
RenderFacet resolveFacet = (RenderFacet) facet;
- assertThat(resolveFacet.value(), is(Render.Type.EAGERLY));
+ assertThat(resolveFacet.value(), is(RenderType.EAGERLY));
assertNoMethodsRemoved();
}
@@ -138,7 +138,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(Render.Type.EAGERLY));
+ assertThat(facet.value(), is(RenderType.EAGERLY));
}
public void testAnnotationWithLazilyHintPickedUpOnCollection() {
@@ -153,7 +153,7 @@ public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation ext
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(Render.Type.LAZILY));
+ assertThat(facet.value(), is(RenderType.LAZILY));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java
index 35d111c..f8a6539 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java
@@ -22,7 +22,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.annotation.Render;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.applib.services.grid.GridService;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadata;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -101,7 +101,7 @@ public class LayoutMetadataReaderFromJsonTest_readMetadata {
assertThat(metadata.getColumns().get(3).collections.containsKey("similarItems"), is(true));
assertThat(metadata.getColumns().get(3).collections.get("similarItems").render, is(not(nullValue())));
- assertThat(metadata.getColumns().get(3).collections.get("similarItems").render.value, is(Render.Type.LAZILY));
+ assertThat(metadata.getColumns().get(3).collections.get("similarItems").render.value, is(RenderType.LAZILY));
assertThat(metadata.getActions(), is(not(nullValue())));
assertThat(metadata.getActions().size(), is(2));
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
index 460e0e4..c42e426 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
@@ -20,7 +20,6 @@ package org.apache.isis.viewer.restfulobjects.rendering;
import java.util.List;
-import org.apache.isis.applib.annotation.Render;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
index aac5e03..83befa3 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
@@ -18,8 +18,10 @@ package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import java.util.List;
import java.util.Map;
+
import com.google.common.collect.Lists;
-import org.apache.isis.applib.annotation.Render.Type;
+
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
@@ -73,7 +75,7 @@ public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRender
private boolean renderEagerly() {
final RenderFacet renderFacet = objectMember.getFacet(RenderFacet.class);
- return renderFacet != null && renderFacet.value() == Type.EAGERLY;
+ return renderFacet != null && renderFacet.value() == RenderType.EAGERLY;
}
// ///////////////////////////////////////////////////
@@ -113,7 +115,7 @@ public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRender
private boolean renderEagerly(ObjectAdapter valueAdapter) {
final RenderFacet renderFacet = objectMember.getFacet(RenderFacet.class);
- return renderFacet != null && renderFacet.value() == Type.EAGERLY && rendererContext.canEagerlyRender(valueAdapter);
+ return renderFacet != null && renderFacet.value() == RenderType.EAGERLY && rendererContext.canEagerlyRender(valueAdapter);
}
// ///////////////////////////////////////////////////
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index 27a8446..8f87f33 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -22,7 +22,7 @@ import java.util.Map;
import com.fasterxml.jackson.databind.node.NullNode;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.annotation.Render.Type;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -117,7 +117,7 @@ public class ObjectPropertyReprRenderer extends AbstractObjectMemberReprRenderer
final RenderFacet renderFacet = objectMember.getFacet(RenderFacet.class);
boolean eagerlyRender =
- (renderFacet != null && renderFacet.value() == Type.EAGERLY && rendererContext.canEagerlyRender(valueAdapter))
+ (renderFacet != null && renderFacet.value() == RenderType.EAGERLY && rendererContext.canEagerlyRender(valueAdapter))
|| (linkFollower != null && !linkFollower.isTerminated());
if(valueAdapter == null) {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
index 80de447..eb6beb7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
@@ -29,7 +29,7 @@ import com.google.common.collect.Lists;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import org.apache.isis.applib.annotation.Render;
+import org.apache.isis.applib.annotation.RenderType;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
@@ -195,7 +195,7 @@ public class CollectionSelectorHelper implements Serializable {
final OneToManyAssociation collection =
entityCollectionModel.getCollectionMemento().getCollection(entityCollectionModel.getSpecificationLoader());
RenderFacet renderFacet = collection.getFacet(RenderFacet.class);
- return renderFacet != null && renderFacet.value() == Render.Type.EAGERLY;
+ return renderFacet != null && renderFacet.value() == RenderType.EAGERLY;
}
private static boolean hasDefaultViewFacet(IModel<?> model) {
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 02/02: ISIS-1742: deletes @Resolve annotation and supporting
facets.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fb9c4d1c7427d1bafe31415e58edbf980066a299
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 15:00:50 2017 +0100
ISIS-1742: deletes @Resolve annotation and supporting facets.
---
.../org/apache/isis/applib/annotation/Resolve.java | 70 ---------
.../facets/members/render/RenderFacet.java | 4 -
.../render/annotprop/RenderFacetAnnotation.java | 36 -----
.../annotprop/RenderFacetOrResolveFactory.java | 23 +--
.../annotprop/RenderFacetViaResolveAnnotation.java | 36 -----
...ationFacetFactoryTest_withRenderAnnotation.java | 154 --------------------
...tionFacetFactoryTest_withResolveAnnotation.java | 160 ---------------------
7 files changed, 1 insertion(+), 482 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
deleted file mode 100644
index 16959a0..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Resolve.java
+++ /dev/null
@@ -1,70 +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.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @deprecated - use {@link CollectionLayout#render()} instead.
- */
-@Deprecated
-@Inherited
-@Target( ElementType.METHOD )
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Resolve {
-
- /**
- * @deprecated - use {@link RenderType} instead.
- */
- @Deprecated
- public enum Type {
- /**
- * @deprecated - use {@link RenderType#EAGERLY} instead.
- */
- @Deprecated
- EAGERLY(RenderType.EAGERLY),
- /**
- * @deprecated - use {@link RenderType#LAZILY} instead.
- */
- @Deprecated
- LAZILY(RenderType.LAZILY);
-
- private final org.apache.isis.applib.annotation.RenderType renderType;
-
- private Type(RenderType renderType) {
- this.renderType = renderType;
- }
-
- @Deprecated
- public org.apache.isis.applib.annotation.RenderType getRenderType() {
- return renderType;
- }
- }
-
- /**
- * @deprecated - use {@link CollectionLayout#render()} instead.
- */
- @Deprecated
- Type value() default Type.EAGERLY;
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacet.java
index cf25f54..adcfb4c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/RenderFacet.java
@@ -20,15 +20,11 @@
package org.apache.isis.core.metamodel.facets.members.render;
import org.apache.isis.applib.annotation.RenderType;
-import org.apache.isis.applib.annotation.Resolve;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
/**
* Indicates that a class member should be rendered eagerly/lazily and so should
* be presented in the viewer in an appropriate manner.
- *
- * <p>
- * @see Resolve
*/
public interface RenderFacet extends SingleValueFacet<RenderType> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetAnnotation.java
deleted file mode 100644
index 9605808..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetAnnotation.java
+++ /dev/null
@@ -1,36 +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.members.render.annotprop;
-
-import org.apache.isis.applib.annotation.RenderType;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.members.render.RenderFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class RenderFacetAnnotation extends RenderFacetAbstract {
-
- public RenderFacetAnnotation(final FacetHolder holder, RenderType value) {
- super(value, holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
index 41ea403..394c123 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
@@ -21,24 +21,19 @@ package org.apache.isis.core.metamodel.facets.members.render.annotprop;
import java.util.Properties;
-import org.apache.isis.applib.annotation.Resolve;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
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.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.members.render.RenderFacet;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
- private final MetaModelValidatorForDeprecatedAnnotation resolveValidator = new MetaModelValidatorForDeprecatedAnnotation(Resolve.class);
public RenderFacetOrResolveFactory() {
super(FeatureType.MEMBERS);
@@ -48,9 +43,6 @@ public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
public void process(final ProcessMethodContext processMethodContext) {
RenderFacet renderFacet = createFromMetadataPropertiesIfPossible(processMethodContext);
- if(renderFacet == null) {
- renderFacet = resolveValidator.flagIfPresent(createFromResolveAnnotationIfPossible(processMethodContext), processMethodContext);
- }
// no-op if null
FacetUtil.addFacet(renderFacet);
@@ -72,27 +64,14 @@ public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
return properties != null ? new RenderFacetProperties(properties, holder) : null;
}
- // @Render was originally called @Resolve, so look for that annotation instead.
- @SuppressWarnings("deprecation")
- private static RenderFacet createFromResolveAnnotationIfPossible(final ProcessMethodContext processMethodContext) {
- final org.apache.isis.applib.annotation.Resolve resolveAnnotation =
- Annotations.getAnnotation(processMethodContext.getMethod(), org.apache.isis.applib.annotation.Resolve.class);
- return resolveAnnotation == null ? null : new RenderFacetViaResolveAnnotation(processMethodContext.getFacetHolder(), resolveAnnotation.value());
- }
@Override
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(resolveValidator);
+
}
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- resolveValidator.setConfiguration(configuration);
- }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetViaResolveAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetViaResolveAnnotation.java
deleted file mode 100644
index ea33f34..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetViaResolveAnnotation.java
+++ /dev/null
@@ -1,36 +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.members.render.annotprop;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.members.render.RenderFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class RenderFacetViaResolveAnnotation extends RenderFacetAbstract {
-
- @SuppressWarnings("deprecation")
- public RenderFacetViaResolveAnnotation(final FacetHolder holder, org.apache.isis.applib.annotation.Resolve.Type value) {
- super(value.getRenderType(), holder);
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
deleted file mode 100644
index 7901e83..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation.java
+++ /dev/null
@@ -1,154 +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.members.resolve;
-
-import java.util.Collection;
-
-import org.apache.isis.applib.annotation.RenderType;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.members.render.RenderFacet;
-import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetAnnotation;
-import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetOrResolveFactory;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class RenderOrResolveAnnotationFacetFactoryTest_withRenderAnnotation extends AbstractFacetFactoryTest {
-
- private RenderFacetOrResolveFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new RenderFacetOrResolveFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testAnnotationWithNoHintPickedUpOnProperty() {
-
- class Customer {
- @SuppressWarnings("unused")
- public int getNumberOfOrders() {
- return 0;
- }
- }
-
- facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(RenderFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof RenderFacetAnnotation);
- RenderFacet resolveFacet = (RenderFacet) facet;
- assertThat(resolveFacet.value(), is(RenderType.EAGERLY));
-
- assertNoMethodsRemoved();
- }
-
- public void testAnnotationWithEagerlyHintPickedUpOnProperty() {
-
- class Customer {
- @SuppressWarnings("unused")
- public int getNumberOfOrders() {
- return 0;
- }
- }
-
- facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(RenderType.EAGERLY));
- }
-
- public void testAnnotationForLazilyPickedUpOnProperty() {
-
- class Customer {
- @SuppressWarnings("unused")
- public int getNumberOfOrders() {
- return 0;
- }
- }
-
- facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(RenderType.LAZILY));
- }
-
- public void testAnnotationNoHintPickedUpOnCollection() {
- class Customer {
- @SuppressWarnings("unused")
- public Collection<?> getOrders() {
- return null;
- }
- }
- facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(RenderFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof RenderFacetAnnotation);
- RenderFacet resolveFacet = (RenderFacet) facet;
- assertThat(resolveFacet.value(), is(RenderType.EAGERLY));
-
- assertNoMethodsRemoved();
- }
-
- public void testAnnotationEagerlyHintPickedUpOnCollection() {
- class Customer {
- @SuppressWarnings("unused")
- public Collection<?> getOrders() {
- return null;
- }
- }
- facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(RenderType.EAGERLY));
- }
-
- public void testAnnotationWithLazilyHintPickedUpOnCollection() {
- class Customer {
- @SuppressWarnings("unused")
- public Collection<?> getOrders() {
- return null;
- }
- }
- facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(RenderType.LAZILY));
- }
-
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
deleted file mode 100644
index ec71f5d..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/resolve/RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation.java
+++ /dev/null
@@ -1,160 +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.members.resolve;
-
-import java.util.Collection;
-
-import org.apache.isis.applib.annotation.RenderType;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.members.render.RenderFacet;
-import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetOrResolveFactory;
-import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetViaResolveAnnotation;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class RenderOrResolveAnnotationFacetFactoryTest_withResolveAnnotation extends AbstractFacetFactoryTest {
-
- private RenderFacetOrResolveFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new RenderFacetOrResolveFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testAnnotationWithNoHintPickedUpOnProperty() {
-
- class Customer {
- @SuppressWarnings({ "deprecation", "unused" })
- @org.apache.isis.applib.annotation.Resolve
- public int getNumberOfOrders() {
- return 0;
- }
- }
-
- facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(RenderFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof RenderFacetViaResolveAnnotation);
- RenderFacet resolveFacet = (RenderFacet) facet;
- assertThat(resolveFacet.value(), is(RenderType.EAGERLY));
-
- assertNoMethodsRemoved();
- }
-
- public void testAnnotationWithEagerlyHintPickedUpOnProperty() {
-
- class Customer {
- @SuppressWarnings({ "deprecation", "unused" })
- @org.apache.isis.applib.annotation.Resolve(org.apache.isis.applib.annotation.Resolve.Type.EAGERLY)
- public int getNumberOfOrders() {
- return 0;
- }
- }
-
- facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(RenderType.EAGERLY));
- }
-
- public void testAnnotationForLazilyPickedUpOnProperty() {
-
- class Customer {
- @SuppressWarnings({ "deprecation", "unused" })
- @org.apache.isis.applib.annotation.Resolve(org.apache.isis.applib.annotation.Resolve.Type.LAZILY)
- public int getNumberOfOrders() {
- return 0;
- }
- }
-
- facetedMethod = FacetedMethod.createForProperty(Customer.class, "numberOfOrders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(RenderType.LAZILY));
- }
-
- public void testAnnotationNoHintPickedUpOnCollection() {
- class Customer {
- @SuppressWarnings({ "deprecation", "unused" })
- @org.apache.isis.applib.annotation.Resolve
- public Collection<?> getOrders() {
- return null;
- }
- }
- facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(RenderFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof RenderFacetViaResolveAnnotation);
- RenderFacet resolveFacet = (RenderFacet) facet;
- assertThat(resolveFacet.value(), is(RenderType.EAGERLY));
-
- assertNoMethodsRemoved();
- }
-
- public void testAnnotationEagerlyHintPickedUpOnCollection() {
- class Customer {
- @SuppressWarnings({ "deprecation", "unused" })
- @org.apache.isis.applib.annotation.Resolve(org.apache.isis.applib.annotation.Resolve.Type.EAGERLY)
- public Collection<?> getOrders() {
- return null;
- }
- }
- facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(RenderType.EAGERLY));
- }
-
- public void testAnnotationWithLazilyHintPickedUpOnCollection() {
- class Customer {
- @SuppressWarnings({ "deprecation", "unused" })
- @org.apache.isis.applib.annotation.Resolve(org.apache.isis.applib.annotation.Resolve.Type.LAZILY)
- public Collection<?> getOrders() {
- return null;
- }
- }
- facetedMethod = FacetedMethod.createForCollection(Customer.class, "orders");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, facetedMethod.getMethod(), methodRemover, facetedMethod));
-
- final RenderFacet facet = facetedMethod.getFacet(RenderFacet.class);
- assertThat(facet.value(), is(RenderType.LAZILY));
- }
-
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.