JENA-625: prepare release: 1. add ReleaseNotes, LICENSE and NOTICE files 2. add missing license headers and java docs 3. add scm links
git-svn-id: http://svn.apache.org/repos/asf/jena/Experimental/jena-csv@1618117 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/78bfe709 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/78bfe709 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/78bfe709 Branch: refs/heads/master Commit: 78bfe709e925129c3a30bb25db4e8fa6af790fd7 Parents: 74c4bd0 Author: Ying Jiang <[email protected]> Authored: Fri Aug 15 08:46:16 2014 +0000 Committer: Ying Jiang <[email protected]> Committed: Fri Aug 15 08:46:16 2014 +0000 ---------------------------------------------------------------------- LICENSE | 202 +++++++++++++++++++ NOTICE | 11 + ReleaseNotes.txt | 9 + pom.xml | 8 +- .../jena/propertytable/graph/GraphCSV.java | 7 + .../propertytable/graph/GraphPropertyTable.java | 7 + .../graph/QueryIterPropertyTable.java | 147 +++++++------- .../graph/QueryIterPropertyTableRow.java | 6 + .../jena/propertytable/graph/RowMatch.java | 4 + .../graph/StageGeneratorPropertyTable.java | 7 +- .../jena/propertytable/impl/ColumnImpl.java | 6 + .../impl/PropertyTableArrayImpl.java | 5 + .../impl/PropertyTableBuilder.java | 5 + .../apache/jena/propertytable/lang/LangCSV.java | 4 + .../apache/jena/propertytable/util/IRILib.java | 6 +- src/main/java/riotcmd/LocatorOupputFile.java | 2 +- src/main/java/riotcmd/ModDest.java | 2 +- .../jena/propertytable/AbstractColumnTest.java | 4 + .../AbstractPropertyTableTest.java | 4 + .../jena/propertytable/AbstractRowTest.java | 5 +- .../jena/propertytable/graph/GraphCSVTest.java | 4 + .../impl/AbstractPropertyTableBuilderTest.java | 5 + .../impl/PropertyTableArrayImplTest.java | 4 + .../PropertyTableBuilderForArrayImplTest.java | 18 ++ .../PropertyTableBuilderForHashMapImplTest.java | 18 ++ .../impl/PropertyTableHashMapImplTest.java | 5 +- .../jena/propertytable/lang/TestLangCSV.java | 6 + 27 files changed, 425 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..c20e6a4 --- /dev/null +++ b/NOTICE @@ -0,0 +1,11 @@ +Apache Jena - CSV PropertyTable module +Copyright 2011, 2012, 2013, 2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Portions of this software were originally based on the following: + - Copyright 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP + - Copyright 2010, 2011 Epimorphics Ltd. + - Copyright 2010 Talis Systems Ltd. +These have been licensed to the Apache Software Foundation under a software grant. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/ReleaseNotes.txt ---------------------------------------------------------------------- diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt new file mode 100644 index 0000000..0fd1154 --- /dev/null +++ b/ReleaseNotes.txt @@ -0,0 +1,9 @@ +Release Notes +============= + +==== Apache Jena - CSV PropertyTable 1.0.0 + ++ PropertyTable and 2 implementations: + ++ + http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 457532b..9af8728 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <artifactId>jena-csv</artifactId> <packaging>jar</packaging> <name>Apache Jena - Data Tables for SPARQL</name> - <version>1.0</version> + <version>1.0.0</version> <parent> <groupId>org.apache.jena</groupId> @@ -45,6 +45,12 @@ <description>jena-csv is for getting CSVs into a form that is amenable to Jena SPARQL processing, and doing so in a way that is not specific to CSV files. It includes getting the right architecture in place for regular table shaped data, using the core abstraction of PropertyTable.</description> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/jena/Experimental/jena-csv</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jena/Experimental/jena-csv</developerConnection> + <url>https://svn.apache.org/repos/asf/jena/Experimental/jena-csv</url> + </scm> + <properties> <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format> <build.time.xsd>${maven.build.timestamp}</build.time.xsd> http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/graph/GraphCSV.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/graph/GraphCSV.java b/src/main/java/org/apache/jena/propertytable/graph/GraphCSV.java index 54ad131..d002ec6 100644 --- a/src/main/java/org/apache/jena/propertytable/graph/GraphCSV.java +++ b/src/main/java/org/apache/jena/propertytable/graph/GraphCSV.java @@ -22,6 +22,12 @@ import org.apache.jena.propertytable.PropertyTable; import org.apache.jena.propertytable.impl.PropertyTableBuilder; +/** + * GraphCSV is a sub class of GraphPropertyTable aiming at CSV data. + * Its constructor takes a CSV file path as the parameter, parse the file using a CSV Parser, + * and makes a PropertyTable through PropertyTableBuilder. + * + */ public class GraphCSV extends GraphPropertyTable { public static GraphCSV createHashMapImpl( String csvFilePath ){ @@ -36,6 +42,7 @@ public class GraphCSV extends GraphPropertyTable { super(table); } + // use the Java array implementation of PropertyTable for default public GraphCSV ( String csvFilePath ){ super(PropertyTableBuilder.buildPropetyTableArrayImplFromCsv(csvFilePath)); } http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java b/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java index 8054279..3f1e930 100644 --- a/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java +++ b/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java @@ -37,6 +37,13 @@ import com.hp.hpl.jena.util.iterator.Filter; import com.hp.hpl.jena.util.iterator.NullIterator; import com.hp.hpl.jena.util.iterator.WrappedIterator; +/** + * GraphPropertyTable implements the Graph interface (read-only) over a PropertyTable. + * This is subclass from GraphBase and implements find(). + * The graphBaseFind()(for matching a Triple) and propertyTableBaseFind()(for matching a whole Row) methods can choose the access route based on the find arguments. + * GraphPropertyTable holds/wraps an reference of the PropertyTable instance, so that such a Graph can be treated in a more table-like fashion. + * + */ public class GraphPropertyTable extends GraphBase { private PropertyTable pt; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java b/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java index 0d737fb..9b13e6c 100644 --- a/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java +++ b/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java @@ -37,84 +37,79 @@ import com.hp.hpl.jena.sparql.serializer.SerializationContext; import com.hp.hpl.jena.sparql.util.FmtUtils; import com.hp.hpl.jena.sparql.util.Utils; -public class QueryIterPropertyTable extends QueryIter1 - { - private BasicPattern pattern ; - private Graph graph ; - private QueryIterator output ; - - public static QueryIterator create(QueryIterator input, - BasicPattern pattern , - ExecutionContext execContext) - { - return new QueryIterPropertyTable(input, pattern, execContext) ; - } - - private QueryIterPropertyTable(QueryIterator input, - BasicPattern pattern , - ExecutionContext execContext) - { - super(input, execContext) ; - this.pattern = pattern ; - graph = execContext.getActiveGraph() ; - // Create a chain of triple iterators. - QueryIterator chain = getInput() ; - Collection<BasicPattern> patterns = sort(pattern); - for (BasicPattern p : patterns) - chain = new QueryIterPropertyTableRow(chain, p, execContext) ; - output = chain ; - } - - private Collection<BasicPattern> sort(BasicPattern pattern){ - HashMap<Node, BasicPattern> map= new HashMap<Node, BasicPattern>(); - for(Triple triple: pattern.getList()){ - Node subject = triple.getSubject(); - if(! map.containsKey(subject)){ - List<Triple> triples = new ArrayList<Triple>(); - BasicPattern p = BasicPattern.wrap(triples); - map.put(subject, p); - p.add(triple); - }else { - map.get(subject).add(triple); - } - } - return map.values(); - } +/** + * Split the incoming BasicPattern by subjects, (i.e. it becomes multiple sub BasicPatterns grouped by the same subjects. + * + */ +public class QueryIterPropertyTable extends QueryIter1 { + + private BasicPattern pattern; + private Graph graph; + private QueryIterator output; + + public static QueryIterator create(QueryIterator input, + BasicPattern pattern, ExecutionContext execContext) { + return new QueryIterPropertyTable(input, pattern, execContext); + } + + private QueryIterPropertyTable(QueryIterator input, BasicPattern pattern, + ExecutionContext execContext) { + super(input, execContext); + this.pattern = pattern; + graph = execContext.getActiveGraph(); + // Create a chain of triple iterators. + QueryIterator chain = getInput(); + Collection<BasicPattern> patterns = sort(pattern); + for (BasicPattern p : patterns) + chain = new QueryIterPropertyTableRow(chain, p, execContext); + output = chain; + } + + private Collection<BasicPattern> sort(BasicPattern pattern) { + HashMap<Node, BasicPattern> map = new HashMap<Node, BasicPattern>(); + for (Triple triple : pattern.getList()) { + Node subject = triple.getSubject(); + if (!map.containsKey(subject)) { + List<Triple> triples = new ArrayList<Triple>(); + BasicPattern p = BasicPattern.wrap(triples); + map.put(subject, p); + p.add(triple); + } else { + map.get(subject).add(triple); + } + } + return map.values(); + } + + @Override + protected boolean hasNextBinding() { + return output.hasNext(); + } - @Override - protected boolean hasNextBinding() - { - return output.hasNext() ; - } + @Override + protected Binding moveToNextBinding() { + return output.nextBinding(); + } - @Override - protected Binding moveToNextBinding() - { - return output.nextBinding() ; - } + @Override + protected void closeSubIterator() { + if (output != null) + output.close(); + output = null; + } - @Override - protected void closeSubIterator() - { - if ( output != null ) - output.close() ; - output = null ; - } - - @Override - protected void requestSubCancel() - { - if ( output != null ) - output.cancel(); - } + @Override + protected void requestSubCancel() { + if (output != null) + output.cancel(); + } - @Override - protected void details(IndentedWriter out, SerializationContext sCxt) - { - out.print(Utils.className(this)) ; - out.println() ; - out.incIndent() ; - FmtUtils.formatPattern(out, pattern, sCxt) ; - out.decIndent() ; - } + @Override + protected void details(IndentedWriter out, SerializationContext sCxt) { + out.print(Utils.className(this)); + out.println(); + out.incIndent(); + FmtUtils.formatPattern(out, pattern, sCxt); + out.decIndent(); + } } http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTableRow.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTableRow.java b/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTableRow.java index 16f6723..a479e25 100644 --- a/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTableRow.java +++ b/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTableRow.java @@ -42,7 +42,13 @@ import com.hp.hpl.jena.util.iterator.ExtendedIterator; import com.hp.hpl.jena.util.iterator.NiceIterator; import com.hp.hpl.jena.util.iterator.WrappedIterator; +/** + * If the triple size within a BasicePattern is greater than 1 (i.e. at least 2 triples), it's turned into a row querying. + * + */ public class QueryIterPropertyTableRow extends QueryIterRepeatApply{ + + private final BasicPattern pattern ; public QueryIterPropertyTableRow( QueryIterator input, http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/graph/RowMatch.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/graph/RowMatch.java b/src/main/java/org/apache/jena/propertytable/graph/RowMatch.java index 3310807..15fe088 100644 --- a/src/main/java/org/apache/jena/propertytable/graph/RowMatch.java +++ b/src/main/java/org/apache/jena/propertytable/graph/RowMatch.java @@ -21,6 +21,10 @@ package org.apache.jena.propertytable.graph; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.sparql.core.BasicPattern; +/** + * The data structure for matching a Row + * + */ public class RowMatch { private BasicPattern pattern; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/graph/StageGeneratorPropertyTable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/graph/StageGeneratorPropertyTable.java b/src/main/java/org/apache/jena/propertytable/graph/StageGeneratorPropertyTable.java index c601000..9c3457b 100644 --- a/src/main/java/org/apache/jena/propertytable/graph/StageGeneratorPropertyTable.java +++ b/src/main/java/org/apache/jena/propertytable/graph/StageGeneratorPropertyTable.java @@ -25,6 +25,10 @@ import com.hp.hpl.jena.sparql.engine.ExecutionContext; import com.hp.hpl.jena.sparql.engine.QueryIterator; import com.hp.hpl.jena.sparql.engine.main.StageGenerator; +/** + * The extension of StageGenerator for querying a Row. + * + */ public class StageGeneratorPropertyTable implements StageGenerator { // Using OpExecutor is preferred. @@ -42,13 +46,10 @@ public class StageGeneratorPropertyTable implements StageGenerator { Graph g = execCxt.getActiveGraph() ; if ( ! ( g instanceof GraphPropertyTable ) ) - // Not us - bounce up the StageGenerator chain return above.execute(pattern, input, execCxt) ; if (pattern.size() <= 1){ -// System.out.println( "<=1 "+ pattern); return above.execute(pattern, input, execCxt) ; } -// System.out.println( ">1" + pattern); return QueryIterPropertyTable.create(input, pattern, execCxt); } http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/impl/ColumnImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/impl/ColumnImpl.java b/src/main/java/org/apache/jena/propertytable/impl/ColumnImpl.java index 8d03885..f846aee 100644 --- a/src/main/java/org/apache/jena/propertytable/impl/ColumnImpl.java +++ b/src/main/java/org/apache/jena/propertytable/impl/ColumnImpl.java @@ -26,7 +26,13 @@ import org.apache.jena.propertytable.PropertyTable; import com.hp.hpl.jena.graph.Node; +/** + * The simple implementation of Column + * + */ public class ColumnImpl implements Column { + + private final PropertyTable table; private Node p; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/impl/PropertyTableArrayImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/impl/PropertyTableArrayImpl.java b/src/main/java/org/apache/jena/propertytable/impl/PropertyTableArrayImpl.java index 1c3bbd1..b8e2708 100644 --- a/src/main/java/org/apache/jena/propertytable/impl/PropertyTableArrayImpl.java +++ b/src/main/java/org/apache/jena/propertytable/impl/PropertyTableArrayImpl.java @@ -35,6 +35,11 @@ import com.hp.hpl.jena.graph.Triple; import com.hp.hpl.jena.util.iterator.ExtendedIterator; import com.hp.hpl.jena.util.iterator.WrappedIterator; +/** + * A PropertyTable Implementation using a two dimension array. + * It contains SPO and PSO indexes. + * + */ public class PropertyTableArrayImpl implements PropertyTable { private final List<Node> rowList; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/impl/PropertyTableBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/impl/PropertyTableBuilder.java b/src/main/java/org/apache/jena/propertytable/impl/PropertyTableBuilder.java index 0c625f7..665c282 100644 --- a/src/main/java/org/apache/jena/propertytable/impl/PropertyTableBuilder.java +++ b/src/main/java/org/apache/jena/propertytable/impl/PropertyTableBuilder.java @@ -35,6 +35,11 @@ import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.graph.NodeFactory; +/** + * A tool for constructing PropertyTable from a file (e.g., a CSV file). + * + * + */ public class PropertyTableBuilder { public static Node CSV_ROW_NODE = NodeFactory.createURI(LangCSV.CSV_ROW); http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java b/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java index d53f7a7..ccda47e 100644 --- a/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java +++ b/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java @@ -46,6 +46,10 @@ import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.graph.NodeFactory; import com.hp.hpl.jena.sparql.util.Context; +/** + * The LangRIOT implementation for CSV + * + */ public class LangCSV implements LangRIOT { public static final String CSV_PREFIX = "http://w3c/future-csv-vocab/";; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/org/apache/jena/propertytable/util/IRILib.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/util/IRILib.java b/src/main/java/org/apache/jena/propertytable/util/IRILib.java index 7df9b7f..b535c88 100644 --- a/src/main/java/org/apache/jena/propertytable/util/IRILib.java +++ b/src/main/java/org/apache/jena/propertytable/util/IRILib.java @@ -27,8 +27,10 @@ import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.riot.SysRIOT ; /** - * Operations related to IRIs - * Add '£', based on org.apache.jena.riot.system.IRILib + * Operations related to IRIs. + * Add support for '£', based on {@link org.apache.jena.riot.system.IRILib} + * + * This class should be merged into riot IRILib in future. */ public class IRILib { http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/riotcmd/LocatorOupputFile.java ---------------------------------------------------------------------- diff --git a/src/main/java/riotcmd/LocatorOupputFile.java b/src/main/java/riotcmd/LocatorOupputFile.java index 3d9cc52..14caeeb 100644 --- a/src/main/java/riotcmd/LocatorOupputFile.java +++ b/src/main/java/riotcmd/LocatorOupputFile.java @@ -31,7 +31,7 @@ import com.hp.hpl.jena.util.FileManager; import com.hp.hpl.jena.util.FileUtils; import com.hp.hpl.jena.util.LocatorFile; -public class LocatorOupputFile { +class LocatorOupputFile { static Logger log = LoggerFactory.getLogger(LocatorOupputFile.class) ; private String thisDir = null ; private String thisDirLogStr = "" ; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/main/java/riotcmd/ModDest.java ---------------------------------------------------------------------- diff --git a/src/main/java/riotcmd/ModDest.java b/src/main/java/riotcmd/ModDest.java index 739adcd..e5560f0 100644 --- a/src/main/java/riotcmd/ModDest.java +++ b/src/main/java/riotcmd/ModDest.java @@ -24,7 +24,7 @@ import arq.cmdline.ArgModuleGeneral; import arq.cmdline.CmdArgModule; import arq.cmdline.CmdGeneral; -public class ModDest implements ArgModuleGeneral{ +class ModDest implements ArgModuleGeneral{ private ArgDecl argDest = new ArgDecl(ArgDecl.HasValue, "dest") ; private String dest = null ; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java b/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java index 0682618..90ff0af 100644 --- a/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java +++ b/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java @@ -26,6 +26,10 @@ import org.junit.Test; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.graph.NodeFactory; +/** + * Tests related to Column. + * + */ public abstract class AbstractColumnTest extends BaseTest{ http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java b/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java index ff08d76..3738d4e 100644 --- a/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java +++ b/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java @@ -25,6 +25,10 @@ import org.junit.Test; import com.hp.hpl.jena.graph.NodeFactory; +/** + * Tests related to PropertyTable. + * + */ public abstract class AbstractPropertyTableTest extends AbstractRowTest{ @Test http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java b/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java index f07ac32..9457375 100644 --- a/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java +++ b/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java @@ -24,7 +24,10 @@ import org.junit.Test; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.graph.NodeFactory; - +/** + * Tests related to Row. + * + */ public abstract class AbstractRowTest extends AbstractColumnTest{ @Test http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java b/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java index d6b0c26..3d23f86 100644 --- a/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java +++ b/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java @@ -36,6 +36,10 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.sparql.engine.main.StageBuilder; import com.hp.hpl.jena.sparql.engine.main.StageGenerator; +/** + * Tests related to GraphCSV with some real world data. + * + */ public class GraphCSVTest extends Assert { @BeforeClass http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/impl/AbstractPropertyTableBuilderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/impl/AbstractPropertyTableBuilderTest.java b/src/test/java/org/apache/jena/propertytable/impl/AbstractPropertyTableBuilderTest.java index ae7f565..f7a1e02 100644 --- a/src/test/java/org/apache/jena/propertytable/impl/AbstractPropertyTableBuilderTest.java +++ b/src/test/java/org/apache/jena/propertytable/impl/AbstractPropertyTableBuilderTest.java @@ -31,6 +31,11 @@ import org.junit.Test; import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.graph.NodeFactory; + +/** + * Tests related to PropertyTableBuilder, or more explicitly for the CSV parser in the current release. + * + */ public abstract class AbstractPropertyTableBuilderTest extends BaseTest { @Test http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/impl/PropertyTableArrayImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/impl/PropertyTableArrayImplTest.java b/src/test/java/org/apache/jena/propertytable/impl/PropertyTableArrayImplTest.java index 99e98ad..ba1ca2d 100644 --- a/src/test/java/org/apache/jena/propertytable/impl/PropertyTableArrayImplTest.java +++ b/src/test/java/org/apache/jena/propertytable/impl/PropertyTableArrayImplTest.java @@ -24,6 +24,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +/** + * Tests for PropertyTableArrayImpl + * + */ public class PropertyTableArrayImplTest extends AbstractPropertyTableTest{ private static int rowNum = 10; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForArrayImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForArrayImplTest.java b/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForArrayImplTest.java index ce83f98..7b7e0c8 100644 --- a/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForArrayImplTest.java +++ b/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForArrayImplTest.java @@ -1,3 +1,21 @@ +/* + * 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.jena.propertytable.impl; import org.junit.After; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForHashMapImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForHashMapImplTest.java b/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForHashMapImplTest.java index 6585327..f2768f5 100644 --- a/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForHashMapImplTest.java +++ b/src/test/java/org/apache/jena/propertytable/impl/PropertyTableBuilderForHashMapImplTest.java @@ -1,3 +1,21 @@ +/* + * 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.jena.propertytable.impl; import org.junit.After; http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImplTest.java b/src/test/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImplTest.java index 1087055..33d95ae 100644 --- a/src/test/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImplTest.java +++ b/src/test/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImplTest.java @@ -22,7 +22,10 @@ import org.apache.jena.propertytable.AbstractPropertyTableTest; import org.junit.After; import org.junit.Before; - +/** + * Tests for PropertyTableHashMapImpl + * + */ public class PropertyTableHashMapImplTest extends AbstractPropertyTableTest{ @Before http://git-wip-us.apache.org/repos/asf/jena/blob/78bfe709/src/test/java/org/apache/jena/propertytable/lang/TestLangCSV.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/jena/propertytable/lang/TestLangCSV.java b/src/test/java/org/apache/jena/propertytable/lang/TestLangCSV.java index 0e0204d..697ba27 100644 --- a/src/test/java/org/apache/jena/propertytable/lang/TestLangCSV.java +++ b/src/test/java/org/apache/jena/propertytable/lang/TestLangCSV.java @@ -32,7 +32,13 @@ import org.junit.Test; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; + +/** + * Tests for the registered LangCSV in RIOT. + * + */ public class TestLangCSV extends BaseTest { + private static final String FILE_NAME = "src/test/resources/test.csv"; private static final String FILE_URI = IRIResolver.resolveString(FILE_NAME);
