Fixed some code smells
This commit is contained in:
parent
58a8b939fa
commit
1a289f6800
21 changed files with 55 additions and 13 deletions
|
@ -2,10 +2,12 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
|||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class BooleanCondition extends Condition<BooleanTriggerable> {
|
||||
|
||||
@Getter
|
||||
|
|
|
@ -17,6 +17,14 @@ public class ConfirmationToken {
|
|||
@Column(name = "confirmation_token", unique = true)
|
||||
private String confirmToken;
|
||||
|
||||
public Date getCreatedDate() {
|
||||
return new Date(createdDate.getTime());
|
||||
}
|
||||
|
||||
public void setCreatedDate(Date createdDate) {
|
||||
this.createdDate = new Date(createdDate.getTime());
|
||||
}
|
||||
|
||||
@Temporal(TemporalType.TIMESTAMP)
|
||||
private Date createdDate;
|
||||
|
||||
|
|
|
@ -7,10 +7,12 @@ import java.util.Set;
|
|||
import javax.persistence.*;
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.Min;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
|
||||
public class Dimmable extends Switchable implements RangeTriggerable {
|
||||
|
||||
|
@ -70,6 +72,7 @@ public class Dimmable extends Switchable implements RangeTriggerable {
|
|||
setIntensity(state.getIntensity());
|
||||
}
|
||||
|
||||
@Override
|
||||
public State cloneState() {
|
||||
final DimmableState newState = new DimmableState();
|
||||
newState.setDeviceId(getId());
|
||||
|
|
|
@ -5,9 +5,11 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
|
|||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import javax.persistence.*;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/** Represents a generic dimmer input device */
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
|
||||
public abstract class Dimmer extends InputDevice implements Connectable<Dimmable> {
|
||||
protected Dimmer(String kind) {
|
||||
|
@ -17,6 +19,7 @@ public abstract class Dimmer extends InputDevice implements Connectable<Dimmable
|
|||
@ManyToMany(cascade = CascadeType.DETACH)
|
||||
@GsonExclude
|
||||
@SocketGsonExclude
|
||||
@EqualsAndHashCode.Exclude
|
||||
@JoinTable(
|
||||
name = "dimmer_dimmable",
|
||||
joinColumns = @JoinColumn(name = "dimmer_id"),
|
||||
|
|
|
@ -2,12 +2,14 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
|||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* Represents a dimmer able to set absolute intensity values (i.e. knowing the absolute intensity
|
||||
* value, like a knob)
|
||||
*/
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class KnobDimmer extends Dimmer implements RangeTriggerable {
|
||||
|
||||
@Column private int intensity = 0;
|
||||
|
|
|
@ -2,11 +2,13 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
|||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/** Represents a motion sensor device */
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class MotionSensor extends InputDevice implements BooleanTriggerable {
|
||||
|
||||
@Getter
|
||||
|
|
|
@ -2,10 +2,12 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
|||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class RangeCondition extends Condition<RangeTriggerable> {
|
||||
|
||||
public RangeCondition() {
|
||||
|
|
|
@ -2,11 +2,13 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
|||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/** Represents a standard non-dimmable light */
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class RegularLight extends Switchable implements BooleanTriggerable {
|
||||
|
||||
/** Whether the light is on or not */
|
||||
|
|
|
@ -2,8 +2,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
|||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class SecurityCamera extends Switchable implements BooleanTriggerable {
|
||||
|
||||
public SecurityCamera() {
|
||||
|
|
|
@ -7,9 +7,11 @@ import javax.persistence.Column;
|
|||
import javax.persistence.Entity;
|
||||
import javax.persistence.EnumType;
|
||||
import javax.persistence.Enumerated;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/** A sensor input device that measures a quantity in a continuous scale (e.g. temperature) */
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class Sensor extends InputDevice implements RangeTriggerable {
|
||||
|
||||
public static final Map<SensorType, BigDecimal> TYPICAL_VALUES =
|
||||
|
|
|
@ -3,9 +3,11 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
|||
import java.math.BigDecimal;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/** A smart plug that can be turned either on or off */
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class SmartPlug extends Switchable implements BooleanTriggerable {
|
||||
|
||||
/** The average consumption of an active plug when on in Watt */
|
||||
|
|
|
@ -5,9 +5,11 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
|
|||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import javax.persistence.*;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/** A switch input device */
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class Switch extends InputDevice implements BooleanTriggerable, Connectable<Switchable> {
|
||||
|
||||
@ManyToMany(
|
||||
|
|
|
@ -5,9 +5,11 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
|
|||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import javax.persistence.*;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/** A device that can be turned either on or off */
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
public abstract class Switchable extends OutputDevice {
|
||||
|
||||
|
|
|
@ -5,9 +5,11 @@ import java.math.BigDecimal;
|
|||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Transient;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/** A thermostat capable of controlling cooling and heating. */
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class Thermostat extends Switchable implements BooleanTriggerable {
|
||||
|
||||
@Override
|
||||
|
|
|
@ -3,8 +3,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
|||
import com.google.gson.annotations.SerializedName;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Entity
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class ThermostatCondition extends Condition<Thermostat> {
|
||||
|
||||
public ThermostatCondition() {
|
||||
|
|
|
@ -66,7 +66,7 @@ public class DeviceService {
|
|||
a -> {
|
||||
final List<Condition<?>> conditions =
|
||||
conditionRepository.findAllByAutomationId(a.getId());
|
||||
if (conditions.size() == 0) return true;
|
||||
if (conditions.isEmpty()) return true;
|
||||
return conditions.stream().allMatch(Condition::triggered);
|
||||
})
|
||||
.map(Automation::getScenes)
|
||||
|
|
|
@ -15,6 +15,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
|
|||
import java.security.Principal;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
|
@ -186,6 +187,6 @@ public class AutomationControllerTests {
|
|||
old.setId(42L);
|
||||
old.setName("Old Name");
|
||||
doNothing().when(automationRepository).deleteById(42L);
|
||||
automationController.delete(42L);
|
||||
Assertions.assertDoesNotThrow(() -> automationController.delete(42L));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,6 +12,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
|
|||
import java.security.Principal;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
|
@ -93,6 +94,6 @@ public class SceneControllerTests {
|
|||
public void testDelete() {
|
||||
doNothing().when(stateStateRepository).deleteAllBySceneId(42L);
|
||||
doNothing().when(sceneRepository).deleteById(42L);
|
||||
sceneController.deleteById(42L);
|
||||
Assertions.assertDoesNotThrow(() -> sceneController.deleteById(42L));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,6 +14,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
|
|||
import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
|
||||
import java.security.Principal;
|
||||
import java.util.Optional;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
|
@ -88,6 +89,6 @@ public class SmartPlugControllerTests {
|
|||
public void testDelete() throws NotFoundException {
|
||||
when(mockPrincipal.getName()).thenReturn("user");
|
||||
doNothing().when(deviceService).deleteByIdAsOwner(42L, "user");
|
||||
smartPlugController.deleteById(42L, mockPrincipal);
|
||||
Assertions.assertDoesNotThrow(() -> smartPlugController.deleteById(42L, mockPrincipal));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ public class ExceptionTests {
|
|||
try {
|
||||
throw new BadDataException("message");
|
||||
} catch (BadDataException e) {
|
||||
assertEquals(e.getMessage(), "message");
|
||||
assertEquals("message", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ public class ExceptionTests {
|
|||
try {
|
||||
throw new DuplicateRegistrationException();
|
||||
} catch (DuplicateRegistrationException e) {
|
||||
assertEquals(e.getMessage(), "Email or username already belonging to another user");
|
||||
assertEquals("Email or username already belonging to another user", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -31,8 +31,8 @@ public class ExceptionTests {
|
|||
throw new DuplicateStateException();
|
||||
} catch (DuplicateStateException e) {
|
||||
assertEquals(
|
||||
e.getMessage(),
|
||||
"Cannot create state since it has already been created for this scene and this device");
|
||||
"Cannot create state since it has already been created for this scene and this device",
|
||||
e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -41,7 +41,7 @@ public class ExceptionTests {
|
|||
try {
|
||||
throw new EmailTokenNotFoundException();
|
||||
} catch (EmailTokenNotFoundException e) {
|
||||
assertEquals(e.getMessage(), "Email verification token not found in DB");
|
||||
assertEquals("Email verification token not found in DB", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -50,13 +50,13 @@ public class ExceptionTests {
|
|||
try {
|
||||
throw new NotFoundException();
|
||||
} catch (NotFoundException e) {
|
||||
assertEquals(e.getMessage(), "Not found");
|
||||
assertEquals("Not found", e.getMessage());
|
||||
}
|
||||
|
||||
try {
|
||||
throw new NotFoundException("message");
|
||||
} catch (NotFoundException e) {
|
||||
assertEquals(e.getMessage(), "message not found");
|
||||
assertEquals("message not found", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -65,7 +65,7 @@ public class ExceptionTests {
|
|||
try {
|
||||
throw new UserNotFoundException();
|
||||
} catch (UserNotFoundException e) {
|
||||
assertEquals(e.getMessage(), "No user found with given email");
|
||||
assertEquals("No user found with given email", e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,6 +8,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
|
|||
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
|
@ -151,7 +152,7 @@ public class DeviceServiceTests {
|
|||
@Test
|
||||
public void populateComputedFields() {
|
||||
doNothing().when(devicePopulationService).populateComputedFields(List.of());
|
||||
deviceService.populateComputedFields(List.of());
|
||||
Assertions.assertDoesNotThrow(() -> deviceService.populateComputedFields(List.of()));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Reference in a new issue