This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 8e9f20d org.apache.juneau.cp tests.
8e9f20d is described below
commit 8e9f20dde1302f28ca3789c179a3d44d7b84e20c
Author: JamesBognar <[email protected]>
AuthorDate: Sun Jul 26 09:11:36 2020 -0400
org.apache.juneau.cp tests.
---
...{MessageBundle_Test.java => Messages_Test.java} | 8 ++---
...sourceManager_Test.java => Resources_Test.java} | 2 +-
.../cp/{MessageBundle.java => Messages.java} | 38 +++++++++++-----------
.../org/apache/juneau/utils/MessageBundle.java | 2 +-
.../apache/juneau/microservice/Microservice.java | 8 ++---
.../juneau/microservice/console/ConfigCommand.java | 2 +-
.../juneau/microservice/console/ExitCommand.java | 2 +-
.../juneau/microservice/console/HelpCommand.java | 2 +-
.../microservice/console/RestartCommand.java | 2 +-
.../microservice/jetty/JettyMicroservice.java | 6 ++--
.../org/apache/juneau/rest/RestParamsTest.java | 4 +--
.../java/org/apache/juneau/rest/RestContext.java | 12 +++----
.../org/apache/juneau/rest/RestMethodParam.java | 4 +--
.../org/apache/juneau/rest/RestParamDefaults.java | 4 +--
.../java/org/apache/juneau/rest/RestRequest.java | 8 ++---
.../org/apache/juneau/rest/SwaggerGenerator.java | 4 +--
.../apache/juneau/rest/annotation/HookEvent.java | 4 +--
17 files changed, 56 insertions(+), 56 deletions(-)
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/MessageBundle_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
similarity index 88%
rename from
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/MessageBundle_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
index e5c74f8..8c6c6f9 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/MessageBundle_Test.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
@@ -23,17 +23,17 @@ import org.apache.juneau.cp.test1.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
-public class MessageBundle_Test {
+public class Messages_Test {
@Test
public void a01_nonExistent() throws Exception {
- assertThrown(()->MessageBundle.of(Test1.class)).contains("Could
not find bundle path for class");
-
assertThrown(()->MessageBundle.of(Test1.class,"bad.properties")).contains("Bundle
path should not end with '.properties'");
+ assertThrown(()->Messages.of(Test1.class)).contains("Could not
find bundle path for class");
+
assertThrown(()->Messages.of(Test1.class,"bad.properties")).contains("Bundle
path should not end with '.properties'");
}
@Test
public void a02_sameDirectory() throws Exception {
- MessageBundle x = MessageBundle.of(MessageBundleTest1.class);
+ Messages x = Messages.of(MessageBundleTest1.class);
assertString(x.getString("file")).is("MessageBundleTest1.properties");
assertString(x.getBundle(JAPANESE).getString("file")).is("MessageBundleTest1_ja.properties");
assertString(x.getBundle(JAPAN).getString("file")).is("MessageBundleTest1_ja_JP.properties");
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/ResourceManager_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Resources_Test.java
similarity index 99%
rename from
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/ResourceManager_Test.java
rename to
juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Resources_Test.java
index 9f2897b..5a9133e 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/ResourceManager_Test.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Resources_Test.java
@@ -22,7 +22,7 @@ import org.apache.juneau.plaintext.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
-public class ResourceManager_Test {
+public class Resources_Test {
private static Parser PARSER = PlainTextParser.DEFAULT;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/MessageBundle.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
similarity index 89%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/MessageBundle.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
index c2ae09d..88804b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/MessageBundle.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
@@ -52,7 +52,7 @@ import org.apache.juneau.collections.*;
* This class is thread-safe.
* </ul>
*/
-public class MessageBundle extends ResourceBundle {
+public class Messages extends ResourceBundle {
private static final ThreadLocal<Locale> clientLocale = new
ThreadLocal<>();
@@ -70,10 +70,10 @@ public class MessageBundle extends ResourceBundle {
// Bundles to search through to find properties.
// Typically this will be a list of resource bundles for each class up
the class hierarchy chain.
- private final CopyOnWriteArrayList<MessageBundle> searchBundles = new
CopyOnWriteArrayList<>();
+ private final CopyOnWriteArrayList<Messages> searchBundles = new
CopyOnWriteArrayList<>();
// Cache of message bundles per locale.
- private final ConcurrentHashMap<Locale,MessageBundle> localizedBundles
= new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<Locale,Messages> localizedBundles = new
ConcurrentHashMap<>();
/**
* Sets the locale for this thread so that calls to {@link
#getClientString(String, Object...)} return messages in
@@ -82,7 +82,7 @@ public class MessageBundle extends ResourceBundle {
* @param locale The new client locale.
*/
public static void setClientLocale(Locale locale) {
- MessageBundle.clientLocale.set(locale);
+ Messages.clientLocale.set(locale);
}
/**
@@ -91,8 +91,8 @@ public class MessageBundle extends ResourceBundle {
* @param forClass The class
* @return A new message bundle belonging to the class.
*/
- public static final MessageBundle of(Class<?> forClass) {
- return new MessageBundle(forClass, null, null);
+ public static final Messages of(Class<?> forClass) {
+ return new Messages(forClass, null, null);
}
/**
@@ -102,8 +102,8 @@ public class MessageBundle extends ResourceBundle {
* @param bundlePath The location of the resource bundle.
* @return A new message bundle belonging to the class.
*/
- public static final MessageBundle of(Class<?> forClass, String
bundlePath) {
- return new MessageBundle(forClass, bundlePath, null);
+ public static final Messages of(Class<?> forClass, String bundlePath) {
+ return new Messages(forClass, bundlePath, null);
}
/**
@@ -125,7 +125,7 @@ public class MessageBundle extends ResourceBundle {
* <br>If <jk>null</jk>, uses the default locale.
* @throws MissingResourceException If resource bundle could not be
found.
*/
- public MessageBundle(Class<?> forClass, String bundlePath, Locale
locale) throws MissingResourceException {
+ public Messages(Class<?> forClass, String bundlePath, Locale locale)
throws MissingResourceException {
this.forClass = forClass;
this.className = forClass.getSimpleName();
@@ -188,9 +188,9 @@ public class MessageBundle extends ResourceBundle {
* @param bundlePath The bundle path.
* @return This object (for method chaining).
*/
- public MessageBundle addSearchPath(Class<?> forClass, String
bundlePath) {
+ public Messages addSearchPath(Class<?> forClass, String bundlePath) {
assertSameThread(creationThreadId, "This method can only be
called from the same thread that created the object.");
- MessageBundle srb = new MessageBundle(forClass, bundlePath,
null);
+ Messages srb = new Messages(forClass, bundlePath, null);
if (srb.rb != null) {
allKeys.addAll(srb.keySet());
searchBundles.add(srb);
@@ -275,7 +275,7 @@ public class MessageBundle extends ResourceBundle {
* @return The resolved value, or <jk>null</jk> if no value is found or
the resource bundle is missing.
*/
public String findFirstString(Locale locale, String...keys) {
- MessageBundle srb = getBundle(locale);
+ Messages srb = getBundle(locale);
return srb.findFirstString(keys);
}
@@ -308,7 +308,7 @@ public class MessageBundle extends ResourceBundle {
@Override /* ResourceBundle */
protected Object handleGetObject(String key) {
- for (MessageBundle srb : searchBundles) {
+ for (Messages srb : searchBundles) {
if (srb.rb != null) {
String key2 = srb.keyMap.get(key);
if (key2 != null) {
@@ -353,18 +353,18 @@ public class MessageBundle extends ResourceBundle {
* <br>If <jk>null</jk>, assumes the default locale.
* @return The resource bundle for the specified locale. Never
<jk>null</jk>.
*/
- public MessageBundle getBundle(Locale locale) {
+ public Messages getBundle(Locale locale) {
if (locale == null)
locale = Locale.getDefault();
- MessageBundle mb = localizedBundles.get(locale);
+ Messages mb = localizedBundles.get(locale);
if (mb != null)
return mb;
- mb = new MessageBundle(forClass, bundlePath, locale);
- List<MessageBundle> l = new ArrayList<>(searchBundles.size()-1);
+ mb = new Messages(forClass, bundlePath, locale);
+ List<Messages> l = new ArrayList<>(searchBundles.size()-1);
for (int i = 1; i < searchBundles.size(); i++) {
- MessageBundle srb = searchBundles.get(i);
- srb = new MessageBundle(srb.forClass, srb.bundlePath,
locale);
+ Messages srb = searchBundles.get(i);
+ srb = new Messages(srb.forClass, srb.bundlePath,
locale);
l.add(srb);
mb.allKeys.addAll(srb.keySet());
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
index ea77882..bef0de8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
@@ -51,7 +51,7 @@ import org.apache.juneau.collections.*;
* <li>
* This class is thread-safe.
* </ul>
- * @deprecated Use {@link org.apache.juneau.cp.MessageBundle}.
+ * @deprecated Use {@link org.apache.juneau.cp.Messages}.
*/
@Deprecated
public class MessageBundle extends ResourceBundle {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index b54aea9..dff54ec 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -39,7 +39,7 @@ import org.apache.juneau.parser.ParseException;
import org.apache.juneau.svl.*;
import org.apache.juneau.svl.vars.ManifestFileVar;
import org.apache.juneau.utils.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
/**
* Parent class for all microservices.
@@ -111,7 +111,7 @@ public class Microservice implements ConfigEventListener {
}
- final MessageBundle messages = MessageBundle.of(Microservice.class);
+ final Messages messages = Messages.of(Microservice.class);
//-----------------------------------------------------------------------------------------------------------------
// Properties set in constructor
@@ -764,7 +764,7 @@ public class Microservice implements ConfigEventListener {
* @param messageKey The message key.
* @param args Optional {@link MessageFormat}-style arguments.
*/
- public void out(MessageBundle mb, String messageKey, Object...args) {
+ public void out(Messages mb, String messageKey, Object...args) {
String msg = mb.getString(messageKey, args);
if (consoleEnabled)
getConsoleWriter().println(msg);
@@ -781,7 +781,7 @@ public class Microservice implements ConfigEventListener {
* @param messageKey The message key.
* @param args Optional {@link MessageFormat}-style arguments.
*/
- public void err(MessageBundle mb, String messageKey, Object...args) {
+ public void err(Messages mb, String messageKey, Object...args) {
String msg = mb.getString(messageKey, args);
if (consoleEnabled)
System.err.println(mb.getString(messageKey, args)); //
NOT DEBUG
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConfigCommand.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConfigCommand.java
index c5d2a47..ea000cb 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConfigCommand.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConfigCommand.java
@@ -25,7 +25,7 @@ import org.apache.juneau.cp.*;
*/
public class ConfigCommand extends ConsoleCommand {
- private final MessageBundle mb = MessageBundle.of(ConfigCommand.class,
"Messages");
+ private final Messages mb = Messages.of(ConfigCommand.class,
"Messages");
@Override /* ConsoleCommand */
public String getName() {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ExitCommand.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ExitCommand.java
index 03914c9..9f18c28 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ExitCommand.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ExitCommand.java
@@ -24,7 +24,7 @@ import org.apache.juneau.cp.*;
*/
public class ExitCommand extends ConsoleCommand {
- private final MessageBundle mb = MessageBundle.of(ExitCommand.class,
"Messages");
+ private final Messages mb = Messages.of(ExitCommand.class, "Messages");
@Override /* ConsoleCommand */
public String getName() {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
index f4f7318..6a6b089 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
@@ -24,7 +24,7 @@ import org.apache.juneau.cp.*;
*/
public class HelpCommand extends ConsoleCommand {
- private final MessageBundle mb = MessageBundle.of(HelpCommand.class,
"Messages");
+ private final Messages mb = Messages.of(HelpCommand.class, "Messages");
@Override /* ConsoleCommand */
public String getName() {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/RestartCommand.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/RestartCommand.java
index 4a4bc4e..51791a4 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/RestartCommand.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/RestartCommand.java
@@ -24,7 +24,7 @@ import org.apache.juneau.cp.*;
*/
public class RestartCommand extends ConsoleCommand {
- private final MessageBundle mb = MessageBundle.of(RestartCommand.class,
"Messages");
+ private final Messages mb = Messages.of(RestartCommand.class,
"Messages");
@Override /* ConsoleCommand */
public String getName() {
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 538f020..ca6b9e1 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -24,7 +24,7 @@ import javax.servlet.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.config.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
import org.apache.juneau.internal.*;
import org.apache.juneau.microservice.*;
import org.apache.juneau.parser.ParseException;
@@ -88,7 +88,7 @@ public class JettyMicroservice extends Microservice {
.join();
}
- final MessageBundle messages =
MessageBundle.of(JettyMicroservice.class);
+ final Messages messages = Messages.of(JettyMicroservice.class);
//-----------------------------------------------------------------------------------------------------------------
// Properties set in constructor
@@ -165,7 +165,7 @@ public class JettyMicroservice extends Microservice {
@Override /* Microservice */
public synchronized JettyMicroservice stop() throws Exception {
final Logger logger = getLogger();
- final MessageBundle mb2 = messages;
+ final Messages mb2 = messages;
Thread t = new Thread("JettyMicroserviceStop") {
@Override /* Thread */
public void run() {
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
index d90030c..95dea0e 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
@@ -22,7 +22,7 @@ import java.util.*;
import javax.servlet.*;
import org.apache.juneau.config.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
@@ -44,7 +44,7 @@ public class RestParamsTest {
return t == null ? null : t.getString("foo");
}
@RestMethod
- public String a02(MessageBundle t) {
+ public String a02(Messages t) {
return t == null ? null : t.getString("foo");
}
@RestMethod(name=POST)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 386e4f3..bc69ce1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -39,7 +39,7 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.config.*;
import org.apache.juneau.cp.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
import org.apache.juneau.encoders.*;
import org.apache.juneau.html.*;
import org.apache.juneau.html.annotation.*;
@@ -1584,7 +1584,7 @@ public final class RestContext extends BeanContext {
* Messages are also available by passing either of the following
parameter types into your Java method:
* <ul class='javatree'>
* <li class='jc'>{@link ResourceBundle} - Basic Java resource
bundle.
- * <li class='jc'>{@link MessageBundle} - Extended resource bundle
with several convenience methods.
+ * <li class='jc'>{@link Messages} - Extended resource bundle with
several convenience methods.
* </ul>
*
* <p>
@@ -3608,7 +3608,7 @@ public final class RestContext extends BeanContext {
private final MimetypesFileTypeMap mimetypesFileTypeMap;
private final StaticFiles[] staticFiles;
private final String[] staticFilesPaths;
- private final MessageBundle msgs;
+ private final Messages msgs;
private final Config config;
private final VarResolver varResolver;
private final Map<String,RestCallRouter> callRouters;
@@ -3852,9 +3852,9 @@ public final class RestContext extends BeanContext {
MessageBundleLocation[] mbl =
getInstanceArrayProperty(REST_messages, MessageBundleLocation.class, new
MessageBundleLocation[0]);
if (mbl.length == 0)
- msgs = new MessageBundle(rci.inner(), "", null);
+ msgs = new Messages(rci.inner(), "", null);
else {
- msgs = new MessageBundle(mbl[0] != null ?
mbl[0].baseClass : rci.inner(), mbl[0].bundlePath, null);
+ msgs = new Messages(mbl[0] != null ?
mbl[0].baseClass : rci.inner(), mbl[0].bundlePath, null);
for (int i = 1; i < mbl.length; i++)
msgs.addSearchPath(mbl[i] != null ?
mbl[i].baseClass : rci.inner(), mbl[i].bundlePath);
}
@@ -4504,7 +4504,7 @@ public final class RestContext extends BeanContext {
* The resource bundle for this resource.
* <br>Never <jk>null</jk>.
*/
- public MessageBundle getMessages() {
+ public Messages getMessages() {
return msgs;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
index eaddf47..e419697 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
@@ -21,7 +21,7 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.config.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.header.Date;
@@ -83,7 +83,7 @@ import org.apache.juneau.reflect.*;
* <li class='jc'>{@link Config}
* <li class='jc'>{@link InputStream}
* <li class='jc'>{@link Locale}
- * <li class='jc'>{@link MessageBundle}
+ * <li class='jc'>{@link Messages}
* <li class='jc'>{@link OutputStream}
* <li class='jc'>{@link Parser}
* <li class='jc'>{@link Reader}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
index 324b289..ac8a3b4 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
@@ -25,7 +25,7 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.config.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.annotation.Body;
@@ -589,7 +589,7 @@ class RestParamDefaults {
static final class MessageBundleObject extends RestMethodParam {
protected MessageBundleObject() {
- super(OTHER, MessageBundle.class);
+ super(OTHER, Messages.class);
}
@Override /* RestMethodParam */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index aa21bc0..91971c6 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -37,7 +37,7 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.config.*;
import org.apache.juneau.cp.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
@@ -1236,7 +1236,7 @@ public final class RestRequest extends
HttpServletRequestWrapper {
*
* <ul class='notes'>
* <li>
- * The {@link MessageBundle} object can also be passed as
a parameter on the method.
+ * The {@link Messages} object can also be passed as a
parameter on the method.
* </ul>
*
* <ul class='seealso'>
@@ -1249,12 +1249,12 @@ public final class RestRequest extends
HttpServletRequestWrapper {
* The resource bundle.
* <br>Never <jk>null</jk>.
*/
- public MessageBundle getMessageBundle() {
+ public Messages getMessageBundle() {
return context.getMessages().getBundle(getLocale());
}
/**
- * Shortcut method for calling {@link MessageBundle#getString(Locale,
String, Object...)} based on the request locale.
+ * Shortcut method for calling {@link Messages#getString(Locale,
String, Object...)} based on the request locale.
*
* @param key The message key.
* @param args Optional {@link MessageFormat}-style arguments.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
index 595b3b7..bd3af28 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
@@ -26,7 +26,7 @@ import org.apache.juneau.jsonschema.annotation.SubItems;
import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
@@ -70,7 +70,7 @@ final class SwaggerGenerator {
private final JsonSchemaGeneratorSession js;
private final Class<?> c;
private final Object resource;
- private final MessageBundle mb;
+ private final Messages mb;
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
index 4c695e9..cbf1664 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
@@ -21,7 +21,7 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.config.*;
-import org.apache.juneau.cp.MessageBundle;
+import org.apache.juneau.cp.Messages;
import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.exception.*;
@@ -145,7 +145,7 @@ public enum HookEvent {
* <li>Other objects:
* <ul>
* <li>{@link ResourceBundle}
- * <li>{@link MessageBundle}
+ * <li>{@link Messages}
* <li>{@link InputStream}
* <li>{@link ServletInputStream}
* <li>{@link Reader}
