Simplified fluentparser protected interfaces Removed unneccessary protected _interfaces, rest moved to be inside the most appropriate public interface
Buildable now public (to expose common build()) Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/9c1e6386 Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/9c1e6386 Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/9c1e6386 Branch: refs/heads/fluent-parser Commit: 9c1e63861bcc14f17b0c0ab66cde849f35c4567b Parents: 708312c Author: Stian Soiland-Reyes <st...@apache.org> Authored: Tue Feb 20 10:33:26 2018 +0000 Committer: Stian Soiland-Reyes <st...@apache.org> Committed: Tue Feb 20 10:33:26 2018 +0000 ---------------------------------------------------------------------- .../commons/rdf/api/fluentparser/Async.java | 2 +- .../commons/rdf/api/fluentparser/Buildable.java | 49 ++++++++++++++++++++ .../rdf/api/fluentparser/NeedSourceBased.java | 16 ++++++- .../rdf/api/fluentparser/NeedSourceOrBase.java | 9 +++- .../rdf/api/fluentparser/NeedTarget.java | 26 ----------- .../rdf/api/fluentparser/NeedTargetOrRDF.java | 18 ++++++- .../fluentparser/NeedTargetOrRDFOrSyntax.java | 22 --------- .../rdf/api/fluentparser/OptionalTarget.java | 4 +- .../fluentparser/OptionalTargetOrSyntax.java | 6 ++- .../commons/rdf/api/fluentparser/Sync.java | 2 +- .../rdf/api/fluentparser/_Buildable.java | 49 -------------------- .../api/fluentparser/_NeedIdentifiedSource.java | 33 ------------- .../rdf/api/fluentparser/_NeedSourceOrBase.java | 21 --------- .../rdf/api/fluentparser/_NeedSyntax.java | 24 ---------- .../rdf/api/fluentparser/_NeedTarget.java | 30 ------------ .../rdf/api/fluentparser/_NeedTargetOrRDF.java | 21 --------- .../rdf/api/fluentparser/_OptionalBase.java | 26 ----------- .../rdf/api/fluentparser/_OptionalRDF.java | 25 ---------- .../rdf/api/fluentparser/_OptionalTarget.java | 21 --------- 19 files changed, 97 insertions(+), 307 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 0101f6c..9341d00 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 @@ -22,7 +22,7 @@ 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 { +public interface Async<T, S> extends Buildable { Async<T, S> build(); <V> Async<T,S> option(Option<V> option, V value); http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 new file mode 100644 index 0000000..6236cc3 --- /dev/null +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/Buildable.java @@ -0,0 +1,49 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.rdf.api.fluentparser; + +import org.apache.commons.rdf.api.io.Option; +import org.apache.commons.rdf.api.io.Option.RequiredOption; + +public 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 + */ + Buildable build(); + + /** + * Return a builder with the given option set. + * <p> + * Note that implementations of {@link Parser} may support different + * vendor-specific {@link Option} types, and are free to ignore the set + * option (unless it is a {@link RequiredOption}). + * <p> + * It is undefined if setting multiple values for the same (equal) option + * are accumulative or overriding. + * + * @param <V> The type of the {@link Option} value + * @param option Option to set + * @param value Value to set for option + * @return A builder with the given option set + */ + <V> Buildable option(Option<V> option, V value); + +} http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 7b9f2f7..5933fa9 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 @@ -18,12 +18,24 @@ package org.apache.commons.rdf.api.fluentparser; import java.io.InputStream; +import java.nio.file.Path; +import org.apache.commons.rdf.api.IRI; import org.apache.commons.rdf.api.io.Option; +import org.apache.commons.rdf.api.io.ParserSource; -public interface NeedSourceBased<T> extends _NeedIdentifiedSource<T>, _Buildable { +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 +} +interface _NeedIdentifiedSource<T> { + Sync<T, IRI> source(IRI iri); + + Sync<T, Path> source(Path path); + + <S> Sync<T, S> source(ParserSource<S> source); + + Sync<T, IRI> source(String iri); +} http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 4da540a..c99eb99 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,9 +17,16 @@ */ package org.apache.commons.rdf.api.fluentparser; +import org.apache.commons.rdf.api.IRI; 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 +} +interface _NeedSourceOrBase<T> extends _NeedIdentifiedSource<T> { + NeedSourceBased<T> base(IRI iri); + + NeedSourceBased<T> base(String iri); +} + http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 deleted file mode 100644 index a2285a0..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTarget.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -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/9c1e6386/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 674e540..df0e163 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,10 +17,24 @@ */ package org.apache.commons.rdf.api.fluentparser; +import org.apache.commons.rdf.api.Dataset; +import org.apache.commons.rdf.api.Graph; +import org.apache.commons.rdf.api.RDF; import org.apache.commons.rdf.api.io.Option; +import org.apache.commons.rdf.api.io.ParserTarget; -public interface NeedTargetOrRDF extends _NeedTargetOrRDF,_Buildable { +public interface NeedTargetOrRDF extends _NeedTargetOrRDF,Buildable { NeedTargetOrRDF build(); <V> NeedTargetOrRDF option(Option<V> option, V value); +} +interface _NeedTargetOrRDF extends _NeedTarget { + OptionalTarget<Dataset> rdf(RDF rdf); +} -} \ No newline at end of file +interface _NeedTarget { + NeedSourceOrBase<Dataset> target(Dataset dataset); + + NeedSourceOrBase<Graph> target(Graph graph); + + <T> NeedSourceOrBase<T> target(ParserTarget<T> target); +} http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDFOrSyntax.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDFOrSyntax.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDFOrSyntax.java deleted file mode 100644 index 61a0256..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/NeedTargetOrRDFOrSyntax.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -public interface NeedTargetOrRDFOrSyntax extends _NeedTargetOrRDF, _NeedSyntax { - -} http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 5693b57..bb1a8ab 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 @@ -19,8 +19,10 @@ package org.apache.commons.rdf.api.fluentparser; import org.apache.commons.rdf.api.io.Option; -public interface OptionalTarget<T> extends _OptionalTarget<T>,_Buildable { +public interface OptionalTarget<T> extends _OptionalTarget<T>,Buildable { OptionalTarget<T> build(); <V> OptionalTarget<T> option(Option<V> option, V value); +} +interface _OptionalTarget<T> extends _NeedTarget, _NeedSourceOrBase<T> { } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTargetOrSyntax.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTargetOrSyntax.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTargetOrSyntax.java index e4768f8..2a7f6ca 100644 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTargetOrSyntax.java +++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/OptionalTargetOrSyntax.java @@ -16,5 +16,9 @@ * limitations under the License. */ package org.apache.commons.rdf.api.fluentparser; -public interface OptionalTargetOrSyntax<T> extends _OptionalTarget<T>, _NeedSyntax { + +import org.apache.commons.rdf.api.RDFSyntax; + +public interface OptionalTargetOrSyntax<T> extends _OptionalTarget<T> { + NeedTargetOrRDF syntax(RDFSyntax syntax); } http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 c877180..3aec96f 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 @@ -20,7 +20,7 @@ package org.apache.commons.rdf.api.fluentparser; import org.apache.commons.rdf.api.io.Option; import org.apache.commons.rdf.api.io.Parsed; -public interface Sync<T, S> extends _Buildable { +public interface Sync<T, S> extends Buildable { Sync<T, S> build(); <V> Sync<T, S> option(Option<V> option, V value); http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 deleted file mode 100644 index 4f1060a..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_Buildable.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -import org.apache.commons.rdf.api.io.Option; -import org.apache.commons.rdf.api.io.Option.RequiredOption; - -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 - */ - _Buildable build(); - - /** - * Return a builder with the given option set. - * <p> - * Note that implementations of {@link Parser} may support different - * vendor-specific {@link Option} types, and are free to ignore the set - * option (unless it is a {@link RequiredOption}). - * <p> - * It is undefined if setting multiple values for the same (equal) option - * are accumulative or overriding. - * - * @param <V> The type of the {@link Option} value - * @param option Option to set - * @param value Value to set for option - * @return A builder with the given option set - */ - <V> _Buildable option(Option<V> option, V value); - -} http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedIdentifiedSource.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedIdentifiedSource.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedIdentifiedSource.java deleted file mode 100644 index cb0a1a8..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedIdentifiedSource.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -import java.nio.file.Path; - -import org.apache.commons.rdf.api.IRI; -import org.apache.commons.rdf.api.io.ParserSource; - -interface _NeedIdentifiedSource<T> { - Sync<T, IRI> source(IRI iri); - - Sync<T, Path> source(Path path); - - <S> Sync<T, S> source(ParserSource<S> source); - - Sync<T, IRI> source(String iri); -} http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 deleted file mode 100644 index a95b4b2..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedSourceOrBase.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -interface _NeedSourceOrBase<T> extends _OptionalBase<T>, _NeedIdentifiedSource<T> { -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedSyntax.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedSyntax.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedSyntax.java deleted file mode 100644 index 6ab0142..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedSyntax.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -import org.apache.commons.rdf.api.RDFSyntax; - -interface _NeedSyntax { - NeedTargetOrRDF syntax(RDFSyntax syntax); -} http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 deleted file mode 100644 index 2053f3b..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedTarget.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -import org.apache.commons.rdf.api.Dataset; -import org.apache.commons.rdf.api.Graph; -import org.apache.commons.rdf.api.io.ParserTarget; - -interface _NeedTarget { - NeedSourceOrBase<Dataset> target(Dataset dataset); - - NeedSourceOrBase<Graph> target(Graph graph); - - <T> NeedSourceOrBase<T> target(ParserTarget<T> target); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 deleted file mode 100644 index 89016b4..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_NeedTargetOrRDF.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -interface _NeedTargetOrRDF extends _NeedTarget, _OptionalRDF { -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalBase.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalBase.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalBase.java deleted file mode 100644 index 3e3235c..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalBase.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -import org.apache.commons.rdf.api.IRI; - -interface _OptionalBase<T> { - NeedSourceBased<T> base(IRI iri); - - NeedSourceBased<T> base(String iri); -} http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalRDF.java ---------------------------------------------------------------------- diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalRDF.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalRDF.java deleted file mode 100644 index 80ac15b..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalRDF.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -import org.apache.commons.rdf.api.Dataset; -import org.apache.commons.rdf.api.RDF; - -interface _OptionalRDF { - OptionalTarget<Dataset> rdf(RDF rdf); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/9c1e6386/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 deleted file mode 100644 index 3a2143e..0000000 --- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/fluentparser/_OptionalTarget.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.rdf.api.fluentparser; - -interface _OptionalTarget<T> extends _NeedTarget, _NeedSourceOrBase<T> { -} \ No newline at end of file
