Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-350] Minor code clean up

This commit is contained in:
Michael Bolz 2014-09-02 10:25:23 +02:00
parent 412a9901f7
commit a1621331c1
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java
View File

@ -35,9 +35,11 @@ import org.slf4j.LoggerFactory;
public abstract class ODataTranslatedException extends ODataException { public abstract class ODataTranslatedException extends ODataException {
private static final long serialVersionUID = -1210541002198287561L; private static final long serialVersionUID = -1210541002198287561L;
private static final Logger log = LoggerFactory.getLogger(ODataTranslatedException.class); private static final Logger LOG = LoggerFactory.getLogger(ODataTranslatedException.class);
private static final Locale DEFAULT_LOCALE = Locale.ENGLISH; private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
protected static final String DEFAULT_SERVER_BUNDLE_NAME = "server-core-exceptions-i18n";
public static interface MessageKey { public static interface MessageKey {
public String getKey(); public String getKey();
} }
@ -96,7 +98,7 @@ public abstract class ODataTranslatedException extends ODataException {
try { try {
return ResourceBundle.getBundle(getBundleName(), locale == null ? DEFAULT_LOCALE : locale); return ResourceBundle.getBundle(getBundleName(), locale == null ? DEFAULT_LOCALE : locale);
} catch (final MissingResourceException e) { } catch (final MissingResourceException e) {
log.error(e.getMessage(), e); LOG.error(e.getMessage(), e);
return null; return null;
} }
} }

2
lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializerException.java
View File

@ -54,6 +54,6 @@ public class ODataSerializerException extends ODataTranslatedException {
@Override @Override
protected String getBundleName() { protected String getBundleName() {
return "server-core-exceptions-i18n"; return DEFAULT_SERVER_BUNDLE_NAME;
} }
} }

2
lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java
View File

@ -50,6 +50,6 @@ public class ContentNegotiatorException extends ODataTranslatedException {
@Override @Override
protected String getBundleName() { protected String getBundleName() {
return "server-core-exceptions-i18n"; return DEFAULT_SERVER_BUNDLE_NAME;
} }
} }

2
lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java
View File

@ -44,6 +44,6 @@ public class ODataHandlerException extends ODataTranslatedException {
@Override @Override
protected String getBundleName() { protected String getBundleName() {
return "server-core-exceptions-i18n"; return DEFAULT_SERVER_BUNDLE_NAME;
} }
} }

2
lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java
View File

@ -35,6 +35,6 @@ abstract public class UriParserException extends ODataTranslatedException {
@Override @Override
protected String getBundleName() { protected String getBundleName() {
return "server-core-exceptions-i18n"; return DEFAULT_SERVER_BUNDLE_NAME;
} }
} }

2
lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java
View File

@ -69,6 +69,6 @@ public class UriValidationException extends ODataTranslatedException {
@Override @Override
protected String getBundleName() { protected String getBundleName() {
return "server-core-exceptions-i18n"; return DEFAULT_SERVER_BUNDLE_NAME;
} }
} }