You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/06/15 16:38:21 UTC
git commit: DELTASPIKE-202 MessageInterpolator
Updated Branches:
refs/heads/master bc187acb6 -> c75903ac9
DELTASPIKE-202 MessageInterpolator
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/c75903ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/c75903ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/c75903ac
Branch: refs/heads/master
Commit: c75903ac9edaec804cafcea3f0e07f725c63771d
Parents: bc187ac
Author: Mark Struberg <st...@apache.org>
Authored: Fri Jun 15 16:30:16 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Fri Jun 15 16:30:16 2012 +0200
----------------------------------------------------------------------
.../impl/message/DefaultMessageInterpolator.java | 7 ++-
.../message/MessageBundleInvocationHandler.java | 1 +
.../deltaspike/core/impl/message/ProxyUtils.java | 47 ---------------
.../impl/message/TypedMessageBundleProducer.java | 10 +++-
.../test/core/api/message/MessageContextTest.java | 4 +-
.../test/core/api/message/SimpleMessage.java | 3 +
.../test/core/api/message/SimpleMessageTest.java | 1 +
7 files changed, 22 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c75903ac/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
index b246170..6c2af77 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
@@ -34,6 +34,11 @@ class DefaultMessageInterpolator implements MessageInterpolator, Serializable
@Override
public String interpolate(String messageTemplate, Object... arguments)
{
- return messageTemplate;
+ if (arguments == null || arguments.length == 0)
+ {
+ return messageTemplate;
+ }
+
+ return String.format(messageTemplate, arguments);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c75903ac/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
index 6bf420f..8b0d1af 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
@@ -36,6 +36,7 @@ import java.util.Locale;
class MessageBundleInvocationHandler implements InvocationHandler
{
+
/**
* @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object,
* java.lang.reflect.Method, java.lang.Object[])
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c75903ac/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ProxyUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ProxyUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ProxyUtils.java
deleted file mode 100644
index 9fb8865..0000000
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ProxyUtils.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.core.impl.message;
-
-import org.apache.deltaspike.core.util.ClassUtils;
-
-import javax.enterprise.inject.Typed;
-import java.lang.reflect.Proxy;
-
-/**
- * A factory class to produce message bundle implementations.
- */
-@Typed()
-abstract class ProxyUtils
-{
- private ProxyUtils()
- {
- // prevent instantiation
- }
-
- /**
- * @param type the bundle type class
- * @param <T> the bundle type
- * @return the bundle
- */
- static <T> T createMessageBundleProxy(Class<T> type)
- {
- return type.cast(Proxy.newProxyInstance(
- ClassUtils.getClassLoader(null), new Class<?>[]{type}, new MessageBundleInvocationHandler()));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c75903ac/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/TypedMessageBundleProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/TypedMessageBundleProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/TypedMessageBundleProducer.java
index 7ddf199..f73beba 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/TypedMessageBundleProducer.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/TypedMessageBundleProducer.java
@@ -18,14 +18,16 @@
*/
package org.apache.deltaspike.core.impl.message;
-import static org.apache.deltaspike.core.impl.message.ProxyUtils.createMessageBundleProxy;
import static org.apache.deltaspike.core.util.ReflectionUtils.getRawType;
import java.io.Serializable;
+import java.lang.reflect.Proxy;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
+import org.apache.deltaspike.core.util.ClassUtils;
+
/**
* The <code>TypedMessageBundleProducer</code> provides a producer method for
* injected typed message bundles.
@@ -41,4 +43,10 @@ class TypedMessageBundleProducer implements Serializable
{
return createMessageBundleProxy(getRawType(injectionPoint.getType()));
}
+
+ private <T> T createMessageBundleProxy(Class<T> type)
+ {
+ return type.cast(Proxy.newProxyInstance(ClassUtils.getClassLoader(null),
+ new Class<?>[]{type}, new MessageBundleInvocationHandler()));
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c75903ac/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
index 24a52e4..6e85aa1 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
@@ -86,8 +86,8 @@ public class MessageContextTest
String messageText = messageContext.config()
.use()
- .localeResolver(localeResolver)
- .messageResolver(new TestMessageResolver(localeResolver))
+ .localeResolver(localeResolver)
+ .messageResolver(new TestMessageResolver(localeResolver))
.create().message().text("{hello}").toText();
assertEquals("test message", messageText);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c75903ac/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessage.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessage.java
index e77805f..b72ce04 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessage.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessage.java
@@ -31,4 +31,7 @@ public interface SimpleMessage
@MessageTemplate("Welcome to %s")
Message welcomeTo(MessageContext messageContext, String name);
+
+ @MessageTemplate("Welcome to %s")
+ String simpleText(String name);
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c75903ac/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
index b258075..96e75f6 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
@@ -71,5 +71,6 @@ public class SimpleMessageTest
public void testSimpleMessage()
{
assertEquals("Welcome to DeltaSpike", simpleMessage.welcomeToDeltaSpike());
+ //X assertEquals("Welcome to DeltaSpike", simpleMessage.simpleText("DeltaSpike"));
}
}