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 2019/12/05 16:10:09 UTC
[isis] branch master updated: ISIS-2177: mementos: remove
unreferenced methods
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 f35c49c ISIS-2177: mementos: remove unreferenced methods
f35c49c is described below
commit f35c49cfd0d7b03528611b4bfd33428d3aab2872
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 5 17:09:59 2019 +0100
ISIS-2177: mementos: remove unreferenced methods
---
.../isis/runtime/memento/CollectionData.java | 16 ++--
.../java/org/apache/isis/runtime/memento/Data.java | 57 ++++----------
.../java/org/apache/isis/runtime/memento/Null.java | 23 +-----
.../apache/isis/runtime/memento/ObjectData.java | 91 ++--------------------
.../isis/runtime/memento/StandaloneData.java | 68 ----------------
5 files changed, 24 insertions(+), 231 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/memento/CollectionData.java b/core/runtime/src/main/java/org/apache/isis/runtime/memento/CollectionData.java
index a8411ca..289f4b7 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/memento/CollectionData.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/memento/CollectionData.java
@@ -19,12 +19,10 @@
package org.apache.isis.runtime.memento;
-import java.io.IOException;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.metamodel.adapter.oid.Oid;
final class CollectionData extends Data {
@@ -38,16 +36,12 @@ final class CollectionData extends Data {
}
@Override
- public void encode(final DataOutputExtended output) throws IOException {
- super.encode(output);
- output.writeEncodables(elements);
- }
-
- @Override
public String toString() {
- return "(" + streamElements()
- .map(data->""+data)
- .collect(Collectors.joining(",")) + ")";
+ return "("
+ + streamElements()
+ .map(data->""+data)
+ .collect(Collectors.joining(","))
+ + ")";
}
public Stream<Data> streamElements() {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/memento/Data.java b/core/runtime/src/main/java/org/apache/isis/runtime/memento/Data.java
index 73f5698..2ded560 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/memento/Data.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/memento/Data.java
@@ -19,58 +19,27 @@
package org.apache.isis.runtime.memento;
-import java.io.IOException;
import java.io.Serializable;
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-
-class Data implements Encodable, Serializable {
-
- private final static long serialVersionUID = 1L;
-
- private final String className;
- private final Oid oid;
+import javax.annotation.Nullable;
- public Data(final Oid oid, final String className) {
- this.className = className;
- this.oid = oid;
- initialized();
- }
-
- public Data(final DataInputExtended input) throws IOException {
- this.className = input.readUTF();
- this.oid = input.readEncodable(Oid.class);
- initialized();
- }
+import org.apache.isis.metamodel.adapter.oid.Oid;
- @Override
- public void encode(final DataOutputExtended output) throws IOException {
- output.writeUTF(className);
- output.writeEncodable(oid);
- }
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
- private void initialized() {
- // nothing to do
- }
+@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+@ToString
+class Data implements Serializable {
+ private final static long serialVersionUID = 1L;
/**
- * Note: could be <tt>null</tt> if represents a value (standalone adapter).
+ * @apiNote could be <tt>null</tt> if represents a value (standalone adapter).
*/
- public Oid getOid() {
- return oid;
- }
-
- public String getClassName() {
- return className;
- }
-
- @Override
- public String toString() {
- return className + "/" + oid;
- }
+ @Getter @Nullable private final Oid oid;
+ @Getter private final String className;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/memento/Null.java b/core/runtime/src/main/java/org/apache/isis/runtime/memento/Null.java
index 2ffb10f..99cf93c 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/memento/Null.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/memento/Null.java
@@ -21,34 +21,13 @@ package org.apache.isis.runtime.memento;
import java.io.Serializable;
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-import org.apache.isis.commons.internal.encoding.Encodable;
-
-final class Null implements Encodable, Serializable {
+final class Null implements Serializable {
private static final long serialVersionUID = 1L;
public Null() {
- initialized();
- }
-
- public Null(final DataInputExtended input) {
- initialized();
}
@Override
- public void encode(final DataOutputExtended output) {
- }
-
- private void initialized() {
- // nothing to do
- }
-
- // ///////////////////////////////////////////////////////
- //
- // ///////////////////////////////////////////////////////
-
- @Override
public String toString() {
return "NULL";
}
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectData.java b/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectData.java
index f861bb5..40730f1 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectData.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectData.java
@@ -19,104 +19,23 @@
package org.apache.isis.runtime.memento;
-import java.io.IOException;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.metamodel.adapter.oid.Oid;
final class ObjectData extends Data {
- private static final long serialVersionUID = 7121411963269613347L;
- private final static Encodable NO_ENTRY = new Null();
+ private static final long serialVersionUID = 3772154051989942219L;
+
+ private final static Serializable NO_ENTRY = new Null();
private final Map<String, Object> fields = new HashMap<String, Object>();
- private static enum As {
- OBJECT(0), NULL(1), STRING(2);
- static Map<Integer, As> cache = new HashMap<Integer, As>();
- static {
- for (final As as : values()) {
- cache.put(as.idx, as);
- }
- }
- private final int idx;
-
- private As(final int idx) {
- this.idx = idx;
- }
-
- static As get(final int idx) {
- return cache.get(idx);
- }
-
- public static As readFrom(final DataInputExtended input) throws IOException {
- return get(input.readByte());
- }
-
- public void writeTo(final DataOutputExtended output) throws IOException {
- output.writeByte(idx);
- }
- }
-
public ObjectData(final Oid oid, final String className) {
super(oid, className);
- initialized();
}
- public ObjectData(final DataInputExtended input) throws IOException {
- super(input);
-
- final int size = input.readInt();
- for (int i = 0; i < size; i++) {
- final String key = input.readUTF();
- final As as = As.readFrom(input);
- if (as == As.OBJECT) {
- final Data object = input.readEncodable(Data.class);
- fields.put(key, object);
- } else if (as == As.NULL) {
- fields.put(key, NO_ENTRY);
- } else {
- final String value = input.readUTF();
- fields.put(key, value);
- }
- }
- initialized();
- }
-
- @Override
- public void encode(final DataOutputExtended output) throws IOException {
- super.encode(output);
-
- output.writeInt(fields.size());
-
- for (final String key : fields.keySet()) {
- final Object value = fields.get(key);
-
- output.writeUTF(key);
- if (value instanceof Data) {
- As.OBJECT.writeTo(output);
- output.writeEncodable(value);
- } else if (value instanceof Null) {
- As.NULL.writeTo(output);
- // nothing to do; if read back corresponds to NO_ENTRY
- } else {
- As.STRING.writeTo(output);
- output.writeUTF((String) value);
- }
- }
- }
-
- private void initialized() {
- // nothing to do
- }
-
- // ///////////////////////////////////////////////////////
- //
- // ///////////////////////////////////////////////////////
-
public void addField(final String fieldName, final Object entry) {
if (fields.containsKey(fieldName)) {
throw new IllegalArgumentException("Field already entered " + fieldName);
@@ -125,7 +44,7 @@ final class ObjectData extends Data {
}
public boolean containsField() {
- return fields != null && fields.size() > 0;
+ return !fields.isEmpty();
}
public Object getEntry(final String fieldName) {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java b/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java
index a10f920..c37bcf6 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java
@@ -19,13 +19,8 @@
package org.apache.isis.runtime.memento;
-import java.io.IOException;
import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
@@ -38,36 +33,6 @@ final class StandaloneData extends Data {
private static final long serialVersionUID = 1L;
- private static enum As {
-
- ENCODED_STRING(0),
- SERIALIZABLE(1);
-
- static Map<Integer, As> cache = new HashMap<Integer, As>();
- static {
- for (final As as : values()) {
- cache.put(as.idx, as);
- }
- }
- private final int idx;
-
- private As(int idx) {
- this.idx = idx;
- }
-
- static As get(int idx) {
- return cache.get(idx);
- }
-
- public static As readFrom(DataInputExtended input) throws IOException {
- return get(input.readByte());
- }
-
- public void writeTo(DataOutputExtended output) throws IOException {
- output.writeByte(idx);
- }
- }
-
private String objectAsEncodedString;
private Serializable objectAsSerializable;
@@ -77,51 +42,18 @@ final class StandaloneData extends Data {
final Object object = adapter.getPojo();
if (object instanceof Serializable) {
this.objectAsSerializable = (Serializable) object;
- initialized();
return;
}
val encodeableFacet = adapter.getSpecification().getFacet(EncodableFacet.class);
if (encodeableFacet != null) {
this.objectAsEncodedString = encodeableFacet.toEncodedString(adapter);
- initialized();
return;
}
throw new IllegalArgumentException("Object wrapped by standalone adapter is not serializable and its specificatoin does not have an EncodeableFacet");
}
- public StandaloneData(final DataInputExtended input) throws IOException {
- super(input);
- final As as = As.readFrom(input);
- if (as == As.SERIALIZABLE) {
- this.objectAsSerializable = input.readSerializable(Serializable.class);
- } else {
- this.objectAsEncodedString = input.readUTF();
- }
- initialized();
- }
-
- @Override
- public void encode(final DataOutputExtended output) throws IOException {
- super.encode(output);
- if (objectAsSerializable != null) {
- As.SERIALIZABLE.writeTo(output);
- output.writeSerializable(objectAsSerializable);
- } else {
- As.ENCODED_STRING.writeTo(output);
- output.writeUTF(objectAsEncodedString);
- }
- }
-
- private void initialized() {
- // nothing to do
- }
-
- // ///////////////////////////////////////////////////////
- //
- // ///////////////////////////////////////////////////////
-
public ManagedObject getAdapter(
ObjectAdapterProvider objectAdapterProvider,
SpecificationLoader specificationLoader) {