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 0767427718 ISIS-3101: minor: just code formatting
0767427718 is described below
commit 076742771849ca9cc66109c3a3123e40b05a1a5f
Author: andi-huber <[email protected]>
AuthorDate: Sun Jul 31 10:37:52 2022 +0200
ISIS-3101: minor: just code formatting
---
.../applib/services/bookmark/IdStringifier.java | 27 ++++++++++++++--------
.../idstringifiers/IdStringifierForCharacter.java | 4 +++-
.../IdStringifierForSerializable.java | 10 ++++----
.../idstringifiers/IdStringifierForString.java | 4 +++-
.../internal/memento/_Mementos_MementoDefault.java | 3 +++
.../bookmarks/BookmarkServiceDefault.java | 6 ++---
.../executionlog/jdo/dom/ExecutionLogEntryPK.java | 6 +++--
.../executionlog/jpa/dom/ExecutionLogEntryPK.java | 7 +++---
.../jdo/dom/ExecutionOutboxEntryPK.java | 6 +++--
.../jpa/dom/ExecutionOutboxEntryPK.java | 7 +++---
.../facets/entity/IdStringifierForCharId.java | 8 ++++---
.../entity/IdStringifierForCharIdentity.java | 8 ++++---
.../facets/entity/IdStringifierForDatastoreId.java | 6 +++--
.../entity/IdStringifierForDatastoreIdImpl.java | 7 +++---
.../IdStringifierForDatastoreUniqueLongId.java | 7 +++---
.../facets/entity/IdStringifierForObjectId.java | 8 ++++---
.../entity/IdStringifierForObjectIdentity.java | 8 ++++---
.../facets/entity/IdStringifierForStringId.java | 8 ++++---
.../entity/IdStringifierForStringIdentity.java | 8 ++++---
19 files changed, 93 insertions(+), 55 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/IdStringifier.java
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/IdStringifier.java
index 382b8267c6..a516cccc83 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/IdStringifier.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/IdStringifier.java
@@ -58,7 +58,7 @@ public interface IdStringifier<T> {
*
* @param candidateValueClass
*/
- boolean handles(final @NonNull Class<?> candidateValueClass);
+ boolean handles(@NonNull Class<?> candidateValueClass);
/**
@@ -68,7 +68,7 @@ public interface IdStringifier<T> {
* @see #destring(String, Class)
* @see #handles(Class)
*/
- String enstring(final @NonNull T value);
+ String enstring(@NonNull T value);
/**
* Convert a string representation of the identifier (as returned by
{@link #enstring(Object)}) into an object
@@ -79,7 +79,7 @@ public interface IdStringifier<T> {
* we always have this information available,
and is needed (at least) by the JDO
* implementations of application primary keys
using built-ins, eg <code>LongIdentity</code>.
*/
- T destring(final @NonNull String stringified, final @NonNull Class<?>
targetEntityClass);
+ T destring(@NonNull String stringified, @NonNull Class<?>
targetEntityClass);
abstract class Abstract<T> implements IdStringifier<T> {
@@ -108,7 +108,9 @@ public interface IdStringifier<T> {
@Override
public boolean handles(final @NonNull Class<?> candidateValueClass) {
- return valueClass.isAssignableFrom(candidateValueClass) ||
primitiveValueClassIfAny != null &&
primitiveValueClassIfAny.isAssignableFrom(candidateValueClass);
+ return valueClass.isAssignableFrom(candidateValueClass)
+ || primitiveValueClassIfAny != null
+ &&
primitiveValueClassIfAny.isAssignableFrom(candidateValueClass);
}
}
@@ -137,12 +139,14 @@ public interface IdStringifier<T> {
/**
* Overridable hook
*/
- protected String doEnstring(T value) {
+ protected String doEnstring(final T value) {
return value.toString();
}
@Override
- public final T destring(final @NonNull String stringified, final
@NonNull Class<?> targetEntityClass) {
+ public final T destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
val suffix = removePrefix(stringified);
return doDestring(suffix, targetEntityClass);
}
@@ -150,19 +154,22 @@ public interface IdStringifier<T> {
/**
* Mandatory hook
*/
- protected abstract T doDestring(final @NonNull String idStr, final
@NonNull Class<?> targetEntityClass);
+ protected abstract T doDestring(
+ final @NonNull String idStr,
+ final @NonNull Class<?> targetEntityClass);
- private String removePrefix(String str) {
+ private String removePrefix(final String str) {
if (str.startsWith(prefix)) {
return str.substring(prefix.length());
}
- throw new IllegalArgumentException(String.format("expected id to
start with '%s', but got '%s'", prefix, str));
+ throw new IllegalArgumentException(
+ String.format("expected id to start with '%s', but got
'%s'", prefix, str));
}
/**
* Not API
*/
- public boolean recognizes(String stringified) {
+ public boolean recognizes(final String stringified) {
return stringified.startsWith(prefix);
}
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForCharacter.java
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForCharacter.java
index 3f35774de9..80eb05b834 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForCharacter.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForCharacter.java
@@ -60,7 +60,9 @@ public class IdStringifierForCharacter extends
IdStringifier.Abstract<Character>
* Not API, but publicly visible for adhoc reuse by other {@link
IdStringifier} implementations.
*/
@Override
- public Character destring(final @NonNull String stringified, @NonNull
Class<?> targetEntityClass) {
+ public Character destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
if(stringified.startsWith(REGULAR_PREFIX)) {
return stringified.substring(REGULAR_PREFIX.length()).charAt(0);
}
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForSerializable.java
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForSerializable.java
index 66c99df870..a7d31638ee 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForSerializable.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForSerializable.java
@@ -55,19 +55,19 @@ public class IdStringifierForSerializable extends
IdStringifier.Abstract<Seriali
this.codec = codec;
this.serializer = new _Mementos.SerializingAdapter() {
@Override
- public Serializable write(Object value) {
+ public Serializable write(final Object value) {
return _Casts.uncheckedCast(value);
}
@Override
- public <T> T read(Class<T> cls, Serializable value) {
+ public <T> T read(final Class<T> cls, final Serializable value) {
return _Casts.uncheckedCast(value);
}
};
}
@Override
- public boolean handles(@NonNull Class<?> candidateValueClass) {
+ public boolean handles(final @NonNull Class<?> candidateValueClass) {
return isPredefinedSerializable(candidateValueClass);
}
@@ -77,7 +77,9 @@ public class IdStringifierForSerializable extends
IdStringifier.Abstract<Seriali
}
@Override
- public Serializable destring(final @NonNull String stringified, @NonNull
Class<?> targetEntityClass) {
+ public Serializable destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
if (_Strings.isEmpty(stringified)) {
return null;
}
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForString.java
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForString.java
index 0ecf68b232..66774f9193 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForString.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/idstringifiers/IdStringifierForString.java
@@ -59,7 +59,9 @@ public class IdStringifierForString extends
IdStringifier.Abstract<String> {
* Not API, but publicly visible for adhoc reuse by other {@link
IdStringifier} implementations.
*/
@Override
- public String destring(final @NonNull String stringified, @NonNull
Class<?> targetEntityClass) {
+ public String destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
if(stringified.startsWith(REGULAR_PREFIX)) {
return stringified.substring(REGULAR_PREFIX.length());
}
diff --git
a/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
b/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
index 5656ee8086..d18581f552 100644
---
a/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
+++
b/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
@@ -76,6 +76,9 @@ class _Mementos_MementoDefault implements _Mementos.Memento {
if(value==null) {
return this; //no-op, there is no point in storing null values
}
+ if(name.equals("contingentHours")) {
+ System.err.printf("storing contingentHours %s%n", "" + value);
+ }
valuesByKey.put(name, serializer.write(value));
return this;
}
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
index 9193809be3..bc265c60b0 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkHolder;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.bookmark.IdStringifier;
-import org.apache.isis.core.runtime.idstringifier.IdStringifierLookupService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._Strings;
@@ -47,6 +46,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.idstringifier.IdStringifierLookupService;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import lombok.val;
@@ -143,7 +143,7 @@ public class BookmarkServiceDefault implements
BookmarkService, SerializingAdapt
val idStringifierIfAny = idStringifierLookupService.lookup(valueClass);
if(idStringifierIfAny.isPresent()) {
- IdStringifier<T> idStringifier = idStringifierIfAny.get();
+ final IdStringifier<T> idStringifier = idStringifierIfAny.get();
return idStringifier.destring((String)value, null);
}
@@ -167,7 +167,7 @@ public class BookmarkServiceDefault implements
BookmarkService, SerializingAdapt
return write(_Casts.uncheckedCast(value), value.getClass());
}
- private <T> Serializable write(T value, Class<T> aClass) {
+ private <T> Serializable write(final T value, final Class<T> aClass) {
Optional<IdStringifier<T>> idStringifierIfAny =
idStringifierLookupService.lookup(aClass);
if(idStringifierIfAny.isPresent()) {
diff --git
a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
index 072ff01ff6..427cac1586 100644
---
a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
+++
b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
@@ -65,12 +65,14 @@ public class ExecutionLogEntryPK implements Serializable {
}
@Override
- public String enstring(ExecutionLogEntryPK value) {
+ public String enstring(final ExecutionLogEntryPK value) {
return value.toString();
}
@Override
- public ExecutionLogEntryPK destring(@NonNull String stringified,
@NonNull Class<?> targetEntityClass) {
+ public ExecutionLogEntryPK destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
return new ExecutionLogEntryPK(stringified);
}
}
diff --git
a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
index 03c40f1a34..15c2e3c412 100644
---
a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
+++
b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
@@ -37,7 +37,6 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
-import lombok.Setter;
import lombok.val;
@EqualsAndHashCode(of = {"interactionId", "sequence"})
@@ -78,12 +77,14 @@ public class ExecutionLogEntryPK implements Serializable {
}
@Override
- public String enstring(ExecutionLogEntryPK value) {
+ public String enstring(final ExecutionLogEntryPK value) {
return value.toString();
}
@Override
- public ExecutionLogEntryPK destring(@NonNull String stringified,
@NonNull Class<?> targetEntityClass) {
+ public ExecutionLogEntryPK destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
return new ExecutionLogEntryPK(stringified);
}
}
diff --git
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
index 9b0e8d9cc6..e9a367c9b2 100644
---
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
+++
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
@@ -65,12 +65,14 @@ public class ExecutionOutboxEntryPK implements Serializable
{
}
@Override
- public String enstring(ExecutionOutboxEntryPK value) {
+ public String enstring(final ExecutionOutboxEntryPK value) {
return value.toString();
}
@Override
- public ExecutionOutboxEntryPK destring(@NonNull String stringified,
@NonNull Class<?> targetEntityClass) {
+ public ExecutionOutboxEntryPK destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
return new ExecutionOutboxEntryPK(stringified);
}
}
diff --git
a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java
b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java
index 5c8ffcc7e6..398657596f 100644
---
a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java
+++
b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java
@@ -37,7 +37,6 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
-import lombok.Setter;
import lombok.val;
@EqualsAndHashCode(of = {"interactionId", "sequence"})
@@ -78,12 +77,14 @@ public class ExecutionOutboxEntryPK implements Serializable
{
}
@Override
- public String enstring(ExecutionOutboxEntryPK value) {
+ public String enstring(final ExecutionOutboxEntryPK value) {
return value.toString();
}
@Override
- public ExecutionOutboxEntryPK destring(@NonNull String stringified,
@NonNull Class<?> targetEntityClass) {
+ public ExecutionOutboxEntryPK destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
return new ExecutionOutboxEntryPK(stringified);
}
}
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharId.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharId.java
index cd9875bb30..5a1b8c1fe8 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharId.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharId.java
@@ -46,18 +46,20 @@ public class IdStringifierForCharId extends
IdStringifier.Abstract<CharId> {
* for testing only
*/
@Builder
- IdStringifierForCharId(IdStringifierForCharacter
idStringifierForCharacter) {
+ IdStringifierForCharId(final IdStringifierForCharacter
idStringifierForCharacter) {
this();
this.idStringifierForCharacter = idStringifierForCharacter;
}
@Override
- public String enstring(@NonNull CharId value) {
+ public String enstring(final @NonNull CharId value) {
return idStringifierForCharacter.enstring(value.getKey());
}
@Override
- public CharId destring(@NonNull String stringified, @NonNull Class<?>
targetEntityClass) {
+ public CharId destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
val idValue = idStringifierForCharacter.destring(stringified,
targetEntityClass);
return new CharId(targetEntityClass, idValue);
}
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharIdentity.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharIdentity.java
index 36b84b56f9..095830df77 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharIdentity.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForCharIdentity.java
@@ -46,18 +46,20 @@ public class IdStringifierForCharIdentity extends
IdStringifier.Abstract<CharIde
* for testing only
*/
@Builder
- IdStringifierForCharIdentity(IdStringifierForCharacter
idStringifierForCharacter) {
+ IdStringifierForCharIdentity(final IdStringifierForCharacter
idStringifierForCharacter) {
this();
this.idStringifierForCharacter = idStringifierForCharacter;
}
@Override
- public String enstring(@NonNull CharIdentity value) {
+ public String enstring(final @NonNull CharIdentity value) {
return idStringifierForCharacter.enstring(value.getKey());
}
@Override
- public CharIdentity destring(@NonNull String stringified, @NonNull
Class<?> targetEntityClass) {
+ public CharIdentity destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
val idValue = idStringifierForCharacter.destring(stringified,
targetEntityClass);
return new CharIdentity(targetEntityClass, idValue);
}
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreId.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreId.java
index cb0f9519aa..628998c2fd 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreId.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreId.java
@@ -43,7 +43,7 @@ public class IdStringifierForDatastoreId extends
IdStringifier.Abstract<Datastor
}
@Override
- public String enstring(@NonNull DatastoreId value) {
+ public String enstring(final @NonNull DatastoreId value) {
//
// the JDO spec (5.4.3) requires that OIDs are serializable toString
and
// re-create-able through the constructor
@@ -54,7 +54,9 @@ public class IdStringifierForDatastoreId extends
IdStringifier.Abstract<Datastor
@SneakyThrows
@Override
- public DatastoreId destring(@NonNull String stringified, @Nullable
Class<?> targetEntityClass) {
+ public DatastoreId destring(
+ final @NonNull String stringified,
+ final @Nullable Class<?> targetEntityClass) {
int idx = stringified.indexOf(SEPARATOR);
String clsName = stringified.substring(0, idx);
String keyStr = stringified.substring(idx + 1);
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreIdImpl.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreIdImpl.java
index c485306f51..de6449efd9 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreIdImpl.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreIdImpl.java
@@ -21,7 +21,6 @@ package
org.apache.isis.persistence.jdo.datanucleus.metamodel.facets.entity;
import javax.annotation.Priority;
import org.datanucleus.identity.DatastoreIdImpl;
-import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.PriorityPrecedence;
@@ -42,13 +41,15 @@ public class IdStringifierForDatastoreIdImpl extends
IdStringifier.Abstract<Data
}
@Override
- public String enstring(@NonNull DatastoreIdImpl value) {
+ public String enstring(final @NonNull DatastoreIdImpl value) {
return value.getKeyAsObject().toString();
}
@SneakyThrows
@Override
- public DatastoreIdImpl destring(@NonNull String stringified, @NonNull
Class<?> targetEntityClass) {
+ public DatastoreIdImpl destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
// enString invoked toString() on the original key; invoking
toString() on its stringified form does not change it
val proto = new DatastoreIdImpl(targetEntityClass.getName(),
stringified);
// now render in the form that the DataStoreImpl constructor expects;
it will take it apart itself.
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreUniqueLongId.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreUniqueLongId.java
index 16fc34cd79..b56d1a6ed2 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreUniqueLongId.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForDatastoreUniqueLongId.java
@@ -39,15 +39,16 @@ public class IdStringifierForDatastoreUniqueLongId extends
IdStringifier.Abstrac
}
@Override
- public String enstring(@NonNull DatastoreUniqueLongId value) {
+ public String enstring(final @NonNull DatastoreUniqueLongId value) {
return value.toString();
}
@SneakyThrows
@Override
- public DatastoreUniqueLongId destring(@NonNull String stringified,
@Nullable Class<?> targetEntityClass) {
+ public DatastoreUniqueLongId destring(
+ final @NonNull String stringified,
+ final @Nullable Class<?> targetEntityClass) {
return new DatastoreUniqueLongId(stringified);
}
-
}
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectId.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectId.java
index fc0f76e17b..07319b83b9 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectId.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectId.java
@@ -49,13 +49,13 @@ public class IdStringifierForObjectId extends
IdStringifier.Abstract<ObjectId> {
* @param idStringifierForUuid
*/
@Builder
- IdStringifierForObjectId(IdStringifierForUuid idStringifierForUuid) {
+ IdStringifierForObjectId(final IdStringifierForUuid idStringifierForUuid) {
this();
this.idStringifierForUuid = idStringifierForUuid;
}
@Override
- public String enstring(@NonNull ObjectId value) {
+ public String enstring(final @NonNull ObjectId value) {
Object keyAsObject = value.getKeyAsObject();
if (keyAsObject instanceof UUID) {
UUID uuid = (UUID) keyAsObject;
@@ -66,7 +66,9 @@ public class IdStringifierForObjectId extends
IdStringifier.Abstract<ObjectId> {
}
@Override
- public ObjectId destring(@NonNull String stringified, @NonNull Class<?>
targetEntityClass) {
+ public ObjectId destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
if (idStringifierForUuid.recognizes(stringified)) {
UUID uuid = idStringifierForUuid.destring(stringified,
targetEntityClass);
return new ObjectId(targetEntityClass, uuid);
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectIdentity.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectIdentity.java
index eb6532f071..01dd261733 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectIdentity.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForObjectIdentity.java
@@ -49,13 +49,13 @@ public class IdStringifierForObjectIdentity extends
IdStringifier.Abstract<Objec
* @param idStringifierForUuid
*/
@Builder
- IdStringifierForObjectIdentity(IdStringifierForUuid idStringifierForUuid) {
+ IdStringifierForObjectIdentity(final IdStringifierForUuid
idStringifierForUuid) {
this();
this.idStringifierForUuid = idStringifierForUuid;
}
@Override
- public String enstring(@NonNull ObjectIdentity value) {
+ public String enstring(final @NonNull ObjectIdentity value) {
Object keyAsObject = value.getKeyAsObject();
if (keyAsObject instanceof UUID) {
UUID uuid = (UUID) keyAsObject;
@@ -66,7 +66,9 @@ public class IdStringifierForObjectIdentity extends
IdStringifier.Abstract<Objec
}
@Override
- public ObjectIdentity destring(@NonNull String stringified, @NonNull
Class<?> targetEntityClass) {
+ public ObjectIdentity destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
if (idStringifierForUuid.recognizes(stringified)) {
UUID uuid = idStringifierForUuid.destring(stringified,
targetEntityClass);
return new ObjectIdentity(targetEntityClass, uuid);
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringId.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringId.java
index bf512ac8fc..83046b1b45 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringId.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringId.java
@@ -46,18 +46,20 @@ public class IdStringifierForStringId extends
IdStringifier.Abstract<StringIdent
* for testing only
*/
@Builder
- IdStringifierForStringId(IdStringifierForString idStringifierForString) {
+ IdStringifierForStringId(final IdStringifierForString
idStringifierForString) {
this();
this.idStringifierForString = idStringifierForString;
}
@Override
- public String enstring(@NonNull StringIdentity value) {
+ public String enstring(final @NonNull StringIdentity value) {
return idStringifierForString.enstring(value.getKey());
}
@Override
- public StringIdentity destring(@NonNull String stringified, @NonNull
Class<?> targetEntityClass) {
+ public StringIdentity destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
val idValue = idStringifierForString.destring(stringified,
targetEntityClass);
return new StringIdentity(targetEntityClass, idValue);
}
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringIdentity.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringIdentity.java
index c477d5e9ed..e5a759d856 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringIdentity.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/IdStringifierForStringIdentity.java
@@ -46,18 +46,20 @@ public class IdStringifierForStringIdentity extends
IdStringifier.Abstract<Strin
* for testing only
*/
@Builder
- IdStringifierForStringIdentity(IdStringifierForString
idStringifierForString) {
+ IdStringifierForStringIdentity(final IdStringifierForString
idStringifierForString) {
this();
this.idStringifierForString = idStringifierForString;
}
@Override
- public String enstring(@NonNull StringIdentity value) {
+ public String enstring(final @NonNull StringIdentity value) {
return idStringifierForString.enstring(value.getKey());
}
@Override
- public StringIdentity destring(@NonNull String stringified, @NonNull
Class<?> targetEntityClass) {
+ public StringIdentity destring(
+ final @NonNull String stringified,
+ final @NonNull Class<?> targetEntityClass) {
val idValue = idStringifierForString.destring(stringified,
targetEntityClass);
return new StringIdentity(targetEntityClass, idValue);
}
