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:54 UTC
[isis] 11/24: ISIS-1742: replaces uses of the now deleted
PublishedObject.ChangeKind enum with its replacement, PublishingChangeKind
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 b8252323ffe2e23f81946e981d1a22a80da75a11
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 09:17:43 2017 +0100
ISIS-1742: replaces uses of the now deleted PublishedObject.ChangeKind enum with its replacement, PublishingChangeKind
---
...stence-layer_ChangedObjectsServiceInternal.adoc | 2 +-
.../changes/ChangedObjectsServiceInternal.java | 15 ++++++------
.../services/publish/PublishedObjectsDefault.java | 27 +++++++++++----------
.../publish/PublishingServiceInternalDefault.java | 28 +++++++++++-----------
4 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_ChangedObjectsServiceInternal.adoc b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_ChangedObjectsServiceInternal.adoc
index 660e6d0..7d42d0f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_ChangedObjectsServiceInternal.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer_ChangedObjectsServiceInternal.adoc
@@ -27,7 +27,7 @@ public class ChangedObjectsServiceInternal {
public boolean hasChangedAdapters(); // <2>
- public Map<ObjectAdapter, PublishedObject.ChangeKind> getChangeKindByEnlistedAdapter(); // <3>
+ public Map<ObjectAdapter, PublishingChangeKind> getChangeKindByEnlistedAdapter(); // <3>
public int numberObjectsDirtied();
public int numberObjectPropertiesModified();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
index b00d413..2a82ea3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
@@ -30,6 +30,7 @@ import com.google.common.collect.Sets;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.PublishingChangeKind;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.WithTransactionScope;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -66,7 +67,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
// used for publishing
- private final Map<ObjectAdapter,PublishedObject.ChangeKind> changeKindByEnlistedAdapter = Maps.newLinkedHashMap();
+ private final Map<ObjectAdapter,PublishingChangeKind> changeKindByEnlistedAdapter = Maps.newLinkedHashMap();
@Programmatic
public boolean isEnlisted(ObjectAdapter adapter) {
@@ -91,7 +92,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
return;
}
- enlistForPublishing(adapter, PublishedObject.ChangeKind.CREATE);
+ enlistForPublishing(adapter, PublishingChangeKind.CREATE);
for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property);
@@ -125,7 +126,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
return;
}
- enlistForPublishing(adapter, PublishedObject.ChangeKind.UPDATE);
+ enlistForPublishing(adapter, PublishingChangeKind.UPDATE);
for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property);
@@ -159,7 +160,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
return;
}
- final boolean enlisted = enlistForPublishing(adapter, PublishedObject.ChangeKind.DELETE);
+ final boolean enlisted = enlistForPublishing(adapter, PublishingChangeKind.DELETE);
if(!enlisted) {
return;
}
@@ -182,8 +183,8 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
/**
* @return <code>true</code> if successfully enlisted, <code>false</code> if was already enlisted
*/
- private boolean enlistForPublishing(final ObjectAdapter adapter, final PublishedObject.ChangeKind current) {
- final PublishedObject.ChangeKind previous = changeKindByEnlistedAdapter.get(adapter);
+ private boolean enlistForPublishing(final ObjectAdapter adapter, final PublishingChangeKind current) {
+ final PublishingChangeKind previous = changeKindByEnlistedAdapter.get(adapter);
if(previous == null) {
changeKindByEnlistedAdapter.put(adapter, current);
return true;
@@ -260,7 +261,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
@Programmatic
- public Map<ObjectAdapter, PublishedObject.ChangeKind> getChangeKindByEnlistedAdapter() {
+ public Map<ObjectAdapter, PublishingChangeKind> getChangeKindByEnlistedAdapter() {
return changeKindByEnlistedAdapter;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
index 43bd546..9784214 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
@@ -32,6 +32,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimaps;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.PublishingChangeKind;
import org.apache.isis.applib.services.publish.PublishedObjects;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -53,7 +54,7 @@ public class PublishedObjectsDefault implements PublishedObjects {
private final Timestamp completedAt;
private final int numberLoaded;
private final int numberObjectPropertiesModified;
- private final Map<ObjectAdapter, PublishedObject.ChangeKind> changesByAdapter;
+ private final Map<ObjectAdapter, PublishingChangeKind> changesByAdapter;
public PublishedObjectsDefault(
final UUID transactionUuid,
@@ -62,7 +63,7 @@ public class PublishedObjectsDefault implements PublishedObjects {
final Timestamp completedAt,
final int numberLoaded,
final int numberObjectPropertiesModified,
- final Map<ObjectAdapter, PublishedObject.ChangeKind> changesByAdapter) {
+ final Map<ObjectAdapter, PublishingChangeKind> changesByAdapter) {
this.transactionUuid = transactionUuid;
this.sequence = sequence;
this.userName = userName;
@@ -124,17 +125,17 @@ public class PublishedObjectsDefault implements PublishedObjects {
@Override
public int getNumberCreated() {
- return numAdaptersOfKind(PublishedObject.ChangeKind.CREATE);
+ return numAdaptersOfKind(PublishingChangeKind.CREATE);
}
@Override
public int getNumberUpdated() {
- return numAdaptersOfKind(PublishedObject.ChangeKind.UPDATE);
+ return numAdaptersOfKind(PublishingChangeKind.UPDATE);
}
@Override
public int getNumberDeleted() {
- return numAdaptersOfKind(PublishedObject.ChangeKind.DELETE);
+ return numAdaptersOfKind(PublishingChangeKind.DELETE);
}
@Override
@@ -142,7 +143,7 @@ public class PublishedObjectsDefault implements PublishedObjects {
return numberObjectPropertiesModified;
}
- private int numAdaptersOfKind(final PublishedObject.ChangeKind kind) {
+ private int numAdaptersOfKind(final PublishingChangeKind kind) {
final Collection<ObjectAdapter> objectAdapters = adaptersByChange().get(kind);
return objectAdapters != null ? objectAdapters.size() : 0;
}
@@ -151,9 +152,9 @@ public class PublishedObjectsDefault implements PublishedObjects {
/**
* Lazily populated
*/
- private Map<PublishedObject.ChangeKind, Collection<ObjectAdapter>> adaptersByChange;
+ private Map<PublishingChangeKind, Collection<ObjectAdapter>> adaptersByChange;
- private Map<PublishedObject.ChangeKind, Collection<ObjectAdapter>> adaptersByChange() {
+ private Map<PublishingChangeKind, Collection<ObjectAdapter>> adaptersByChange() {
return adaptersByChange != null? adaptersByChange : (adaptersByChange = invert(changesByAdapter));
}
@@ -180,9 +181,9 @@ public class PublishedObjectsDefault implements PublishedObjects {
final ObjectsDto objectsDto = new ObjectsDto();
- objectsDto.setCreated(oidsDtoFor(PublishedObject.ChangeKind.CREATE));
- objectsDto.setUpdated(oidsDtoFor(PublishedObject.ChangeKind.UPDATE));
- objectsDto.setDeleted(oidsDtoFor(PublishedObject.ChangeKind.DELETE));
+ objectsDto.setCreated(oidsDtoFor(PublishingChangeKind.CREATE));
+ objectsDto.setUpdated(oidsDtoFor(PublishingChangeKind.UPDATE));
+ objectsDto.setDeleted(oidsDtoFor(PublishingChangeKind.DELETE));
objectsDto.setLoaded(getNumberLoaded());
objectsDto.setPropertiesModified(getNumberPropertiesModified());
@@ -190,10 +191,10 @@ public class PublishedObjectsDefault implements PublishedObjects {
return objectsDto;
}
- private OidsDto oidsDtoFor(final PublishedObject.ChangeKind kind) {
+ private OidsDto oidsDtoFor(final PublishingChangeKind kind) {
final OidsDto oidsDto = new OidsDto();
- final Map<PublishedObject.ChangeKind, Collection<ObjectAdapter>> adaptersByChange = adaptersByChange();
+ final Map<PublishingChangeKind, Collection<ObjectAdapter>> adaptersByChange = adaptersByChange();
final Collection<ObjectAdapter> adapters = adaptersByChange.get(kind);
if(adapters != null) {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
index 7006679..aad979c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.annotation.PublishedObject.ChangeKind;
+import org.apache.isis.applib.annotation.PublishingChangeKind;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
@@ -115,14 +115,14 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
// take a copy of enlisted adapters ... the JDO implementation of the PublishingService
// creates further entities which would be enlisted; taking copy of the map avoids ConcurrentModificationException
- final Map<ObjectAdapter, ChangeKind> changeKindByEnlistedAdapter = Maps.newHashMap();
+ final Map<ObjectAdapter, PublishingChangeKind> changeKindByEnlistedAdapter = Maps.newHashMap();
changeKindByEnlistedAdapter.putAll(changedObjectsServiceInternal.getChangeKindByEnlistedAdapter());
publishObjectsToPublishingService(changeKindByEnlistedAdapter);
publishObjectsToPublisherServices(changeKindByEnlistedAdapter);
}
- private void publishObjectsToPublishingService(final Map<ObjectAdapter, ChangeKind> changeKindByEnlistedAdapter) {
+ private void publishObjectsToPublishingService(final Map<ObjectAdapter, PublishingChangeKind> changeKindByEnlistedAdapter) {
if(publishingServiceIfAny == null) {
return;
@@ -132,9 +132,9 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
final Timestamp timestamp = clockService.nowAsJavaSqlTimestamp();
final ObjectStringifier stringifier = objectStringifier();
- for (final Map.Entry<ObjectAdapter, ChangeKind> adapterAndChange : changeKindByEnlistedAdapter.entrySet()) {
+ for (final Map.Entry<ObjectAdapter, PublishingChangeKind> adapterAndChange : changeKindByEnlistedAdapter.entrySet()) {
final ObjectAdapter enlistedAdapter = adapterAndChange.getKey();
- final ChangeKind changeKind = adapterAndChange.getValue();
+ final PublishingChangeKind changeKind = adapterAndChange.getValue();
publishObjectToPublishingService(
enlistedAdapter, changeKind, currentUser, timestamp, stringifier);
@@ -143,7 +143,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
private void publishObjectToPublishingService(
final ObjectAdapter enlistedAdapter,
- final ChangeKind changeKind,
+ final PublishingChangeKind changeKind,
final String currentUser,
final Timestamp timestamp,
final ObjectStringifier stringifier) {
@@ -171,9 +171,9 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
}
private void publishObjectsToPublisherServices(
- final Map<ObjectAdapter, ChangeKind> changeKindByEnlistedAdapter) {
+ final Map<ObjectAdapter, PublishingChangeKind> changeKindByEnlistedAdapter) {
- final Map<ObjectAdapter, ChangeKind> changeKindByPublishedAdapter =
+ final Map<ObjectAdapter, PublishingChangeKind> changeKindByPublishedAdapter =
Maps.filterKeys(
changeKindByEnlistedAdapter,
PublishedObjectFacet.Predicates.isPublished());
@@ -195,7 +195,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
private PublishedObjects newPublishedObjects(
final int numberLoaded,
final int numberObjectPropertiesModified,
- final Map<ObjectAdapter, ChangeKind> changeKindByPublishedAdapter) {
+ final Map<ObjectAdapter, PublishingChangeKind> changeKindByPublishedAdapter) {
final Command command = commandContext.getCommand();
final UUID transactionUuid = command.getTransactionId();
@@ -342,7 +342,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
private EventMetadata newEventMetadata(
final String currentUser,
final Timestamp timestamp,
- final ChangeKind changeKind,
+ final PublishingChangeKind changeKind,
final String enlistedAdapterClass,
final Bookmark enlistedTarget) {
final EventType eventType = PublishingServiceInternalDefault.eventTypeFor(changeKind);
@@ -356,14 +356,14 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
enlistedAdapterClass, null, enlistedTarget, null, null, null, null);
}
- private static EventType eventTypeFor(ChangeKind changeKind) {
- if(changeKind == ChangeKind.UPDATE) {
+ private static EventType eventTypeFor(PublishingChangeKind changeKind) {
+ if(changeKind == PublishingChangeKind.UPDATE) {
return EventType.OBJECT_UPDATED;
}
- if(changeKind == ChangeKind.CREATE) {
+ if(changeKind == PublishingChangeKind.CREATE) {
return EventType.OBJECT_CREATED;
}
- if(changeKind == ChangeKind.DELETE) {
+ if(changeKind == PublishingChangeKind.DELETE) {
return EventType.OBJECT_DELETED;
}
throw new IllegalArgumentException("unknown ChangeKind '" + changeKind + "'");
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.