svn commit: r1383045 - in /openjpa/branches/2.2.x: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/ openjpa-persistence/src/main/java/org/apache/openjpa/persistence/

[jg...@apache.org]

Author: jgrassel
Date: Mon Sep 10 18:58:47 2012
New Revision: 1383045

URL: http://svn.apache.org/viewvc?rev=1383045&view=rev
Log:
OPENJPA-2260: Parenthesis-augmented parameters are improperly processed at EM level

Added:
    openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/
    openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java   (with props)
Modified:
    openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

Added: openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java?rev=1383045&view=auto
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java (added)
+++ openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java Mon Sep 10 18:58:47 2012
@@ -0,0 +1,79 @@
+/*
+ * 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.openjpa.persistence.entitymanager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+
+import org.apache.openjpa.persistence.EntityManagerImpl;
+import org.apache.openjpa.persistence.datacache.common.apps.PObject;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestEntityManagerConfiguration extends SingleEMFTestCase {
+    public void setUp() throws Exception {
+        super.setUp(PObject.class);
+    }
+    
+    public void testEMConfig001() {
+        Map propMap = new HashMap();
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertTrue(eml.getQuerySQLCache());
+    }
+    
+    public void testEMConfig002() {
+        Map propMap = new HashMap();
+        propMap.put("openjpa.jdbc.QuerySQLCache", "true(EnableStatistics=true)");
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertTrue(eml.getQuerySQLCache());
+    }
+    
+    public void testEMConfig003() {
+        Map propMap = new HashMap();
+        propMap.put("openjpa.jdbc.QuerySQLCache", "false");
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertFalse(eml.getQuerySQLCache());
+    }
+    
+    public void testEMConfig004() {
+        Map propMap = new HashMap();
+        propMap.put("openjpa.jdbc.QuerySQLCache", "false(EnableStatistics=true)");
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertFalse(eml.getQuerySQLCache());
+    }
+    
+    public void testEMConfig005() {
+        Map propMap = new HashMap();
+        propMap.put("openjpa.jdbc.QuerySQLCache", "notabool");
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertFalse(eml.getQuerySQLCache());
+    }
+}

Propchange: openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=1383045&r1=1383044&r2=1383045&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Mon Sep 10 18:58:47 2012
@@ -1853,7 +1853,12 @@ public class EntityManagerImpl
             if ("null".equals(value)) {
                 return null;
             } else {
-                return Strings.parse((String) value, targetType);
+                String val = (String) value;
+                int parenIndex = val.indexOf('(');
+                if (!String.class.equals(targetType) && (parenIndex > 0)) {
+                    val = val.substring(0, parenIndex);
+                }
+                return Strings.parse(val, targetType);
             } 
         } else if (value instanceof AutoDetachType) {
         	EnumSet<AutoDetachType> autoDetachFlags = EnumSet.noneOf(AutoDetachType.class);