didinst/fias
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Schema annotaions in code

Browse Source
This commit is contained in:
Terekhin Alexander
2020-09-16 18:46:11 +03:00
parent fbd8d9fc34
commit f166400869
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/bearns/fias/domain/Addrobj.java
-2
View File
@@ -15,7 +15,6 @@ import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.Objects;
import java.util.UUID; import java.util.UUID;
@EqualsAndHashCode @EqualsAndHashCode
@@ -42,7 +41,6 @@ public class Addrobj implements Serializable {
//@Type(type="uuid-char") //@Type(type="uuid-char")
@Column(name = "aoid") @Column(name = "aoid")
@XmlAttribute(name = "AOID", required = true) @XmlAttribute(name = "AOID", required = true)
@ManyToMany
public UUID aoid; public UUID aoid;
//@Type(type="uuid-char") //@Type(type="uuid-char")
src/main/java/me/bearns/fias/domain/House.java
+6 -6
View File
@@ -43,9 +43,9 @@ public class House implements Serializable {
//@Type(type="uuid-char") //@Type(type="uuid-char")
@XmlAttribute(name = "AOGUID", required = true) @XmlAttribute(name = "AOGUID", required = true)
//@Column(name = "aoguid") //@Column(name = "aoguid")
@ManyToMany @ManyToOne(targetEntity = Addrobj.class)
@JoinColumn(name = "aoguid") @JoinColumn(name = "aoguid", referencedColumnName = "aoguid")
public UUID aoguid; public Addrobj aoguid;
//@Type(type="uuid-char") //@Type(type="uuid-char")
@XmlAttribute(name = "HOUSEGUID", required = true) @XmlAttribute(name = "HOUSEGUID", required = true)
@@ -98,12 +98,12 @@ public class House implements Serializable {
@XmlAttribute(name = "DIVTYPE", required = true) @XmlAttribute(name = "DIVTYPE", required = true)
protected int divtype; protected int divtype;
public House aoguid(String aoguid) { /* public House aoguid(String aoguid) {
this.aoguid = UUID.fromString(aoguid); this.aoguid = UUID.fromString(aoguid);
return this; return this;
} }*/
public void setAoguid(UUID aoguid) { public void setAoguid(Addrobj aoguid) {
this.aoguid = aoguid; this.aoguid = aoguid;
} }