You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jg...@apache.org on 2012/09/10 17:52:03 UTC
svn commit: r1382953 - in /openjpa/branches/2.1.x:
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/
openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entitymanagerfactory/
openjpa-persistence...
Author: jgrassel
Date: Mon Sep 10 15:52:02 2012
New Revision: 1382953
URL: http://svn.apache.org/viewvc?rev=1382953&view=rev
Log:
OPENJPA-2260: Parenthesis-augmented parameters are improperly processed at EM level
Added:
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java (with props)
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entitymanagerfactory/
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entitymanagerfactory/META-INF/
Modified:
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
Added: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java?rev=1382953&view=auto
==============================================================================
--- openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java (added)
+++ openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java Mon Sep 10 15:52:02 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.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=1382953&r1=1382952&r2=1382953&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Mon Sep 10 15:52:02 2012
@@ -1826,7 +1826,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);
}
}
return value;