Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 71092 invoked from network); 28 Sep 2009 14:24:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Sep 2009 14:24:02 -0000 Received: (qmail 4795 invoked by uid 500); 28 Sep 2009 14:24:02 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 4771 invoked by uid 500); 28 Sep 2009 14:24:02 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 4762 invoked by uid 99); 28 Sep 2009 14:24:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Sep 2009 14:24:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Sep 2009 14:23:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 26420238897D; Mon, 28 Sep 2009 14:23:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r819549 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat: EntityC_U1M_Map_RelKey_FK.java Uni_1ToM_Map_RelKey_FK.java Date: Mon, 28 Sep 2009 14:23:37 -0000 To: commits@openjpa.apache.org From: mikedd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090928142337.26420238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikedd Date: Mon Sep 28 14:23:36 2009 New Revision: 819549 URL: http://svn.apache.org/viewvc?rev=819549&view=rev Log: OPENJPA-1253: Setting svn:eol-style = native Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java (contents, props changed) openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java (contents, props changed) Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java?rev=819549&r1=819548&r2=819549&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java Mon Sep 28 14:23:36 2009 @@ -1,61 +1,61 @@ -/* - * 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.compat; - -import java.util.List; - -import javax.persistence.*; - -@Entity -public class EntityC_U1M_Map_RelKey_FK { - - @Id - @GeneratedValue - private long id; - - private String name; - - public long getId() { - return id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int hashCode() { - return name.hashCode() + (int)id; - } - - public boolean equals(Object o) { - if (!(o instanceof EntityC_U1M_Map_RelKey_FK)) return false; - EntityC_U1M_Map_RelKey_FK c = (EntityC_U1M_Map_RelKey_FK)o; - if (!c.name.equals(name)) return false; - if (c.id != id) return false; - return true; - } - - public String toString() { - return id + name; - } -} +/* + * 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.compat; + +import java.util.List; + +import javax.persistence.*; + +@Entity +public class EntityC_U1M_Map_RelKey_FK { + + @Id + @GeneratedValue + private long id; + + private String name; + + public long getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int hashCode() { + return name.hashCode() + (int)id; + } + + public boolean equals(Object o) { + if (!(o instanceof EntityC_U1M_Map_RelKey_FK)) return false; + EntityC_U1M_Map_RelKey_FK c = (EntityC_U1M_Map_RelKey_FK)o; + if (!c.name.equals(name)) return false; + if (c.id != id) return false; + return true; + } + + public String toString() { + return id + name; + } +} Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java?rev=819549&r1=819548&r2=819549&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java Mon Sep 28 14:23:36 2009 @@ -1,97 +1,97 @@ -/* - * 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.compat; - -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.persistence.*; - -//non-default mapping -//Sec 11.1.36, Example 3: -// Unidirectional One-to-Many association using a foreign key mapping -// In Customer class: -// @OneToMany(orphanRemoval=true) -// @JoinColumn(name="CUST_ID") // join column is in table for Order -// public Set getOrders() {return orders;} - -@Entity -public class Uni_1ToM_Map_RelKey_FK { - - @Id - @GeneratedValue - private long id; - - private String name; - - @OneToMany(/*cascade = CascadeType.ALL,*/ fetch=FetchType.EAGER) - @JoinColumn(name="Uni1MFK_ID") - private Map entityCs = null; - - public long getId() { - return id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Map getEntityCs() { - return entityCs; - } - - public void setEntityCs(Map entityCs) { - this.entityCs = entityCs; - } - - public int hashCode() { - return name.hashCode(); - } - - public boolean equals(Object o) { - if (!(o instanceof Uni_1ToM_Map_RelKey_FK)) return false; - Uni_1ToM_Map_RelKey_FK b = (Uni_1ToM_Map_RelKey_FK)o; - if (!b.name.equals(name)) return false; - if (b.entityCs.size() != entityCs.size()) return false; - - Set coll = b.entityCs.keySet(); - for (EntityC cKey : coll) { - EntityC_U1M_Map_RelKey_FK val = (EntityC_U1M_Map_RelKey_FK)getValue(b.entityCs, cKey); - EntityC_U1M_Map_RelKey_FK val1 = (EntityC_U1M_Map_RelKey_FK)getValue(entityCs, cKey); - if (!val.equals(val1)) - return false; - } - return true; - } - - private Object getValue(Map map, Object mkey) { - Set entries = map.entrySet(); - for (Map.Entry entry : entries) { - if (entry.getKey().equals(mkey)) - return entry.getValue(); - } - return null; - } -} +/* + * 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.compat; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.persistence.*; + +//non-default mapping +//Sec 11.1.36, Example 3: +// Unidirectional One-to-Many association using a foreign key mapping +// In Customer class: +// @OneToMany(orphanRemoval=true) +// @JoinColumn(name="CUST_ID") // join column is in table for Order +// public Set getOrders() {return orders;} + +@Entity +public class Uni_1ToM_Map_RelKey_FK { + + @Id + @GeneratedValue + private long id; + + private String name; + + @OneToMany(/*cascade = CascadeType.ALL,*/ fetch=FetchType.EAGER) + @JoinColumn(name="Uni1MFK_ID") + private Map entityCs = null; + + public long getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Map getEntityCs() { + return entityCs; + } + + public void setEntityCs(Map entityCs) { + this.entityCs = entityCs; + } + + public int hashCode() { + return name.hashCode(); + } + + public boolean equals(Object o) { + if (!(o instanceof Uni_1ToM_Map_RelKey_FK)) return false; + Uni_1ToM_Map_RelKey_FK b = (Uni_1ToM_Map_RelKey_FK)o; + if (!b.name.equals(name)) return false; + if (b.entityCs.size() != entityCs.size()) return false; + + Set coll = b.entityCs.keySet(); + for (EntityC cKey : coll) { + EntityC_U1M_Map_RelKey_FK val = (EntityC_U1M_Map_RelKey_FK)getValue(b.entityCs, cKey); + EntityC_U1M_Map_RelKey_FK val1 = (EntityC_U1M_Map_RelKey_FK)getValue(entityCs, cKey); + if (!val.equals(val1)) + return false; + } + return true; + } + + private Object getValue(Map map, Object mkey) { + Set entries = map.entrySet(); + for (Map.Entry entry : entries) { + if (entry.getKey().equals(mkey)) + return entry.getValue(); + } + return null; + } +} Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java ------------------------------------------------------------------------------ svn:eol-style = native