You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/03/04 18:22:15 UTC
svn commit: r1078062 - in /camel/trunk:
components/camel-servlet/src/main/java/org/apache/camel/component/servlet/
tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/
Author: cschneider
Date: Fri Mar 4 17:22:14 2011
New Revision: 1078062
URL: http://svn.apache.org/viewvc?rev=1078062&view=rev
Log:
CAMEL-3549 Some fixes according to the review by cibsen
Added:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java
- copied, changed from r1078028, camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistryImpl.java
Removed:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistryImpl.java
Modified:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml
Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java?rev=1078062&r1=1078061&r2=1078062&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java Fri Mar 4 17:22:14 2011
@@ -38,23 +38,23 @@ public class CamelHttpTransportServlet e
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
- this.setServletName(config.getServletName());
if (httpRegistry == null) {
- httpRegistry = HttpRegistryImpl.getSingletonHttpRegistry();
+ httpRegistry = DefaultHttpRegistry.getSingletonHttpRegistry();
}
httpRegistry.register(this);
- LOG.info("Initialized CamelHttpTransportServlet[" + getServletName() + "]");
+ LOG.info("Initialized CamelHttpTransportServlet[{}]", getServletName());
}
@Override
public void destroy() {
httpRegistry.unregister(this);
- LOG.info("Destroyed CamelHttpTransportServlet[" + getServletName() + "]");
+ LOG.info("Destroyed CamelHttpTransportServlet[{}]", getServletName());
}
private ServletEndpoint getServletEndpoint(HttpConsumer consumer) {
if (!(consumer.getEndpoint() instanceof ServletEndpoint)) {
- throw new RuntimeException("Invalid consumer type. Must be ServletEndpoint");
+ throw new RuntimeException("Invalid consumer type. Must be ServletEndpoint but is "
+ + consumer.getClass().getName());
}
return (ServletEndpoint)consumer.getEndpoint();
}
Copied: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java (from r1078028, camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistryImpl.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java?p2=camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java&p1=camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistryImpl.java&r1=1078028&r2=1078062&rev=1078062&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/HttpRegistryImpl.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java Fri Mar 4 17:22:14 2011
@@ -28,15 +28,15 @@ import org.apache.camel.component.http.H
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class HttpRegistryImpl implements HttpRegistry {
- private static final transient Logger LOG = LoggerFactory.getLogger(HttpRegistryImpl.class);
+public class DefaultHttpRegistry implements HttpRegistry {
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultHttpRegistry.class);
private static HttpRegistry singleton;
- private Set<HttpConsumer> consumers;
- private Set<CamelServlet> providers;
+ private final Set<HttpConsumer> consumers;
+ private final Set<CamelServlet> providers;
- public HttpRegistryImpl() {
+ public DefaultHttpRegistry() {
consumers = new HashSet<HttpConsumer>();
providers = new HashSet<CamelServlet>();
}
@@ -48,7 +48,7 @@ public class HttpRegistryImpl implements
*/
public static synchronized HttpRegistry getSingletonHttpRegistry() {
if (singleton == null) {
- singleton = new HttpRegistryImpl();
+ singleton = new DefaultHttpRegistry();
}
return singleton;
}
@@ -58,7 +58,8 @@ public class HttpRegistryImpl implements
*/
@Override
public void register(HttpConsumer consumer) {
- LOG.debug("Registering consumer for path" + consumer.getPath() + " providers present: " + providers.size());
+ LOG.debug("Registering consumer for path {} providers present: {}",
+ consumer.getPath(), providers.size());
consumers.add(consumer);
for (CamelServlet provider : providers) {
provider.connect(consumer);
@@ -70,7 +71,7 @@ public class HttpRegistryImpl implements
*/
@Override
public void unregister(HttpConsumer consumer) {
- LOG.debug("Unregistering consumer for path " + consumer.getPath());
+ LOG.debug("Unregistering consumer for path {} ", consumer.getPath());
consumers.remove(consumer);
for (CamelServlet provider : providers) {
provider.disconnect(consumer);
@@ -79,7 +80,7 @@ public class HttpRegistryImpl implements
@SuppressWarnings("rawtypes")
public void register(CamelServlet provider, Map properties) {
- LOG.debug("Registering provider through OSGi service listener " + properties);
+ LOG.debug("Registering provider through OSGi service listener {}", properties);
if (provider instanceof CamelServlet) {
CamelServlet camelServlet = (CamelServlet)provider;
camelServlet.setServletName((String) properties.get("servlet-name"));
@@ -98,7 +99,8 @@ public class HttpRegistryImpl implements
*/
@Override
public void register(CamelServlet provider) {
- LOG.debug("Registering CamelServlet with name " + provider.getServletName() + " consumers present: " + consumers.size());
+ LOG.debug("Registering CamelServlet with name {} consumers present: {}",
+ provider.getServletName(), consumers.size());
providers.add(provider);
for (HttpConsumer consumer : consumers) {
provider.connect(consumer);
Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java?rev=1078062&r1=1078061&r2=1078062&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java Fri Mar 4 17:22:14 2011
@@ -59,7 +59,7 @@ public class ServletComponent extends Ht
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
if (httpRegistry == null) {
- httpRegistry = HttpRegistryImpl.getSingletonHttpRegistry();
+ httpRegistry = DefaultHttpRegistry.getSingletonHttpRegistry();
}
uri = uri.startsWith("servlet:") ? remaining : uri;
Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml?rev=1078062&r1=1078061&r2=1078062&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml Fri Mar 4 17:22:14 2011
@@ -31,7 +31,7 @@
</osgi:listener>
</osgi:reference>
- <bean id="httpRegistry" class="org.apache.camel.component.servlet.HttpRegistryImpl"/>
+ <bean id="httpRegistry" class="org.apache.camel.component.servlet.DefaultHttpRegistry"/>
<bean id="servlet" class="org.apache.camel.component.servlet.ServletComponent">
<property name="httpRegistry" ref="httpRegistry" />