From f166400869d562d9471b4564ae657fbb67f2b094 Mon Sep 17 00:00:00 2001
From: Terekhin Alexander <aterekhin@bcc.ru>
Date: Wed, 16 Sep 2020 18:46:11 +0300
Subject: [PATCH] Schema annotaions in code

---
 src/main/java/me/bearns/fias/domain/Addrobj.java |  2 --
 src/main/java/me/bearns/fias/domain/House.java   | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/me/bearns/fias/domain/Addrobj.java b/src/main/java/me/bearns/fias/domain/Addrobj.java
index 676a39d..3e17bc0 100644
--- a/src/main/java/me/bearns/fias/domain/Addrobj.java
+++ b/src/main/java/me/bearns/fias/domain/Addrobj.java
@@ -15,7 +15,6 @@ import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.Objects;
 import java.util.UUID;
 
 @EqualsAndHashCode
@@ -42,7 +41,6 @@ public class Addrobj implements Serializable {
     //@Type(type="uuid-char")
     @Column(name = "aoid")
     @XmlAttribute(name = "AOID", required = true)
-    @ManyToMany
     public UUID aoid;
 
     //@Type(type="uuid-char")
diff --git a/src/main/java/me/bearns/fias/domain/House.java b/src/main/java/me/bearns/fias/domain/House.java
index 1a1d212..20dcd3a 100644
--- a/src/main/java/me/bearns/fias/domain/House.java
+++ b/src/main/java/me/bearns/fias/domain/House.java
@@ -43,9 +43,9 @@ public class House implements Serializable {
     //@Type(type="uuid-char")
     @XmlAttribute(name = "AOGUID", required = true)
     //@Column(name = "aoguid")
-    @ManyToMany
-    @JoinColumn(name = "aoguid")
-    public UUID aoguid;
+    @ManyToOne(targetEntity = Addrobj.class)
+    @JoinColumn(name = "aoguid", referencedColumnName = "aoguid")
+    public Addrobj aoguid;
 
     //@Type(type="uuid-char")
     @XmlAttribute(name = "HOUSEGUID", required = true)
@@ -98,12 +98,12 @@ public class House implements Serializable {
     @XmlAttribute(name = "DIVTYPE", required = true)
     protected int divtype;
 
-    public House aoguid(String aoguid) {
+/*    public House aoguid(String aoguid) {
         this.aoguid = UUID.fromString(aoguid);
         return this;
-    }
+    }*/
 
-    public void setAoguid(UUID aoguid) {
+    public void setAoguid(Addrobj aoguid) {
         this.aoguid = aoguid;
     }