| Chunk |
|---|
| Conflicting content |
|---|
tika.setMaxStringLength(-1);
}
<<<<<<< HEAD
public static InputStream getInputStream(String filepath) throws Exception {
InputStream is;
if (filepath.startsWith("http://") || filepath.startsWith("https://")) {
URL url = new URL(filepath);
is = url.openStream();
} else if (filepath.startsWith("/com/jgaap/resources")){
is = com.jgaap.JGAAP.class.getResourceAsStream(filepath);
} else {
is = new FileInputStream(filepath);
}
return is;
}
public static String loadDocument(String filepath, String charset) throws Exception {
=======
static String loadDocument(String filepath, String charset) throws Exception {
>>>>>>> 7591820de2d9611542d0dff0f4ce76152f42f8cd
InputStream is = getInputStream(filepath);
String text = tika.parseToString(is);
is.close(); |
| Solution content |
|---|
tika.setMaxStringLength(-1);
}
public static InputStream getInputStream(String filepath) throws Exception {
InputStream is;
if (filepath.startsWith("http://") || filepath.startsWith("https://")) {
URL url = new URL(filepath);
is = url.openStream();
} else if (filepath.startsWith("/com/jgaap/resources")){
is = com.jgaap.JGAAP.class.getResourceAsStream(filepath);
} else {
is = new FileInputStream(filepath);
}
return is;
}
public static String loadDocument(String filepath, String charset) throws Exception {
InputStream is = getInputStream(filepath);
String text = tika.parseToString(is);
is.close(); |
| File |
|---|
| DocumentHelper.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Method signature |