_Buildable can't use generics
Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/5241e75f Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/5241e75f Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/5241e75f Branch: refs/heads/fluent-parser Commit: 5241e75fe51a3dd49a3981dfde92b9c681aabc00 Parents: aee8a63 Author: Stian Soiland-Reyes <st...@apache.org> Authored: Thu Feb 15 00:16:07 2018 +0000 Committer: Stian Soiland-Reyes <st...@apache.org> Committed: Thu Feb 15 00:16:07 2018 +0000 ---------------------------------------------------------------------- .../java/org/apache/commons/rdf/api/fluentparser/Async.java | 6 +++++- .../apache/commons/rdf/api/fluentparser/NeedSourceBased.java | 6 +++++- .../commons/rdf/api/fluentparser/NeedSourceOrBase.java | 6 +++++- .../org/apache/commons/rdf/api/fluentparser/NeedTarget.java | 7 ++++++- .../apache/commons/rdf/api/fluentparser/NeedTargetOrRDF.java | 7 ++++++- .../apache/commons/rdf/api/fluentparser/OptionalTarget.java | 7 ++++++- .../java/org/apache/commons/rdf/api/fluentparser/Sync.java | 8 +++++++- .../org/apache/commons/rdf/api/fluentparser/_Buildable.java | 6 +++--- 8 files changed, 43 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5241e75f/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Async.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Async.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Async.java index 84fdacd..0101f6c 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Async.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Async.java @@ -19,9 +19,13 @@ package org.apache.commons.rdf.api.fluentparser; import java.util.concurrent.Future; +import org.apache.commons.rdf.api.io.Option; import org.apache.commons.rdf.api.io.Parsed; -public interface Async<T, S> extends _Buildable<Async<T,S>> { +public interface Async<T, S> extends _Buildable { + Async<T, S> build(); + <V> Async<T,S> option(Option<V> option, V value); + Future<Parsed<T, S>> parseAsync(); } http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5241e75f/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceBased.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceBased.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceBased.java index 8086264..7b9f2f7 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceBased.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceBased.java @@ -19,7 +19,11 @@ package org.apache.commons.rdf.api.fluentparser; import java.io.InputStream; -public interface NeedSourceBased<T> extends _NeedIdentifiedSource<T>, _Buildable<NeedSourceBased<T>> { +import org.apache.commons.rdf.api.io.Option; +public interface NeedSourceBased<T> extends _NeedIdentifiedSource<T>, _Buildable { + + NeedSourceBased<T> build(); + <V> NeedSourceBased<T> option(Option<V> option, V value); Sync<T, InputStream> source(InputStream is); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5241e75f/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceOrBase.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceOrBase.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceOrBase.java index 66161bc..4da540a 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceOrBase.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedSourceOrBase.java @@ -17,5 +17,9 @@ */ package org.apache.commons.rdf.api.fluentparser; -public interface NeedSourceOrBase<T> extends _NeedSourceOrBase<T>, _Buildable<NeedSourceOrBase<T>> { +import org.apache.commons.rdf.api.io.Option; + +public interface NeedSourceOrBase<T> extends _NeedSourceOrBase<T> { + NeedSourceOrBase<T> build(); + <V> NeedSourceOrBase<T> option(Option<V> option, V value); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5241e75f/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTarget.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTarget.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTarget.java index 55e196e..a2285a0 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTarget.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTarget.java @@ -17,5 +17,10 @@ */ package org.apache.commons.rdf.api.fluentparser; -interface NeedTarget extends _NeedTarget,_Buildable<NeedTarget> { +import org.apache.commons.rdf.api.io.Option; + +interface NeedTarget extends _NeedTarget,_Buildable { + NeedTarget build(); + <V> NeedTarget option(Option<V> option, V value); + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5241e75f/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDF.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDF.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDF.java index 6949f15..674e540 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDF.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDF.java @@ -17,5 +17,10 @@ */ package org.apache.commons.rdf.api.fluentparser; -public interface NeedTargetOrRDF extends _NeedTargetOrRDF,_Buildable<NeedTargetOrRDF> { +import org.apache.commons.rdf.api.io.Option; + +public interface NeedTargetOrRDF extends _NeedTargetOrRDF,_Buildable { + NeedTargetOrRDF build(); + <V> NeedTargetOrRDF option(Option<V> option, V value); + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5241e75f/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTarget.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTarget.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTarget.java index b8d5d03..5693b57 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTarget.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTarget.java @@ -17,5 +17,10 @@ */ package org.apache.commons.rdf.api.fluentparser; -public interface OptionalTarget<T> extends _OptionalTarget<T>,_Buildable<OptionalTarget<T>> { +import org.apache.commons.rdf.api.io.Option; + +public interface OptionalTarget<T> extends _OptionalTarget<T>,_Buildable { + OptionalTarget<T> build(); + <V> OptionalTarget<T> option(Option<V> option, V value); + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5241e75f/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Sync.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Sync.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Sync.java index 98de4d8..14f321d 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Sync.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Sync.java @@ -19,9 +19,15 @@ package org.apache.commons.rdf.api.fluentparser; import java.util.concurrent.ExecutorService; +import org.apache.commons.rdf.api.io.Option; import org.apache.commons.rdf.api.io.Parsed; -public interface Sync<T, S> extends _Buildable<Sync<T, S>>{ +public interface Sync<T, S> extends _Buildable { + + Sync<T, S> build(); + <V> Sync<T, S> option(Option<V> option, V value); + + Async<T, S> async(); Async<T, S> async(ExecutorService executor); Parsed<T, S> parse(); http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5241e75f/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_Buildable.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_Buildable.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_Buildable.java index 5183035..1675cfa 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_Buildable.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_Buildable.java @@ -21,14 +21,14 @@ import org.apache.commons.rdf.api.io.Option; import org.apache.commons.rdf.api.io.Option.RequiredOption; import org.apache.commons.rdf.api.io.ParserFactory; -interface _Buildable<Self extends _Buildable<Self>> { +interface _Buildable { /** * Return an immutable builder at the current state. The returned builder * can be re-used multiple times in a thread-safe way. * * @return An immutable builder */ - Self build(); + _Buildable build(); /** * Return a builder with the given option set. @@ -45,6 +45,6 @@ interface _Buildable<Self extends _Buildable<Self>> { * @param value Value to set for option * @return A builder with the given option set */ - <V> Self option(Option<V> option, V value); + <V> _Buildable option(Option<V> option, V value); }
