Skip to content

OAK-11979: Clean up *StringValue in JCR XML import #2572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reschke wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

OAK-11979: Clean up *StringValue in JCR XML import #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 13 additions & 66 deletions oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
Expand All @@ -31,15 +30,17 @@
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Base64;

import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFactory;

import org.apache.commons.io.input.ReaderInputStream;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.xml.TextValue;
import org.apache.jackrabbit.util.Base64;
import org.apache.jackrabbit.util.TransientFileFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -133,9 +134,7 @@ public String getString() {
private String retrieveString() throws IOException {
String value = retrieve();
if (base64) {
ByteArrayOutputStream out = new ByteArrayOutputStream();
Base64.decode(value, out);
value = new String(out.toByteArray(), "UTF-8");
value = new String(Base64.getDecoder().decode(value), StandardCharsets.UTF_8);
}
return value;
}
Expand All @@ -157,14 +156,11 @@ public String retrieve() throws IOException {
}
StringBuilder sb = new StringBuilder((int) length);
char[] chunk = new char[0x2000];
Reader reader = openReader();
try {
try (Reader reader = openReader()) {
int read;
while ((read = reader.read(chunk)) > -1) {
sb.append(chunk, 0, read);
}
} finally {
reader.close();
}
return sb.toString();
} else {
Expand All @@ -173,7 +169,7 @@ public String retrieve() throws IOException {
}

private Reader openReader() throws IOException {
return new InputStreamReader(openStream(), "UTF-8");
return new InputStreamReader(openStream(), StandardCharsets.UTF_8);
}

private InputStream openStream() throws IOException {
Expand All @@ -182,9 +178,10 @@ private InputStream openStream() throws IOException {

private InputStream stream() throws IOException {
if (base64) {
return new Base64ReaderInputStream(reader());
return Base64.getDecoder().wrap(
ReaderInputStream.builder().setReader(reader()).setCharset(StandardCharsets.UTF_8).get());
} else if (buffer != null) {
return new ByteArrayInputStream(retrieve().getBytes("UTF-8"));
return new ByteArrayInputStream(retrieve().getBytes(StandardCharsets.UTF_8));
} else if (tmpFile != null) {
// close writer first
writer.close();
Expand Down Expand Up @@ -229,7 +226,7 @@ public void append(char[] chars, int start, int len)
TransientFileFactory fileFactory = TransientFileFactory.getInstance();
tmpFile = fileFactory.createTransientFile("txt", null, null);
BufferedOutputStream fout = new BufferedOutputStream(new FileOutputStream(tmpFile));
writer = new OutputStreamWriter(fout, "UTF-8");
writer = new OutputStreamWriter(fout, StandardCharsets.UTF_8);
writer.write(buffer.toString());
writer.write(chars, start, len);
// reset the in-memory buffer
Expand Down Expand Up @@ -290,7 +287,9 @@ public void dispose() {
} else if (tmpFile != null) {
try {
writer.close();
tmpFile.delete();
if (!tmpFile.delete()) {
log.warn("Problem disposing property value: {} not deleted", tmpFile);
}
tmpFile = null;
writer = null;
} catch (IOException e) {
Expand All @@ -300,56 +299,4 @@ public void dispose() {
log.warn("this instance has already been disposed");
}
}

/**
* This class converts the text read Converts a base64 reader to an input stream.
*/
private static class Base64ReaderInputStream extends InputStream {

private static final int BUFFER_SIZE = 1024;
private final char[] chars;
private final ByteArrayOutputStream out;
private final Reader reader;
private int pos;
private int remaining;
private byte[] buffer;

public Base64ReaderInputStream(Reader reader) {
chars = new char[BUFFER_SIZE];
this.reader = reader;
out = new ByteArrayOutputStream(BUFFER_SIZE);
}

private void fillBuffer() throws IOException {
int len = reader.read(chars, 0, BUFFER_SIZE);
if (len < 0) {
remaining = -1;
return;
}
Base64.decode(chars, 0, len, out);
buffer = out.toByteArray();
pos = 0;
remaining = buffer.length;
out.reset();
}

@Override
public int read() throws IOException {
if (remaining == 0) {
fillBuffer();
}
if (remaining < 0) {
return -1;
}
remaining--;
return buffer[pos++] & 0xff;
}

@Override
public void close() throws IOException {
reader.close();
}

}

}
11 changes: 4 additions & 7 deletions oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/StringValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
package org.apache.jackrabbit.oak.jcr.xml;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Base64;

import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
Expand All @@ -27,7 +26,6 @@

import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.xml.TextValue;
import org.apache.jackrabbit.util.Base64;

/**
* {@code StringValue} represents an immutable serialized value.
Expand Down Expand Up @@ -63,12 +61,11 @@ public String getString() {
@Override @SuppressWarnings("deprecation")
public Value getValue(int type) throws RepositoryException {
if (type == PropertyType.BINARY) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
Base64.decode(value, baos);
byte[] bytes = Base64.getDecoder().decode(value);
Copy link
Contributor

@mbaedke mbaedke Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe inline that?

Copy link
Contributor Author

@reschke reschke Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inline?

return valueFactory.createValue(
new ByteArrayInputStream(baos.toByteArray()));
} catch (IOException e) {
new ByteArrayInputStream(bytes));
} catch (IllegalArgumentException e) {
throw new RepositoryException(
"Failed to decode binary value: " + value, e);
}
Expand Down
Loading