Tidy up code- remove warnings.

afs · Nov 14, 2010 · 86ece5a · 86ece5a
1 parent ac2d87c
commit 86ece5a
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 48 deletions.
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Aug 25 19:14:39 BST 2010
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
diff --git a/log4j.properties b/log4j.properties
@@ -1,15 +1,21 @@
-#log4j.rootLogger=WARN, stdout
+log4j.rootLogger=INFO, stdlog
-log4j.rootLogger=WARN, stderr
+
-
+log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+## log4j.appender.stdlog.target=System.err
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-20c{1} :: %m%n
+log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: %m%n
-##log4j.appender.stdout.layout.ConversionPattern=%-5p %-20c{1} :: %m%n
+
-
+# Execution logging
-log4j.appender.stderr=org.apache.log4j.ConsoleAppender
+log4j.logger.com.hp.hpl.jena.arq.info=INFO
-log4j.appender.stderr.target=System.err
+log4j.logger.com.hp.hpl.jena.arq.exec=INFO
-log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
+
-log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-20c{1} :: %m%n
+# Everything else in Jena
-
+log4j.logger.com.hp.hpl.jena=WARN
-log4j.logger.benchmark=INFO
+log4j.logger.org.openjena=WARN
-
+log4j.logger.org.openjena.riot=INFO
+
+# Joseki server
+log4j.logger.org.joseki=INFO
+
+
+log4j.logger.benchmark=INFO
diff --git a/mvn-update b/mvn-update
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mvn dependency:resolve dependency:sources
diff --git a/src/benchmark/generator/ParetoDistGenerator.java b/src/benchmark/generator/ParetoDistGenerator.java
@@ -15,7 +15,8 @@ public ParetoDistGenerator(double alpha, int maxValue)
 	public int getValue()
 	{
 		int i;
-		for(i=(int)pareto.inverseF(Math.random());i>max;i=(int)pareto.inverseF(Math.random()));
+		for(i=(int)pareto.inverseF(Math.random());i>max;i=(int)pareto.inverseF(Math.random())) 
+		{}
 		return i;
 	}
 }
diff --git a/src/benchmark/serializer/NTriples.java b/src/benchmark/serializer/NTriples.java
@@ -25,7 +25,8 @@ public NTriples(String file, boolean forwardChaining)
 		nrTriples = 0l;
 	}
 
-	public void gatherData(ObjectBundle bundle) {
+	@Override
+    public void gatherData(ObjectBundle bundle) {
 		Iterator<BSBMResource> it = bundle.iterator();
 
 		while(it.hasNext())
@@ -677,7 +678,8 @@ private String createURIref(String uri)
 
 
 
-	public void serialize() {
+	@Override
+    public void serialize() {
 		//Close File
 		try {
 			fileWriter.flush();
@@ -688,7 +690,8 @@ public void serialize() {
 		}
 	}
 
-	public Long triplesGenerated() {
+	@Override
+    public Long triplesGenerated() {
 		return nrTriples;
 	}
 }
diff --git a/src/benchmark/serializer/SQLSerializer.java b/src/benchmark/serializer/SQLSerializer.java
@@ -38,7 +38,8 @@ public SQLSerializer(String directory, boolean forwardChaining, String database)
 		initTables();
 	}
 
-	public void gatherData(ObjectBundle bundle) {
+	@Override
+    public void gatherData(ObjectBundle bundle) {
 		Iterator<BSBMResource> it = bundle.iterator();
 
 		try {
@@ -576,7 +577,8 @@ private void convertReview(Review review) throws IOException
 		tables.reviewDump.append(values);
 	}
 
-	public void serialize() {
+	@Override
+    public void serialize() {
 		//Finish files and close
 		try {
 			tables.productTypeDump.append(tables.endTable(tables.productTypeInsertCounter, "producttype"));
@@ -625,7 +627,8 @@ public void serialize() {
 		}
 	}
 
-	public Long triplesGenerated() {
+	@Override
+    public Long triplesGenerated() {
 		return nrTriples;
 	}
 

diff --git a/src/benchmark/serializer/TriG.java b/src/benchmark/serializer/TriG.java
@@ -77,7 +77,8 @@ private String createPrefixLine(String prefix, String namespace) {
 	}
 
 
-	public void gatherData(ObjectBundle bundle) {
+	@Override
+    public void gatherData(ObjectBundle bundle) {
 		Iterator<BSBMResource> it = bundle.iterator();
 
 		//Write Graph and provenance data
@@ -678,7 +679,8 @@ private String createURIref(String uri)
 
 
 
-	public void serialize() {
+	@Override
+    public void serialize() {
 		//Write provenance data file end and close files
 		try {
 			provenanceGraphWriter.append("}\n");
@@ -712,7 +714,8 @@ public void serialize() {
 		}
 	}
 
-	public Long triplesGenerated() {
+	@Override
+    public Long triplesGenerated() {
 		return nrTriples;
 	}
 }
diff --git a/src/benchmark/serializer/Turtle.java b/src/benchmark/serializer/Turtle.java
@@ -72,7 +72,8 @@ private String createPrefixLine(String prefix, String namespace) {
 	}
 
 
-	public void gatherData(ObjectBundle bundle) {
+	@Override
+    public void gatherData(ObjectBundle bundle) {
 		Iterator<BSBMResource> it = bundle.iterator();
 
 		try {
@@ -742,7 +743,8 @@ private String createURIref(String uri)
 
 
 
-	public void serialize() {
+	@Override
+    public void serialize() {
 		//Close files
 		try {
 			dataFileWriter.flush();
@@ -768,7 +770,8 @@ public void serialize() {
 		}
 	}
 
-	public Long triplesGenerated() {
+	@Override
+    public Long triplesGenerated() {
 		return nrTriples;
 	}
 

diff --git a/src/benchmark/serializer/VirtSerializer.java b/src/benchmark/serializer/VirtSerializer.java
@@ -36,7 +36,8 @@ public VirtSerializer (String directory, boolean forwardChaining) {
 		initTables();
 	}
 
-	public void gatherData(ObjectBundle bundle) {
+	@Override
+    public void gatherData(ObjectBundle bundle) {
 		Iterator<BSBMResource> it = bundle.iterator();
 
 		try {
@@ -574,7 +575,8 @@ private void convertReview(Review review) throws IOException
 		tables.reviewDump.append(values);
 	}
 
-	public void serialize() {
+	@Override
+    public void serialize() {
 		//Finish files and close
 		try {
 			tables.productTypeDump.flush();
@@ -613,7 +615,8 @@ public void serialize() {
 		}
 	}
 
-	public Long triplesGenerated() {
+	@Override
+    public Long triplesGenerated() {
 		return nrTriples;
 	}
 

diff --git a/src/benchmark/serializer/XMLSerializer.java b/src/benchmark/serializer/XMLSerializer.java
@@ -78,7 +78,8 @@ else if(publisher.contains("ratingsite"))
 	}
 
 
-	public void gatherData(ObjectBundle bundle) {
+	@Override
+    public void gatherData(ObjectBundle bundle) {
 		Iterator<BSBMResource> it = bundle.iterator();
 
 		String publisherType = getPublisherTypeString(bundle);
@@ -552,7 +553,8 @@ private String leafTagWA(int indentationSteps, String tag, String content, Strin
 		return sb.toString();
 	}
 
-	public void serialize() {
+	@Override
+    public void serialize() {
 		//Close files
 		try {
 			writeFooterData();
@@ -564,7 +566,8 @@ public void serialize() {
 		}
 	}
 
-	public Long triplesGenerated() {
+	@Override
+    public Long triplesGenerated() {
 		return nrTriples;
 	}
 

diff --git a/src/benchmark/testdriver/SPARQLConnection.java b/src/benchmark/testdriver/SPARQLConnection.java
@@ -31,7 +31,8 @@ public SPARQLConnection(String serviceURL, String defaultGraph, int timeout) {
 	/*
 	 * Execute Query with Query Object
 	 */
-	public void executeQuery(Query query, byte queryType) {
+	@Override
+    public void executeQuery(Query query, byte queryType) {
 		executeQuery(query.getQueryString(), queryType, query.getNr(), query.getQueryMix());
 	}
 
@@ -79,7 +80,8 @@ private void executeQuery(String queryString, byte queryType, int queryNr, Query
 		qe.close();
 	}
 
-	public void executeQuery(CompiledQuery query, CompiledQueryMix queryMix) {
+	@Override
+    public void executeQuery(CompiledQuery query, CompiledQueryMix queryMix) {
 		double timeInSeconds;
 
 		String queryString = query.getQueryString();
@@ -211,7 +213,8 @@ public int getCount() {
 		}
 	}
 
-	public void close() {
+	@Override
+    public void close() {
 		//nothing to close
 	}
 
@@ -220,7 +223,8 @@ public void close() {
 	 * @see benchmark.testdriver.ServerConnection#executeValidation(benchmark.testdriver.Query, byte, java.lang.String[])
 	 * Gather information about the result a query returns.
 	 */
-	public QueryResult executeValidation(Query query, byte queryType) {
+	@Override
+    public QueryResult executeValidation(Query query, byte queryType) {
 		String queryString = query.getQueryString();
 		int queryNr = query.getNr();
 		String[] rowNames = query.getRowNames();

diff --git a/src/benchmark/testdriver/SQLConnection.java b/src/benchmark/testdriver/SQLConnection.java
@@ -38,7 +38,8 @@ public SQLConnection(String serviceURL, int timeout, String driverClassName) {
 	/*
 	 * Execute Query with Query Object
 	 */
-	public void executeQuery(Query query, byte queryType) {
+	@Override
+    public void executeQuery(Query query, byte queryType) {
 		executeQuery(query.getQueryString(), queryType, query.getNr(), query.getQueryMix());
 	}
 
@@ -84,7 +85,8 @@ private void executeQuery(String queryString, byte queryType, int queryNr, Query
 	 * Execute Query with precompiled Query
 	 * @see benchmark.testdriver.ServerConnection#executeQuery(benchmark.testdriver.CompiledQuery, benchmark.testdriver.CompiledQueryMix)
 	 */
-	public void executeQuery(CompiledQuery query, CompiledQueryMix queryMix) {
+	@Override
+    public void executeQuery(CompiledQuery query, CompiledQueryMix queryMix) {
 		double timeInSeconds;
 		String queryString = query.getQueryString();
 		byte queryType = query.getQueryType();
@@ -144,7 +146,8 @@ private void logResultInfo(int queryNr, int queryMixRun, double timeInSeconds,
 		logger.log(Level.ALL, sb.toString());
 	}
 
-	public void close() {
+	@Override
+    public void close() {
 		try {
 		conn.close();
 		} catch(SQLException e) {
@@ -153,7 +156,8 @@ public void close() {
 		}
 	}
 
-	public QueryResult executeValidation(Query query, byte queryType) {
+	@Override
+    public QueryResult executeValidation(Query query, byte queryType) {
 		// TODO Auto-generated method stub
 		return null;
 	}

diff --git a/src/benchmark/tools/ResultTransform.java b/src/benchmark/tools/ResultTransform.java
@@ -293,7 +293,8 @@ private static void init() {
 }
 
 class FileFilter implements FilenameFilter {
-	public boolean accept(File dir, String name) {
+	@Override
+    public boolean accept(File dir, String name) {
 		return name.endsWith(".xml");
 	}
 }
@@ -391,7 +392,8 @@ public String getQmValue() {
 }
 
 class StringLengthComparator implements Comparator<String> {
-	public int compare(String s1, String s2) {
+	@Override
+    public int compare(String s1, String s2) {
 		if(s1.length() == s2.length())
 			return 0;
 		else if(s1.length()>s2.length())

diff --git a/src/benchmark/tools/ResultTransformOriginalStyle.java b/src/benchmark/tools/ResultTransformOriginalStyle.java
@@ -278,7 +278,8 @@ private static void init() {
 	}
 
 	private static class FileFilter1 implements FilenameFilter {
-	    public boolean accept(File dir, String name) {
+	    @Override
+        public boolean accept(File dir, String name) {
 	        return name.endsWith(".xml");
 	    }
 	}
@@ -376,7 +377,8 @@ public String getQmValue() {
 	}
 
 	private static class StringLengthComparator1 implements Comparator<String> {
-	    public int compare(String s1, String s2) {
+	    @Override
+        public int compare(String s1, String s2) {
 	        if(s1.length() == s2.length())
 	            return 0;
 	        else if(s1.length()>s2.length())

diff --git a/src/openrdf/test.java b/src/openrdf/test.java
@@ -18,12 +18,12 @@ public class test
 {
     static { System.setProperty("log4j.configuration", "file:log4j.properties") ; }
 
-    public static void main(String... argv) throws IOException
+    public static void main(String... argv) 
     {
         query(argv) ;
     }
 
-    public static void query(String... argv) throws IOException
+    public static void query(String... argv)
     {
         if ( argv.length == 0 )
         {