You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by st...@apache.org on 2018/02/20 11:27:23 UTC
[1/2] commons-rdf git commit: Custom serialization of
ImmutableWriterConfigImpl
Repository: commons-rdf
Updated Branches:
refs/heads/fluent-parser f9613b90a -> 996e40a29
Custom serialization of ImmutableWriterConfigImpl
Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/f68f53d6
Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/f68f53d6
Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/f68f53d6
Branch: refs/heads/fluent-parser
Commit: f68f53d69a0e71b638aa0d5451e47ac73eacf62a
Parents: f9613b9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 20 11:25:59 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 20 11:25:59 2018 +0000
----------------------------------------------------------------------
.../rdf/api/io/ImmutableWriterConfigImpl.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/f68f53d6/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableWriterConfigImpl.java
----------------------------------------------------------------------
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableWriterConfigImpl.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableWriterConfigImpl.java
index 4c238d9..2b5e5e1 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableWriterConfigImpl.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableWriterConfigImpl.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.rdf.api.io;
+import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
@@ -23,7 +24,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
-import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDF;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.io.WriterConfig.ImmutableWriterConfig;
@@ -86,6 +86,20 @@ class ImmutableWriterConfigImpl implements ImmutableWriterConfig, Serializable {
static class WithParent extends ImmutableWriterConfigImpl implements ImmutableWriterConfig {
private final ImmutableWriterConfig parent;
+ /**
+ * Override which object to use by Serializable, avoiding
+ * serialization of the whole WithParent tree.
+ *
+ * This method is protected so it will be invoked for all subclasses of
+ * WithParent.
+ *
+ * @return a {@link SnapshotWriterConfig}
+ * @throws ObjectStreamException
+ */
+ protected Object writeReplace() throws ObjectStreamException {
+ return new SnapshotWriterConfig(this);
+ }
+
WithParent(ImmutableWriterConfig parent) {
this.parent = parent;
}
@@ -110,6 +124,7 @@ class ImmutableWriterConfigImpl implements ImmutableWriterConfig, Serializable {
return parent.rdf();
}
+ @SuppressWarnings("rawtypes")
@Override
public Map<Option, Object> options() {
return parent.options();
@@ -172,6 +187,7 @@ class ImmutableWriterConfigImpl implements ImmutableWriterConfig, Serializable {
}
+ @SuppressWarnings("rawtypes")
static class WithOption extends WithParent implements WriterConfig {
private Option o;
private Object v;
[2/2] commons-rdf git commit: Try to calm down rawtype warnings
Posted by st...@apache.org.
Try to calm down rawtype warnings
Really this Option system needs refinement so they
also can be ensured to be serializable
Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/996e40a2
Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/996e40a2
Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/996e40a2
Branch: refs/heads/fluent-parser
Commit: 996e40a294998874b97bee5741459cfcc618c563
Parents: f68f53d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 20 11:26:50 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 20 11:26:50 2018 +0000
----------------------------------------------------------------------
.../org/apache/commons/rdf/api/io/ImmutableParserConfigImpl.java | 4 +++-
.../java/org/apache/commons/rdf/api/io/MutableParserConfig.java | 1 -
.../src/main/java/org/apache/commons/rdf/api/io/Writer.java | 4 ----
3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/996e40a2/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableParserConfigImpl.java
----------------------------------------------------------------------
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableParserConfigImpl.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableParserConfigImpl.java
index 5dea128..25be678 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableParserConfigImpl.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/ImmutableParserConfigImpl.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import java.util.concurrent.ExecutorService;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDF;
@@ -34,6 +33,7 @@ class ImmutableParserConfigImpl implements ImmutableParserConfig, Serializable {
private static final long serialVersionUID = 1L;
+ @SuppressWarnings("rawtypes")
@Override
public Optional<ParserSource> source() {
return Optional.empty();
@@ -44,6 +44,7 @@ class ImmutableParserConfigImpl implements ImmutableParserConfig, Serializable {
return Optional.empty();
}
+ @SuppressWarnings("rawtypes")
@Override
public Optional<ParserTarget> target() {
return Optional.empty();
@@ -59,6 +60,7 @@ class ImmutableParserConfigImpl implements ImmutableParserConfig, Serializable {
return Optional.empty();
}
+ @SuppressWarnings("rawtypes")
@Override
public Map<Option, Object> options() {
// Always a fresh map, so that our children can
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/996e40a2/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/MutableParserConfig.java
----------------------------------------------------------------------
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/MutableParserConfig.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/MutableParserConfig.java
index c99407e..b38a9f8 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/MutableParserConfig.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/MutableParserConfig.java
@@ -20,7 +20,6 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
-import java.util.concurrent.ExecutorService;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDF;
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/996e40a2/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/Writer.java
----------------------------------------------------------------------
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/Writer.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/Writer.java
index 5267e97..1dceb99 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/Writer.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/io/Writer.java
@@ -16,10 +16,6 @@
*/
package org.apache.commons.rdf.api.io;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
public interface Writer {
@SuppressWarnings("rawtypes")