Return-Path: X-Original-To: apmail-clerezza-commits-archive@www.apache.org Delivered-To: apmail-clerezza-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CF254104BD for ; Sun, 22 Mar 2015 15:31:50 +0000 (UTC) Received: (qmail 93554 invoked by uid 500); 22 Mar 2015 15:31:50 -0000 Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org Received: (qmail 93513 invoked by uid 500); 22 Mar 2015 15:31:50 -0000 Mailing-List: contact commits-help@clerezza.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@clerezza.apache.org Delivered-To: mailing list commits@clerezza.apache.org Received: (qmail 93503 invoked by uid 99); 22 Mar 2015 15:31:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Mar 2015 15:31:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7AD3CE0EF3; Sun, 22 Mar 2015 15:31:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reto@apache.org To: commits@clerezza.apache.org Date: Sun, 22 Mar 2015 15:31:50 -0000 Message-Id: <65d8ec590e0549cfb9dccfa717fd6f8b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] clerezza git commit: CLEREZZA-971: using rdf-commons from clerezza-rdf-core repository Repository: clerezza Updated Branches: refs/heads/rdf-commons a369fee2e -> 39b02c14b CLEREZZA-971: using rdf-commons from clerezza-rdf-core repository Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/ee4b8b38 Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/ee4b8b38 Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/ee4b8b38 Branch: refs/heads/rdf-commons Commit: ee4b8b38a5ebf98f464b7dbee566ac020cbed8ed Parents: a369fee Author: Reto Gmuer Authored: Sun Mar 22 13:35:32 2015 +0000 Committer: Reto Gmuer Committed: Sun Mar 22 13:35:32 2015 +0000 ---------------------------------------------------------------------- rdf.jena.storage/LICENSE | 201 --------------- rdf.jena.storage/pom.xml | 70 ------ .../rdf/jena/storage/JenaGraphAdaptor.java | 156 ------------ .../clerezza/rdf/jena/storage/WeakBidiMap.java | 242 ------------------- .../rdf/jena/storage/RoundTripTest.java | 58 ----- rdf/jena/pom.xml | 1 + rdf/jena/storage/LICENSE | 201 +++++++++++++++ rdf/jena/storage/pom.xml | 76 ++++++ .../rdf/jena/storage/JenaGraphAdaptor.java | 159 ++++++++++++ .../clerezza/rdf/jena/storage/WeakBidiMap.java | 242 +++++++++++++++++++ .../rdf/jena/storage/RoundTripTest.java | 57 +++++ 11 files changed, 736 insertions(+), 727 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf.jena.storage/LICENSE ---------------------------------------------------------------------- diff --git a/rdf.jena.storage/LICENSE b/rdf.jena.storage/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/rdf.jena.storage/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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/clerezza/blob/ee4b8b38/rdf.jena.storage/pom.xml ---------------------------------------------------------------------- diff --git a/rdf.jena.storage/pom.xml b/rdf.jena.storage/pom.xml deleted file mode 100644 index 8a23158..0000000 --- a/rdf.jena.storage/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - 4.0.0 - - clerezza - org.apache.clerezza - 1.0.0-SNAPSHOT - ../parent - - org.apache.clerezza - rdf.jena.storage - bundle - 1.0.0-SNAPSHOT - Clerezza - SCB Jena Storage Provider - Allows converting Jena graphs to SCB graphs. (Currently no TcProvider comprised) - - - org.apache.clerezza - rdf.jena.commons - 1.0.0-SNAPSHOT - - - org.wymiwyg - wymiwyg-commons-core - - - junit - junit - test - - - org.apache.clerezza - rdf.simple.storage - test - 0.8 - - - org.apache.clerezza - rdf.ontologies - test - 0.12 - - - org.apache.clerezza - rdf.jena.facade - test - 0.14 - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java ---------------------------------------------------------------------- diff --git a/rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java b/rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java deleted file mode 100644 index 0edbb6c..0000000 --- a/rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java +++ /dev/null @@ -1,156 +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.clerezza.rdf.jena.storage; - -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import org.apache.clerezza.rdf.core.BNode; -import org.apache.clerezza.rdf.core.NonLiteral; -import org.apache.clerezza.rdf.core.Resource; -import org.apache.clerezza.rdf.core.Triple; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.AbstractMGraph; -import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil; -import org.apache.clerezza.rdf.jena.commons.Tria2JenaUtil; -import org.wymiwyg.commons.util.collections.BidiMap; -import org.wymiwyg.commons.util.collections.BidiMapImpl; - -/** - * An adaptor to expose a Jena Graph as Clerezza MGraph. - * - * @author rbn - */ -public class JenaGraphAdaptor extends AbstractMGraph { - - private final Graph jenaGraph; - final BidiMap tria2JenaBNodes = new WeakBidiMap(); - final Jena2TriaUtil jena2TriaUtil = - new Jena2TriaUtil(tria2JenaBNodes.inverse()); - final Tria2JenaUtil tria2JenaUtil = - new Tria2JenaUtil(tria2JenaBNodes); - - /** - * Constructs an MGraph based on the supplied jena Graph. - * - * @param jenaGraph - */ - public JenaGraphAdaptor(Graph jenaGraph) { - this.jenaGraph = jenaGraph; - } - - @Override - public void clear() { - super.clear(); - tria2JenaBNodes.clear(); - } - - @Override - public int size() { - return jenaGraph.size(); - } - - @Override - public Iterator performFilter(NonLiteral subject, UriRef predicate, Resource object) { - Node jenaSubject = null; - Node jenaPredicate = null; - Node jenaObject = null; - if (subject != null) { - jenaSubject = tria2JenaUtil.convert2JenaNode(subject); - if (jenaSubject == null) { - return Collections.EMPTY_SET.iterator(); - } - } - if (object != null) { - jenaObject = tria2JenaUtil.convert2JenaNode(object); - if (jenaObject == null) { - return Collections.EMPTY_SET.iterator(); - } - } - if (predicate != null) { - jenaPredicate = tria2JenaUtil.convert2JenaNode(predicate); - } - - final ExtendedIterator jenaIter = jenaGraph.find(jenaSubject, jenaPredicate, - jenaObject); - return new Iterator() { - - private Triple lastReturned = null; - private Iterator precached = null; - - @Override - public boolean hasNext() { - if (precached != null) { - return precached.hasNext(); - } else { - return jenaIter.hasNext(); - } - } - - @Override - public Triple next() { - if (precached != null) { - lastReturned = precached.next(); - } else { - lastReturned = jena2TriaUtil.convertTriple( - (com.hp.hpl.jena.graph.Triple)jenaIter.next()); - } - return lastReturned; - } - - @Override - public void remove() { - final Triple deleting = lastReturned; - if (precached == null) { - final ArrayList data = new ArrayList(); - while (hasNext()) { - data.add(next()); - } - precached = data.iterator(); - } - //jenaIter.remove(); - //JenaGraphAdaptor.this.performRemove(lastReturned); - jenaGraph.delete(tria2JenaUtil.convertTriple(deleting)); - } - }; - - } - - @Override - public boolean performAdd(Triple triple) { - if (contains(triple)) { - return false; - } - jenaGraph.add(tria2JenaUtil.convertTriple(triple, true)); - return true; - } - - @Override - public boolean performRemove(Triple triple) { - if (!contains(triple)) { - return false; - } - jenaGraph.delete(tria2JenaUtil.convertTriple(triple)); - return true; - } -} http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/WeakBidiMap.java ---------------------------------------------------------------------- diff --git a/rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/WeakBidiMap.java b/rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/WeakBidiMap.java deleted file mode 100644 index cdc0dfc..0000000 --- a/rdf.jena.storage/src/main/java/org/apache/clerezza/rdf/jena/storage/WeakBidiMap.java +++ /dev/null @@ -1,242 +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.clerezza.rdf.jena.storage; - -import java.lang.ref.WeakReference; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; -import org.wymiwyg.commons.util.collections.BidiMap; - -/** - * Like a WeakHashMap but Bidirectional. Only weak references are kept to the - * key - * - * @author reto - * - */ -public class WeakBidiMap implements BidiMap { - - private final Map forward = new WeakHashMap(); - private final Map> backward = new HashMap>(); - - public WeakBidiMap() { - super(); - } - - @Override - public K getKey(V value) { - WeakReference ref = backward.get(value); - if (ref == null) { - return null; - } - return ref.get(); - } - - @Override - public int size() { - return forward.size(); - } - - @Override - public boolean isEmpty() { - return forward.isEmpty(); - } - - @Override - public boolean containsKey(Object key) { - return forward.containsKey(key); - } - - @Override - public boolean containsValue(Object value) { - return values().contains(value); - } - - @Override - public V get(Object key) { - return forward.get(key); - } - - @Override - public V put(K key, V value) { - //remove possible existing with same value - - WeakReference ref = backward.get(value); - if (ref != null) { - K oldKey = ref.get(); - if (oldKey != null) { - forward.remove(oldKey); - } - } - if (forward.containsKey(key)) { - V oldValue = forward.get(key); - backward.remove(oldValue); - } - backward.put(value, new WeakReference(key)); - return forward.put(key, value); - } - - @Override - public V remove(Object key) { - V value = forward.remove(key); - backward.remove(value); - return value; - } - - @Override - public void putAll(Map m) { - for (Entry entry : m.entrySet()) { - put(entry.getKey(), entry.getValue()); - } - - } - - @Override - public void clear() { - forward.clear(); - backward.clear(); - - } - - @Override - public Set keySet() { - return forward.keySet(); - } - - @Override - public Collection values() { - return backward.keySet(); - } - - @Override - public Set> entrySet() { - return forward.entrySet(); - } - - public BidiMap inverse() { - return new BidiMap() { - - @Override - public V getKey(K v) { - return WeakBidiMap.this.get(v); - } - - @Override - public BidiMap inverse() { - return WeakBidiMap.this; - } - - @Override - public int size() { - return WeakBidiMap.this.size(); - } - - @Override - public boolean isEmpty() { - return WeakBidiMap.this.isEmpty(); - } - - @Override - public boolean containsKey(Object o) { - return WeakBidiMap.this.containsValue(o); - } - - @Override - public boolean containsValue(Object o) { - return WeakBidiMap.this.containsKey(o); - } - - @Override - public K get(Object o) { - try { - return WeakBidiMap.this.getKey((V)o); - } catch (ClassCastException e) { - return null; - } - } - - @Override - public K put(V k, K v) { - K origValue = get(k); - WeakBidiMap.this.put(v, k); - return origValue; - } - - @Override - public K remove(Object o) { - K key = get(o); - if (key != null) { - WeakBidiMap.this.remove(key); - } - return key; - } - - @Override - public void putAll(Map map) { - for (Entry entry : map.entrySet()) { - put(entry.getKey(), entry.getValue()); - } - } - - @Override - public void clear() { - WeakBidiMap.this.clear(); - } - - @Override - public Set keySet() { - return (Set) WeakBidiMap.this.values(); - } - - @Override - public Collection values() { - return WeakBidiMap.this.keySet(); - } - - @Override - public Set> entrySet() { - Set> result = new HashSet>(); - for (final Entry e: WeakBidiMap.this.entrySet()) { - result.add(new Entry() { - - @Override - public V getKey() { - return e.getValue(); - } - - @Override - public K getValue() { - return e.getKey(); - } - - @Override - public K setValue(K v) { - throw new UnsupportedOperationException("Not supported."); - } - }); - } - return result; - } - }; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf.jena.storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java ---------------------------------------------------------------------- diff --git a/rdf.jena.storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java b/rdf.jena.storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java deleted file mode 100644 index ab42f55..0000000 --- a/rdf.jena.storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java +++ /dev/null @@ -1,58 +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.clerezza.rdf.jena.storage; - -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.vocabulary.DC; -import com.hp.hpl.jena.vocabulary.RDFS; -import org.junit.Assert; -import org.junit.Test; -import org.apache.clerezza.rdf.core.BNode; -import org.apache.clerezza.rdf.core.LiteralFactory; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.impl.SimpleMGraph; -import org.apache.clerezza.rdf.core.impl.TripleImpl; -import org.apache.clerezza.rdf.jena.facade.JenaGraph; -import org.apache.clerezza.rdf.ontologies.SKOS; - -/** - * - * @author rbn - */ -public class RoundTripTest { - - @Test - public void addAndCount() { - MGraph mGraph = new SimpleMGraph(); - Graph jenaGraph = new JenaGraph(mGraph); - Model model = ModelFactory.createModelForGraph(jenaGraph); - model.add(DC.title, RDFS.label, "title"); - MGraph rewrappedMGraph = new JenaGraphAdaptor(jenaGraph); - Assert.assertEquals(1, rewrappedMGraph.size()); - rewrappedMGraph.add(new TripleImpl(new BNode(), SKOS.prefLabel, - LiteralFactory.getInstance().createTypedLiteral("foo"))); - Assert.assertEquals(2, rewrappedMGraph.size()); - Assert.assertEquals(2, mGraph.size()); - Assert.assertEquals(mGraph.getGraph(), rewrappedMGraph.getGraph()); - rewrappedMGraph.clear(); - Assert.assertEquals(0, rewrappedMGraph.size()); - } -} http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf/jena/pom.xml ---------------------------------------------------------------------- diff --git a/rdf/jena/pom.xml b/rdf/jena/pom.xml index 277497c..8eb1756 100644 --- a/rdf/jena/pom.xml +++ b/rdf/jena/pom.xml @@ -47,6 +47,7 @@ facade parser serializer + storage http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf/jena/storage/LICENSE ---------------------------------------------------------------------- diff --git a/rdf/jena/storage/LICENSE b/rdf/jena/storage/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/rdf/jena/storage/LICENSE @@ -0,0 +1,201 @@ + 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/clerezza/blob/ee4b8b38/rdf/jena/storage/pom.xml ---------------------------------------------------------------------- diff --git a/rdf/jena/storage/pom.xml b/rdf/jena/storage/pom.xml new file mode 100644 index 0000000..a03eb5f --- /dev/null +++ b/rdf/jena/storage/pom.xml @@ -0,0 +1,76 @@ + + + + 4.0.0 + + clerezza + org.apache.clerezza + 1.0.0-SNAPSHOT + ../parent + + org.apache.clerezza + rdf.jena.storage + bundle + 1.0.0-SNAPSHOT + Clerezza - SCB Jena Storage Provider + Allows converting Jena graphs to SCB graphs. (Currently no TcProvider comprised) + + + org.apache.clerezza + rdf.jena.commons + 1.0.0-SNAPSHOT + + + org.wymiwyg + wymiwyg-commons-core + + + junit + junit + test + + + org.apache.clerezza + rdf.simple.storage + test + 1.0.0-SNAPSHOT + + + org.apache.clerezza + rdf.core + test + 1.0.0-SNAPSHOT + + + org.apache.clerezza + rdf.ontologies + test + 1.0.0-SNAPSHOT + + + org.apache.clerezza + rdf.jena.facade + test + 1.0.0-SNAPSHOT + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java ---------------------------------------------------------------------- diff --git a/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java b/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java new file mode 100644 index 0000000..0fb594e --- /dev/null +++ b/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java @@ -0,0 +1,159 @@ +/* + * 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.clerezza.rdf.jena.storage; + +import com.hp.hpl.jena.graph.Graph; +import com.hp.hpl.jena.graph.Node; +import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import org.apache.commons.rdf.BlankNode; +import org.apache.commons.rdf.BlankNodeOrIri; +import org.apache.commons.rdf.RdfTerm; +import org.apache.commons.rdf.Triple; +import org.apache.commons.rdf.Iri; +import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil; +import org.apache.clerezza.rdf.jena.commons.Tria2JenaUtil; +import org.apache.commons.rdf.impl.utils.AbstractGraph; +import org.wymiwyg.commons.util.collections.BidiMap; + +/** + * An adaptor to expose a Jena Graph as Clerezza Graph. + * + * @author rbn + */ +public class JenaGraphAdaptor extends AbstractGraph { + + private final Graph jenaGraph; + final BidiMap tria2JenaBlankNodes = new WeakBidiMap(); + final Jena2TriaUtil jena2TriaUtil = + new Jena2TriaUtil(tria2JenaBlankNodes.inverse()); + final Tria2JenaUtil tria2JenaUtil = + new Tria2JenaUtil(tria2JenaBlankNodes); + + /** + * Constructs an Graph based on the supplied jena ImmutableGraph. + * + * @param jenaGraph + */ + public JenaGraphAdaptor(com.hp.hpl.jena.graph.Graph jenaGraph) { + this.jenaGraph = jenaGraph; + } + + @Override + public void clear() { + super.clear(); + tria2JenaBlankNodes.clear(); + } + + @Override + protected int performSize() { + return jenaGraph.size(); + } + + @Override + public Iterator performFilter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) { + Node jenaSubject = null; + Node jenaPredicate = null; + Node jenaObject = null; + if (subject != null) { + jenaSubject = tria2JenaUtil.convert2JenaNode(subject); + if (jenaSubject == null) { + return Collections.EMPTY_SET.iterator(); + } + } + if (object != null) { + jenaObject = tria2JenaUtil.convert2JenaNode(object); + if (jenaObject == null) { + return Collections.EMPTY_SET.iterator(); + } + } + if (predicate != null) { + jenaPredicate = tria2JenaUtil.convert2JenaNode(predicate); + } + + final ExtendedIterator jenaIter = jenaGraph.find(jenaSubject, jenaPredicate, + jenaObject); + return new Iterator() { + + private Triple lastReturned = null; + private Iterator precached = null; + + @Override + public boolean hasNext() { + if (precached != null) { + return precached.hasNext(); + } else { + return jenaIter.hasNext(); + } + } + + @Override + public Triple next() { + if (precached != null) { + lastReturned = precached.next(); + } else { + lastReturned = jena2TriaUtil.convertTriple( + (com.hp.hpl.jena.graph.Triple)jenaIter.next()); + } + return lastReturned; + } + + @Override + public void remove() { + final Triple deleting = lastReturned; + if (precached == null) { + final ArrayList data = new ArrayList(); + while (hasNext()) { + data.add(next()); + } + precached = data.iterator(); + } + //jenaIter.remove(); + //JenaGraphAdaptor.this.performRemove(lastReturned); + jenaGraph.delete(tria2JenaUtil.convertTriple(deleting)); + } + }; + + } + + @Override + public boolean performAdd(Triple triple) { + if (contains(triple)) { + return false; + } + jenaGraph.add(tria2JenaUtil.convertTriple(triple, true)); + return true; + } + + @Override + protected boolean performRemove(Object o) { + return performRemove((Triple)o); + } + + public boolean performRemove(Triple triple) { + if (!contains(triple)) { + return false; + } + jenaGraph.delete(tria2JenaUtil.convertTriple(triple)); + return true; + } + +} http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/WeakBidiMap.java ---------------------------------------------------------------------- diff --git a/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/WeakBidiMap.java b/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/WeakBidiMap.java new file mode 100644 index 0000000..cdc0dfc --- /dev/null +++ b/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/WeakBidiMap.java @@ -0,0 +1,242 @@ +/* + * 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.clerezza.rdf.jena.storage; + +import java.lang.ref.WeakReference; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; +import org.wymiwyg.commons.util.collections.BidiMap; + +/** + * Like a WeakHashMap but Bidirectional. Only weak references are kept to the + * key + * + * @author reto + * + */ +public class WeakBidiMap implements BidiMap { + + private final Map forward = new WeakHashMap(); + private final Map> backward = new HashMap>(); + + public WeakBidiMap() { + super(); + } + + @Override + public K getKey(V value) { + WeakReference ref = backward.get(value); + if (ref == null) { + return null; + } + return ref.get(); + } + + @Override + public int size() { + return forward.size(); + } + + @Override + public boolean isEmpty() { + return forward.isEmpty(); + } + + @Override + public boolean containsKey(Object key) { + return forward.containsKey(key); + } + + @Override + public boolean containsValue(Object value) { + return values().contains(value); + } + + @Override + public V get(Object key) { + return forward.get(key); + } + + @Override + public V put(K key, V value) { + //remove possible existing with same value + + WeakReference ref = backward.get(value); + if (ref != null) { + K oldKey = ref.get(); + if (oldKey != null) { + forward.remove(oldKey); + } + } + if (forward.containsKey(key)) { + V oldValue = forward.get(key); + backward.remove(oldValue); + } + backward.put(value, new WeakReference(key)); + return forward.put(key, value); + } + + @Override + public V remove(Object key) { + V value = forward.remove(key); + backward.remove(value); + return value; + } + + @Override + public void putAll(Map m) { + for (Entry entry : m.entrySet()) { + put(entry.getKey(), entry.getValue()); + } + + } + + @Override + public void clear() { + forward.clear(); + backward.clear(); + + } + + @Override + public Set keySet() { + return forward.keySet(); + } + + @Override + public Collection values() { + return backward.keySet(); + } + + @Override + public Set> entrySet() { + return forward.entrySet(); + } + + public BidiMap inverse() { + return new BidiMap() { + + @Override + public V getKey(K v) { + return WeakBidiMap.this.get(v); + } + + @Override + public BidiMap inverse() { + return WeakBidiMap.this; + } + + @Override + public int size() { + return WeakBidiMap.this.size(); + } + + @Override + public boolean isEmpty() { + return WeakBidiMap.this.isEmpty(); + } + + @Override + public boolean containsKey(Object o) { + return WeakBidiMap.this.containsValue(o); + } + + @Override + public boolean containsValue(Object o) { + return WeakBidiMap.this.containsKey(o); + } + + @Override + public K get(Object o) { + try { + return WeakBidiMap.this.getKey((V)o); + } catch (ClassCastException e) { + return null; + } + } + + @Override + public K put(V k, K v) { + K origValue = get(k); + WeakBidiMap.this.put(v, k); + return origValue; + } + + @Override + public K remove(Object o) { + K key = get(o); + if (key != null) { + WeakBidiMap.this.remove(key); + } + return key; + } + + @Override + public void putAll(Map map) { + for (Entry entry : map.entrySet()) { + put(entry.getKey(), entry.getValue()); + } + } + + @Override + public void clear() { + WeakBidiMap.this.clear(); + } + + @Override + public Set keySet() { + return (Set) WeakBidiMap.this.values(); + } + + @Override + public Collection values() { + return WeakBidiMap.this.keySet(); + } + + @Override + public Set> entrySet() { + Set> result = new HashSet>(); + for (final Entry e: WeakBidiMap.this.entrySet()) { + result.add(new Entry() { + + @Override + public V getKey() { + return e.getValue(); + } + + @Override + public K getValue() { + return e.getKey(); + } + + @Override + public K setValue(K v) { + throw new UnsupportedOperationException("Not supported."); + } + }); + } + return result; + } + }; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/clerezza/blob/ee4b8b38/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java ---------------------------------------------------------------------- diff --git a/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java b/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java new file mode 100644 index 0000000..efe68cf --- /dev/null +++ b/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java @@ -0,0 +1,57 @@ +/* + * 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.clerezza.rdf.jena.storage; + +import com.hp.hpl.jena.graph.Graph; +import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.ModelFactory; +import com.hp.hpl.jena.vocabulary.DC; +import com.hp.hpl.jena.vocabulary.RDFS; +import org.junit.Assert; +import org.junit.Test; +import org.apache.commons.rdf.BlankNode; +import org.apache.commons.rdf.impl.utils.simple.SimpleGraph; +import org.apache.commons.rdf.impl.utils.TripleImpl; +import org.apache.clerezza.rdf.jena.facade.JenaGraph; +import org.apache.clerezza.rdf.ontologies.SKOS04; +import org.apache.clerezza.rdf.core.LiteralFactory; + +/** + * + * @author rbn + */ +public class RoundTripTest { + + @Test + public void addAndCount() { + org.apache.commons.rdf.Graph mGraph = new SimpleGraph(); + Graph jenaGraph = new JenaGraph(mGraph); + Model model = ModelFactory.createModelForGraph(jenaGraph); + model.add(DC.title, RDFS.label, "title"); + org.apache.commons.rdf.Graph rewrappedGraph = new JenaGraphAdaptor(jenaGraph); + Assert.assertEquals(1, rewrappedGraph.size()); + rewrappedGraph.add(new TripleImpl(new BlankNode(), SKOS04.prefLabel, + LiteralFactory.getInstance().createTypedLiteral("foo"))); + Assert.assertEquals(2, rewrappedGraph.size()); + Assert.assertEquals(2, mGraph.size()); + Assert.assertEquals(mGraph.getImmutableGraph(), rewrappedGraph.getImmutableGraph()); + rewrappedGraph.clear(); + Assert.assertEquals(0, rewrappedGraph.size()); + } +}