Merge branch 'tests' into 'dev'

Code smells fix

See merge request sa4-2020/the-sanmarinoes/backend!173
This commit is contained in:
Claudio Maggioni 2020-05-23 23:40:38 +02:00
commit f3b0f65499

View file

@ -5,11 +5,9 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import javax.persistence.*; import javax.persistence.*;
import lombok.EqualsAndHashCode;
/** A device that can be turned either on or off */ /** A device that can be turned either on or off */
@Entity @Entity
@EqualsAndHashCode(callSuper = false)
@Inheritance(strategy = InheritanceType.JOINED) @Inheritance(strategy = InheritanceType.JOINED)
public abstract class Switchable extends OutputDevice { public abstract class Switchable extends OutputDevice {
@ -23,7 +21,6 @@ public abstract class Switchable extends OutputDevice {
}) })
@GsonExclude @GsonExclude
@SocketGsonExclude @SocketGsonExclude
@EqualsAndHashCode.Exclude
private Set<Switch> inputs = new HashSet<>(); private Set<Switch> inputs = new HashSet<>();
protected Switchable(String kind) { protected Switchable(String kind) {