From 06dbd2bef0fee0df2d69176d53cbc6919dfa762a Mon Sep 17 00:00:00 2001 From: omenem Date: Sun, 26 Apr 2020 13:57:30 +0200 Subject: [PATCH] fix --- .../inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java | 3 --- .../usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java | 3 --- .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java index f52e5ca..fde9b3b 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java @@ -2,11 +2,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; @Entity -@Inheritance(strategy = InheritanceType.JOINED) public class BooleanTrigger extends Trigger { @Column(name = "switchable_on") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java index a03781d..db94966 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java @@ -3,12 +3,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import com.google.gson.annotations.SerializedName; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import javax.validation.constraints.NotNull; @Entity -@Inheritance(strategy = InheritanceType.JOINED) public class RangeTrigger extends Trigger { @Override diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java index 9caeaee..4e74b11 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java @@ -15,7 +15,7 @@ import javax.persistence.PreRemove; import javax.validation.constraints.NotNull; @Entity -@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) public abstract class Trigger { public abstract boolean triggered();