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 2024/03/27 08:56:59 UTC
(jena) 05/05: Drop chaining style for AWriter
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit d034081ed54950159bd45b60006c806bf243e2ae
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Mar 24 22:00:58 2024 +0000
Drop chaining style for AWriter
Interacts with try-with-resources and causes IDE warnings.
---
.../main/java/org/apache/jena/riot/RDFParser.java | 1 -
.../riot/lang/rdfxml/rrx/ParserRDFXML_SAX.java | 8 +-
.../java/org/apache/jena/update/UpdateAction.java | 1 -
.../java/org/apache/jena/atlas/io/AWriter.java | 24 +++---
.../java/org/apache/jena/atlas/io/AWriterBase.java | 6 +-
.../org/apache/jena/atlas/io/IndentedWriter.java | 94 ++++++++--------------
.../java/org/apache/jena/atlas/io/Writer2.java | 21 ++---
7 files changed, 59 insertions(+), 96 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
index 8bde96cdb6..278dd8e2a2 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
@@ -451,7 +451,6 @@ public class RDFParser {
throw new InternalErrorException("Both inputStream and javaReader are null");
}
- @SuppressWarnings("resource")
private TypedInputStream openTypedInputStream(String urlStr, Path path) {
// If path, use that.
if ( path != null ) {
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRDFXML_SAX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRDFXML_SAX.java
index dc95990806..20328c4a58 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRDFXML_SAX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRDFXML_SAX.java
@@ -420,9 +420,11 @@ public class ParserRDFXML_SAX
// private ParseType parseType = null;
public ParserRDFXML_SAX(String xmlBase, ParserProfile parserProfile, StreamRDF destination, Context context) {
// Debug
- if ( TRACE )
- {
- IndentedWriter out1 = IndentedWriter.stdout.clone().setFlushOnNewline(true).setUnitIndent(4).setLinePrefix("# ");
+ if ( TRACE ) {
+ IndentedWriter out1 = IndentedWriter.stdout.clone();
+ out1.setFlushOnNewline(true);
+ out1.setUnitIndent(4);
+ out1.setLinePrefix("# ");
this.trace = out1;
//IndentedWriter out2 = IndentedWriter.stdout.clone().setFlushOnNewline(true).setUnitIndent(4).setLinePrefix("! ");
} else {
diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
index be5c577489..139fb62526 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
@@ -321,7 +321,6 @@ public class UpdateAction
}
/** Parse update operations into a DatasetGraph by reading it from a file */
- @SuppressWarnings("resource")
public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, Binding inputBinding, String baseURI, Syntax syntax)
{
InputStream in = null ;
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/AWriter.java b/jena-base/src/main/java/org/apache/jena/atlas/io/AWriter.java
index 335fd7641c..56c3476e5b 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/AWriter.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/AWriter.java
@@ -25,18 +25,18 @@ import org.apache.jena.atlas.lib.Closeable ;
public interface AWriter extends Closeable, AutoCloseable
{
- public AWriter write(char ch) ;
- public AWriter write(char[] cbuf) ;
- public AWriter write(String string) ;
-
- public AWriter print(char ch) ;
- public AWriter print(char[] cbuf) ;
- public AWriter print(String string) ;
- public AWriter printf(String fmt, Object ...arg) ;
- public AWriter println(String object) ;
- public AWriter println() ;
-
- public AWriter flush() ;
+ public void write(char ch) ;
+ public void write(char[] cbuf) ;
+ public void write(String string) ;
+
+ public void print(char ch) ;
+ public void print(char[] cbuf) ;
+ public void print(String string) ;
+ public void printf(String fmt, Object ...arg) ;
+ public void println(String object) ;
+ public void println() ;
+
+ public void flush() ;
@Override
public void close() ;
}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/AWriterBase.java b/jena-base/src/main/java/org/apache/jena/atlas/io/AWriterBase.java
index e45dbc5c63..bc80fc286c 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/AWriterBase.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/AWriterBase.java
@@ -24,10 +24,10 @@ package org.apache.jena.atlas.io;
public abstract class AWriterBase implements AWriter
{
@Override
- public final AWriter write(char ch) { return print(ch) ; }
+ public final void write(char ch) { print(ch) ; }
@Override
- public final AWriter write(char[] cbuf) { return print(cbuf) ; }
+ public final void write(char[] cbuf) { print(cbuf) ; }
@Override
- public final AWriter write(String string) { return print(string) ; }
+ public final void write(String string) { print(string) ; }
}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java b/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
index a430505820..b32fa86b44 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
@@ -115,61 +115,54 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
startingNewLine = true;
}
- protected IndentedWriter rtnObject() { return this; }
-
@Override
- public IndentedWriter print(String str) {
+ public void print(String str) {
if ( str == null )
str = "null";
if ( false ) {
// Don't check for embedded newlines.
write$(str);
- return this;
+ return;
}
for ( int i = 0; i < str.length(); i++ )
printOneChar(str.charAt(i));
- return this;
}
@Override
- public IndentedWriter printf(String formatStr, Object... args) {
+ public void printf(String formatStr, Object... args) {
print(format(formatStr, args));
- return this;
}
@Override
- public IndentedWriter print(char ch) { printOneChar(ch); return this; }
- public IndentedWriter print(Object obj) { print(String.valueOf(obj)); return this; }
+ public void print(char ch) { printOneChar(ch); }
+ public void print(Object obj) { print(String.valueOf(obj)); }
@Override
- public IndentedWriter println(String str) { print(str); newline(); return this; }
- public IndentedWriter println(char ch) { print(ch); newline(); return this; }
- public IndentedWriter println(Object obj) { print(String.valueOf(obj)); newline(); return this; }
+ public void println(String str) { print(str); newline(); }
+ public void println(char ch) { print(ch); newline(); }
+ public void println(Object obj) { print(String.valueOf(obj)); newline(); }
@Override
- public IndentedWriter println() { newline(); return this; }
+ public void println() { newline(); }
@Override
- public IndentedWriter print(char[] cbuf) {
+ public void print(char[] cbuf) {
for ( char aCbuf : cbuf ) {
printOneChar(aCbuf);
}
- return this;
}
/** Print a string N times */
- public IndentedWriter print(String s, int n) {
+ public void print(String s, int n) {
for ( int i = 0; i < n; i++ )
print(s);
- return this;
}
/** Print a char N times */
- public IndentedWriter print(char ch, int n) {
+ public void print(char ch, int n) {
lineStart();
for ( int i = 0; i < n; i++ )
printOneChar(ch);
- return this;
}
private char lastChar = '\0';
@@ -201,7 +194,7 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
private void write$(String s)
{ try { out.write(s); } catch (IOException ex) { IO.exception(ex); } }
- public IndentedWriter newline() {
+ public void newline() {
lineStart();
if ( endOfLineMarker != null )
@@ -215,15 +208,13 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
// so if layered over a PrintWriter, need to flush that as well.
if ( flushOnNewline )
flush();
- return this;
}
private boolean atStartOfLine() { return column <= currentIndent; }
- public IndentedWriter ensureStartOfLine() {
+ public void ensureStartOfLine() {
if ( !atStartOfLine() )
newline();
- return this;
}
public boolean atLineStart() { return startingNewLine; }
@@ -253,28 +244,27 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
public void close() { IO.close(out); }
@Override
- public IndentedWriter flush() { IO.flush(out); return this; }
+ public void flush() { IO.flush(out); }
/** Pad to the indent (if we are before it) */
- public IndentedWriter pad() {
+ public void pad() {
if ( startingNewLine && currentIndent > 0 )
lineStart();
padInternal();
- return this;
}
/** Pad to a given number of columns EXCLUDING the indent.
*
* @param col Column number (first column is 1).
*/
- public IndentedWriter pad(int col) { return pad(col, false); }
+ public void pad(int col) { pad(col, false); }
/** Pad to a given number of columns maybe including the indent.
*
* @param col Column number (first column is 1).
* @param absoluteColumn Whether to include the indent
*/
- public IndentedWriter pad(int col, boolean absoluteColumn) {
+ public void pad(int col, boolean absoluteColumn) {
// Make absolute
if ( !absoluteColumn )
col = col + currentIndent;
@@ -283,7 +273,6 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
write$(' '); // Always a space.
column++;
}
- return this;
}
private void padInternal() {
@@ -312,18 +301,16 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
return column;
}
- public IndentedWriter incIndent() { incIndent(unitIndent); return this; }
+ public void incIndent() { incIndent(unitIndent); }
- public IndentedWriter incIndent(int x) {
+ public void incIndent(int x) {
currentIndent += x;
- return this;
}
- public IndentedWriter decIndent() { decIndent(unitIndent); return this; }
+ public void decIndent() { decIndent(unitIndent); }
- public IndentedWriter decIndent(int x) {
+ public void decIndent(int x) {
currentIndent -= x;
- return this;
}
/** Position past current indent */
@@ -339,32 +326,25 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
public int getAbsoluteIndent() { return currentIndent; }
/** Set indent from the left hand edge. Returns {@code this}. */
- public IndentedWriter setAbsoluteIndent(int x) { currentIndent = x; return rtnObject(); }
+ public void setAbsoluteIndent(int x) { currentIndent = x; }
public boolean hasLineNumbers() {
return lineNumbers;
}
- public IndentedWriter setLineNumbers(boolean lineNumbers) {
+ public void setLineNumbers(boolean lineNumbers) {
this.lineNumbers = lineNumbers;
- return rtnObject();
}
public String getEndOfLineMarker() { return endOfLineMarker; }
/** Set the marker included at end of line - set to null for "none". Usually used for debugging. */
- public IndentedWriter setEndOfLineMarker(String marker) {
- endOfLineMarker = marker;
- return rtnObject();
- }
+ public void setEndOfLineMarker(String marker) { endOfLineMarker = marker; }
/** Flat mode - print without NL, for a more compact representation*/
public boolean inFlatMode() { return flatMode; }
/** Flat mode - print without NL, for a more compact representation*/
- public IndentedWriter setFlatMode(boolean flatMode) {
- this.flatMode = flatMode;
- return rtnObject();
- }
+ public void setFlatMode(boolean flatMode) { this.flatMode = flatMode; }
/** Flush on newline **/
public boolean getFlushOnNewline() { return flushOnNewline; }
@@ -374,24 +354,17 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
* but not by default otherwise. The underlying output, if it is a {@link PrintStream}
* may also have a flush on newline as well (e.g {@link System#out}).
*/
- public IndentedWriter setFlushOnNewline(boolean flushOnNewline) {
- this.flushOnNewline = flushOnNewline;
- return rtnObject();
- }
+ public void setFlushOnNewline(boolean flushOnNewline) { this.flushOnNewline = flushOnNewline; }
public char getPadChar() { return padChar; }
- public IndentedWriter setPadChar(char ch) {
- this.padChar = ch;
- return rtnObject();
- }
+ public void setPadChar(char ch) { this.padChar = ch; }
public String getPadString() { return padString; }
- public IndentedWriter setPadString(String str) {
+ public void setPadString(String str) {
this.padString = str;
this.unitIndent = str.length();
- return rtnObject();
}
/** Initial string printed at the start of each line : defaults to no string. */
@@ -400,16 +373,14 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
}
/** Set the initial string printed at the start of each line. */
- public IndentedWriter setLinePrefix(String str) {
+ public void setLinePrefix(String str) {
this.linePrefix = str;
- return rtnObject();
}
public int getUnitIndent() { return unitIndent; }
- public IndentedWriter setUnitIndent(int x) {
+ public void setUnitIndent(int x) {
unitIndent = x;
- return rtnObject();
}
private int widthLineNumber = 3;
@@ -420,9 +391,8 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
/** Set the width of the number field.
* There is also a single space after the number not included in this setting.
*/
- public IndentedWriter setNumberWidth(int widthOfNumbers) {
+ public void setNumberWidth(int widthOfNumbers) {
widthLineNumber = widthOfNumbers;
- return rtnObject();
}
private void insertLineNumber() {
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/Writer2.java b/jena-base/src/main/java/org/apache/jena/atlas/io/Writer2.java
index eddce6ab8e..d60a901619 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/Writer2.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/Writer2.java
@@ -49,43 +49,39 @@ public class Writer2 extends AWriterBase implements AWriter, Closeable
}
@Override
- public AWriter print(char ch) {
+ public void print(char ch) {
try {
writer.write(ch);
} catch (IOException ex) {
IO.exception(ex);
}
- return this;
}
@Override
- public AWriter print(String string) {
+ public void print(String string) {
try {
writer.write(string);
} catch (IOException ex) {
IO.exception(ex);
}
- return this;
}
@Override
- public AWriter print(char[] cbuf) {
+ public void print(char[] cbuf) {
try {
writer.write(cbuf);
} catch (IOException ex) {
IO.exception(ex);
}
- return this;
}
@Override
- public AWriter flush() {
+ public void flush() {
try {
writer.flush();
} catch (IOException ex) {
IO.exception(ex);
}
- return this;
}
@Override
@@ -98,22 +94,19 @@ public class Writer2 extends AWriterBase implements AWriter, Closeable
}
@Override
- public AWriter printf(String fmt, Object...args) {
+ public void printf(String fmt, Object...args) {
print(String.format(fmt, args));
- return this;
}
@Override
- public AWriter println(String obj) {
+ public void println(String obj) {
print(obj);
print("\n");
- return this;
}
@Override
- public AWriter println() {
+ public void println() {
print("\n");
- return this;
}
@Override