cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r705985 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/access/types/ test/java/org/apache/art/ test/java/org/apache/art/auto/ test/java/org/apache/cayenne/access/
Date Sun, 19 Oct 2008 11:48:11 GMT
Author: aadamchik
Date: Sun Oct 19 04:48:11 2008
New Revision: 705985

URL: http://svn.apache.org/viewvc?rev=705985&view=rev
Log:
CAY-1123 Add UUID support

Added:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/UUIDType.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/UuidTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/auto/_UuidTestEntity.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UUIDTest.java

Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/UUIDType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/UUIDType.java?rev=705985&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/UUIDType.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/UUIDType.java
Sun Oct 19 04:48:11 2008
@@ -0,0 +1,102 @@
+/*****************************************************************
+ *   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.cayenne.access.types;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.UUID;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.validation.ValidationResult;
+
+/**
+ * An ExtendedType to map Java UUIDs as persistent attributes.
+ * 
+ * @since 3.0
+ */
+public class UUIDType implements ExtendedType {
+
+    public String getClassName() {
+        return UUID.class.getName();
+    }
+
+    public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
+        String uuid = rs.getString(index);
+        if (uuid == null) {
+            return null;
+        }
+
+        try {
+            return UUID.fromString(uuid);
+        }
+        catch (IllegalArgumentException e) {
+            throw new CayenneRuntimeException("Invalid UUID value: " + uuid, e);
+        }
+    }
+
+    public Object materializeObject(CallableStatement rs, int index, int type)
+            throws Exception {
+
+        String uuid = rs.getString(index);
+        if (uuid == null) {
+            return null;
+        }
+
+        try {
+            return UUID.fromString(uuid);
+        }
+        catch (IllegalArgumentException e) {
+            throw new CayenneRuntimeException("Invalid UUID value: " + uuid, e);
+        }
+    }
+
+    public void setJdbcObject(
+            PreparedStatement statement,
+            Object value,
+            int pos,
+            int type,
+            int scale) throws Exception {
+
+        if (value == null) {
+            statement.setNull(pos, type);
+        }
+        else if (value instanceof UUID) {
+            statement.setObject(pos, value);
+        }
+        else {
+            throw new IllegalArgumentException("Expected java.util.UUID, got "
+                    + value.getClass().getName());
+        }
+    }
+
+    /**
+     * @deprecated since 3.0
+     */
+    public boolean validateProperty(
+            Object source,
+            String property,
+            Object value,
+            DbAttribute dbAttribute,
+            ValidationResult validationResult) {
+        return true;
+    }
+
+}

Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/UuidTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/UuidTestEntity.java?rev=705985&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/UuidTestEntity.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/UuidTestEntity.java
Sun Oct 19 04:48:11 2008
@@ -0,0 +1,7 @@
+package org.apache.art;
+
+import org.apache.art.auto._UuidTestEntity;
+
+public class UuidTestEntity extends _UuidTestEntity {
+
+}

Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/auto/_UuidTestEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/auto/_UuidTestEntity.java?rev=705985&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/auto/_UuidTestEntity.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/auto/_UuidTestEntity.java
Sun Oct 19 04:48:11 2008
@@ -0,0 +1,26 @@
+package org.apache.art.auto;
+
+import java.util.UUID;
+
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _UuidTestEntity was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _UuidTestEntity extends CayenneDataObject {
+
+    public static final String UUID_PROPERTY = "uuid";
+
+    public static final String ID_PK_COLUMN = "ID";
+
+    public void setUuid(UUID uuid) {
+        writeProperty("uuid", uuid);
+    }
+    public UUID getUuid() {
+        return (UUID)readProperty("uuid");
+    }
+
+}

Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UUIDTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UUIDTest.java?rev=705985&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UUIDTest.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UUIDTest.java
Sun Oct 19 04:48:11 2008
@@ -0,0 +1,53 @@
+/*****************************************************************
+ *   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.cayenne.access;
+
+import java.util.UUID;
+
+import org.apache.art.UuidTestEntity;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.unit.CayenneCase;
+
+public class UUIDTest extends CayenneCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        deleteTestData();
+    }
+
+    public void testUUID() throws Exception {
+
+        ObjectContext context = createDataContext();
+        UuidTestEntity test = context.newObject(UuidTestEntity.class);
+
+        UUID id = UUID.randomUUID();
+        test.setUuid(id);
+        context.commitChanges();
+
+        SelectQuery q = new SelectQuery(UuidTestEntity.class);
+        UuidTestEntity testRead = (UuidTestEntity) context.performQuery(q).get(0);
+        assertNotNull(testRead.getUuid());
+        assertEquals(id, testRead.getUuid());
+
+        test.setUuid(null);
+        context.commitChanges();
+    }
+}



Mime
View raw message