You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/15 17:43:33 UTC
[isis] branch master updated: ISIS-2569: polishing Oid
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 6acd5f9 ISIS-2569: polishing Oid
6acd5f9 is described below
commit 6acd5f9e501df787d9edcfd4fe271468867b8303
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 15 19:39:58 2021 +0200
ISIS-2569: polishing Oid
---
.../apache/isis/applib/jaxb/PersistentEntitiesAdapter.java | 2 +-
.../org/apache/isis/applib/jaxb/PersistentEntityAdapter.java | 2 +-
.../org/apache/isis/applib/services/bookmark/Bookmark.java | 2 +-
.../org/apache/isis/applib/services/command/Command.java | 2 +-
.../java/org/apache/isis/core/metamodel/adapter/oid/Oid.java | 8 ++++----
.../isis/core/metamodel/adapter/oid/_OidMarshaller.java | 8 +++++---
.../identify/ObjectIdentifier_builtinHandlers.java | 8 ++++----
.../metamodel/adapter/oid/OidMarshallerTest_marshall.java | 2 +-
.../adapter/oid/OidMarshallerTest_roundtripping.java | 4 ++--
.../isis/core/metamodel/adapter/oid/OidVersionTest.java | 12 ++++++------
.../RootOidDefaultTest_valueSemantics_whenPersistent.java | 10 +++++-----
.../isis/core/metamodel/adapter/oid/RootOidTest_create.java | 2 +-
.../command/CommandExecutorServiceDefault.java | 2 +-
.../core/runtimeservices/wrapper/WrapperFactoryDefault.java | 2 +-
.../isis/extensions/commandlog/impl/jdo/CommandJdo.java | 2 +-
.../extensions/commandlog/impl/jdo/CommandJdoRepository.java | 2 +-
.../datanucleus/metamodel/facets/entity/JdoEntityFacet.java | 2 +-
.../typeconverters/schema/v2/IsisOidDtoConverter.java | 4 ++--
18 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/jaxb/PersistentEntitiesAdapter.java b/api/applib/src/main/java/org/apache/isis/applib/jaxb/PersistentEntitiesAdapter.java
index d08557a..e0d6bea 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/jaxb/PersistentEntitiesAdapter.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/jaxb/PersistentEntitiesAdapter.java
@@ -45,7 +45,7 @@ public class PersistentEntitiesAdapter extends XmlAdapter<OidsDto, List<Object>>
List<Object> domainObjects = new ArrayList<>();
for (val oidDto : oidsDto.getOid()) {
- val bookmark = Bookmark.from(oidDto);
+ val bookmark = Bookmark.fromOidDto(oidDto);
val domainObject = bookmarkService.lookup(bookmark);
domainObjects.add(domainObject);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/jaxb/PersistentEntityAdapter.java b/api/applib/src/main/java/org/apache/isis/applib/jaxb/PersistentEntityAdapter.java
index 3054ff8..0427bb5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/jaxb/PersistentEntityAdapter.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/jaxb/PersistentEntityAdapter.java
@@ -35,7 +35,7 @@ public class PersistentEntityAdapter extends XmlAdapter<OidDto, Object> {
@Override
public Object unmarshal(final OidDto oidDto) throws Exception {
- val bookmark = Bookmark.from(oidDto);
+ val bookmark = Bookmark.fromOidDto(oidDto);
return bookmarkService.lookup(bookmark);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
index f94a00d..b37b410 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
@@ -89,7 +89,7 @@ public class Bookmark implements Serializable {
return oidDto;
}
- public static Bookmark from(@NonNull OidDto oidDto) {
+ public static Bookmark fromOidDto(final @NonNull OidDto oidDto) {
return Bookmark.of(oidDto.getType(), oidDto.getId());
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index 69dc5a8..aa6b048 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -144,7 +144,7 @@ public class Command implements HasInteractionId, HasUsername, HasCommandDto {
@ToString.Include(name = "target")
public Bookmark getTarget() {
return commandDto != null
- ? Bookmark.from(commandDto.getTargets().getOid().get(0))
+ ? Bookmark.fromOidDto(commandDto.getTargets().getOid().get(0))
: null;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
index 1321f97..486970e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
@@ -49,7 +49,7 @@ public interface Oid extends Serializable {
return _EmptyOid.INSTANCE;
}
- public static Oid root(final LogicalType logicalType, final String identifier) {
+ public static Oid of(final LogicalType logicalType, final String identifier) {
return _SimpleOid.of(
logicalType.getLogicalTypeName(),
identifier);
@@ -61,10 +61,10 @@ public interface Oid extends Serializable {
bookmark.getIdentifier());
}
- public static Oid forDto(final OidDto oid) {
+ public static Oid forDto(final OidDto oidDto) {
return _SimpleOid.of(
- oid.getType(),
- oid.getId());
+ oidDto.getType(),
+ oidDto.getId());
}
public static Oid forLogicalTypeNameAndIdentifier(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/_OidMarshaller.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/_OidMarshaller.java
index 1210378..01456c5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/_OidMarshaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/_OidMarshaller.java
@@ -32,6 +32,8 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import static org.apache.isis.commons.internal.base._Strings.splitThenStream;
+import lombok.NonNull;
+
/**
* Factory for subtypes of {@link Oid}, based on their oid str.
*
@@ -111,14 +113,14 @@ final class _OidMarshaller {
"([\\" + SEPARATOR_VERSION + "].*)?" + // to be compatible with previous patterns, that optionally included version information
"$");
- // -- MARSHAL
+ // -- MARSHAL / STRINGIFY
- static final String marshal(Oid oid) {
+ static final String marshal(final @NonNull Oid oid) {
_Assert.assertFalse(oid.isEmpty(), "cannot marshal an empty OID");
return oid.getLogicalTypeName() + SEPARATOR + oid.getIdentifier();
}
- // -- UNMARSHAL
+ // -- UNMARSHAL / PARSE
static <T extends Oid> T unmarshal(String oidStr) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index 06794a6..a56a61a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -60,7 +60,7 @@ class ObjectIdentifier_builtinHandlers {
@Override
public Oid handle(ManagedObject managedObject) {
final String identifier = SERVICE_IDENTIFIER;
- return Oid.root(managedObject.getSpecification().getLogicalType(), identifier);
+ return Oid.of(managedObject.getSpecification().getLogicalType(), identifier);
}
}
@@ -86,7 +86,7 @@ class ObjectIdentifier_builtinHandlers {
throw _Exceptions.unrecoverable(msg);
}
val identifier = entityFacet.identifierFor(spec, pojo);
- return Oid.root(spec.getLogicalType(), identifier);
+ return Oid.of(spec.getLogicalType(), identifier);
}
}
@@ -117,7 +117,7 @@ class ObjectIdentifier_builtinHandlers {
val spec = managedObject.getSpecification();
val recreatableObjectFacet = spec.getFacet(ViewModelFacet.class);
val identifier = recreatableObjectFacet.memento(managedObject.getPojo());
- return Oid.root(spec.getLogicalType(), identifier);
+ return Oid.of(spec.getLogicalType(), identifier);
}
}
@@ -133,7 +133,7 @@ class ObjectIdentifier_builtinHandlers {
public Oid handle(ManagedObject managedObject) {
val spec = managedObject.getSpecification();
val identifier = UUID.randomUUID().toString();
- return Oid.root(spec.getLogicalType(), identifier);
+ return Oid.of(spec.getLogicalType(), identifier);
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
index afff9a5..f01b64e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
@@ -27,7 +27,7 @@ public class OidMarshallerTest_marshall {
@Test
public void oid() {
- final String marshal = _OidMarshaller.marshal(Oid.root(LogicalTypeTestFactory.cus(), "123"));
+ final String marshal = _OidMarshaller.marshal(Oid.of(LogicalTypeTestFactory.cus(), "123"));
assertThat(marshal, equalTo("CUS:123"));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
index 1d2ef39..844d99a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
@@ -30,7 +30,7 @@ public class OidMarshallerTest_roundtripping {
@Test
public void oid() {
- val oid = Oid.root(LogicalTypeTestFactory.cus(), "123");
+ val oid = Oid.of(LogicalTypeTestFactory.cus(), "123");
final String enString = oid.stringify();
final Oid deString = Oid.parse(enString);
@@ -39,7 +39,7 @@ public class OidMarshallerTest_roundtripping {
@Test
public void oid_withLegacyVersionIgnored() {
- val oid = Oid.root(LogicalTypeTestFactory.cus(), "123");
+ val oid = Oid.of(LogicalTypeTestFactory.cus(), "123");
final String enString = oid.stringify();
final Oid deString = Oid.parse(enString + "^" + 90807L);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java
index 19ead98..0a12db6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java
@@ -36,24 +36,24 @@ public class OidVersionTest {
@Test
public void whenEquivalent() throws Exception {
- oid1 = Oid.root(cus, "123");
- oid2 = Oid.root(cus, "123");
+ oid1 = Oid.of(cus, "123");
+ oid2 = Oid.of(cus, "123");
assertThat(oid1, is(equalTo(oid2)));
}
@Test
public void whenNotEquivalentById() throws Exception {
- oid1 = Oid.root(cus, "123");
- oid2 = Oid.root(cus, "124");
+ oid1 = Oid.of(cus, "123");
+ oid2 = Oid.of(cus, "124");
assertThat(oid1, is(not(equalTo(oid2))));
}
@Test
public void whenNotEquivalentByObjectSpecId() throws Exception {
- oid1 = Oid.root(cus, "123");
- oid2 = Oid.root(ord, "123");
+ oid1 = Oid.of(cus, "123");
+ oid2 = Oid.of(ord, "123");
assertThat(oid1, is(not(equalTo(oid2))));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
index 1fbcf62..effcfb4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
@@ -29,17 +29,17 @@ extends ValueTypeContractTestAbstract<Oid> {
@Override
protected List<Oid> getObjectsWithSameValue() {
return Arrays.asList(
- Oid.root(LogicalTypeTestFactory.cus(), "123"),
- Oid.root(LogicalTypeTestFactory.cus(), "123"),
- Oid.root(LogicalTypeTestFactory.cus(), "123"));
+ Oid.of(LogicalTypeTestFactory.cus(), "123"),
+ Oid.of(LogicalTypeTestFactory.cus(), "123"),
+ Oid.of(LogicalTypeTestFactory.cus(), "123"));
}
@Override
protected List<Oid> getObjectsWithDifferentValue() {
return Arrays.asList(
//Oid.Factory.of(ObjectSpecId.of("CUS"), "123"),
- Oid.root(LogicalTypeTestFactory.cus(), "124"),
- Oid.root(LogicalTypeTestFactory.cux(), "123"));
+ Oid.of(LogicalTypeTestFactory.cus(), "124"),
+ Oid.of(LogicalTypeTestFactory.cux(), "123"));
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
index 5d63e5a..4b515ef 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
@@ -30,7 +30,7 @@ public class RootOidTest_create {
@Test
public void create() throws Exception {
val logicalType = LogicalTypeTestFactory.cus();
- Oid oid = Oid.root(logicalType, "123");
+ Oid oid = Oid.of(logicalType, "123");
assertThat(oid.getLogicalTypeName(), is(logicalType.getLogicalTypeName()));
assertThat(oid.getIdentifier(), is("123"));
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
index f938cca..c316bce 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -233,7 +233,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
for (OidDto targetOidDto : targetOidDtos) {
- final Bookmark bookmark = Bookmark.from(targetOidDto);
+ final Bookmark bookmark = Bookmark.fromOidDto(targetOidDto);
final Object targetObject = bookmarkService.lookup(bookmark);
val targetAdapter = adapterFor(targetObject);
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index f34e299..55a8ef0 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -386,7 +386,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
val oidDto = commandDto.getTargets().getOid().get(0);
asyncControl.setMethod(method);
- asyncControl.setBookmark(Bookmark.from(oidDto));
+ asyncControl.setBookmark(Bookmark.fromOidDto(oidDto));
val executorService = asyncControl.getExecutorService();
val future = executorService.submit(
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
index ea1b6b5..9d4d23d 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
@@ -308,7 +308,7 @@ public class CommandJdo
setTimestamp(JavaSqlXMLGregorianCalendarMarshalling.toTimestamp(commandDto.getTimestamp()));
setCommandDto(commandDto);
- setTarget(Bookmark.from(commandDto.getTargets().getOid().get(targetIndex)));
+ setTarget(Bookmark.fromOidDto(commandDto.getTargets().getOid().get(targetIndex)));
setLogicalMemberIdentifier(commandDto.getMember().getLogicalMemberIdentifier());
// the hierarchy of commands calling other commands is only available on the primary system, and is
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
index 623e4e8..3e331b3 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
@@ -340,7 +340,7 @@ public class CommandJdoRepository {
commandJdo.setReplayState(ReplayState.PENDING);
final OidDto firstTarget = dto.getTargets().getOid().get(0);
- commandJdo.setTarget(Bookmark.from(firstTarget));
+ commandJdo.setTarget(Bookmark.fromOidDto(firstTarget));
commandJdo.setCommandDto(dto);
commandJdo.setLogicalMemberIdentifier(dto.getMember().getLogicalMemberIdentifier());
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index da92d37..a2e85e7 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -126,7 +126,7 @@ implements EntityFacet {
_Assert.assertTrue(entitySpec.isEntity());
- val oid = Oid.root(entitySpec.getLogicalType(), identifier);
+ val oid = Oid.of(entitySpec.getLogicalType(), identifier);
log.debug("fetchEntity; oid={}", oid);
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.java
index fa11f3c..6a33529 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.java
@@ -33,8 +33,8 @@ public class IsisOidDtoConverter implements TypeConverter<OidDto, String>{
@Override
public String toDatastoreType(final OidDto memberValue) {
return memberValue != null
- ? Bookmark.from(memberValue).toString()
- : null;
+ ? Bookmark.fromOidDto(memberValue).toString()
+ : null;
}
@Override