Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/PAN-15' into PAN-15

Browse Source 
# Conflicts:
#	services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
#	services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java
This commit is contained in:
atusa17
2019-03-20 22:17:24 -06:00
parent 748781f10f 083c149a73
commit f35777b5a6
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
+2 -4
View File
@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
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;
@@ -15,11 +14,10 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class Account extends BaseDto implements Serializable {
@NotBlank(groups = edu.msudenver.tsp.persistence.dto.Account.Insert.class, message = "A username must be specified") @Size(max = 50) private String username;
@NotBlank(groups = edu.msudenver.tsp.persistence.dto.Account.Insert.class, message = "A password must be specified") @Size(max = 256) private String password;
@Size(max = 50) private String username;
@Size(max = 256) private String password;
@NotNull @SerializedName("administrator_status") private boolean administratorStatus;
@Temporal(TemporalType.DATE) @SerializedName("last_login") private Date lastLogin;
private static final long serialVersionUID = 7095627971593953734L;
}
services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java
+1 -1
View File
@@ -24,6 +24,6 @@ public class RequestFactory {
}
public Request patch(final String uri, final String requestJson) {
return StringUtils.isNotBlank(requestJson) ? Request.Put(uri).bodyString(requestJson, ContentType.APPLICATION_JSON) : Request.Patch(uri);
return StringUtils.isNotBlank(requestJson) ? Request.Patch(uri).bodyString(requestJson, ContentType.APPLICATION_JSON) : Request.Patch(uri);
}
}
services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java
-1
View File
@@ -18,7 +18,6 @@ import static org.mockito.Mockito.when;
public class ParserServiceTest {
@Mock private ParserService mockParserService;
@InjectMocks private ParserService parserService;
@Test