Author: mikedd
Date: Fri Jul 23 19:06:25 2010
New Revision: 967205
URL: http://svn.apache.org/viewvc?rev=967205&view=rev
Log:
OPENJPA-1738: setting eol-style native
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java
(contents, props changed)
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java
(contents, props changed)
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java
(contents, props changed)
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java?rev=967205&r1=967204&r2=967205&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java
Fri Jul 23 19:06:25 2010
@@ -1,73 +1,73 @@
-/*
- * 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.jdbc.sqlcache;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * Child in a bidirectional parent-child relationship.
- *
- * Notes:
- * a) there is no mutator for id because it is generated by JPA provider.
- *
- */
-...@entity
-...@table(name="zchild")
-public class Child {
- @Id
- @GeneratedValue
- private String id;
-
- private String name;
-
- @ManyToOne(fetch=FetchType.LAZY)
- private Parent parent;
-
- /**
- * Restrict access to constructor for Parent to create the Child.
- */
- public Child() {
-
- }
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String city) {
- this.name = city;
- }
-
- public Parent getParent() {
- return parent;
- }
-
- void setParent(Parent owner) {
- this.parent = owner;
- }
-}
+/*
+ * 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.jdbc.sqlcache;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * Child in a bidirectional parent-child relationship.
+ *
+ * Notes:
+ * a) there is no mutator for id because it is generated by JPA provider.
+ *
+ */
+...@entity
+...@table(name="zchild")
+public class Child {
+ @Id
+ @GeneratedValue
+ private String id;
+
+ private String name;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ private Parent parent;
+
+ /**
+ * Restrict access to constructor for Parent to create the Child.
+ */
+ public Child() {
+
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String city) {
+ this.name = city;
+ }
+
+ public Parent getParent() {
+ return parent;
+ }
+
+ void setParent(Parent owner) {
+ this.parent = owner;
+ }
+}
Propchange:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Child.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java?rev=967205&r1=967204&r2=967205&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java
Fri Jul 23 19:06:25 2010
@@ -1,119 +1,119 @@
-/*
- * 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.jdbc.sqlcache;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-/**
- * Parent in a bidirectional parent-child relationship.
- *
- * Note:
- * a) there is no mutator for id because it is generated by JPA provider.
- *
- */
-...@entity
-...@idclass(ParentId.class)
-...@table(name="zparent")
-public class Parent {
- @Id
- private long id;
- @Id
- private String name;
- @Id
- @OneToOne(cascade = CascadeType.ALL)
- @JoinColumn(name="addrid")
- private Address addrId;
-
- /**
- * This field is mapped by the child. The child's table will hold a foreign
- * key linking to the primary key of this Parent's table. In JPA
- * terminology, that makes the Child the owner of this bi-directional
- * relationship.
- */
- @OneToMany(mappedBy="parent", cascade = CascadeType.ALL)
- private Collection<Child> children;
-
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setAddrId(Address addr) {
- this.addrId = addr;
- }
-
- public Address getAddrId() {
- return addrId;
- }
-
- public Collection<Child> getChildren() {
- return children;
- }
-
- /**
- * Creates and adds a child to this receiver. Creating child via the parent
- * is the preferred pattern to ensure referential integrity of domain
model.
- */
- public Child newChild(String name) {
- Child child = new Child();
- child.setName(name);
- child.setParent(this);
- if (children == null)
- children = new ArrayList<Child>();
- children.add(child);
- return child;
- }
-
- public boolean removeChild(Child child) {
- return children != null && children.remove(child);
- }
-
- /**
- * Unsafe way of adding a child. Does not warranty referential integrity.
- * The caller has to ensure bi-directionality of parent-child relation is
- * consistent.
- */
- public void add(Child child) {
- if (children == null)
- children = new ArrayList<Child>();
- children.add(child);
- }
-}
+/*
+ * 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.jdbc.sqlcache;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+/**
+ * Parent in a bidirectional parent-child relationship.
+ *
+ * Note:
+ * a) there is no mutator for id because it is generated by JPA provider.
+ *
+ */
+...@entity
+...@idclass(ParentId.class)
+...@table(name="zparent")
+public class Parent {
+ @Id
+ private long id;
+ @Id
+ private String name;
+ @Id
+ @OneToOne(cascade = CascadeType.ALL)
+ @JoinColumn(name="addrid")
+ private Address addrId;
+
+ /**
+ * This field is mapped by the child. The child's table will hold a foreign
+ * key linking to the primary key of this Parent's table. In JPA
+ * terminology, that makes the Child the owner of this bi-directional
+ * relationship.
+ */
+ @OneToMany(mappedBy="parent", cascade = CascadeType.ALL)
+ private Collection<Child> children;
+
+
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setAddrId(Address addr) {
+ this.addrId = addr;
+ }
+
+ public Address getAddrId() {
+ return addrId;
+ }
+
+ public Collection<Child> getChildren() {
+ return children;
+ }
+
+ /**
+ * Creates and adds a child to this receiver. Creating child via the parent
+ * is the preferred pattern to ensure referential integrity of domain
model.
+ */
+ public Child newChild(String name) {
+ Child child = new Child();
+ child.setName(name);
+ child.setParent(this);
+ if (children == null)
+ children = new ArrayList<Child>();
+ children.add(child);
+ return child;
+ }
+
+ public boolean removeChild(Child child) {
+ return children != null && children.remove(child);
+ }
+
+ /**
+ * Unsafe way of adding a child. Does not warranty referential integrity.
+ * The caller has to ensure bi-directionality of parent-child relation is
+ * consistent.
+ */
+ public void add(Child child) {
+ if (children == null)
+ children = new ArrayList<Child>();
+ children.add(child);
+ }
+}
Propchange:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java?rev=967205&r1=967204&r2=967205&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java
Fri Jul 23 19:06:25 2010
@@ -1,83 +1,83 @@
-/*
- * 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.jdbc.sqlcache;
-
-public class ParentId implements java.io.Serializable {
- private static final long serialVersionUID = 4262907482129342511L;
-
- private long id;
- private String name;
- private long addrId;
-
- private Integer hashcode = null;
-
- public ParentId() {
- }
-
- public long getId() {
- return id;
- }
-
- public void setiId(long id) {
- this.id = id;
- }
-
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public long getAddrId() {
- return addrId;
- }
-
- public void setAddrId(long addrId) {
- this.addrId = addrId;
- }
-
- public boolean equals(Object o) {
- if (o == this) {
- return true;
- }
-
- if (o instanceof ParentId) {
- ParentId oId = (ParentId) o;
- if ( oId.id == this.id &&
- oId.name.equals(this.name) &&
- oId.addrId == this.addrId) {
- return true;
- }
- }
-
- return false;
- }
-
- public int hashCode() {
- if (hashcode == null) {
- String hashStr = this.id + ":" + this.name + ":" + this.addrId;
- hashcode = hashStr.hashCode();
- }
- return hashcode.intValue();
- }
-
-}
+/*
+ * 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.jdbc.sqlcache;
+
+public class ParentId implements java.io.Serializable {
+ private static final long serialVersionUID = 4262907482129342511L;
+
+ private long id;
+ private String name;
+ private long addrId;
+
+ private Integer hashcode = null;
+
+ public ParentId() {
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public void setiId(long id) {
+ this.id = id;
+ }
+
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public long getAddrId() {
+ return addrId;
+ }
+
+ public void setAddrId(long addrId) {
+ this.addrId = addrId;
+ }
+
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+
+ if (o instanceof ParentId) {
+ ParentId oId = (ParentId) o;
+ if ( oId.id == this.id &&
+ oId.name.equals(this.name) &&
+ oId.addrId == this.addrId) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public int hashCode() {
+ if (hashcode == null) {
+ String hashStr = this.id + ":" + this.name + ":" + this.addrId;
+ hashcode = hashStr.hashCode();
+ }
+ return hashcode.intValue();
+ }
+
+}
Propchange:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java
------------------------------------------------------------------------------
svn:eol-style = native
