svn commit: r1205227 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/test/java/org/apache/camel/impl/ components/camel-jpa/src/test/java/org/apache/camel/component/jpa/

[cm...@apache.org]

Author: cmueller
Date: Tue Nov 22 23:17:41 2011
New Revision: 1205227

URL: http://svn.apache.org/viewvc?rev=1205227&view=rev
Log:
CAMEL-4362: Bug in parsing of JPA uri

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java
    camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=1205227&r1=1205226&r2=1205227&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java Tue Nov 22 23:17:41 2011
@@ -78,7 +78,7 @@ public abstract class DefaultComponent e
             path = path.substring(2);
         }
         int idx = path.indexOf('?');
-        if (idx > 0) {
+        if (idx > -1) {
             path = path.substring(0, idx);
         }
         Map<String, Object> parameters = URISupport.parseParameters(u);

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java?rev=1205227&r1=1205226&r2=1205227&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java Tue Nov 22 23:17:41 2011
@@ -96,6 +96,22 @@ public class DefaultComponentReferencePr
         return jndi;
     }
 
+    public void testEmptyPath() throws Exception {
+        DefaultComponent component = new DefaultComponent(context) {
+            @Override
+            protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+                assertEquals("foo://?name=Christian", uri);
+                assertEquals("", remaining);
+                assertEquals(1, parameters.size());
+                assertEquals("Christian", parameters.get("name"));
+                
+                return null;
+            }
+            
+        };
+        component.createEndpoint("foo://?name=Christian");
+    }
+    
     public void testOnlyStringSetter() throws Exception {
         MyComponent component = new MyComponent(context);
         MyEndpoint endpoint = (MyEndpoint) component.createEndpoint("foo://?name=Claus");

Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java?rev=1205227&r1=1205226&r2=1205227&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java Tue Nov 22 23:17:41 2011
@@ -38,6 +38,7 @@ public class JpaComponentTest extends Ca
 
         JpaEndpoint jpa = (JpaEndpoint) comp.createEndpoint("jpa://" + SendEmail.class.getName());
         assertNotNull(jpa);
+        assertNotNull(jpa.getEntityType());
     }
 
     @Test
@@ -59,6 +60,30 @@ public class JpaComponentTest extends Ca
 
         JpaEndpoint jpa = (JpaEndpoint) comp.createEndpoint("jpa://" + SendEmail.class.getName());
         assertNotNull(jpa);
+        assertNotNull(jpa.getEntityType());
+    }
+    
+    @Test
+    public void testJpaComponentWithPath() throws Exception {
+        JpaComponent comp = new JpaComponent();
+        comp.setCamelContext(context);
+        assertNull(comp.getEntityManagerFactory());
+        assertNull(comp.getTransactionManager());
+
+        JpaEndpoint jpa = (JpaEndpoint) comp.createEndpoint("jpa://" + SendEmail.class.getName() + "?persistenceUnit=journalPersistenceUnit&usePersist=true");
+        assertNotNull(jpa);
+        assertNotNull(jpa.getEntityType());
     }
 
+    @Test
+    public void testJpaComponentEmptyPath() throws Exception {
+        JpaComponent comp = new JpaComponent();
+        comp.setCamelContext(context);
+        assertNull(comp.getEntityManagerFactory());
+        assertNull(comp.getTransactionManager());
+
+        JpaEndpoint jpa = (JpaEndpoint) comp.createEndpoint("jpa:?persistenceUnit=journalPersistenceUnit&usePersist=true");
+        assertNotNull(jpa);
+        assertNull(jpa.getEntityType());
+    }
 }