From 8c9f2bbd9cb79f1a75c286ea598aba091fc90827 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 24 Feb 2019 17:30:39 -0700 Subject: [PATCH] PAN-48 Updated the AccountsDto and the AccountsRepository --- .../edu/msudenver/tsp/persistence/dto/AccountsDto.java | 7 +++++-- .../tsp/persistence/repository/AccountsRepository.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountsDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountsDto.java index 6d689a5..ebc0a0a 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountsDto.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountsDto.java @@ -9,6 +9,7 @@ import javax.persistence.Entity; import javax.persistence.EntityListeners; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; @@ -19,10 +20,12 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) public class AccountsDto extends BaseDto implements Serializable { - @Size(max = 50) private String username; - @Size(max = 256) private String password; + @NotBlank(groups = Insert.class, message = "A username must be specified") @Size(max = 50) private String username; + @NotBlank(groups = Insert.class, message = "A password must be specified") @Size(max = 256) private String password; @NotNull @JsonProperty("administrator_status") private boolean administratorStatus; @Temporal(TemporalType.DATE) @JsonProperty("last_login") private Date lastLogin; public static final long serialVersionUID = 7095627971593953734L; + + interface Insert {} } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java index a2d0704..b1658be 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java @@ -1,9 +1,9 @@ package edu.msudenver.tsp.persistence.repository; import edu.msudenver.tsp.persistence.dto.AccountsDto; -import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; @Repository -public interface AccountsRepository extends JpaRepository { +public interface AccountsRepository extends CrudRepository { }