Skip to content

use correct outputStream #670

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

Merged
MajoBerger merged 5 commits into from
May 31, 2024
Merged

use correct outputStream #670

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d9ee87
use correct outputStream
MajoBerger May 27, 2024
ae08d79
workable, but not acceptable
MajoBerger May 28, 2024
2daaadd
sacrifice to the checkstyle god
MajoBerger May 28, 2024
e48638d
much better fix
MajoBerger May 30, 2024
56fb5e8
more clear name
MajoBerger May 30, 2024
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
12 changes: 7 additions & 5 deletions dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinRefBoxController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
import static java.util.Arrays.asList;
import static javax.servlet.http.HttpServletResponse.SC_OK;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -191,7 +193,7 @@ public ResponseEntity getCitationText(@RequestParam(name = "type") String type,
Context context = null;
OAIPMH oaipmh = null;
// ClarinOutputStream write OAI-PMH data into String instead of bytes.
ClarinOutputStream output = new ClarinOutputStream();
OutputStream output = new UTF8ClarinOutputStream();
try {
request.setCharacterEncoding("UTF-8");
context = contextService.getContext();
Expand Down Expand Up @@ -402,17 +404,17 @@ private String getXmlTextContent(String xml) throws ParserConfigurationException
/**
* This ClarinOutputStream write the content into the string instead of bytes.
*/
class ClarinOutputStream extends OutputStream {
private StringBuilder string = new StringBuilder();
class UTF8ClarinOutputStream extends OutputStream {
private ByteArrayOutputStream bao = new ByteArrayOutputStream();

@Override
public void write(int b) throws IOException {
this.string.append((char) b );
bao.write(b);
}

@Override
public String toString() {
return this.string.toString();
return bao.toString(StandardCharsets.UTF_8);
}
}

Expand Down