github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#8900] Extract MiniJAXB common exception handling logic

Browse Source 
`marshal()` and `unmarshal()` now share the same exception handling.
This commit is contained in:
Knut Wannheden 2019-07-04 20:37:49 +02:00
parent bcdadee556
commit eee38f618c
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
jOOQ/src/main/java/org/jooq/conf/MiniJAXB.java
View File

@ -113,19 +113,7 @@ public class MiniJAXB {
return;
}
catch (Throwable t) {
if (t instanceof Error) {
ExceptionTools.sneakyThrow(t);
}
else if (ExceptionTools.getCause(t, ClassNotFoundException.class) != null ||
ExceptionTools.getCause(t, Error.class) != null) {
jaxbAvailable = false;
log.debug("JAXB is not available from the classpath / module path");
}
else {
jaxbAvailable = true;
log.debug("JAXB is available from the classpath / module path");
throw new ConfigurationException("Error while reading xml", t);
}
handleJaxbException(t);
}
}
@ -144,6 +132,24 @@ public class MiniJAXB {
}
}
private static void handleJaxbException(Throwable t) {
if (t instanceof Error) {
jaxbAvailable = true;
log.debug("JAXB is available from the classpath / module path");
ExceptionTools.sneakyThrow(t);
}
else if (ExceptionTools.getCause(t, ClassNotFoundException.class) != null ||
ExceptionTools.getCause(t, Error.class) != null) {
jaxbAvailable = false;
log.debug("JAXB is not available from the classpath / module path");
}
else {
jaxbAvailable = true;
log.debug("JAXB is available from the classpath / module path");
throw new ConfigurationException("Error while reading xml", t);
}
}
public static <T> T unmarshal(InputStream in, Class<T> type) {
return unmarshal0(new InputSource(in), type);
}
@ -174,19 +180,7 @@ public class MiniJAXB {
return result;
}
catch (Throwable t) {
if (t instanceof Error) {
ExceptionTools.sneakyThrow(t);
}
if (ExceptionTools.getCause(t, ClassNotFoundException.class) != null ||
ExceptionTools.getCause(t, Error.class) != null) {
jaxbAvailable = false;
log.debug("JAXB is not available from the classpath / module path");
}
else {
jaxbAvailable = true;
log.debug("JAXB is available from the classpath / module path");
throw new ConfigurationException("Error while reading xml", t);
}
handleJaxbException(t);
}
}