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 11:58:51 UTC
[isis] 08/24: ISIS-1742: fixes up PublishedObjectFacet
implementations,
removing references to the now deleted PublishingPayloadFactory stuff.
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 7183a7a07754dec756731d52a6391b0926a1b11f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 09:12:30 2017 +0100
ISIS-1742: fixes up PublishedObjectFacet implementations, removing references to the now deleted PublishingPayloadFactory stuff.
Also deletes PublishedObjectFacetForPublishedObjectAnnotation, since that annotation previously deleted.
---
.../DomainObjectAnnotationFacetFactory.java | 1 -
...lishedObjectFacetForDomainObjectAnnotation.java | 32 ++----------
...FacetForDomainObjectAnnotationAsConfigured.java | 4 +-
...hedObjectFacetForPublishedObjectAnnotation.java | 57 ----------------------
.../PublishedObjectFacetFromConfiguration.java | 4 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 1 -
6 files changed, 9 insertions(+), 90 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index a61a99e..2a72c05 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -72,7 +72,6 @@ import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.Ob
import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForJdoPersistenceCapableAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetFromObjectTypeAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForDomainObjectAnnotation;
-import org.apache.isis.core.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForPublishedObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.recreatable.RecreatableObjectFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.immutable.immutableannot.ImmutableFacetForImmutableAnnotation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
index 2ef5b69..5e284e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
@@ -43,42 +43,20 @@ public class PublishedObjectFacetForDomainObjectAnnotation extends PublishedObje
case NONE:
return null;
default:
- final PublishingPayloadFactoryForObject publishingPayloadFactory = newPayloadFactory(domainObject);
return domainObject != null
- ? new PublishedObjectFacetForDomainObjectAnnotationAsConfigured(publishingPayloadFactory, holder)
- : new PublishedObjectFacetFromConfiguration(publishingPayloadFactory, holder);
+ ? new PublishedObjectFacetForDomainObjectAnnotationAsConfigured(holder)
+ : new PublishedObjectFacetFromConfiguration(holder);
}
case DISABLED:
return null;
case ENABLED:
- return new PublishedObjectFacetForDomainObjectAnnotation(
- newPayloadFactory(domainObject), holder);
+ return new PublishedObjectFacetForDomainObjectAnnotation(holder);
}
return null;
}
- /**
- * @return null means that the default payload factories will be used; this is handled within IsisTransaction.
- */
- protected static PublishingPayloadFactoryForObject newPayloadFactory(final DomainObject domainObject) {
- if(domainObject == null) {
- return null;
- }
- final Class<? extends PublishingPayloadFactoryForObject> value = domainObject.publishingPayloadFactory();
- if(value == null) {
- return null;
- }
- try {
- return value.newInstance();
- } catch (final InstantiationException e) {
- return null;
- } catch (final IllegalAccessException e) {
- return null;
- }
- }
-
- PublishedObjectFacetForDomainObjectAnnotation(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
- super(publishingPayloadFactory, holder);
+ PublishedObjectFacetForDomainObjectAnnotation(final FacetHolder holder) {
+ super(holder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
index eadcec4..c5d061b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotationAsConfigured.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class PublishedObjectFacetForDomainObjectAnnotationAsConfigured extends PublishedObjectFacetForDomainObjectAnnotation {
- PublishedObjectFacetForDomainObjectAnnotationAsConfigured(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
- super(publishingPayloadFactory, holder);
+ PublishedObjectFacetForDomainObjectAnnotationAsConfigured(final FacetHolder holder) {
+ super(holder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForPublishedObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForPublishedObjectAnnotation.java
deleted file mode 100644
index 2ab33e2..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForPublishedObjectAnnotation.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.domainobject.publishing;
-
-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;
- }
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java
index 6848fd0..a1b1088 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetFromConfiguration.java
@@ -24,8 +24,8 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
public class PublishedObjectFacetFromConfiguration extends PublishedObjectFacetAbstract {
- PublishedObjectFacetFromConfiguration(final PublishingPayloadFactoryForObject publishingPayloadFactory, final FacetHolder holder) {
- super(publishingPayloadFactory, holder);
+ PublishedObjectFacetFromConfiguration(final FacetHolder holder) {
+ super(holder);
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 51efe7f..81fef2e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -50,7 +50,6 @@ import org.apache.isis.core.metamodel.facets.object.domainobject.editing.Immutab
import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForDomainObjectAnnotationAsConfigured;
-import org.apache.isis.core.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForPublishedObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetFromConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.recreatable.RecreatableObjectFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.