You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/05/16 10:59:23 UTC
[41/50] [abbrv] jena git commit: JENA-938 : Code cleaning (extract of
PR #60)
JENA-938 : Code cleaning (extract of PR #60)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/49480190
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/49480190
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/49480190
Branch: refs/heads/add-contract-tests
Commit: 49480190d4ab4bb1436a431a64dc5883faa4190c
Parents: 22b9e4a
Author: Andy Seaborne <an...@apache.org>
Authored: Thu May 14 21:04:40 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu May 14 21:04:40 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/json/JsonArray.java | 2 +-
.../atlas/json/io/parser/TokenizerJSON.java | 697 +++++++++----------
.../apache/jena/sparql/lang/arq/ARQParser.java | 2 +-
.../jena/sparql/modify/UpdateProcessRemote.java | 3 +-
.../sparql/modify/UpdateProcessRemoteForm.java | 3 +-
.../jena/web/DatasetGraphAccessorHTTP.java | 3 +-
jena-arq/src/main/java/riotcmd/utf8.java | 48 +-
.../jena/riot/lang/TestPipedRDFIterators.java | 6 +-
.../jena/riot/system/TestIO_JenaReaders.java | 4 +-
.../jena/riot/system/TestIO_JenaWriters.java | 4 +-
.../sparql/core/TestDatasetGraphWithLock.java | 4 +-
.../sparql/engine/index/TestIndexTable.java | 4 +-
.../apache/jena/sparql/junit/EarlTestCase.java | 8 +-
.../org/apache/jena/sparql/junit/QueryTest.java | 10 +-
.../jena/sparql/junit/SurpressedTest.java | 2 +-
.../apache/jena/sparql/junit/SyntaxTest.java | 2 +-
.../jena/sparql/junit/SyntaxUpdateTest.java | 2 +-
.../jena/sparql/junit/TestSerialization.java | 2 +-
.../apache/jena/sparql/junit/UpdateTest.java | 6 +-
.../apache/jena/sparql/util/TestFmtUtils.java | 6 +-
20 files changed, 383 insertions(+), 435 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
index 05604e5..023004c 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
@@ -24,7 +24,7 @@ import java.util.Iterator ;
import java.util.List ;
import java.util.ListIterator ;
-public class JsonArray extends JsonValue implements List<JsonValue>, Iterable<JsonValue>
+public class JsonArray extends JsonValue implements List<JsonValue>
{
private List<JsonValue> array = new ArrayList<>() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
index 4ce1365..9c98cc6 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
@@ -47,44 +47,40 @@ public class TokenizerJSON implements Tokenizer
}
@Override
- public final boolean hasNext()
- {
+ public final boolean hasNext() {
if ( finished )
return false ;
if ( token != null )
return true ;
skip() ;
- if (reader.eof())
+ if ( reader.eof() )
return false ;
token = parseToken() ;
return token != null ;
}
-
+
@Override
- public final boolean eof()
- {
+ public final boolean eof() {
return hasNext() ;
}
/** Move to next token */
@Override
- public final Token next()
- {
- if ( ! hasNext() )
+ public final Token next() {
+ if ( !hasNext() )
throw new NoSuchElementException() ;
Token t = token ;
token = null ;
return t ;
}
-
@Override
- public final Token peek()
- {
- if ( ! hasNext() ) return null ;
- return token ;
+ public final Token peek() {
+ if ( !hasNext() )
+ return null ;
+ return token ;
}
-
+
@Override
public void remove()
{ throw new UnsupportedOperationException() ; }
@@ -98,50 +94,46 @@ public class TokenizerJSON implements Tokenizer
// Keys (restricted strings, used as keys in maps)
// ALPHA (ALPHA,NUMERIC,_,...)
- private Token parseToken()
- {
- token = new Token(getLine(), getColumn()) ;
-
- int ch = reader.peekChar() ;
-
- // ---- String
- // Support both "" and '' strings (only "" is legal JSON)
- if ( ch == CH_QUOTE1 || ch == CH_QUOTE2 )
- {
- reader.readChar() ;
- int ch2 = reader.peekChar() ;
- if (ch2 == ch )
- {
- // Maybe """-strings/'''-strings
- reader.readChar() ; // Read potential second quote.
- int ch3 = reader.peekChar() ;
- if ( ch3 == ch )
- {
- // """-strings/'''-strings
- reader.readChar() ;
- token.setImage(readLong(ch, false)) ;
- TokenType tt = (ch == CH_QUOTE1) ? TokenType.LONG_STRING1 : TokenType.LONG_STRING2 ;
- token.setType(tt) ;
- return token ;
- }
- // Two quotes then a non-quote.
- // Must be '' or ""
-
- // No need to pushback characters as we know the lexical form is the empty string.
- //if ( ch2 != EOF ) reader.pushbackChar(ch2) ;
- //if ( ch1 != EOF ) reader.pushbackChar(ch1) ; // Must be '' or ""
- token.setImage("") ;
+ private Token parseToken() {
+ token = new Token(getLine(), getColumn()) ;
+
+ int ch = reader.peekChar() ;
+
+ // ---- String
+ // Support both "" and '' strings (only "" is legal JSON)
+ if ( ch == CH_QUOTE1 || ch == CH_QUOTE2 ) {
+ reader.readChar() ;
+ int ch2 = reader.peekChar() ;
+ if ( ch2 == ch ) {
+ // Maybe """-strings/'''-strings
+ reader.readChar() ; // Read potential second quote.
+ int ch3 = reader.peekChar() ;
+ if ( ch3 == ch ) {
+ // """-strings/'''-strings
+ reader.readChar() ;
+ token.setImage(readLong(ch, false)) ;
+ TokenType tt = (ch == CH_QUOTE1) ? TokenType.LONG_STRING1 : TokenType.LONG_STRING2 ;
+ token.setType(tt) ;
+ return token ;
}
- else
- // Single quote character.
- token.setImage(allBetween(ch, ch, true, false)) ;
- // Single quoted string.
- token.setType( (ch == CH_QUOTE1) ? TokenType.STRING1 : TokenType.STRING2 ) ;
- return token ;
- }
-
- switch(ch)
- {
+ // Two quotes then a non-quote.
+ // Must be '' or ""
+
+ // No need to pushback characters as we know the lexical form is
+ // the empty string.
+ // if ( ch2 != EOF ) reader.pushbackChar(ch2) ;
+ // if ( ch1 != EOF ) reader.pushbackChar(ch1) ; // Must be '' or
+ // ""
+ token.setImage("") ;
+ } else
+ // Single quote character.
+ token.setImage(allBetween(ch, ch, true, false)) ;
+ // Single quoted string.
+ token.setType((ch == CH_QUOTE1) ? TokenType.STRING1 : TokenType.STRING2) ;
+ return token ;
+ }
+
+ switch (ch) {
// DOT can't start a decimal in JSON. Check for digit.
case CH_DOT:
// reader.readChar() ;
@@ -155,98 +147,123 @@ public class TokenizerJSON implements Tokenizer
// }
token.setType(TokenType.DOT) ;
return token ;
-
-
- case CH_SEMICOLON: reader.readChar() ; token.setType(TokenType.SEMICOLON) ; return token ;
- case CH_COMMA: reader.readChar() ; token.setType(TokenType.COMMA) ; return token ;
- case CH_LBRACE: reader.readChar() ; token.setType(TokenType.LBRACE) ; return token ;
- case CH_RBRACE: reader.readChar() ; token.setType(TokenType.RBRACE) ; return token ;
- case CH_LPAREN: reader.readChar() ; token.setType(TokenType.LPAREN) ; return token ;
- case CH_RPAREN: reader.readChar() ; token.setType(TokenType.RPAREN) ; return token ;
- case CH_LBRACKET: reader.readChar() ; token.setType(TokenType.LBRACKET) ; return token ;
- case CH_RBRACKET: reader.readChar() ; token.setType(TokenType.RBRACKET) ; return token ;
-
+
+ case CH_SEMICOLON :
+ reader.readChar() ;
+ token.setType(TokenType.SEMICOLON) ;
+ return token ;
+ case CH_COMMA :
+ reader.readChar() ;
+ token.setType(TokenType.COMMA) ;
+ return token ;
+ case CH_LBRACE :
+ reader.readChar() ;
+ token.setType(TokenType.LBRACE) ;
+ return token ;
+ case CH_RBRACE :
+ reader.readChar() ;
+ token.setType(TokenType.RBRACE) ;
+ return token ;
+ case CH_LPAREN :
+ reader.readChar() ;
+ token.setType(TokenType.LPAREN) ;
+ return token ;
+ case CH_RPAREN :
+ reader.readChar() ;
+ token.setType(TokenType.RPAREN) ;
+ return token ;
+ case CH_LBRACKET :
+ reader.readChar() ;
+ token.setType(TokenType.LBRACKET) ;
+ return token ;
+ case CH_RBRACKET :
+ reader.readChar() ;
+ token.setType(TokenType.RBRACKET) ;
+ return token ;
+
// Some interesting characters
- case CH_COLON: reader.readChar() ; token.setType(TokenType.COLON) ; return token ;
- // case CH_UNDERSCORE: reader.readChar() ; token.setType(TokenType.UNDERSCORE) ; return token ;
- case CH_LT: reader.readChar() ; token.setType(TokenType.LT) ; return token ;
- case CH_GT: reader.readChar() ; token.setType(TokenType.GT) ; return token ;
- // GE, LE
- }
-
- if ( ch == CH_PLUS || ch == CH_MINUS || range(ch, '0', '9'))
- {
- readNumber() ;
+ case CH_COLON :
+ reader.readChar() ;
+ token.setType(TokenType.COLON) ;
return token ;
- }
-
- // Plain words and prefixes.
- // Can't start with a number due to numeric test above.
- // Can start with a '_' (no blank node test above)
-
- readKeyWord(token) ;
+ // case CH_UNDERSCORE: reader.readChar() ;
+ // token.setType(TokenType.UNDERSCORE) ; return token ;
+ case CH_LT :
+ reader.readChar() ;
+ token.setType(TokenType.LT) ;
+ return token ;
+ case CH_GT :
+ reader.readChar() ;
+ token.setType(TokenType.GT) ;
+ return token ;
+ // GE, LE
+ }
+
+ if ( ch == CH_PLUS || ch == CH_MINUS || range(ch, '0', '9') ) {
+ readNumber() ;
return token ;
}
- private void skip()
- {
+ // Plain words and prefixes.
+ // Can't start with a number due to numeric test above.
+ // Can start with a '_' (no blank node test above)
+
+ readKeyWord(token) ;
+ return token ;
+ }
+
+ private void skip() {
int ch = EOF ;
- for ( ;; )
- {
+ for ( ; ; ) {
if ( reader.eof() )
return ;
-
+
ch = reader.peekChar() ;
- if ( ch == CH_HASH )
- {
+ if ( ch == CH_HASH ) {
reader.readChar() ;
- // Comment. Skip to NL
- for ( ;; )
- {
+ // Comment. Skip to NL
+ for ( ; ; ) {
ch = reader.peekChar() ;
if ( ch == EOF || isNewlineChar(ch) )
break ;
reader.readChar() ;
}
}
-
+
// Including excess newline chars from comment.
- if ( ! isWhitespace(ch) )
+ if ( !isWhitespace(ch) )
break ;
reader.readChar() ;
}
}
- private void readKeyWord(Token token2)
- {
+ private void readKeyWord(Token token2) {
long posn = reader.getPosition() ;
token2.setImage(readWord(false)) ;
token2.setType(TokenType.KEYWORD) ;
int ch = reader.peekChar() ;
- // If we made no progress, nothing found, not even a keyword -- it's an error.
- if ( posn == reader.getPosition() )
- exception(String.format("Unknown char: %c(%d)",ch,ch)) ;
+ // If we made no progress, nothing found, not even a keyword -- it's an
+ // error.
+ if ( posn == reader.getPosition() )
+ exception(String.format("Unknown char: %c(%d)", ch, ch)) ;
}
-
- private String readLong(int quoteChar, boolean endNL)
- {
+
+ private String readLong(int quoteChar, boolean endNL) {
sb.setLength(0) ;
- for ( ;; )
- {
+ for ( ; ; ) {
int ch = reader.readChar() ;
- if ( ch == EOF )
- {
- if ( endNL ) return sb.toString() ;
+ if ( ch == EOF ) {
+ if ( endNL )
+ return sb.toString() ;
exception("Broken long string") ;
}
-
- if ( ch == quoteChar )
- {
+
+ if ( ch == quoteChar ) {
if ( threeQuotes(quoteChar) )
return sb.toString() ;
}
-
+
if ( ch == '\\' )
ch = readLiteralEscape() ;
insertLiteralChar(sb, ch) ;
@@ -259,57 +276,49 @@ public class TokenizerJSON implements Tokenizer
// On return:
// If false, have moved over no more characters (due to pushbacks)
// If true, at end of 3 quotes
- private boolean threeQuotes(int ch)
- {
+ private boolean threeQuotes(int ch) {
//reader.readChar() ; // Read first quote.
int ch2 = reader.peekChar() ;
- if (ch2 != ch )
- {
- //reader.pushbackChar(ch2) ;
+ if ( ch2 != ch ) {
+ // reader.pushbackChar(ch2) ;
return false ;
}
-
- reader.readChar() ; // Read second quote.
+
+ reader.readChar() ; // Read second quote.
int ch3 = reader.peekChar() ;
- if ( ch3 != ch )
- {
- //reader.pushbackChar(ch3) ;
+ if ( ch3 != ch ) {
+ // reader.pushbackChar(ch3) ;
reader.pushbackChar(ch2) ;
return false ;
}
-
+
// Three quotes.
- reader.readChar() ; // Read third quote.
+ reader.readChar() ; // Read third quote.
return true ;
}
-
+
// Read a "word": alphanumerics, "_", ".", "-"
- private String readWord(boolean leadingDigitAllowed)
- {
+ private String readWord(boolean leadingDigitAllowed) {
sb.setLength(0) ;
int idx = 0 ;
- if ( ! leadingDigitAllowed )
- {
+ if ( !leadingDigitAllowed ) {
int ch = reader.peekChar() ;
if ( Character.isDigit(ch) )
return "" ;
}
-
- for ( ;; idx++ )
- {
+
+ for ( ; ; idx++ ) {
int ch = reader.peekChar() ;
-
- if ( Character.isLetterOrDigit(ch) || ch == '_' || ch == '.' || ch == '-' )
- {
+
+ if ( Character.isLetterOrDigit(ch) || ch == '_' || ch == '.' || ch == '-' ) {
reader.readChar() ;
sb.append((char)ch) ;
continue ;
- }
- else
+ } else
break ;
-
+
}
-
+
// // Trailing DOT?
// // BAD : assumes pushbackChar is infinite.
// // Check is ends in "."
@@ -334,32 +343,25 @@ public class TokenizerJSON implements Tokenizer
[] hex ::= 0x0123456789ABCDEFG
*/
- private void readNumber()
- {
+ private void readNumber() {
// One entry, definitely a number.
// Beware of '.' as a (non) decimal.
/*
- maybeSign()
- digits()
- if dot ==> decimal, digits
- if e ==> double, maybeSign, digits
- else
- check not "." for decimal.
- */
+ * maybeSign() digits() if dot ==> decimal, digits if e ==> double,
+ * maybeSign, digits else check not "." for decimal.
+ */
boolean isDouble = false ;
boolean isDecimal = false ;
sb.setLength(0) ;
-
+
int x = 0 ; // Digits before a dot.
int ch = reader.peekChar() ;
- if ( ch == '0' )
- {
+ if ( ch == '0' ) {
x++ ;
reader.readChar() ;
sb.append((char)ch) ;
ch = reader.peekChar() ;
- if ( ch == 'x' || ch == 'X' )
- {
+ if ( ch == 'x' || ch == 'X' ) {
reader.readChar() ;
sb.append((char)ch) ;
readHex(reader, sb) ;
@@ -367,38 +369,34 @@ public class TokenizerJSON implements Tokenizer
token.setType(TokenType.HEX) ;
return ;
}
- }
- else if ( ch == '-' || ch == '+' )
- {
+ } else if ( ch == '-' || ch == '+' ) {
readPossibleSign(sb) ;
}
-
x += readDigits(sb) ;
// if ( x == 0 )
// {
//
// }
ch = reader.peekChar() ;
- if ( ch == CH_DOT )
- {
+ if ( ch == CH_DOT ) {
reader.readChar() ;
sb.append(CH_DOT) ;
- isDecimal = true ; // Includes things that will be doubles.
+ isDecimal = true ; // Includes things that will be doubles.
readDigits(sb) ;
}
-
- if ( x == 0 && ! isDecimal )
- // Possible a tokenizer error - should not have entered readNumber in the first place.
+
+ if ( x == 0 && !isDecimal )
+ // Possible a tokenizer error - should not have entered readNumber
+ // in the first place.
exception("Unrecognized as number") ;
-
- if ( exponent(sb) )
- {
+
+ if ( exponent(sb) ) {
isDouble = true ;
isDecimal = false ;
-
+
}
-
+
token.setImage(sb.toString()) ;
if ( isDouble )
token.setType(TokenType.DOUBLE) ;
@@ -408,27 +406,23 @@ public class TokenizerJSON implements Tokenizer
token.setType(TokenType.INTEGER) ;
}
-
- private static void readHex(PeekReader reader, StringBuilder sb)
- {
+ private static void readHex(PeekReader reader, StringBuilder sb) {
// Just after the 0x, which are in sb
int x = 0 ;
- for(;;)
- {
+ for ( ; ; ) {
int ch = reader.peekChar() ;
- if ( ! range(ch, '0', '9') && ! range(ch, 'a', 'f') && ! range(ch, 'A', 'F') )
+ if ( !range(ch, '0', '9') && !range(ch, 'a', 'f') && !range(ch, 'A', 'F') )
break ;
reader.readChar() ;
sb.append((char)ch) ;
x++ ;
}
if ( x == 0 )
- exception(reader, "No hex characters after "+sb.toString()) ;
+ exception(reader, "No hex characters after " + sb.toString()) ;
}
- private boolean exponent(StringBuilder sb)
- {
+ private boolean exponent(StringBuilder sb) {
int ch = reader.peekChar() ;
if ( ch != 'e' && ch != 'E' )
return false ;
@@ -437,116 +431,95 @@ public class TokenizerJSON implements Tokenizer
readPossibleSign(sb) ;
int x = readDigits(sb) ;
if ( x == 0 )
- exception("Malformed double: "+sb) ;
+ exception("Malformed double: " + sb) ;
return true ;
}
- private void readPossibleSign(StringBuilder sb)
- {
+ private void readPossibleSign(StringBuilder sb) {
int ch = reader.peekChar() ;
- if ( ch == '-' || ch == '+' )
- {
+ if ( ch == '-' || ch == '+' ) {
reader.readChar() ;
sb.append((char)ch) ;
}
}
- private int readDigits(StringBuilder buffer)
- {
+ private int readDigits(StringBuilder buffer) {
int count = 0 ;
- for(;;)
- {
+ for ( ; ; ) {
int ch = reader.peekChar() ;
- if ( ! range(ch, '0', '9' ) )
+ if ( !range(ch, '0', '9') )
break ;
reader.readChar() ;
buffer.append((char)ch) ;
- count ++ ;
+ count++ ;
}
return count ;
}
-
- private String langTag()
- {
+
+ private String langTag() {
sb.setLength(0) ;
a2z(sb) ;
if ( sb.length() == 0 )
exception("Bad language tag") ;
- for ( ;; )
- {
+ for ( ; ; ) {
int ch = reader.peekChar() ;
- if ( ch == '-' )
- {
+ if ( ch == '-' ) {
reader.readChar() ;
sb.append('-') ;
- int x = sb.length();
+ int x = sb.length() ;
a2zN(sb) ;
if ( sb.length() == x )
exception("Bad language tag") ;
- }
- else
+ } else
break ;
}
- return sb.toString();
+ return sb.toString() ;
}
-
- private void a2z(StringBuilder sb2)
- {
- for ( ;; )
- {
+
+ private void a2z(StringBuilder sb2) {
+ for ( ; ; ) {
int ch = reader.peekChar() ;
- if ( isA2Z(ch) )
- {
+ if ( isA2Z(ch) ) {
reader.readChar() ;
sb.append((char)ch) ;
- }
- else
+ } else
return ;
}
}
-
- private void a2zN(StringBuilder sb2)
- {
- for ( ;; )
- {
+
+ private void a2zN(StringBuilder sb2) {
+ for ( ; ; ) {
int ch = reader.peekChar() ;
- if ( isA2ZN(ch) )
- {
+ if ( isA2ZN(ch) ) {
reader.readChar() ;
sb.append((char)ch) ;
- }
- else
+ } else
return ;
}
}
// Blank node label: A-Z,a-z0-9 and '-'
- private String blankNodeLabel()
- {
+ private String blankNodeLabel() {
sb.setLength(0) ;
boolean seen = false ;
- for(;;)
- {
+ for ( ; ; ) {
int ch = reader.readChar() ;
if ( ch == EOF )
break ;
- if ( ! isA2ZN(ch) && ch != '-' )
+ if ( !isA2ZN(ch) && ch != '-' )
break ;
sb.append((char)ch) ;
seen = true ;
}
- if ( ! seen )
+ if ( !seen )
exception("Blank node label missing") ;
- return sb.toString() ;
+ return sb.toString() ;
}
-
// Get characters between two markers.
// strEscapes may be processed
// endNL end of line as an ending is OK
- private String allBetween(int startCh, int endCh,
- boolean strEscapes, boolean endNL)
- {
+ private String allBetween(int startCh, int endCh, boolean strEscapes, boolean endNL) {
long y = getLine() ;
long x = getColumn() ;
sb.setLength(0) ;
@@ -555,45 +528,43 @@ public class TokenizerJSON implements Tokenizer
// int ch0 = reader.readChar() ;
// if ( ch0 != startCh )
// exception("Broken parser", y, x) ;
-
- for(;;)
- {
+ for ( ; ; ) {
int ch = reader.readChar() ;
- if ( ch == EOF )
- {
- if ( endNL ) return sb.toString() ;
- exception("Broken token: "+sb.toString(), y, x) ;
+ if ( ch == EOF ) {
+ if ( endNL )
+ return sb.toString() ;
+ exception("Broken token: " + sb.toString(), y, x) ;
}
if ( ch == '\n' )
- exception("Broken token (newline): "+sb.toString(), y, x) ;
-
- if ( ch == endCh )
- {
- //sb.append(((char)ch)) ;
+ exception("Broken token (newline): " + sb.toString(), y, x) ;
+
+ if ( ch == endCh ) {
+ // sb.append(((char)ch)) ;
return sb.toString() ;
}
-
- if ( ch == '\\' )
- {
+
+ if ( ch == '\\' ) {
if ( strEscapes )
ch = readLiteralEscape() ;
- else
- {
+ else {
ch = reader.readChar() ;
- if ( ch == EOF )
- {
- if ( endNL ) return sb.toString() ;
- exception("Broken token: "+sb.toString(), y, x) ;
+ if ( ch == EOF ) {
+ if ( endNL )
+ return sb.toString() ;
+ exception("Broken token: " + sb.toString(), y, x) ;
}
-
- switch (ch)
- {
- case 'u': ch = readUnicode4Escape(); break ;
- case 'U': ch = readUnicode4Escape(); break ;
- default:
- exception(String.format("illegal escape sequence value: %c (0x%02X)", ch, ch));
+
+ switch (ch) {
+ case 'u' :
+ ch = readUnicode4Escape() ;
+ break ;
+ case 'U' :
+ ch = readUnicode4Escape() ;
+ break ;
+ default :
+ exception(String.format("illegal escape sequence value: %c (0x%02X)", ch, ch)) ;
break ;
}
}
@@ -601,16 +572,14 @@ public class TokenizerJSON implements Tokenizer
insertLiteralChar(sb, ch) ;
}
}
-
- private void insertLiteralChar(StringBuilder buffer, int ch)
- {
+
+ private void insertLiteralChar(StringBuilder buffer, int ch) {
if ( Character.charCount(ch) == 1 )
buffer.append((char)ch) ;
- else
- {
- // Convert to UTF-16. Note that the rest of any systemn this is used
- // in must also respect codepoints and surrogate pairs.
- if ( ! Character.isDefined(ch) && ! Character.isSupplementaryCodePoint(ch) )
+ else {
+ // Convert to UTF-16. Note that the rest of any systemn this is used
+ // in must also respect codepoints and surrogate pairs.
+ if ( !Character.isDefined(ch) && !Character.isSupplementaryCodePoint(ch) )
exception(String.format("Illegal codepoint: 0x%04X", ch)) ;
char[] chars = Character.toChars(ch) ;
buffer.append(chars) ;
@@ -618,175 +587,165 @@ public class TokenizerJSON implements Tokenizer
}
@Override
- public long getColumn()
- {
+ public long getColumn() {
return reader.getColNum() ;
}
@Override
- public long getLine()
- {
+ public long getLine() {
return reader.getLineNum() ;
}
- // ---- Character classes
-
+ // ---- Character classes
+
@Override
- public void close()
- {
- try { reader.close() ; }
- catch (IOException ex) { IO.exception(ex) ; }
+ public void close() {
+ try {
+ reader.close() ;
+ }
+ catch (IOException ex) {
+ IO.exception(ex) ;
+ }
}
- private boolean isA2Z(int ch)
- {
+ private boolean isA2Z(int ch) {
return range(ch, 'a', 'z') || range(ch, 'A', 'Z') ;
}
- private boolean isA2ZN(int ch)
- {
+ private boolean isA2ZN(int ch) {
return range(ch, 'a', 'z') || range(ch, 'A', 'Z') || range(ch, '0', '9') ;
}
- private boolean isNumeric(int ch)
- {
+ private boolean isNumeric(int ch) {
return range(ch, '0', '9') ;
}
-
- private static boolean isWhitespace(int ch)
- {
- return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n' || ch == '\f' ;
+
+ private static boolean isWhitespace(int ch) {
+ return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n' || ch == '\f' ;
}
-
- private static boolean isNewlineChar(int ch)
- {
+
+ private static boolean isNewlineChar(int ch) {
return ch == '\r' || ch == '\n' ;
}
// ---- Escape sequences
-
- private final
- int readLiteralEscape()
- {
- int c = reader.readChar();
- if ( c==EOF )
+
+ private final int readLiteralEscape() {
+ int c = reader.readChar() ;
+ if ( c == EOF )
exception("Escape sequence not completed") ;
- switch (c)
- {
- case 'n': return NL ;
- case 'r': return CR ;
- case 't': return '\t' ;
- case 'b': return '\b' ;
- case '"': return '"' ;
- case '/': return '/' ; // JSON requires / escapes.
- case '\'': return '\'' ;
- case '\\': return '\\' ;
- case 'u': return readUnicode4Escape();
- case 'U': return readUnicode8Escape();
- default:
- exception(String.format("illegal escape sequence value: %c (0x%02X)", c, c));
+ switch (c) {
+ case 'n' :
+ return NL ;
+ case 'r' :
+ return CR ;
+ case 't' :
+ return '\t' ;
+ case 'b' :
+ return '\b' ;
+ case '"' :
+ return '"' ;
+ case '/' :
+ return '/' ; // JSON requires / escapes.
+ case '\'' :
+ return '\'' ;
+ case '\\' :
+ return '\\' ;
+ case 'u' :
+ return readUnicode4Escape() ;
+ case 'U' :
+ return readUnicode8Escape() ;
+ default :
+ exception(String.format("illegal escape sequence value: %c (0x%02X)", c, c)) ;
return 0 ;
}
}
-
-
- private final
- int readUnicodeEscape()
- {
+
+ private final int readUnicodeEscape() {
int ch = reader.readChar() ;
if ( ch == EOF )
exception("Broken escape sequence") ;
- switch (ch)
- {
- case 'u': return readUnicode4Escape();
- case 'U': return readUnicode8Escape();
- default:
- exception(String.format("illegal escape sequence value: %c (0x%02X)", ch, ch));
+ switch (ch) {
+ case 'u' :
+ return readUnicode4Escape() ;
+ case 'U' :
+ return readUnicode8Escape() ;
+ default :
+ exception(String.format("illegal escape sequence value: %c (0x%02X)", ch, ch)) ;
}
return 0 ;
}
-
- private final
- int readUnicode4Escape() { return readUnicodeEscape(4) ; }
-
- private final
- int readUnicode8Escape()
- {
+
+ private final int readUnicode4Escape() {
+ return readUnicodeEscape(4) ;
+ }
+
+ private final int readUnicode8Escape() {
int ch8 = readUnicodeEscape(8) ;
if ( ch8 > Character.MAX_CODE_POINT )
- exception(String.format("illegal code point in \\U sequence value: 0x%08X", ch8));
+ exception(String.format("illegal code point in \\U sequence value: 0x%08X", ch8)) ;
return ch8 ;
}
-
- private final
- int readUnicodeEscape(int N)
- {
+
+ private final int readUnicodeEscape(int N) {
int x = 0 ;
- for ( int i = 0 ; i < N ; i++ )
- {
+ for ( int i = 0 ; i < N ; i++ ) {
int d = readHexChar() ;
if ( d < 0 )
return -1 ;
- x = (x<<4)+d ;
+ x = (x << 4) + d ;
}
- return x ;
+ return x ;
}
-
- private final
- int readHexChar()
- {
+
+ private final int readHexChar() {
int ch = reader.readChar() ;
if ( ch == EOF )
exception("Not a hexadecimal character (end of file)") ;
if ( range(ch, '0', '9') )
- return ch-'0' ;
+ return ch - '0' ;
if ( range(ch, 'a', 'f') )
- return ch-'a'+10 ;
+ return ch - 'a' + 10 ;
if ( range(ch, 'A', 'F') )
- return ch-'A'+10 ;
-
- exception("Not a hexadecimal character: "+(char)ch) ;
- return -1 ;
+ return ch - 'A' + 10 ;
+
+ exception("Not a hexadecimal character: " + (char)ch) ;
+ return -1 ;
}
-
- private static boolean range(int ch, char a, char b)
- {
- return ( ch >= a && ch <= b ) ;
+
+ private static boolean range(int ch, char a, char b) {
+ return (ch >= a && ch <= b) ;
}
private boolean expect(String str) {
- for (int i = 0; i < str.length(); i++) {
- char want = str.charAt(i);
- if (reader.eof())
- {
- exception("End of input during expected string: "+str) ;
+ for ( int i = 0 ; i < str.length() ; i++ ) {
+ char want = str.charAt(i) ;
+ if ( reader.eof() ) {
+ exception("End of input during expected string: " + str) ;
return false ;
}
- int inChar = reader.readChar();
- if (inChar != want) {
- //System.err.println("N-triple reader error");
- exception("expected \"" + str + "\"");
- return false;
+ int inChar = reader.readChar() ;
+ if ( inChar != want ) {
+ // System.err.println("N-triple reader error");
+ exception("expected \"" + str + "\"") ;
+ return false ;
}
}
- return true;
+ return true ;
}
- private void exception(String message)
- {
+ private void exception(String message) {
exception(message, reader.getLineNum(), reader.getColNum()) ;
}
-
- private static void exception(PeekReader reader, String message)
- {
+
+ private static void exception(PeekReader reader, String message) {
exception(message, reader.getLineNum(), reader.getColNum()) ;
}
- private static void exception(String message, long line, long col)
- {
+ private static void exception(String message, long line, long col) {
throw new JsonParseException(message, (int)line, (int)col) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
index 876a68b..9132d85 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
@@ -11,7 +11,7 @@ import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
@SuppressWarnings("all")
-public class ARQParser extends ARQParserBase implements ARQParserConstants {
+public class ARQParser extends ARQParserBase {
boolean allowAggregatesInExpressions = false ;
final public void QueryUnit() throws ParseException {
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java
index bd0b29f..e05f245 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java
@@ -23,13 +23,12 @@ import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.web.HttpOp ;
import org.apache.jena.sparql.ARQException ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.UpdateProcessor ;
import org.apache.jena.update.UpdateRequest ;
/**
* UpdateProcess that send the request to a SPARQL endpoint by using POST of application/sparql-update.
*/
-public class UpdateProcessRemote extends UpdateProcessRemoteBase implements UpdateProcessor
+public class UpdateProcessRemote extends UpdateProcessRemoteBase
{
/**
* Creates a new remote update processor that uses the application/sparql-update submission method
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java
index ac1f52b..77fd27f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java
@@ -25,7 +25,6 @@ import org.apache.jena.sparql.ARQException ;
import org.apache.jena.sparql.engine.http.HttpParams ;
import org.apache.jena.sparql.engine.http.Params ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.UpdateProcessor ;
import org.apache.jena.update.UpdateRequest ;
/**
@@ -33,7 +32,7 @@ import org.apache.jena.update.UpdateRequest ;
* form and POST Use of application/sparql-update via @link{UpdateProcessRemote}
* is preferred.
*/
-public class UpdateProcessRemoteForm extends UpdateProcessRemoteBase implements UpdateProcessor {
+public class UpdateProcessRemoteForm extends UpdateProcessRemoteBase {
/**
* Creates a new remote update processor that uses the form URL encoded
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java b/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
index b2781b9..568d832 100644
--- a/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java
@@ -18,7 +18,6 @@
package org.apache.jena.web ;
-import java.io.IOException ;
import java.io.OutputStream ;
import org.apache.http.HttpEntity ;
@@ -239,7 +238,7 @@ public class DatasetGraphAccessorHTTP implements DatasetGraphAccessor {
final RDFFormat syntax = getOutboundSyntax() ;
ContentProducer producer = new ContentProducer() {
@Override
- public void writeTo(OutputStream out) throws IOException {
+ public void writeTo(OutputStream out) {
RDFDataMgr.write(out, graph, syntax) ;
}
} ;
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/main/java/riotcmd/utf8.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/utf8.java b/jena-arq/src/main/java/riotcmd/utf8.java
index 2b66985..1fa5598 100644
--- a/jena-arq/src/main/java/riotcmd/utf8.java
+++ b/jena-arq/src/main/java/riotcmd/utf8.java
@@ -18,7 +18,6 @@
package riotcmd;
-import java.io.IOException ;
import java.io.InputStream ;
import org.apache.jena.atlas.AtlasException ;
@@ -29,55 +28,48 @@ import org.apache.jena.atlas.io.InputStreamBuffered ;
public class utf8
{
/** Simple program to help hunt down bad UTF-8 encoded characters */
- public static void main(String[] args)
- {
- long INIT_LINE = 1 ;
- long INIT_COL = 1 ;
+ public static void main(String[] args) {
+ long INIT_LINE = 1 ;
+ long INIT_COL = 1 ;
if ( args.length == 0 )
- args = new String[] {"-"} ;
-
+ args = new String[]{"-"} ;
+
String label = "" ;
- for ( String fn : args )
- {
+ for ( String fn : args ) {
if ( args.length > 1 )
- label = fn+": " ;
+ label = fn + ": " ;
InputStream in = IO.openFile(fn) ;
in = new InputStreamBuffered(in) ;
-
+
long charCount = 0 ;
long lineNum = INIT_LINE ;
long colNum = INIT_COL ;
-
+
InStreamUTF8 utf8 = null ;
try {
utf8 = new InStreamUTF8(in) ;
- for (;;)
- {
+ for ( ; ; ) {
int ch = utf8.read() ;
if ( ch == -1 )
break ;
charCount++ ;
- if (ch == '\n')
- {
- lineNum++;
+ if ( ch == '\n' ) {
+ lineNum++ ;
colNum = INIT_COL ;
- }
- else
- colNum++;
- if ( ! Character.isDefined(ch) )
+ } else
+ colNum++ ;
+ if ( !Character.isDefined(ch) )
throw new AtlasException(String.format("No such codepoint: 0x%04X", ch)) ;
}
System.out.printf("%s: chars = %d , lines = %d\n", fn, charCount, lineNum) ;
- } catch (AtlasException ex)
- {
- System.out.printf(label+"[line=%d, col=%d] %s\n", lineNum, colNum, ex.getMessage()) ;
}
- catch (IOException ex)
- {
- ex.printStackTrace(System.err) ;
+ catch (AtlasException ex) {
+ System.out.printf(label + "[line=%d, col=%d] %s\n", lineNum, colNum, ex.getMessage()) ;
+ }
+ finally {
+ IO.close(utf8) ;
}
- finally { IO.close(utf8) ; }
}
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
index aaff63d..9a37f8b 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
@@ -93,7 +93,7 @@ public class TestPipedRDFIterators {
Callable<Integer> consumeTriples = new Callable<Integer>() {
@Override
- public Integer call() throws Exception {
+ public Integer call() {
int count = 0;
while (it.hasNext()) {
it.next();
@@ -238,7 +238,7 @@ public class TestPipedRDFIterators {
Callable<Integer> consumeQuads = new Callable<Integer>() {
@Override
- public Integer call() throws Exception {
+ public Integer call() {
int count = 0;
while (it.hasNext()) {
it.next();
@@ -408,7 +408,7 @@ public class TestPipedRDFIterators {
Callable<Integer> consumeTriples = new Callable<Integer>() {
@Override
- public Integer call() throws Exception {
+ public Integer call() {
int count = 0;
while (it.hasNext()) {
it.next();
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
index 4bb3a4b..d3424b9 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
@@ -54,7 +54,7 @@ public class TestIO_JenaReaders {
}
@Test
- public void wireIntoJena() throws Exception {
+ public void wireIntoJena() {
IO_JenaReaders.wireIntoJena();
RDFReaderFImpl readerF = new RDFReaderFImpl();
assertEquals(RDFReaderRIOT_Web.class, readerF.getReader().getClass());
@@ -74,7 +74,7 @@ public class TestIO_JenaReaders {
}
@Test
- public void resetJena() throws Exception {
+ public void resetJena() {
IO_JenaReaders.wireIntoJena();
IO_JenaReaders.resetJena();
RDFReaderFImplExposingProtected readerF = new RDFReaderFImplExposingProtected();
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java
index af643ef..b7c71a3 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java
@@ -62,7 +62,7 @@ public class TestIO_JenaWriters {
}
@Test
- public void testWireIntoJena() throws Exception {
+ public void testWireIntoJena() {
IO_JenaWriters.wireIntoJena();
RDFWriterFImpl writerF = new RDFWriterFImpl();
assertEquals(Basic.class, writerF.getWriter().getClass());
@@ -88,7 +88,7 @@ public class TestIO_JenaWriters {
}
@Test
- public void testResetJena() throws Exception {
+ public void testResetJena() {
IO_JenaWriters.wireIntoJena();
IO_JenaWriters.resetJena();
RDFWriterFImplExposingProtected writerF = new RDFWriterFImplExposingProtected();
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java
index 7cb3a6d..e2f678f 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java
@@ -53,7 +53,7 @@ public class TestDatasetGraphWithLock extends AbstractTestDataset {
Callable<Boolean> callable = new Callable<Boolean>() {
@Override
- public Boolean call() throws Exception {
+ public Boolean call() {
dsg.begin(ReadWrite.READ);
// Hold the lock for a few seconds
@@ -89,7 +89,7 @@ public class TestDatasetGraphWithLock extends AbstractTestDataset {
Callable<Boolean> callable = new Callable<Boolean>() {
@Override
- public Boolean call() throws Exception {
+ public Boolean call() {
dsg.begin(ReadWrite.READ);
// Hold the lock for a few seconds
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java
index aecdae3..50c1409 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java
@@ -142,7 +142,7 @@ public class TestIndexTable {
}
@Test
- public void testLinearIndexTableData() throws Exception
+ public void testLinearIndexTableData()
{
// test twice with different internal mappings
testTableData(IndexFactory.createIndex(order1, partData())) ;
@@ -160,7 +160,7 @@ public class TestIndexTable {
testTableData(new LinearIndex(order2, partData(), emptyKeys, emptyMapping)) ;
}
- private void testTableData(IndexTable index) throws Exception
+ private void testTableData(IndexTable index)
{
// positive test for matching
for ( Binding b: fData )
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java
index 9e01959..27d0519 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java
@@ -100,18 +100,18 @@ public abstract class EarlTestCase extends TestCase
// Increase visibility.
@Override
- protected void setUp() throws Exception {
+ protected void setUp() {
setUpTest() ;
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() {
tearDownTest() ;
}
// Decouple from JUnit3.
- public void setUpTest() throws Exception {}
- public void tearDownTest() throws Exception {}
+ public void setUpTest() {}
+ public void tearDownTest() {}
protected void success()
{
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java
index d92d19a..89844e1 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java
@@ -68,7 +68,7 @@ public class QueryTest extends EarlTestCase
private boolean oldPlainGraphFlag ;
@Override
- public void setUpTest() throws Exception
+ public void setUpTest()
{
super.setUpTest() ;
// SPARQL and ARQ tests are done with no value matching (for query execution and results testing)
@@ -83,7 +83,7 @@ public class QueryTest extends EarlTestCase
}
@Override
- public void tearDownTest() throws Exception
+ public void tearDownTest()
{
SystemARQ.UsePlainGraph = oldPlainGraphFlag ;
CheckerLiterals.WarnOnBadLiterals = oldWarningFlag ;
@@ -185,7 +185,7 @@ public class QueryTest extends EarlTestCase
}
}
- void runTestSelect(Query query, QueryExecution qe) throws Exception
+ void runTestSelect(Query query, QueryExecution qe)
{
// Do the query!
ResultSetRewindable resultsActual = ResultSetFactory.makeRewindable(qe.execSelect()) ;
@@ -345,7 +345,7 @@ public class QueryTest extends EarlTestCase
return b ;
}
- void runTestConstruct(Query query, QueryExecution qe) throws Exception
+ void runTestConstruct(Query query, QueryExecution qe)
{
// Do the query!
Model resultsActual = qe.execConstruct() ;
@@ -374,7 +374,7 @@ public class QueryTest extends EarlTestCase
}
}
- void runTestDescribe(Query query, QueryExecution qe) throws Exception
+ void runTestDescribe(Query query, QueryExecution qe)
{
Model resultsActual = qe.execDescribe() ;
compareGraphResults(resultsActual, query) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java
index 3280ea0..4a4d0a8 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java
@@ -31,7 +31,7 @@ public class SurpressedTest extends EarlTestCase
}
@Override
- protected void runTestForReal() throws Throwable
+ protected void runTestForReal()
{
super.notTested() ;
if ( verbose )
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java
index 94ed6ff..84a2e4a 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java
@@ -57,7 +57,7 @@ public class SyntaxTest extends EarlTestCase
@Override
- protected void runTestForReal() throws Throwable
+ protected void runTestForReal()
{
try {
if ( queryString == null )
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java
index 5e84475..eec627d 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java
@@ -55,7 +55,7 @@ public class SyntaxUpdateTest extends EarlTestCase
@Override
- protected void runTestForReal() throws Throwable
+ protected void runTestForReal()
{
try {
if ( updateString == null )
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java
index 08fcd5d..df37aac 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java
@@ -61,7 +61,7 @@ public class TestSerialization extends EarlTestCase
// Are they equal?
@Override
- protected void runTestForReal() throws Throwable
+ protected void runTestForReal()
{
Query query = null ;
if ( queryString == null )
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java
index da84ff8..20dffe7 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java
@@ -81,7 +81,7 @@ public class UpdateTest extends EarlTestCase
private boolean oldWarningFlag ;
@Override
- public void setUpTest() throws Exception
+ public void setUpTest()
{
super.setUpTest() ;
// Turn parser warnings off for the test data.
@@ -92,7 +92,7 @@ public class UpdateTest extends EarlTestCase
}
@Override
- public void tearDownTest() throws Exception
+ public void tearDownTest()
{
// if ( resetNeeded )
// ARQ.setFalse(ARQ.strictGraph) ;
@@ -103,7 +103,7 @@ public class UpdateTest extends EarlTestCase
}
@Override
- protected void runTestForReal() throws Throwable
+ protected void runTestForReal()
{
try {
UpdateRequest request = UpdateFactory.read(updateFile, Syntax.syntaxSPARQL_11) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/49480190/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java
index 1e5b033..1ff802e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java
@@ -87,7 +87,7 @@ public class TestFmtUtils
}
@Test
- public void stringForObject_misc_versions() throws Exception {
+ public void stringForObject_misc_versions() {
assertEquals("<<null>>", FmtUtils.stringForObject(null)) ;
assertEquals("<n1>", FmtUtils.stringForObject(new LiteralImpl(aNode(), null))) ;
assertEquals("<nzz1>", FmtUtils.stringForObject(new ResourceImpl(NodeFactory.createURI("nzz1"), null))) ;
@@ -130,7 +130,7 @@ public class TestFmtUtils
}
@Test
- public void stringForRDFNode_resource() throws Exception {
+ public void stringForRDFNode_resource() {
final ResourceImpl rdfNod = new ResourceImpl(aUriRemappableNode(), null) ;
assertEquals("zz:abs", stringForRDFNode(rdfNod, getContext())) ;
}
@@ -160,7 +160,7 @@ public class TestFmtUtils
}
@Test
- public void testStringForURI() throws Exception {
+ public void testStringForURI() {
final String s = FmtUtils.stringForURI("zz:ü_fe-zz") ;
assertEquals("<zz:ü_fe-zz>", s) ;