From a265c286eb5b3e738e0deb53fb80240d90c4c86b Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Tue, 12 Mar 2019 22:53:43 +0100 Subject: [PATCH] FIX::fixed package names and imports changed gogreen to greenify FIX::made user tostring test succeed added toString method to user --- .../java/greenify/client/Application.java | 2 +- .../controller/DashBoardController.java | 4 ++-- .../client/controller/UserController.java | 4 ++-- .../greenify/client/rest/UserService.java | 4 ++-- src/Client/src/test/java/ApplicationTest.java | 2 +- src/Client/src/test/java/UserServiceTest.java | 4 ++-- .../greenify/common/ApplicationException.java | 2 +- .../java/greenify/common/ErrorResponse.java | 2 +- .../main/java/greenify/common/UserDTO.java | 2 +- .../java/greenify/server/Application.java | 2 +- .../java/greenify/server/data/model/User.java | 20 ++++++++++++++++++- .../data/repository/UserJpaRepository.java | 4 ++-- .../data/repository/UserRepository.java | 4 ++-- .../server/rest/RestExceptionHandler.java | 6 +++--- .../greenify/server/rest/UserController.java | 6 +++--- .../greenify/server/service/UserService.java | 10 +++++----- src/Server/src/test/java/ApplicationTest.java | 2 +- .../src/test/java/UserControllerTest.java | 4 ++-- src/Server/src/test/java/UserTest.java | 4 ++-- 19 files changed, 53 insertions(+), 35 deletions(-) diff --git a/src/Client/src/main/java/greenify/client/Application.java b/src/Client/src/main/java/greenify/client/Application.java index 645f59f..dca6ad1 100644 --- a/src/Client/src/main/java/greenify/client/Application.java +++ b/src/Client/src/main/java/greenify/client/Application.java @@ -1,4 +1,4 @@ -package gogreen.client; +package greenify.client; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java index 247b265..75c4dd5 100644 --- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java +++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java @@ -1,6 +1,6 @@ -package gogreen.client.controller; +package greenify.client.controller; -import gogreen.client.rest.UserService; +import greenify.client.rest.UserService; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.Button; diff --git a/src/Client/src/main/java/greenify/client/controller/UserController.java b/src/Client/src/main/java/greenify/client/controller/UserController.java index cac42ca..3c58473 100644 --- a/src/Client/src/main/java/greenify/client/controller/UserController.java +++ b/src/Client/src/main/java/greenify/client/controller/UserController.java @@ -1,6 +1,6 @@ -package gogreen.client.controller; +package greenify.client.controller; -import gogreen.client.rest.UserService; +import greenify.client.rest.UserService; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/src/Client/src/main/java/greenify/client/rest/UserService.java b/src/Client/src/main/java/greenify/client/rest/UserService.java index 06d5d02..1423f9c 100644 --- a/src/Client/src/main/java/greenify/client/rest/UserService.java +++ b/src/Client/src/main/java/greenify/client/rest/UserService.java @@ -1,6 +1,6 @@ -package gogreen.client.rest; +package greenify.client.rest; -import gogreen.common.UserDTO; +import greenify.common.UserDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.context.annotation.Bean; diff --git a/src/Client/src/test/java/ApplicationTest.java b/src/Client/src/test/java/ApplicationTest.java index 9c3b44c..32c7f26 100644 --- a/src/Client/src/test/java/ApplicationTest.java +++ b/src/Client/src/test/java/ApplicationTest.java @@ -1,4 +1,4 @@ -import gogreen.client.Application; +import greenify.client.Application; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/Client/src/test/java/UserServiceTest.java b/src/Client/src/test/java/UserServiceTest.java index abc7309..46ba840 100644 --- a/src/Client/src/test/java/UserServiceTest.java +++ b/src/Client/src/test/java/UserServiceTest.java @@ -1,5 +1,5 @@ -import gogreen.client.rest.UserService; -import gogreen.common.UserDTO; +import greenify.client.rest.UserService; +import greenify.common.UserDTO; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/Common/src/main/java/greenify/common/ApplicationException.java b/src/Common/src/main/java/greenify/common/ApplicationException.java index 76e923e..b9321ed 100644 --- a/src/Common/src/main/java/greenify/common/ApplicationException.java +++ b/src/Common/src/main/java/greenify/common/ApplicationException.java @@ -1,4 +1,4 @@ -package gogreen.common; +package greenify.common; public class ApplicationException extends RuntimeException { public ApplicationException(String message) { diff --git a/src/Common/src/main/java/greenify/common/ErrorResponse.java b/src/Common/src/main/java/greenify/common/ErrorResponse.java index e2fe1e6..648fc99 100644 --- a/src/Common/src/main/java/greenify/common/ErrorResponse.java +++ b/src/Common/src/main/java/greenify/common/ErrorResponse.java @@ -1,4 +1,4 @@ -package gogreen.common; +package greenify.common; public class ErrorResponse { String message; diff --git a/src/Common/src/main/java/greenify/common/UserDTO.java b/src/Common/src/main/java/greenify/common/UserDTO.java index 7556406..ba07182 100644 --- a/src/Common/src/main/java/greenify/common/UserDTO.java +++ b/src/Common/src/main/java/greenify/common/UserDTO.java @@ -1,4 +1,4 @@ -package gogreen.common; +package greenify.common; public class UserDTO { private Long id; diff --git a/src/Server/src/main/java/greenify/server/Application.java b/src/Server/src/main/java/greenify/server/Application.java index 682bb66..8ef14a2 100644 --- a/src/Server/src/main/java/greenify/server/Application.java +++ b/src/Server/src/main/java/greenify/server/Application.java @@ -1,4 +1,4 @@ -package gogreen.server; +package greenify.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/Server/src/main/java/greenify/server/data/model/User.java b/src/Server/src/main/java/greenify/server/data/model/User.java index 9be58ba..5d3057a 100644 --- a/src/Server/src/main/java/greenify/server/data/model/User.java +++ b/src/Server/src/main/java/greenify/server/data/model/User.java @@ -1,4 +1,4 @@ -package gogreen.server.data.model; +package greenify.server.data.model; import lombok.Data; import lombok.NoArgsConstructor; @@ -55,4 +55,22 @@ public class User { public String getPassword() { return password; } + + public void setId(Long id) { + this.id = id; + } + + public void setName(String name) { + this.name = name; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public String toString() { + + return "User(id=" + this.id + ", name=" + this.name + ", password=" + this.password + ")"; + } } \ No newline at end of file diff --git a/src/Server/src/main/java/greenify/server/data/repository/UserJpaRepository.java b/src/Server/src/main/java/greenify/server/data/repository/UserJpaRepository.java index 9685cfc..e31ad11 100644 --- a/src/Server/src/main/java/greenify/server/data/repository/UserJpaRepository.java +++ b/src/Server/src/main/java/greenify/server/data/repository/UserJpaRepository.java @@ -1,6 +1,6 @@ -package gogreen.server.data.repository; +package greenify.server.data.repository; -import gogreen.server.data.model.User; +import greenify.server.data.model.User; import org.springframework.data.jpa.repository.JpaRepository; public interface UserJpaRepository extends UserRepository, JpaRepository { diff --git a/src/Server/src/main/java/greenify/server/data/repository/UserRepository.java b/src/Server/src/main/java/greenify/server/data/repository/UserRepository.java index 2f4a5e6..e98f956 100644 --- a/src/Server/src/main/java/greenify/server/data/repository/UserRepository.java +++ b/src/Server/src/main/java/greenify/server/data/repository/UserRepository.java @@ -1,6 +1,6 @@ -package gogreen.server.data.repository; +package greenify.server.data.repository; -import gogreen.server.data.model.User; +import greenify.server.data.model.User; public interface UserRepository { User findByName(String name); diff --git a/src/Server/src/main/java/greenify/server/rest/RestExceptionHandler.java b/src/Server/src/main/java/greenify/server/rest/RestExceptionHandler.java index bffb8cb..0dfd57c 100644 --- a/src/Server/src/main/java/greenify/server/rest/RestExceptionHandler.java +++ b/src/Server/src/main/java/greenify/server/rest/RestExceptionHandler.java @@ -1,7 +1,7 @@ -package gogreen.server.rest; +package greenify.server.rest; -import gogreen.common.ApplicationException; -import gogreen.common.ErrorResponse; +import greenify.common.ApplicationException; +import greenify.common.ErrorResponse; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/Server/src/main/java/greenify/server/rest/UserController.java b/src/Server/src/main/java/greenify/server/rest/UserController.java index caf8850..c80288a 100644 --- a/src/Server/src/main/java/greenify/server/rest/UserController.java +++ b/src/Server/src/main/java/greenify/server/rest/UserController.java @@ -1,7 +1,7 @@ -package gogreen.server.rest; +package greenify.server.rest; -import gogreen.common.UserDTO; -import gogreen.server.service.UserService; +import greenify.common.UserDTO; +import greenify.server.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/Server/src/main/java/greenify/server/service/UserService.java b/src/Server/src/main/java/greenify/server/service/UserService.java index 59bc7ce..4756726 100644 --- a/src/Server/src/main/java/greenify/server/service/UserService.java +++ b/src/Server/src/main/java/greenify/server/service/UserService.java @@ -1,9 +1,9 @@ -package gogreen.server.service; +package greenify.server.service; -import gogreen.common.ApplicationException; -import gogreen.common.UserDTO; -import gogreen.server.data.model.User; -import gogreen.server.data.repository.UserRepository; +import greenify.common.ApplicationException; +import greenify.common.UserDTO; +import greenify.server.data.model.User; +import greenify.server.data.repository.UserRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/Server/src/test/java/ApplicationTest.java b/src/Server/src/test/java/ApplicationTest.java index 11400ff..7b1a958 100644 --- a/src/Server/src/test/java/ApplicationTest.java +++ b/src/Server/src/test/java/ApplicationTest.java @@ -1,4 +1,4 @@ -import gogreen.server.Application; +import greenify.server.Application; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/Server/src/test/java/UserControllerTest.java b/src/Server/src/test/java/UserControllerTest.java index 3f4c4f6..cc8adc2 100644 --- a/src/Server/src/test/java/UserControllerTest.java +++ b/src/Server/src/test/java/UserControllerTest.java @@ -1,5 +1,5 @@ -import gogreen.common.UserDTO; -import gogreen.server.Application; +import greenify.common.UserDTO; +import greenify.server.Application; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/Server/src/test/java/UserTest.java b/src/Server/src/test/java/UserTest.java index 07aac5d..ae359c9 100644 --- a/src/Server/src/test/java/UserTest.java +++ b/src/Server/src/test/java/UserTest.java @@ -1,4 +1,4 @@ -import gogreen.server.data.model.User; +import greenify.server.data.model.User; import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -7,7 +7,7 @@ public class UserTest { @Test public void setAndGetTest() { User user = new User(1L, "greenify", "password"); - User testUser = new User(); + User testUser = new User(null, null, null); testUser.setId(1L); testUser.setName("greenify"); testUser.setPassword("password");