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 17:16:49 UTC
[isis] branch master updated: ISIS-2177: removing unreferenced
Encodable methods from Oids
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 3964824 ISIS-2177: removing unreferenced Encodable methods from Oids
3964824 is described below
commit 3964824cccd4d23adba7ee5b07dd1d20a11d29bf
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 5 18:16:39 2019 +0100
ISIS-2177: removing unreferenced Encodable methods from Oids
---
.../org/apache/isis/metamodel/adapter/oid/Oid.java | 5 +++--
.../isis/metamodel/adapter/oid/Oid_Parented.java | 19 ------------------
.../isis/metamodel/adapter/oid/Oid_Root.java | 23 ----------------------
.../isis/metamodel/adapter/oid/Oid_Value.java | 7 -------
.../isis/metamodel/adapter/oid/ParentedOid.java | 4 +---
.../apache/isis/metamodel/adapter/oid/RootOid.java | 4 +---
.../isis/runtime/memento/ObjectAdapterMemento.java | 7 ++++---
.../wicket/model/models/EntityCollectionModel.java | 5 ++---
8 files changed, 11 insertions(+), 63 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid.java
index eca322f..539be4b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid.java
@@ -19,9 +19,10 @@
package org.apache.isis.metamodel.adapter.oid;
+import java.io.Serializable;
+
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
@@ -33,7 +34,7 @@ import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
* <p>
* Note that value objects (strings, ints, {@link Value}s etc) do not have an {@link Oid}.
*/
-public interface Oid extends Encodable {
+public interface Oid extends Serializable {
/**
* A string representation of this {@link Oid}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
index fbab4f6..64f6d85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
@@ -22,9 +22,6 @@ package org.apache.isis.metamodel.adapter.oid;
import java.io.IOException;
import java.util.Objects;
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-
import static org.apache.isis.commons.internal.base._With.requires;
final class Oid_Parented implements ParentedOid {
@@ -83,28 +80,12 @@ final class Oid_Parented implements ParentedOid {
return Oid.marshaller().marshal(this);
}
-
- // /////////////////////////////////////////////////////////
- // encodeable
- // /////////////////////////////////////////////////////////
-
-
- public Oid_Parented(DataInputExtended inputStream) throws IOException {
- this(Oid_Parented.deString(inputStream.readUTF()));
- }
-
private Oid_Parented(Oid_Parented oid) throws IOException {
this.parentRootOid = oid.getParentOid();
this.name = oid.name;
this.hashCode = calculateHash();
}
-
- @Override
- public void encode(DataOutputExtended outputStream) throws IOException {
- outputStream.writeUTF(enString());
- }
-
// /////////////////////////////////////////////////////////
// Properties
// /////////////////////////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
index 8ac6405..1365091 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
@@ -19,12 +19,9 @@
package org.apache.isis.metamodel.adapter.oid;
-import java.io.IOException;
import java.util.Objects;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.schema.common.v1.BookmarkObjectState;
@@ -64,26 +61,6 @@ final class Oid_Root implements RootOid {
}
- // -- Encodeable
- public Oid_Root(final DataInputExtended input) throws IOException {
- final String oidStr = input.readUTF();
- final Oid_Root oid = Oid.unmarshaller().unmarshal(oidStr, Oid_Root.class);
- this.objectSpecId = oid.objectSpecId;
- this.identifier = oid.identifier;
- this.state = oid.state;
-
- requires(objectSpecId, "objectSpecId");
- requires(identifier, "identifier");
- requires(state, "state");
-
- this.hashCode = calculateHash();
- }
-
- @Override
- public void encode(final DataOutputExtended output) throws IOException {
- output.writeUTF(enString());
- }
-
// -- deString'able, enString
public static Oid_Root deStringEncoded(final String urlEncodedOidStr) {
final String oidStr = UrlDecoderUtil.urlDecode(urlEncodedOidStr);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Value.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Value.java
index 7cbfa4e..53948fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Value.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Value.java
@@ -19,10 +19,7 @@
package org.apache.isis.metamodel.adapter.oid;
-import java.io.IOException;
-
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.schema.common.v1.OidDto;
@@ -58,10 +55,6 @@ final class Oid_Value implements RootOid {
}
@Override
- public void encode(DataOutputExtended outputStream) throws IOException {
- }
-
- @Override
public ObjectSpecId getObjectSpecId() {
return null;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
index 91ba548..3ee771a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/ParentedOid.java
@@ -19,14 +19,12 @@
package org.apache.isis.metamodel.adapter.oid;
-import java.io.Serializable;
-
import org.apache.isis.commons.internal.url.UrlDecoderUtil;
/**
* Used as the {@link Oid} for collections.
*/
-public interface ParentedOid extends Serializable, Oid {
+public interface ParentedOid extends Oid {
RootOid getParentOid();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
index 052603e..a5dc556 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/RootOid.java
@@ -19,14 +19,12 @@
package org.apache.isis.metamodel.adapter.oid;
-import java.io.Serializable;
-
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.schema.common.v1.OidDto;
-public interface RootOid extends Oid, Serializable {
+public interface RootOid extends Oid {
ObjectSpecId getObjectSpecId();
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMemento.java b/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMemento.java
index 896b216..e3f00e7 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMemento.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectAdapterMemento.java
@@ -30,7 +30,6 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.memento.MementoHelper.RecreateStrategy;
/**
* @since 2.0
@@ -41,7 +40,8 @@ public interface ObjectAdapterMemento extends Serializable {
/**
* TODO[2112] outdated
- * Returns a bookmark only if {@link RecreateStrategy#LOOKUP} and
+ * Returns a bookmark only if
+ * {@link org.apache.isis.runtime.memento.MementoHelper.RecreateStrategy#LOOKUP} and
* {@link #getCardinality() sort} is {@link Cardinality#SCALAR scalar}.
* Returns {@code null} otherwise.
*/
@@ -49,7 +49,8 @@ public interface ObjectAdapterMemento extends Serializable {
/**
* TODO[2112] outdated
- * Returns a bookmark only if {@link RecreateStrategy#LOOKUP} and
+ * Returns a bookmark only if
+ * {@link org.apache.isis.runtime.memento.MementoHelper.RecreateStrategy#LOOKUP} and
* {@link #getCardinality() sort} is {@link Cardinality#SCALAR scalar}.
* Returns {@code null} otherwise.
*/
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index c379a87..9bcb7f4 100644
--- a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -59,8 +59,6 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
import lombok.val;
-//import lombok.val;
-
/**
* Model representing a collection of entities, either {@link Type#STANDALONE
* standalone} (eg result of invoking an action) or {@link Type#PARENTED
@@ -514,7 +512,8 @@ implements LinksProvider, UiHintContainer {
public void toggleSelectionOn(ManagedObject selectedAdapter) {
- val selectedAsMemento = super.getMementoService().mementoForAdapter(selectedAdapter);
+ //XXX lombok issue, cannot use val here
+ ObjectAdapterMemento selectedAsMemento = super.getMementoService().mementoForAdapter(selectedAdapter);
// try to remove; if couldn't, then mustn't have been in there, in which case add.
boolean removed = toggledMementosList.remove(selectedAsMemento);