You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/01/05 19:09:50 UTC

[1/5] jena git commit: Remove Guava from dependency management

Repository: jena
Updated Branches:
  refs/heads/master 470ee4d73 -> 20393b594


Remove Guava from dependency management


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/47bf098e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/47bf098e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/47bf098e

Branch: refs/heads/master
Commit: 47bf098eb34407533d54bf88433c6e8ca3eaabbf
Parents: 470ee4d
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jan 5 18:04:20 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jan 5 18:04:20 2015 +0000

----------------------------------------------------------------------
 jena-parent/pom.xml | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/47bf098e/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index e185fb2..e399b5a 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -57,7 +57,6 @@
     <ver.lucene>4.6.1</ver.lucene>
     <ver.solr>4.6.1</ver.solr>
     <ver.spatial4j>0.4</ver.spatial4j>
-    <ver.guava>18.0</ver.guava>
 
     <jdk.version>1.7</jdk.version>
     <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
@@ -289,12 +288,6 @@
         </exclusions>
       </dependency>
 
-      <dependency>
-	<groupId>com.google.guava</groupId>
-	<artifactId>guava</artifactId>
-	<version>${ver.guava}</version>
-      </dependency>
-
     </dependencies>
   </dependencyManagement>
 


[4/5] jena git commit: Remove dependency on Google Guava to avoid version issues

Posted by an...@apache.org.
Remove dependency on Google Guava to avoid version issues


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/63228de3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/63228de3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/63228de3

Branch: refs/heads/master
Commit: 63228de326637f1988e906fb167c610e1842150f
Parents: bf21e35
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jan 5 18:09:23 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jan 5 18:09:23 2015 +0000

----------------------------------------------------------------------
 jena-csv/pom.xml                                |  6 --
 .../impl/PropertyTableHashMapImpl.java          | 59 +++++++++-----------
 2 files changed, 27 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/63228de3/jena-csv/pom.xml
----------------------------------------------------------------------
diff --git a/jena-csv/pom.xml b/jena-csv/pom.xml
index 12602b1..c3c1255 100644
--- a/jena-csv/pom.xml
+++ b/jena-csv/pom.xml
@@ -60,12 +60,6 @@
       <type>pom</type>
     </dependency>
     
-    <!-- Google Code Guava -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-	
     <!-- Testing support -->
     <dependency>
       <groupId>org.apache.jena</groupId>

http://git-wip-us.apache.org/repos/asf/jena/blob/63228de3/jena-csv/src/main/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImpl.java
----------------------------------------------------------------------
diff --git a/jena-csv/src/main/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImpl.java b/jena-csv/src/main/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImpl.java
index b74925b..dad7615 100644
--- a/jena-csv/src/main/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImpl.java
+++ b/jena-csv/src/main/java/org/apache/jena/propertytable/impl/PropertyTableHashMapImpl.java
@@ -18,25 +18,20 @@
 
 package org.apache.jena.propertytable.impl;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+import java.util.* ;
+import java.util.Map.Entry ;
 
 import org.apache.jena.atlas.iterator.Iter;
 import org.apache.jena.atlas.iterator.IteratorConcat;
+import org.apache.jena.atlas.lib.MultiMapToSet ;
 import org.apache.jena.propertytable.Column;
 import org.apache.jena.propertytable.PropertyTable;
 import org.apache.jena.propertytable.Row;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.SetMultimap;
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.graph.Triple;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.hp.hpl.jena.util.iterator.NullIterator ;
 import com.hp.hpl.jena.util.iterator.WrappedIterator;
 
 /**
@@ -52,16 +47,11 @@ public class PropertyTableHashMapImpl implements PropertyTable {
 	private List<Row> rowList; // Stores the list of rows in the table
 
 	// PSO index
-	private Map<Node, Map<Node, Node>> valueIndex; // Maps column Node to
-													// (subject Node, value)
-													// pairs
+	// Maps column Node to (subject Node, value) pairs
+	private Map<Node, Map<Node, Node>> valueIndex; 
 	// POS index
-	private Map<Node, SetMultimap<Node, Node>> valueReverseIndex; // Maps column
-																	// Node to
-																	// (value,
-																	// subject
-																	// Node)
-																	// pairs
+	// Maps column Node to (value, subject Node) pairs
+	private Map<Node, MultiMapToSet<Node, Node>> valueReverseIndex; 
 
 	PropertyTableHashMapImpl() {
 		columnIndex = new HashMap<Node, Column>();
@@ -69,7 +59,7 @@ public class PropertyTableHashMapImpl implements PropertyTable {
 		rowIndex = new HashMap<Node, Row>();
 		rowList = new ArrayList<Row>();
 		valueIndex = new HashMap<Node, Map<Node, Node>>();
-		valueReverseIndex = new HashMap<Node, SetMultimap<Node, Node>>();
+		valueReverseIndex = new HashMap<Node, MultiMapToSet<Node, Node>>();
 	}
 
 	@Override
@@ -131,12 +121,13 @@ public class PropertyTableHashMapImpl implements PropertyTable {
 		
 		
 		Node p = column.getColumnKey();
-		final SetMultimap<Node, Node> valueToSubjectMap = valueReverseIndex
-				.get(p);
+		final MultiMapToSet<Node, Node> valueToSubjectMap = valueReverseIndex.get(p);
+		if ( valueToSubjectMap == null ) 
+		    return NullIterator.instance() ;
 		final Set<Node> subjects = valueToSubjectMap.get(value);
 		ArrayList<Triple> triples = new ArrayList<Triple>();
 		for (Node subject : subjects) {
-			triples.add(Triple.create(subject, p, value));
+		    triples.add(Triple.create(subject, p, value));
 		}
 		return WrappedIterator.create(triples.iterator());
 	}
@@ -181,7 +172,7 @@ public class PropertyTableHashMapImpl implements PropertyTable {
 		columnIndex.put(p, new ColumnImpl(this, p));
 		columnList.add(columnIndex.get(p));
 		valueIndex.put(p, new HashMap<Node, Node>());
-		valueReverseIndex.put(p, HashMultimap.<Node, Node> create());
+		valueReverseIndex.put(p, MultiMapToSet.<Node, Node> create());
 		return getColumn(p);
 	}
 
@@ -236,13 +227,15 @@ public class PropertyTableHashMapImpl implements PropertyTable {
 		
 		
 		Node p = column.getColumnKey();
-		final SetMultimap<Node, Node> valueToSubjectMap = valueReverseIndex
-				.get(p);
+		final MultiMapToSet<Node, Node> valueToSubjectMap = valueReverseIndex.get(p);
+		if ( valueToSubjectMap == null )
+		    return Collections.emptyList() ;
 		final Set<Node> subjects = valueToSubjectMap.get(value);
-		
+		if ( subjects == null )
+		    return Collections.emptyList() ;
 		final ArrayList<Row> matchingRows = new ArrayList<Row>();
 		for (Node subject : subjects) {
-			matchingRows.add(this.getRow(subject));
+		    matchingRows.add(this.getRow(subject));
 		}
 		return matchingRows;
 	}
@@ -263,11 +256,11 @@ public class PropertyTableHashMapImpl implements PropertyTable {
 		addToReverseMap(p, s, oldValue, value);
 	}
 
-	private void addToReverseMap(final Node p, final Node s,
-			final Node oldValue, final Node value) {
+	private void addToReverseMap(final Node p, final Node s, final Node oldValue, final Node value) {
 
-		final SetMultimap<Node, Node> valueToSubjectMap = valueReverseIndex
-				.get(p);
+		final MultiMapToSet<Node, Node> valueToSubjectMap = valueReverseIndex.get(p);
+		if ( valueToSubjectMap == null )
+            return ; 
 		valueToSubjectMap.remove(oldValue, s);
 		valueToSubjectMap.put(value, s);
 	}
@@ -289,7 +282,9 @@ public class PropertyTableHashMapImpl implements PropertyTable {
 
 	private void removeFromReverseMap(final Node p, final Node s,
 			final Node value) {
-		final SetMultimap<Node, Node> valueTokeysMap = valueReverseIndex.get(p);
+		final MultiMapToSet<Node, Node> valueTokeysMap = valueReverseIndex.get(p);
+		if ( valueTokeysMap == null )
+		    return ;
 		valueTokeysMap.remove(s, value);
 	}
 


[3/5] jena git commit: ignore dependency-reduced-pom

Posted by an...@apache.org.
ignore dependency-reduced-pom


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bf21e351
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bf21e351
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bf21e351

Branch: refs/heads/master
Commit: bf21e351d0cd0a06681347571cdcc2054f6f84a8
Parents: 4eaa2e8
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jan 5 18:08:13 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jan 5 18:08:13 2015 +0000

----------------------------------------------------------------------
 jena-fuseki2/jena-fuseki-server/.gitignore | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/bf21e351/jena-fuseki2/jena-fuseki-server/.gitignore
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-server/.gitignore b/jena-fuseki2/jena-fuseki-server/.gitignore
new file mode 100644
index 0000000..916e17c
--- /dev/null
+++ b/jena-fuseki2/jena-fuseki-server/.gitignore
@@ -0,0 +1 @@
+dependency-reduced-pom.xml


[2/5] jena git commit: Cope with no entry at all on deletion

Posted by an...@apache.org.
Cope with no entry at all on deletion


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4eaa2e8c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4eaa2e8c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4eaa2e8c

Branch: refs/heads/master
Commit: 4eaa2e8c82dabd7775f4cb820890fbcc647b14df
Parents: 47bf098
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jan 5 18:05:48 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jan 5 18:05:48 2015 +0000

----------------------------------------------------------------------
 jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/4eaa2e8c/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
index ad33046..1e02028 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
@@ -65,7 +65,10 @@ public abstract class MultiMap<K, V>
         x.add(value) ;
     }
     
-    public void remove(K key, V value)  { map.get(key).remove(value) ; }
+    public void remove(K key, V value)  {
+        if ( map.containsKey(key))
+            map.get(key).remove(value) ;
+    }
     public void removeKey(K key)        { map.remove(key) ; }
     
     protected Collection<V> valuesForKey(K key) { return map.get(key); }


[5/5] jena git commit: Remove

Posted by an...@apache.org.
Remove


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/20393b59
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/20393b59
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/20393b59

Branch: refs/heads/master
Commit: 20393b594b87f56178de7c98e425a283196d089e
Parents: 63228de
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jan 5 18:09:41 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jan 5 18:09:41 2015 +0000

----------------------------------------------------------------------
 .../dependency-reduced-pom.xml                  | 93 --------------------
 1 file changed, 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/20393b59/jena-fuseki2/jena-fuseki-server/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-server/dependency-reduced-pom.xml b/jena-fuseki2/jena-fuseki-server/dependency-reduced-pom.xml
deleted file mode 100644
index 270d99a..0000000
--- a/jena-fuseki2/jena-fuseki-server/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>jena-fuseki</artifactId>
-    <groupId>org.apache.jena</groupId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jena-fuseki-server</artifactId>
-  <name>Apache Jena Fuseki - Server Standalone Jar</name>
-  <version>2.0.0-SNAPSHOT</version>
-  <description>Fuseki server - combined jar with built-in webserver.</description>
-  <url>http://jena.apache.org/</url>
-  <licenses>
-    <license>
-      <name>Apache 2.0 License</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
-  <organization>
-    <name>Apache Jena</name>
-    <url>http://jena.apache.org/</url>
-  </organization>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <shadedArtifactAttached>false</shadedArtifactAttached>
-          <transformers>
-            <transformer>
-              <mainClass>org.apache.jena.fuseki.FusekiCmd</mainClass>
-            </transformer>
-            <transformer />
-            <transformer />
-            <transformer>
-              <addHeader>false</addHeader>
-            </transformer>
-          </transformers>
-          <filters>
-            <filter>
-              <artifact>*:*</artifact>
-              <excludes>
-                <exclude>META-INF/*.SF</exclude>
-                <exclude>META-INF/*.DSA</exclude>
-                <exclude>META-INF/*.RSA</exclude>
-              </excludes>
-            </filter>
-          </filters>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-    </repository>
-  </repositories>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-  <properties>
-    <this.root>${project.artifactId}-${project.version}</this.root>
-    <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
-    <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
-  </properties>
-</project>
-