Repository: juddi Updated Branches: refs/heads/master 776d9081d -> ed1692d1c
JUDDI-946 Incorrect annotation on JPA entity classes, applying user submitted patch Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/ed1692d1 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/ed1692d1 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/ed1692d1 Branch: refs/heads/master Commit: ed1692d1ccddaa564c5bd361bb0877384be4fedb Parents: 776d908 Author: Alex <[email protected]> Authored: Sat Dec 5 19:20:43 2015 -0500 Committer: Alex <[email protected]> Committed: Sat Dec 5 19:20:43 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/juddi/model/TempKey.java | 102 ++++++------ .../org/apache/juddi/model/TransferToken.java | 157 +++++++++---------- 2 files changed, 126 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/ed1692d1/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java b/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java index 33f1927..398b957 100644 --- a/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java +++ b/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java @@ -1,52 +1,52 @@ -package org.apache.juddi.model; -/* - * Copyright 2001-2008 The Apache Software Foundation. - * - * Licensed 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.juddi.model; +/* + * Copyright 2001-2008 The Apache Software Foundation. + * + * Licensed 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. + */ + +import javax.persistence.EmbeddedId; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @author <a href="mailto:[email protected]";>Kurt Stam</a> + */ +@Entity +@Table(name = "j3_temp_key") +public class TempKey implements java.io.Serializable { + + private static final long serialVersionUID = -2763025628473227781L; + + private TempKeyPK pk; + + public TempKey(){ + } -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * @author <a href="mailto:[email protected]";>Kurt Stam</a> - */ -@Entity -@Table(name = "j3_temp_key") -public class TempKey implements java.io.Serializable { - - private static final long serialVersionUID = -2763025628473227781L; - - private TempKeyPK pk; - - public TempKey(){ - } - - @Id - public TempKeyPK getPk() { - return pk; - } - - public void setPk(TempKeyPK pk) { - this.pk = pk; - } - - public void setPk(String txId, String entityKey) { - TempKeyPK pk = new TempKeyPK(); - pk.setEntityKey(entityKey); - pk.setTxId(txId); - this.pk = pk; - } - -} + @EmbeddedId + public TempKeyPK getPk() { + return pk; + } + + public void setPk(TempKeyPK pk) { + this.pk = pk; + } + + public void setPk(String txId, String entityKey) { + TempKeyPK pk = new TempKeyPK(); + pk.setEntityKey(entityKey); + pk.setTxId(txId); + this.pk = pk; + } + +} http://git-wip-us.apache.org/repos/asf/juddi/blob/ed1692d1/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java b/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java index f98acab..39e6cb7 100644 --- a/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java +++ b/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java @@ -1,82 +1,75 @@ -/* - * Copyright 2001-2008 The Apache Software Foundation. - * - * Licensed 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.juddi.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; - -/** - * @author <a href="mailto:[email protected]";>Jeff Faath</a> - */ -@Entity -@Table(name = "j3_transfer_token") -public class TransferToken implements java.io.Serializable{ - - private static final long serialVersionUID = -7361461730400118274L; - private String transferToken; - private Date expirationDate; - protected List<TransferTokenKey> transferKeys = new ArrayList<TransferTokenKey>(0); - - public TransferToken() { - } - - public TransferToken(String transferToken, Date expirationDate, - List<TransferTokenKey> transferKeys) { - this.transferToken = transferToken; - this.expirationDate = expirationDate; - this.transferKeys = transferKeys; - } - - @Id - @Column(name = "transfer_token", nullable = false, length = 51) - public String getTransferToken() { - return transferToken; - } - public void setTransferToken(String transferToken) { - this.transferToken = transferToken; - } - - @Column(name="expiration_date", nullable = false, updatable = false) - public Date getExpirationDate() { - return expirationDate; - } - public void setExpirationDate(Date expirationDate) { - this.expirationDate = expirationDate; - } - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "transferToken") - @OrderBy - public List<TransferTokenKey> getTransferKeys() { - return transferKeys; - } - public void setTransferKeys(List<TransferTokenKey> transferKeys) { - this.transferKeys = transferKeys; - } - - -} +/* + * Copyright 2001-2008 The Apache Software Foundation. + * + * Licensed 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.juddi.model; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author <a href="mailto:[email protected]";>Jeff Faath</a> + */ +@Entity +@Table(name = "j3_transfer_token") +public class TransferToken implements java.io.Serializable{ + + private static final long serialVersionUID = -7361461730400118274L; + private String transferToken; + private Date expirationDate; + protected List<TransferTokenKey> transferKeys = new ArrayList<TransferTokenKey>(0); + + public TransferToken() { + } + + public TransferToken(String transferToken, Date expirationDate, + List<TransferTokenKey> transferKeys) { + this.transferToken = transferToken; + this.expirationDate = expirationDate; + this.transferKeys = transferKeys; + } + + @Id + @Column(name = "transfer_token", nullable = false, length = 51) + public String getTransferToken() { + return transferToken; + } + public void setTransferToken(String transferToken) { + this.transferToken = transferToken; + } + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="expiration_date", nullable = false, updatable = false) + public Date getExpirationDate() { + return expirationDate; + } + public void setExpirationDate(Date expirationDate) { + this.expirationDate = expirationDate; + } + + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "transferToken") + @OrderBy + public List<TransferTokenKey> getTransferKeys() { + return transferKeys; + } + public void setTransferKeys(List<TransferTokenKey> transferKeys) { + this.transferKeys = transferKeys; + } + + +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
