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/22b9e4a9 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/22b9e4a9 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/22b9e4a9
Branch: refs/heads/add-contract-tests Commit: 22b9e4a96395758887304c09be016bf1a2395d72 Parents: d666d74 Author: Andy Seaborne <[email protected]> Authored: Thu May 14 20:55:31 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu May 14 20:55:31 2015 +0100 ---------------------------------------------------------------------- .../apache/jena/atlas/io/CharStreamReader.java | 23 ++- .../org/apache/jena/atlas/io/InStreamASCII.java | 4 +- .../org/apache/jena/atlas/io/InStreamUTF8.java | 4 +- .../apache/jena/atlas/io/PeekInputStream.java | 97 +++++------- .../org/apache/jena/atlas/iterator/Iter.java | 152 +------------------ .../jena/atlas/lib/TestDateTimeUtils.java | 10 +- 6 files changed, 65 insertions(+), 225 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/22b9e4a9/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java b/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java index d7dce11..c441e59 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java @@ -16,37 +16,34 @@ * limitations under the License. */ -package org.apache.jena.atlas.io; +package org.apache.jena.atlas.io ; import java.io.IOException ; import java.io.Reader ; /** Machinary to add Reader functionality to a CharStream */ -public abstract class CharStreamReader extends Reader implements CharStream -{ +public abstract class CharStreamReader extends Reader implements CharStream { + @Override - public int read(char[] cbuf, int off, int len) throws IOException - { - for ( int i = 0 ; i < len ; i++ ) - { + public int read(char[] cbuf, int off, int len) throws IOException { + for ( int i = 0 ; i < len ; i++ ) { int x = advance() ; if ( x == -1 ) - return (i==0)? -1 : i ; + return (i == 0) ? -1 : i ; cbuf[i] = (char)x ; } return len ; } @Override - public int read() throws IOException - { + public int read() throws IOException { return advance() ; } - @Override - public void close() throws IOException - { closeStream() ; } + public void close() throws IOException { + closeStream() ; + } @Override public abstract int advance() ; http://git-wip-us.apache.org/repos/asf/jena/blob/22b9e4a9/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java index 049449c..c369cc6 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java @@ -58,7 +58,7 @@ public final class InStreamASCII extends Reader implements CharStream { IO.close(input) ; } @Override - public int read(char[] cbuf, int off, int len) throws IOException + public int read(char[] cbuf, int off, int len) { for ( int i = off ; i < off+len ; i++ ) { @@ -77,7 +77,7 @@ public final class InStreamASCII extends Reader implements CharStream } @Override - public int read() throws IOException + public int read() { return advance() ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/22b9e4a9/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java index a6107a9..acb9034 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java @@ -113,7 +113,7 @@ public final class InStreamUTF8 extends Reader implements CharStream { IO.close(input) ; } @Override - public int read(char[] cbuf, int off, int len) throws IOException + public int read(char[] cbuf, int off, int len) { // Doing this on a block of bytes may be faster. for ( int i = off ; i < off+len ; i++ ) @@ -131,7 +131,7 @@ public final class InStreamUTF8 extends Reader implements CharStream } @Override - public final int read() throws IOException + public final int read() { int ch = advance(input) ; //if ( ! Character.isDefined(ch) ) throw new AtlasException(String.format("Undefined codepoint: 0x%04X", ch)) ; http://git-wip-us.apache.org/repos/asf/jena/blob/22b9e4a9/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java index c8485e3..c2dee5f 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java @@ -56,32 +56,28 @@ public final class PeekInputStream extends InputStream // ---- static construction methods. - public static PeekInputStream make(InputStream inputStream) - { + public static PeekInputStream make(InputStream inputStream) { return make(inputStream, InputStreamBuffered.DFT_BUFSIZE) ; } - - public static PeekInputStream make(InputStream inputStream, int bufferSize) - { + + public static PeekInputStream make(InputStream inputStream, int bufferSize) { if ( inputStream instanceof PeekInputStream ) return (PeekInputStream)inputStream ; - + if ( inputStream instanceof InputStreamBuffered ) return new PeekInputStream((InputStreamBuffered)inputStream) ; InputStreamBuffered in = new InputStreamBuffered(inputStream, bufferSize) ; return new PeekInputStream(in) ; } - public static PeekInputStream open(String filename) - { + public static PeekInputStream open(String filename) { try { InputStream in = new FileInputStream(filename) ; return make(in) ; } catch (FileNotFoundException ex){ throw new AtlasException("File not found: "+filename) ; } } - private PeekInputStream(InputStreamBuffered input) - { + private PeekInputStream(InputStreamBuffered input) { this.source = input ; this.pushbackBytes = new byte[PUSHBACK_SIZE] ; this.idxPushback = -1 ; @@ -104,20 +100,18 @@ public final class PeekInputStream extends InputStream public long getPosition() { return posn; } //---- Do not access currByte except with peekByte/setCurrByte. - public final int peekByte() - { + public final int peekByte() { if ( idxPushback >= 0 ) return pushbackBytes[idxPushback] ; - + // If not started ... delayed initialization. if ( currByte == UNSET ) init() ; return currByte ; } - + // And the correct way to read the currByte is to call peekByte - private final void setCurrByte(int b) - { + private final void setCurrByte(int b) { currByte = b ; } @@ -127,31 +121,27 @@ public final class PeekInputStream extends InputStream public final void pushbackByte(int b) { unreadByte(b) ; } @Override - public final void close() throws IOException - { + public final void close() throws IOException { source.close() ; } @Override - public final int read() throws IOException - { + public final int read() throws IOException { if ( eof() ) return EOF ; int x = readByte() ; return x ; } - + @Override - public final int read(byte[] buf, int off, int len) throws IOException - { + public final int read(byte[] buf, int off, int len) throws IOException { if ( eof() ) return EOF ; - for ( int i = 0 ; i < len ; i++ ) - { + for ( int i = 0 ; i < len ; i++ ) { int ch = readByte() ; if ( ch == EOF ) - return (i==0)? EOF : i ; - buf[i+off] = (byte)ch ; + return (i == 0) ? EOF : i ; + buf[i + off] = (byte)ch ; } return len ; } @@ -167,65 +157,60 @@ public final class PeekInputStream extends InputStream // The push back buffer is in the order where [0] is the oldest. // Does not alter the line number, column number or position count. - if ( idxPushback >= pushbackBytes.length ) - { + if ( idxPushback >= pushbackBytes.length ) { // Enlarge pushback buffer. - byte[] pushbackBytes2 = new byte[pushbackBytes.length*2] ; + byte[] pushbackBytes2 = new byte[pushbackBytes.length * 2] ; System.arraycopy(pushbackBytes, 0, pushbackBytes2, 0, pushbackBytes.length) ; pushbackBytes = pushbackBytes2 ; - //throw new JenaException("Pushback buffer overflow") ; + // throw new JenaException("Pushback buffer overflow") ; } if ( b == EOF || b == UNSET ) - IO.exception("Illegal byte to push back: "+b) ; - + IO.exception("Illegal byte to push back: " + b) ; + idxPushback++ ; pushbackBytes[idxPushback] = (byte)b ; } - private final void init() - { + private final void init() { advanceAndSet() ; if ( currByte == UNSET ) setCurrByte(EOF) ; } - private final void advanceAndSet() - { + private final void advanceAndSet() { try { int ch = source.read() ; setCurrByte(ch) ; - } catch (IOException ex) { IO.exception(ex) ; } + } + catch (IOException ex) { + IO.exception(ex) ; + } } - - + // Invariants. // currByte is either bytes[idx-1] or pushbackBytes[idxPushback] - - /** Return the next byte, moving on one place and resetting the peek byte */ - private final int nextByte() - { + + /** Return the next byte, moving on one place and resetting the peek byte */ + private final int nextByte() { int b = peekByte() ; - + if ( b == EOF ) return EOF ; - - if ( idxPushback >= 0 ) - { + + if ( idxPushback >= 0 ) { byte b2 = pushbackBytes[idxPushback] ; idxPushback-- ; return b2 ; } posn++ ; - - if (b == '\n') - { - lineNum++; + + if ( b == '\n' ) { + lineNum++ ; colNum = INIT_COL ; - } - else - colNum++; - + } else + colNum++ ; + advanceAndSet() ; return b ; } http://git-wip-us.apache.org/repos/asf/jena/blob/22b9e4a9/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java index 9cf45a7..3db5d89 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java @@ -53,17 +53,14 @@ public class Iter<T> implements Iterator<T> { @SuppressWarnings("rawtypes") private static final Iterator iter0 = new NullIterator() ; - @SuppressWarnings({"unchecked", "cast"}) - public static <T> Iterator<T> nullIterator() { return (NullIterator<T>)iter0 ; } + + @SuppressWarnings({"unchecked"}) + public static <T> Iterator<T> nullIterator() { return iter0 ; } // public static <T> Iterator<T> nullIterator() { // return new NullIterator<T>() ; // } -// public static <T> Set<T> toSet(Iterable<? extends T> stream) { -// return toSet(stream.iterator()) ; -// } - public static <T> Set<T> toSet(Iterator<? extends T> stream) { Accumulate<T, Set<T>> action = new Accumulate<T, Set<T>>() { private Set<T> acc = null ; @@ -89,10 +86,6 @@ public class Iter<T> implements Iterator<T> { return reduce(stream, action) ; } -// public static <T> List<T> toList(Iterable<? extends T> stream) { -// return toList(stream.iterator()) ; -// } - public static <T> List<T> toList(Iterator<? extends T> stream) { Accumulate<T, List<T>> action = new Accumulate<T, List<T>>() { private List<T> acc = null ; @@ -177,13 +170,6 @@ public class Iter<T> implements Iterator<T> { return aggregator.get() ; } - // map without the results - do immediately. - // Also, apply with call in between? - -// public static <T> void apply(Iterable<? extends T> stream, Action<T> action) { -// apply(stream.iterator(), action) ; -// } - public static <T> void apply(Iterator<? extends T> stream, Consumer<T> action) { for (; stream.hasNext();) { T item = stream.next() ; @@ -193,10 +179,6 @@ public class Iter<T> implements Iterator<T> { // ---- Filter -// public static <T> Iterator<T> filter(Iterable<? extends T> stream, Filter<T> filter) { -// return filter(stream.iterator(), filter) ; -// } - public static <T> Iterator<T> filter(final Iterator<? extends T> stream, final Predicate<T> filter) { final Iterator<T> iter = new Iterator<T>() { @@ -241,27 +223,12 @@ public class Iter<T> implements Iterator<T> { return iter ; } -// public static <T> Iterator<T> notFilter(Iterable<? extends T> stream, Filter<T> filter) { -// return notFilter(stream.iterator(), filter) ; -// } - public static <T> Iterator<T> notFilter(final Iterator<? extends T> stream, final Predicate<T> filter) { return filter(stream, filter.negate()) ; } // Filter-related -// /** -// * Return true if every element of stream passes the filter (reads the -// * stream) -// */ -// public static <T> boolean every(Iterable<? extends T> stream, Filter<T> filter) { -// for (T item : stream) -// if ( !filter.accept(item) ) -// return false ; -// return true ; -// } - /** * Return true if every element of stream passes the filter (reads the * stream until the first element not passing the filter) @@ -275,17 +242,6 @@ public class Iter<T> implements Iterator<T> { return true ; } -// /** -// * Return true if every element of stream passes the filter (reads the -// * stream until the first element passing the filter) -// */ -// public static <T> boolean some(Iterable<? extends T> stream, Filter<T> filter) { -// for (T item : stream) -// if ( filter.accept(item) ) -// return true ; -// return false ; -// } - /** * Return true if one or more elements of stream passes the filter (reads * the stream to first element passing the filter) @@ -301,10 +257,6 @@ public class Iter<T> implements Iterator<T> { // ---- Map -// public static <T, R> Iterator<R> map(Iterable<? extends T> stream, Transform<T, R> converter) { -// return map(stream.iterator(), converter) ; -// } - public static <T, R> Iterator<R> map(final Iterator<? extends T> stream, final Function<T, R> converter) { final Iterator<R> iter = new Iterator<R>() { @Override @@ -329,18 +281,6 @@ public class Iter<T> implements Iterator<T> { return toList(map(list.iterator(), converter)) ; } -// public static <T, R> Iterator<R> mapMany(Iterable<? extends T> stream, Transform<T, Iterator<R>> converter) { -// return mapMany(stream.iterator(), converter) ; -// } - -// /** -// * Apply an action to everything in stream, yielding a stream of the same -// * items -// */ -// public static <T> Iterator<T> operate(Iterable<? extends T> stream, Action<T> converter) { -// return operate(stream.iterator(), converter) ; -// } - /** * Apply an action to everything in stream, yielding a stream of the same * items @@ -377,14 +317,6 @@ public class Iter<T> implements Iterator<T> { return Iter.operate(stream, out::println) ; } -// /** Join two iteratables -// * If there, potentially, going to be many iterators, it is better to -// * create an {@link IteratorConcat} explicitly and add each iterator. -// */ -// public static <T> Iterator<T> append(Iterable<? extends T> iter1, Iterable<? extends T> iter2) { -// return IteratorCons.create(iterator(iter1), iterator(iter2)) ; -// } - /** Join two iterator * If there, potentially, going to be many iterators, it is better to * create an {@link IteratorConcat} explicitly and add each iterator. @@ -393,32 +325,15 @@ public class Iter<T> implements Iterator<T> { return IteratorCons.create(iter1, iter2) ; } -// private static <T> Iterator<T> iterator(Iterable<T> iter) { -// return (iter == null) ? null : iter.iterator() ; -// } - -// public static <T> Iterator<T> distinct(Iterable<T> iter) { -// return distinct(iter.iterator()) ; -// } - public static <T> Iterator<T> distinct(Iterator<T> iter) { return filter(iter, new FilterUnique<T>()) ; } -// /** Remove adjacent duplicates */ -// public static <T> Iterator<T> distinctAdjacent(Iterable<T> iter) { -// return distinctAdjacent(iter.iterator()) ; -// } - /** Remove adjacent duplicates */ public static <T> Iterator<T> distinctAdjacent(Iterator<T> iter) { return filter(iter, new FilterDistinctAdjacent<T>()) ; } -// public static <T> Iterator<T> removeNulls(Iterable<T> iter) { -// return filter(iter, new FilterOutNulls<T>()) ; -// } - public static <T> Iterator<T> removeNulls(Iterator<T> iter) { return filter(iter, Objects::nonNull) ; } @@ -472,14 +387,6 @@ public class Iter<T> implements Iterator<T> { return (Iterator<T>)iterator ; } -// /** -// * Count the iterable - many iterable objects have a .size() operation which -// * should be used in preference to this explicit counting operation -// */ -// public static <T> long count(Iterable<T> iterable) { -// return count(iterable.iterator()) ; -// } - /** Count the iterator (this is destructive on the iterator) */ public static <T> long count(Iterator<T> iterator) { long x = 0 ; @@ -488,17 +395,8 @@ public class Iter<T> implements Iterator<T> { x++ ; } return x ; - // ActionCount<T> action = new ActionCount<T>() ; - // Iter.apply(iterator, action) ; - // return action.getCount() ; } -// // --- Consume the iterator. -// /** Consume the iterable */ -// public static <T> void consume(Iterable<T> iterator) { -// count(iterator) ; -// } - /** Consume the iterator */ public static <T> void consume(Iterator<T> iterator) { count(iterator) ; @@ -514,11 +412,6 @@ public class Iter<T> implements Iterator<T> { return asString(stream, new AccString<T>()) ; } -// public static <T> String asString(Iter<T> stream) { -// return asString(stream, new AccString<T>()) ; -// } -// - public static <T> String asString(Iterable<T> stream, String sep) { return asString(stream, new AccString<T>(sep)) ; } @@ -527,10 +420,6 @@ public class Iter<T> implements Iterator<T> { return asString(stream, new AccString<T>(sep)) ; } -// public static <T> String asString(Iter<T> stream, String sep) { -// return asString(stream.iterator(), new AccString<T>(sep)) ; -// } -// public static <T> String asString(Iterable<T> stream, AccString<T> formatter) { return asString(stream.iterator(), formatter) ; } @@ -539,10 +428,6 @@ public class Iter<T> implements Iterator<T> { return reduce(stream, formatter) ; } -// public static <T> String asString(Iter<T> stream, AccString<T> formatter) { -// return reduce(stream.iterator(), formatter) ; -// } - // ---- public static <T> void close(Iterator<T> iter) { @@ -550,7 +435,6 @@ public class Iter<T> implements Iterator<T> { ((Closeable)iter).close() ; } - /** * Print an iterator to stdout, return a copy of the iterator. Printing * occurs now. See {@link #debug} for an operation to print as the @@ -599,16 +483,6 @@ public class Iter<T> implements Iterator<T> { apply(stream, out::println) ; } -// /** Print an iterable */ -// public static <T> void print(PrintStream out, Iterable<T> iterable) { -// print(out, iterable.iterator()) ; -// } -// -// /** Print an iterable */ -// public static <T> void print(Iterable<T> iterable) { -// print(iterable.iterator()) ; -// } - /** Send the elements of the iterator to a sink - consumes the iterator */ public static <T> void sendToSink(Iterator<T> iter, Sink<T> sink) { while ( iter.hasNext() ) { @@ -630,10 +504,6 @@ public class Iter<T> implements Iterator<T> { return iter ; } - // May not do what you expect. iter(int[]) is iter of one object (an int[]) - // public static <T> Iter<T> iter(T...objects) - // { return Iter.iter(Arrays.asList(objects)) ; } - public static <T> Iter<T> iterSingleton(T x) { return iter(SingletonIterator.create(x)) ; } @@ -648,12 +518,6 @@ public class Iter<T> implements Iterator<T> { return new Iter<>(iterator) ; } -// public static <T> Iter<T> iter(Iterable<T> iterable) { -// if ( iterable instanceof Iter<? > ) -// return (Iter<T>)iterable ; -// return new Iter<>(iterable.iterator()) ; -// } - public static <T> Iter<T> singletonIter(T item) { return iter(new SingletonIterator<>(item)) ; } @@ -842,17 +706,11 @@ public class Iter<T> implements Iterator<T> { } public Iter<T> distinct() { - return iter((distinct(iterator()))) ; + return iter((distinct(iterator))) ; } public Iter<T> distinctAdjacent() { - return iter(distinctAdjacent(iterator())) ; - } - - // ---- Iterable -// @Override - public Iterator<T> iterator() { - return iterator ; + return iter(distinctAdjacent(iterator)) ; } // ---- Iterator http://git-wip-us.apache.org/repos/asf/jena/blob/22b9e4a9/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java ---------------------------------------------------------------------- diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java index 8aae32b..193b0a5 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java @@ -29,7 +29,7 @@ import org.junit.Test; public class TestDateTimeUtils { @Test - public void testCalendarToXSDDateTimeString_1() throws Exception { + public void testCalendarToXSDDateTimeString_1() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 0, "Z") ; assertEquals("1984-03-22T14:32:01+00:00", DateTimeUtils.calendarToXSDDateTimeString(cal)); cal.setTimeZone(TimeZone.getTimeZone("MST")); @@ -37,7 +37,7 @@ public class TestDateTimeUtils { } @Test - public void testCalendarToXSDDateTimeString_2() throws Exception { + public void testCalendarToXSDDateTimeString_2() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 50, "Z") ; assertEquals("1984-03-22T14:32:01.050+00:00", DateTimeUtils.calendarToXSDDateTimeString(cal)); cal.setTimeZone(TimeZone.getTimeZone("MST")); @@ -46,7 +46,7 @@ public class TestDateTimeUtils { @Test - public void testCalendarToXSDDateString() throws Exception { + public void testCalendarToXSDDateString() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 23, 59, 1, 0, "Z"); cal.setTimeZone(TimeZone.getTimeZone("Z")) ; assertEquals("1984-03-22+00:00", DateTimeUtils.calendarToXSDDateString(cal)); @@ -55,7 +55,7 @@ public class TestDateTimeUtils { } @Test - public void testCalendarToXSDTimeString_1() throws Exception { + public void testCalendarToXSDTimeString_1() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 0, "GMT+01:00"); assertEquals("14:32:01+01:00", DateTimeUtils.calendarToXSDTimeString(cal)); // Different timezone - moves the cal point-in-time. @@ -64,7 +64,7 @@ public class TestDateTimeUtils { } @Test - public void testCalendarToXSDTimeString_2() throws Exception { + public void testCalendarToXSDTimeString_2() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 500, "GMT+01:00"); assertEquals("14:32:01.500+01:00", DateTimeUtils.calendarToXSDTimeString(cal)); // Different timezone - moves the cal point-in-time.
