-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Guard Mapper.write against null writer (#123)
* Expose anonymous classes to DelegatingX classes Applies the suggestions by @jungm and @rmannibucau * Modify code style
- Loading branch information
1 parent
3f600cf
commit baa4f3d
Showing
5 changed files
with
300 additions
and
161 deletions.
There are no files selected for viewing
75 changes: 75 additions & 0 deletions
75
johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingInputStream.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.johnzon.mapper.internal; | ||
|
||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.util.Objects; | ||
|
||
public class DelegatingInputStream extends InputStream { | ||
|
||
private final InputStream inputStream; | ||
|
||
public DelegatingInputStream(InputStream inputStream) { | ||
this.inputStream = Objects.requireNonNull(inputStream, "delegate inputStream must not be null"); | ||
} | ||
|
||
@Override | ||
public void close() throws IOException { | ||
inputStream.close(); | ||
} | ||
|
||
@Override | ||
public int read(final byte[] b) throws IOException { | ||
return inputStream.read(b); | ||
} | ||
|
||
@Override | ||
public int read(final byte[] b, final int off, final int len) throws IOException { | ||
return inputStream.read(b, off, len); | ||
} | ||
|
||
@Override | ||
public long skip(final long n) throws IOException { | ||
return inputStream.skip(n); | ||
} | ||
|
||
@Override | ||
public int available() throws IOException { | ||
return inputStream.available(); | ||
} | ||
|
||
@Override | ||
public void mark(final int readlimit) { | ||
inputStream.mark(readlimit); | ||
} | ||
|
||
@Override | ||
public void reset() throws IOException { | ||
inputStream.reset(); | ||
} | ||
|
||
@Override | ||
public boolean markSupported() { | ||
return inputStream.markSupported(); | ||
} | ||
|
||
@Override | ||
public int read() throws IOException { | ||
return inputStream.read(); | ||
} | ||
} |
55 changes: 55 additions & 0 deletions
55
johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingOutputStream.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.johnzon.mapper.internal; | ||
|
||
import java.io.IOException; | ||
import java.io.OutputStream; | ||
import java.util.Objects; | ||
|
||
public class DelegatingOutputStream extends OutputStream { | ||
|
||
private final OutputStream outputStream; | ||
|
||
public DelegatingOutputStream(OutputStream outputStream) { | ||
this.outputStream = Objects.requireNonNull(outputStream, "delegate outputStream must not be null"); | ||
} | ||
|
||
@Override | ||
public void close() throws IOException { | ||
outputStream.close(); | ||
} | ||
|
||
@Override | ||
public void write(final int b) throws IOException { | ||
outputStream.write(b); | ||
} | ||
|
||
@Override | ||
public void write(final byte[] b) throws IOException { | ||
outputStream.write(b); | ||
} | ||
|
||
@Override | ||
public void write(final byte[] b, final int off, final int len) throws IOException { | ||
outputStream.write(b, off, len); | ||
} | ||
|
||
@Override | ||
public void flush() throws IOException { | ||
outputStream.flush(); | ||
} | ||
} |
81 changes: 81 additions & 0 deletions
81
johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.johnzon.mapper.internal; | ||
|
||
import java.io.IOException; | ||
import java.io.Reader; | ||
import java.nio.CharBuffer; | ||
import java.util.Objects; | ||
|
||
public class DelegatingReader extends Reader { | ||
|
||
private final Reader reader; | ||
|
||
public DelegatingReader(Reader reader) { | ||
this.reader = Objects.requireNonNull(reader, "delegate reader must not be null"); | ||
} | ||
|
||
@Override | ||
public void close() throws IOException { | ||
reader.close(); | ||
} | ||
|
||
@Override | ||
public int read(final CharBuffer target) throws IOException { | ||
return reader.read(target); | ||
} | ||
|
||
@Override | ||
public int read() throws IOException { | ||
return reader.read(); | ||
} | ||
|
||
@Override | ||
public int read(final char[] cbuf) throws IOException { | ||
return reader.read(cbuf); | ||
} | ||
|
||
@Override | ||
public int read(final char[] cbuf, final int off, final int len) throws IOException { | ||
return reader.read(cbuf, off, len); | ||
} | ||
|
||
@Override | ||
public long skip(final long n) throws IOException { | ||
return reader.skip(n); | ||
} | ||
|
||
@Override | ||
public boolean ready() throws IOException { | ||
return reader.ready(); | ||
} | ||
|
||
@Override | ||
public boolean markSupported() { | ||
return reader.markSupported(); | ||
} | ||
|
||
@Override | ||
public void mark(final int readAheadLimit) throws IOException { | ||
reader.mark(readAheadLimit); | ||
} | ||
|
||
@Override | ||
public void reset() throws IOException { | ||
reader.reset(); | ||
} | ||
} |
79 changes: 79 additions & 0 deletions
79
johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingWriter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.johnzon.mapper.internal; | ||
|
||
import java.io.IOException; | ||
import java.io.Writer; | ||
import java.util.Objects; | ||
|
||
public class DelegatingWriter extends Writer { | ||
private final Writer writer; | ||
|
||
public DelegatingWriter(Writer writer) { | ||
this.writer = Objects.requireNonNull(writer, "delegate writer must not be null"); | ||
} | ||
|
||
@Override | ||
public void write(final int c) throws IOException { | ||
writer.write(c); | ||
} | ||
|
||
@Override | ||
public void write(final char[] cbuf) throws IOException { | ||
writer.write(cbuf); | ||
} | ||
|
||
@Override | ||
public void write(final char[] cbuf, final int off, final int len) throws IOException { | ||
writer.write(cbuf, off, len); | ||
} | ||
|
||
@Override | ||
public void write(final String str) throws IOException { | ||
writer.write(str); | ||
} | ||
|
||
@Override | ||
public void write(final String str, final int off, final int len) throws IOException { | ||
writer.write(str, off, len); | ||
} | ||
|
||
@Override | ||
public Writer append(final CharSequence csq) throws IOException { | ||
return writer.append(csq); | ||
} | ||
|
||
@Override | ||
public Writer append(final CharSequence csq, final int start, final int end) throws IOException { | ||
return writer.append(csq, start, end); | ||
} | ||
|
||
@Override | ||
public Writer append(final char c) throws IOException { | ||
return writer.append(c); | ||
} | ||
|
||
@Override | ||
public void flush() throws IOException { | ||
writer.flush(); | ||
} | ||
|
||
@Override | ||
public void close() throws IOException { | ||
writer.close(); | ||
} | ||
} |
Oops, something went wrong.