You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2011/03/21 20:22:14 UTC
svn commit: r1083912 - in
/cayenne/main/trunk/framework/cayenne-lifecycle/src:
main/java/org/apache/cayenne/lifecycle/uuid/UuidCoder.java
test/java/org/apache/cayenne/lifecycle/ref/
test/java/org/apache/cayenne/lifecycle/ref/ReferenceableHandlerTest.java
Author: aadamchik
Date: Mon Mar 21 19:22:13 2011
New Revision: 1083912
URL: http://svn.apache.org/viewvc?rev=1083912&view=rev
Log:
CAY-1547 cayenne-lifecycle: support for setting UuidRelationships
support for UUID built from replacement ID
Added:
cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/ref/
cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/ref/ReferenceableHandlerTest.java
Modified:
cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/uuid/UuidCoder.java
Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/uuid/UuidCoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/uuid/UuidCoder.java?rev=1083912&r1=1083911&r2=1083912&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/uuid/UuidCoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/uuid/UuidCoder.java Mon Mar 21 19:22:13 2011
@@ -94,7 +94,7 @@ public class UuidCoder {
public String toUuid(ObjectId id) {
- if (id.isTemporary()) {
+ if (id.isTemporary() && !id.isReplacementIdAttached()) {
throw new IllegalArgumentException(
"Can't create UUID for a temporary ObjectId");
}
Added: cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/ref/ReferenceableHandlerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/ref/ReferenceableHandlerTest.java?rev=1083912&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/ref/ReferenceableHandlerTest.java (added)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/ref/ReferenceableHandlerTest.java Mon Mar 21 19:22:13 2011
@@ -0,0 +1,78 @@
+/*****************************************************************
+ * 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.lifecycle.ref;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.configuration.server.ServerRuntime;
+import org.apache.cayenne.lifecycle.db.E1;
+
+public class ReferenceableHandlerTest extends TestCase {
+
+ private ServerRuntime runtime;
+
+ @Override
+ protected void setUp() throws Exception {
+ runtime = new ServerRuntime("cayenne-lifecycle.xml");
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ runtime.shutdown();
+ }
+
+ public void testGetUuid() {
+ ReferenceableHandler handler = new ReferenceableHandler(runtime
+ .getChannel()
+ .getEntityResolver());
+
+ E1 e1 = new E1();
+ e1.setObjectId(new ObjectId("E1", "ID", 5));
+ assertEquals("E1:5", handler.getUuid(e1));
+ }
+
+ public void testGetUuid_TempException() {
+ ReferenceableHandler handler = new ReferenceableHandler(runtime
+ .getChannel()
+ .getEntityResolver());
+
+ E1 e1 = new E1();
+ e1.setObjectId(new ObjectId("E1"));
+
+ try {
+ handler.getUuid(e1);
+ }
+ catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ public void testGetUuid_TempWithReplacement() {
+ ReferenceableHandler handler = new ReferenceableHandler(runtime
+ .getChannel()
+ .getEntityResolver());
+
+ E1 e1 = new E1();
+ e1.setObjectId(new ObjectId("E1"));
+ e1.getObjectId().getReplacementIdMap().put("ID", 6);
+
+ assertEquals("E1:6", handler.getUuid(e1));
+ }
+}