PAN-11 Fixed integration tests

services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java

@@ -14,10 +14,4 @@ public class ServicesTestConfig {
     public UserService userService(final RestService restService) {
         return new UserService(restService);
     }
-
-    @Bean
-    @Autowired
-    public DefinitionService definitionService(final RestService restService) {
-        return new DefinitionService(restService);
-    }
 }

services/src/integrationTest/resources/test.properties

@@ -1,3 +1,3 @@
-persistence.api.connection.timeout.milliseconds = 5000
-persistence.api.socket.timeout.milliseconds = 10000
-persistence.api.base.url = http://localhost:8090/
+persistence.api.connection.timeout.milliseconds=5000
+persistence.api.socket.timeout.milliseconds=10000
+persistence.api.base.url=http://localhost:8090/

services/src/main/java/edu/msudenver/tsp/services/dto/Account.java

@@ -4,6 +4,8 @@ import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -15,7 +17,7 @@ public class Account extends BaseDto implements Serializable {
     @Size(max = 50) private String username;
     @Size(max = 256) private String password;
     @NotNull private boolean administrator;
-    @SerializedName("last_login") private Date lastLogin;
+    @Temporal(TemporalType.DATE) @SerializedName("last_login") private Date lastLogin;
 
     private static final long serialVersionUID = 7095627971593953734L;
 }