You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/09/02 10:30:58 UTC
git commit: [OLINGO-350] Minor code clean up
Repository: olingo-odata4
Updated Branches:
refs/heads/master 412a9901f -> a1621331c
[OLINGO-350] Minor code clean up
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a1621331
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a1621331
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a1621331
Branch: refs/heads/master
Commit: a1621331c19beec362697d5c0e45bafb4f520516
Parents: 412a990
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Sep 2 10:25:23 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Sep 2 10:25:23 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/server/api/ODataTranslatedException.java | 6 ++++--
.../olingo/server/api/serializer/ODataSerializerException.java | 2 +-
.../apache/olingo/server/core/ContentNegotiatorException.java | 2 +-
.../org/apache/olingo/server/core/ODataHandlerException.java | 2 +-
.../olingo/server/core/uri/parser/UriParserException.java | 2 +-
.../server/core/uri/validator/UriValidationException.java | 2 +-
6 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1621331/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java
index bb3bf72..dd4e400 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java
@@ -35,9 +35,11 @@ import org.slf4j.LoggerFactory;
public abstract class ODataTranslatedException extends ODataException {
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;
+ protected static final String DEFAULT_SERVER_BUNDLE_NAME = "server-core-exceptions-i18n";
+
public static interface MessageKey {
public String getKey();
}
@@ -96,7 +98,7 @@ public abstract class ODataTranslatedException extends ODataException {
try {
return ResourceBundle.getBundle(getBundleName(), locale == null ? DEFAULT_LOCALE : locale);
} catch (final MissingResourceException e) {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
return null;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1621331/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializerException.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializerException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializerException.java
index b4fcd19..615ee3d 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializerException.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializerException.java
@@ -54,6 +54,6 @@ public class ODataSerializerException extends ODataTranslatedException {
@Override
protected String getBundleName() {
- return "server-core-exceptions-i18n";
+ return DEFAULT_SERVER_BUNDLE_NAME;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1621331/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java
index 0b1eb60..b30bd8a 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java
@@ -50,6 +50,6 @@ public class ContentNegotiatorException extends ODataTranslatedException {
@Override
protected String getBundleName() {
- return "server-core-exceptions-i18n";
+ return DEFAULT_SERVER_BUNDLE_NAME;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1621331/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java
index 8c92ce0..01048a6 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java
@@ -44,6 +44,6 @@ public class ODataHandlerException extends ODataTranslatedException {
@Override
protected String getBundleName() {
- return "server-core-exceptions-i18n";
+ return DEFAULT_SERVER_BUNDLE_NAME;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1621331/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java
index 5981722..31804a4 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java
@@ -35,6 +35,6 @@ abstract public class UriParserException extends ODataTranslatedException {
@Override
protected String getBundleName() {
- return "server-core-exceptions-i18n";
+ return DEFAULT_SERVER_BUNDLE_NAME;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a1621331/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java
index e70c6aa..f7156cd 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java
@@ -69,6 +69,6 @@ public class UriValidationException extends ODataTranslatedException {
@Override
protected String getBundleName() {
- return "server-core-exceptions-i18n";
+ return DEFAULT_SERVER_BUNDLE_NAME;
}
}