From 29229e457c12afac3d11664e78e0df41925f3f09 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 11 Mar 2019 16:03:00 +0100 Subject: [PATCH] Revert "Revert "MERGE::Merge branch 'fix_gradle_build_file'"" This reverts commit 7af5470a8e9827aa403316b5dde113a4e7574a22. --- .classpath | 420 +++++ .gitignore | 37 +- .project | 17 + build.gradle | 72 +- .../OOPP/META-INF/OOPP.kotlin_module | Bin 0 -> 16 bytes settings.gradle | 6 +- src/.classpath | 7 + src/{Client => }/.idea/checkstyle-idea.xml | 0 src/.idea/checkstyleidea-libs/readme.txt | 6 + src/.idea/compiler.xml | 8 + src/{GoGreen/Client => }/.idea/encodings.xml | 0 src/.idea/gradle.xml | 22 + src/{GoGreen/Server => }/.idea/misc.xml | 2 +- src/{GoGreen/Client => }/.idea/uiDesigner.xml | 0 src/.idea/workspace.xml | 793 +++++++++ src/.project | 17 + src/Client/.classpath | 270 +++ src/Client/.gitignore | 198 --- src/{GoGreen => }/Client/.idea/gradle.xml | 0 src/Client/.idea/modules.xml | 2 - src/Client/.idea/modules/Client.iml | 2 - src/Client/.idea/modules/Client.main.iml | 48 - src/Client/.idea/modules/Client.test.iml | 75 - src/Client/.idea/uiDesigner.xml | 124 ++ src/Client/.idea/vcs.xml | 6 - src/{GoGreen => }/Client/.idea/workspace.xml | 0 src/Client/.project | 17 + src/Client/build.gradle | 55 +- .../main/java/gogreen/client/Application.java | 11 +- .../controller/DashBoardController.java | 81 + .../client/controller/UserController.java | 20 +- .../java/gogreen/client/rest/UserService.java | 0 .../src/main/java/hello/Application.java | 34 - src/Client/src/main/java/hello/Message.java | 37 - .../main/resources}/application.properties | 0 .../src/main/resources/fxml/dashboard.fxml | 76 + .../src/main/resources}/fxml/sample.fxml | 0 .../src/main/resources}/pinkleaf.jpg | Bin .../resources/stylesheets/dashboardStyle.css | 5 + src/Client/src/test/java/ApplicationTest.java | 18 - src/Client/src/test/java/MessageTest.java | 28 - src/Client/src/test/java/UserServiceTest.java | 35 + src/Common/.classpath | 11 + src/Common/.project | 17 + src/{GoGreen => }/Common/build.gradle | 0 .../gogreen/common/ApplicationException.java | 0 .../java/gogreen/common/ErrorResponse.java | 0 .../src/main/java/gogreen/common/UserDTO.java | 0 src/GUI/GUIController.java | 31 - src/GUI/GUIMain.fxml | 23 - src/GUI/GUIMain.java | 38 - src/GUI/GUIStyle.css | 3 - src/GUI/Login.fxml | 21 - src/GUI/LoginController.java | 69 - src/GUI/LoginStyle.css | 6 - .../executionHistory/executionHistory.bin | Bin 169975 -> 0 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .../.gradle/5.2.1/fileChanges/last-build.bin | Bin 1 -> 0 bytes .../5.2.1/fileContent/fileContent.lock | Bin 17 -> 0 bytes .../.gradle/5.2.1/fileHashes/fileHashes.bin | Bin 20247 -> 0 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .../5.2.1/fileHashes/resourceHashesCache.bin | Bin 18599 -> 0 bytes .../Client/.gradle/5.2.1/gc.properties | 0 .../5.2.1/javaCompile/classAnalysis.bin | Bin 23815 -> 0 bytes .../.gradle/5.2.1/javaCompile/jarAnalysis.bin | Bin 19077 -> 0 bytes .../5.2.1/javaCompile/javaCompile.lock | Bin 17 -> 0 bytes .../.gradle/5.2.1/javaCompile/taskHistory.bin | Bin 40149 -> 0 bytes .../buildOutputCleanup.lock | Bin 17 -> 0 bytes .../buildOutputCleanup/cache.properties | 2 - .../buildOutputCleanup/outputFiles.bin | Bin 19019 -> 0 bytes .../Client/.gradle/vcs-1/gc.properties | 0 src/GoGreen/Client/.idea/compiler.xml | 9 - src/GoGreen/Client/.idea/misc.xml | 7 - src/GoGreen/Client/.idea/modules.xml | 8 - src/GoGreen/Client/build.gradle | 83 - .../UserController$AlertHelper.html | 1 - .../UserController.html | 1 - .../UserController.java.html | 90 - .../gogreen.client.controller/index.html | 1 - .../index.source.html | 1 - .../gogreen.client.rest/UserService.html | 1 - .../gogreen.client.rest/UserService.java.html | 32 - .../jacocoHtml/gogreen.client.rest/index.html | 1 - .../gogreen.client.rest/index.source.html | 1 - .../gogreen.client/Application.html | 1 - .../gogreen.client/Application.java.html | 68 - .../jacocoHtml/gogreen.client/index.html | 1 - .../gogreen.client/index.source.html | 1 - .../Client/build/jacocoHtml/index.html | 1 - .../jacocoHtml/jacoco-resources/branchfc.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/branchnc.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/branchpc.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/bundle.gif | Bin 709 -> 0 bytes .../jacocoHtml/jacoco-resources/class.gif | Bin 586 -> 0 bytes .../jacocoHtml/jacoco-resources/down.gif | Bin 67 -> 0 bytes .../jacocoHtml/jacoco-resources/greenbar.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/group.gif | Bin 351 -> 0 bytes .../jacocoHtml/jacoco-resources/method.gif | Bin 193 -> 0 bytes .../jacocoHtml/jacoco-resources/package.gif | Bin 227 -> 0 bytes .../jacocoHtml/jacoco-resources/prettify.css | 13 - .../jacocoHtml/jacoco-resources/prettify.js | 1510 ----------------- .../jacocoHtml/jacoco-resources/redbar.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/report.css | 243 --- .../jacocoHtml/jacoco-resources/report.gif | Bin 363 -> 0 bytes .../jacocoHtml/jacoco-resources/session.gif | Bin 213 -> 0 bytes .../jacocoHtml/jacoco-resources/sort.gif | Bin 58 -> 0 bytes .../build/jacocoHtml/jacoco-resources/sort.js | 147 -- .../jacocoHtml/jacoco-resources/source.gif | Bin 354 -> 0 bytes .../build/jacocoHtml/jacoco-resources/up.gif | Bin 67 -> 0 bytes .../build/jacocoHtml/jacoco-sessions.html | 1 - .../build/resources/main/fxml/dashboard.fxml | 6 - .../src/main/resources/application.properties | 0 .../src/main/resources/fxml/dashboard.fxml | 6 - .../src/main/resources/fxml/sample.fxml | 39 - .../Client/src/main/resources/pinkleaf.jpg | Bin 252662 -> 0 bytes .../executionHistory/executionHistory.bin | Bin 162998 -> 0 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .../.gradle/5.2.1/fileChanges/last-build.bin | Bin 1 -> 0 bytes .../5.2.1/fileContent/fileContent.lock | Bin 17 -> 0 bytes .../.gradle/5.2.1/fileHashes/fileHashes.bin | Bin 20097 -> 0 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .../5.2.1/fileHashes/resourceHashesCache.bin | Bin 18599 -> 0 bytes .../Server/.gradle/5.2.1/gc.properties | 0 .../5.2.1/javaCompile/classAnalysis.bin | Bin 7342058 -> 0 bytes .../.gradle/5.2.1/javaCompile/jarAnalysis.bin | Bin 19009 -> 0 bytes .../5.2.1/javaCompile/javaCompile.lock | Bin 17 -> 0 bytes .../.gradle/5.2.1/javaCompile/taskHistory.bin | Bin 42895 -> 0 bytes .../buildOutputCleanup.lock | Bin 17 -> 0 bytes .../buildOutputCleanup/cache.properties | 2 - .../buildOutputCleanup/outputFiles.bin | Bin 19181 -> 0 bytes .../Server/.gradle/vcs-1/gc.properties | 0 src/GoGreen/Server/.idea/encodings.xml | 4 - src/GoGreen/Server/build.gradle | 73 - src/GoGreen/Server/build/jacoco/test.exec | Bin 401199 -> 0 bytes .../gogreen.server.data.model/User.html | 1 - .../gogreen.server.data.model/User.java.html | 23 - .../gogreen.server.data.model/index.html | 1 - .../index.source.html | 1 - .../RestExceptionHandler.html | 1 - .../RestExceptionHandler.java.html | 18 - .../gogreen.server.rest/UserController.html | 1 - .../UserController.java.html | 27 - .../jacocoHtml/gogreen.server.rest/index.html | 1 - .../gogreen.server.rest/index.source.html | 1 - .../gogreen.server.service/UserService.html | 1 - .../UserService.java.html | 41 - .../gogreen.server.service/index.html | 1 - .../gogreen.server.service/index.source.html | 1 - .../gogreen.server/Application.html | 1 - .../gogreen.server/Application.java.html | 14 - .../jacocoHtml/gogreen.server/index.html | 1 - .../gogreen.server/index.source.html | 1 - .../Server/build/jacocoHtml/index.html | 1 - .../jacocoHtml/jacoco-resources/branchfc.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/branchnc.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/branchpc.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/bundle.gif | Bin 709 -> 0 bytes .../jacocoHtml/jacoco-resources/class.gif | Bin 586 -> 0 bytes .../jacocoHtml/jacoco-resources/down.gif | Bin 67 -> 0 bytes .../jacocoHtml/jacoco-resources/greenbar.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/group.gif | Bin 351 -> 0 bytes .../jacocoHtml/jacoco-resources/method.gif | Bin 193 -> 0 bytes .../jacocoHtml/jacoco-resources/package.gif | Bin 227 -> 0 bytes .../jacocoHtml/jacoco-resources/prettify.css | 13 - .../jacocoHtml/jacoco-resources/prettify.js | 1510 ----------------- .../jacocoHtml/jacoco-resources/redbar.gif | Bin 91 -> 0 bytes .../jacocoHtml/jacoco-resources/report.css | 243 --- .../jacocoHtml/jacoco-resources/report.gif | Bin 363 -> 0 bytes .../jacocoHtml/jacoco-resources/session.gif | Bin 213 -> 0 bytes .../jacocoHtml/jacoco-resources/sort.gif | Bin 58 -> 0 bytes .../build/jacocoHtml/jacoco-resources/sort.js | 147 -- .../jacocoHtml/jacoco-resources/source.gif | Bin 354 -> 0 bytes .../build/jacocoHtml/jacoco-resources/up.gif | Bin 67 -> 0 bytes .../build/jacocoHtml/jacoco-sessions.html | 1 - ...ogreen.server.rest.UserControllerTest.html | 173 -- .../reports/tests/test/css/base-style.css | 179 -- .../build/reports/tests/test/css/style.css | 84 - .../build/reports/tests/test/index.html | 133 -- .../build/reports/tests/test/js/report.js | 194 --- .../test/packages/gogreen.server.rest.html | 103 -- ...gogreen.server.rest.UserControllerTest.xml | 75 - .../build/test-results/test/binary/output.bin | Bin 35516 -> 0 bytes .../test-results/test/binary/output.bin.idx | Bin 69 -> 0 bytes .../test-results/test/binary/results.bin | Bin 117 -> 0 bytes src/GoGreen/settings.gradle | 5 - src/Server/.classpath | 439 +++++ src/Server/.gitignore | 198 --- src/{GoGreen => }/Server/.idea/gradle.xml | 0 src/Server/.idea/misc.xml | 2 +- src/{GoGreen => }/Server/.idea/workspace.xml | 0 src/Server/.project | 17 + src/Server/build.gradle | 47 +- .../main/java/gogreen/server/Application.java | 0 .../java/gogreen/server/data/model/User.java | 22 +- .../data/repository/UserJpaRepository.java | 0 .../data/repository/UserRepository.java | 0 .../server/rest/RestExceptionHandler.java | 0 .../gogreen/server/rest/UserController.java | 0 .../gogreen/server/service/UserService.java | 0 src/Server/src/main/java/hello/Greeting.java | 20 - .../main/java/hello/GreetingController.java | 20 - .../main/java/hello/ServerApplication.java | 12 - .../src/test/java/GreetingControllerTest.java | 15 - src/Server/src/test/java/GreetingTest.java | 18 - .../src/test/java/ServerApplicationTest.java | 8 - .../server/rest/UserControllerTest.java | 0 206 files changed, 2634 insertions(+), 6303 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 classes/production/OOPP/META-INF/OOPP.kotlin_module create mode 100644 src/.classpath rename src/{Client => }/.idea/checkstyle-idea.xml (100%) create mode 100644 src/.idea/checkstyleidea-libs/readme.txt create mode 100644 src/.idea/compiler.xml rename src/{GoGreen/Client => }/.idea/encodings.xml (100%) create mode 100644 src/.idea/gradle.xml rename src/{GoGreen/Server => }/.idea/misc.xml (81%) rename src/{GoGreen/Client => }/.idea/uiDesigner.xml (100%) create mode 100644 src/.idea/workspace.xml create mode 100644 src/.project create mode 100644 src/Client/.classpath delete mode 100644 src/Client/.gitignore rename src/{GoGreen => }/Client/.idea/gradle.xml (100%) delete mode 100644 src/Client/.idea/modules/Client.iml delete mode 100644 src/Client/.idea/modules/Client.main.iml delete mode 100644 src/Client/.idea/modules/Client.test.iml create mode 100644 src/Client/.idea/uiDesigner.xml delete mode 100644 src/Client/.idea/vcs.xml rename src/{GoGreen => }/Client/.idea/workspace.xml (100%) create mode 100644 src/Client/.project rename src/{GoGreen => }/Client/src/main/java/gogreen/client/Application.java (89%) create mode 100644 src/Client/src/main/java/gogreen/client/controller/DashBoardController.java rename src/{GoGreen => }/Client/src/main/java/gogreen/client/controller/UserController.java (84%) rename src/{GoGreen => }/Client/src/main/java/gogreen/client/rest/UserService.java (100%) delete mode 100644 src/Client/src/main/java/hello/Application.java delete mode 100644 src/Client/src/main/java/hello/Message.java rename src/{GoGreen/Client/build/resources/main => Client/src/main/resources}/application.properties (100%) create mode 100644 src/Client/src/main/resources/fxml/dashboard.fxml rename src/{GoGreen/Client/build/resources/main => Client/src/main/resources}/fxml/sample.fxml (100%) rename src/{GoGreen/Client/build/resources/main => Client/src/main/resources}/pinkleaf.jpg (100%) create mode 100644 src/Client/src/main/resources/stylesheets/dashboardStyle.css delete mode 100644 src/Client/src/test/java/ApplicationTest.java delete mode 100644 src/Client/src/test/java/MessageTest.java create mode 100644 src/Client/src/test/java/UserServiceTest.java create mode 100644 src/Common/.classpath create mode 100644 src/Common/.project rename src/{GoGreen => }/Common/build.gradle (100%) rename src/{GoGreen => }/Common/src/main/java/gogreen/common/ApplicationException.java (100%) rename src/{GoGreen => }/Common/src/main/java/gogreen/common/ErrorResponse.java (100%) rename src/{GoGreen => }/Common/src/main/java/gogreen/common/UserDTO.java (100%) delete mode 100644 src/GUI/GUIController.java delete mode 100644 src/GUI/GUIMain.fxml delete mode 100644 src/GUI/GUIMain.java delete mode 100644 src/GUI/GUIStyle.css delete mode 100644 src/GUI/Login.fxml delete mode 100644 src/GUI/LoginController.java delete mode 100644 src/GUI/LoginStyle.css delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/gc.properties delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock delete mode 100644 src/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin delete mode 100644 src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock delete mode 100644 src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties delete mode 100644 src/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin delete mode 100644 src/GoGreen/Client/.gradle/vcs-1/gc.properties delete mode 100644 src/GoGreen/Client/.idea/compiler.xml delete mode 100644 src/GoGreen/Client/.idea/misc.xml delete mode 100644 src/GoGreen/Client/.idea/modules.xml delete mode 100644 src/GoGreen/Client/build.gradle delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/index.html delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif delete mode 100644 src/GoGreen/Client/build/jacocoHtml/jacoco-sessions.html delete mode 100644 src/GoGreen/Client/build/resources/main/fxml/dashboard.fxml delete mode 100644 src/GoGreen/Client/src/main/resources/application.properties delete mode 100644 src/GoGreen/Client/src/main/resources/fxml/dashboard.fxml delete mode 100644 src/GoGreen/Client/src/main/resources/fxml/sample.fxml delete mode 100644 src/GoGreen/Client/src/main/resources/pinkleaf.jpg delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/gc.properties delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock delete mode 100644 src/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin delete mode 100644 src/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock delete mode 100644 src/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties delete mode 100644 src/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin delete mode 100644 src/GoGreen/Server/.gradle/vcs-1/gc.properties delete mode 100644 src/GoGreen/Server/.idea/encodings.xml delete mode 100644 src/GoGreen/Server/build.gradle delete mode 100644 src/GoGreen/Server/build/jacoco/test.exec delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/index.html delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif delete mode 100644 src/GoGreen/Server/build/jacocoHtml/jacoco-sessions.html delete mode 100644 src/GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html delete mode 100644 src/GoGreen/Server/build/reports/tests/test/css/base-style.css delete mode 100644 src/GoGreen/Server/build/reports/tests/test/css/style.css delete mode 100644 src/GoGreen/Server/build/reports/tests/test/index.html delete mode 100644 src/GoGreen/Server/build/reports/tests/test/js/report.js delete mode 100644 src/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html delete mode 100644 src/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml delete mode 100644 src/GoGreen/Server/build/test-results/test/binary/output.bin delete mode 100644 src/GoGreen/Server/build/test-results/test/binary/output.bin.idx delete mode 100644 src/GoGreen/Server/build/test-results/test/binary/results.bin delete mode 100644 src/GoGreen/settings.gradle create mode 100644 src/Server/.classpath delete mode 100644 src/Server/.gitignore rename src/{GoGreen => }/Server/.idea/gradle.xml (100%) rename src/{GoGreen => }/Server/.idea/workspace.xml (100%) create mode 100644 src/Server/.project rename src/{GoGreen => }/Server/src/main/java/gogreen/server/Application.java (100%) rename src/{GoGreen => }/Server/src/main/java/gogreen/server/data/model/User.java (53%) rename src/{GoGreen => }/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java (100%) rename src/{GoGreen => }/Server/src/main/java/gogreen/server/data/repository/UserRepository.java (100%) rename src/{GoGreen => }/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java (100%) rename src/{GoGreen => }/Server/src/main/java/gogreen/server/rest/UserController.java (100%) rename src/{GoGreen => }/Server/src/main/java/gogreen/server/service/UserService.java (100%) delete mode 100644 src/Server/src/main/java/hello/Greeting.java delete mode 100644 src/Server/src/main/java/hello/GreetingController.java delete mode 100644 src/Server/src/main/java/hello/ServerApplication.java delete mode 100644 src/Server/src/test/java/GreetingControllerTest.java delete mode 100644 src/Server/src/test/java/GreetingTest.java delete mode 100644 src/Server/src/test/java/ServerApplicationTest.java rename src/{GoGreen => }/Server/src/test/java/gogreen/server/rest/UserControllerTest.java (100%) diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..f3a1f5f --- /dev/null +++ b/.classpath @@ -0,0 +1,420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 851ae2e..3e5b4b2 100644 --- a/.gitignore +++ b/.gitignore @@ -19,10 +19,12 @@ # Edit at https://www.gitignore.io/?templates=java,maven,eclipse,intellij,visualstudiocode ### our project ### -Client/.idea/ -Client/.gradle/ -Server/.idea/ -Server/.gradle/ +# src/**/.idea/ +# src/**/.gradle/ + +!src/GoGreen/build/reports + + ### Eclipse ### @@ -84,10 +86,10 @@ local.properties ### Eclipse Patch ### # Eclipse Core -.project +# .project # JDT-specific (Eclipse Java Development Tools) -.classpath +# .classpath # Annotation Processing .apt_generated @@ -215,4 +217,25 @@ buildNumber.properties # Ignore all local history of files .history -# End of https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode \ No newline at end of file +# End of https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode + +### Gradle ### +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + +# End of https://www.gitignore.io/api/gradle \ No newline at end of file diff --git a/.project b/.project new file mode 100644 index 0000000..dd47242 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + OOPP + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + diff --git a/build.gradle b/build.gradle index 16fa58a..04e3b0b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,20 @@ buildscript { repositories { mavenCentral() + maven { + url "https://plugins.gradle.org/m2/" + } } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE") + classpath("org.openjfx:javafx-plugin:0.0.7") } } +//plugins { +// id "org.openjfx.javafxplugin" version "0.0.7" +//} + + apply plugin: 'java' apply plugin: 'eclipse' @@ -14,6 +23,22 @@ apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'jacoco' apply plugin: 'checkstyle' +apply plugin: 'application' + +application { + mainClassName = 'gogreen.client.Application' +} + + + + +//apply plugin: 'org.openjfx.javafxplugin' + +tasks.withType(Checkstyle) { + reports { + html.destination rootProject.file("build/reports/checkstyle.html") + } +} repositories { mavenCentral() @@ -33,6 +58,10 @@ bootJar { sourceCompatibility = 1.8 targetCompatibility = 1.8 +test { + useJUnitPlatform() +} + dependencies { compile("org.springframework.boot:spring-boot-starter") compile("org.springframework:spring-web") @@ -40,4 +69,45 @@ dependencies { compile("org.springframework.boot:spring-boot-starter-web") testCompile('org.springframework.boot:spring-boot-starter-test') testCompile("junit:junit") -} \ No newline at end of file +// compile project('src:Common') + compileOnly 'org.projectlombok:lombok:1.18.6' + compile("org.springframework.boot:spring-boot-starter-data-jpa") + compile("com.h2database:h2") + annotationProcessor 'org.projectlombok:lombok:1.18.6' + testCompile( + 'junit:junit:4.12', + 'org.junit.jupiter:junit-jupiter-api:5.4.0' + ) + testRuntime( + 'org.junit.jupiter:junit-jupiter-engine:5.4.0', + 'org.junit.vintage:junit-vintage-engine:5.4.0' + ) +} + +jacoco { + toolVersion = "0.8.3" + reportsDir = file("$buildDir/customJacocoReportDir") +} + +jacocoTestReport { + reports { + xml.enabled false + csv.enabled false + html.destination file("${buildDir}/jacocoHtml") + } +} + +//bootJar { +// mainClassName = 'Client.Application' +//} + + + +task application(type: JavaExec, dependsOn: classes) { + main = 'Cient.Application' +} + + + + + diff --git a/classes/production/OOPP/META-INF/OOPP.kotlin_module b/classes/production/OOPP/META-INF/OOPP.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c GIT binary patch literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ literal 0 HcmV?d00001 diff --git a/settings.gradle b/settings.gradle index f310c3a..df6f113 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'OOPP' \ No newline at end of file +rootProject.name = 'OOPP' + +include ':src:Client' +include ':src:Common' +include ':src:Server' \ No newline at end of file diff --git a/src/.classpath b/src/.classpath new file mode 100644 index 0000000..757e1b8 --- /dev/null +++ b/src/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/Client/.idea/checkstyle-idea.xml b/src/.idea/checkstyle-idea.xml similarity index 100% rename from src/Client/.idea/checkstyle-idea.xml rename to src/.idea/checkstyle-idea.xml diff --git a/src/.idea/checkstyleidea-libs/readme.txt b/src/.idea/checkstyleidea-libs/readme.txt new file mode 100644 index 0000000..cd71e1b --- /dev/null +++ b/src/.idea/checkstyleidea-libs/readme.txt @@ -0,0 +1,6 @@ +This folder contains libraries copied from the "OOPP" project. +It is managed by the CheckStyle-IDEA IDE plugin. +Do not modify this folder while the IDE is running. +When the IDE is stopped, you may delete this folder at any time. It will be recreated as needed. +In order to prevent the CheckStyle-IDEA IDE plugin from creating this folder, +uncheck the "Copy libraries from project directory" option in the CheckStyle-IDEA settings dialog. diff --git a/src/.idea/compiler.xml b/src/.idea/compiler.xml new file mode 100644 index 0000000..a1757ae --- /dev/null +++ b/src/.idea/compiler.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/GoGreen/Client/.idea/encodings.xml b/src/.idea/encodings.xml similarity index 100% rename from src/GoGreen/Client/.idea/encodings.xml rename to src/.idea/encodings.xml diff --git a/src/.idea/gradle.xml b/src/.idea/gradle.xml new file mode 100644 index 0000000..6321230 --- /dev/null +++ b/src/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/src/GoGreen/Server/.idea/misc.xml b/src/.idea/misc.xml similarity index 81% rename from src/GoGreen/Server/.idea/misc.xml rename to src/.idea/misc.xml index 5325e36..bc8d0a3 100644 --- a/src/GoGreen/Server/.idea/misc.xml +++ b/src/.idea/misc.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/src/GoGreen/Client/.idea/uiDesigner.xml b/src/.idea/uiDesigner.xml similarity index 100% rename from src/GoGreen/Client/.idea/uiDesigner.xml rename to src/.idea/uiDesigner.xml diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml new file mode 100644 index 0000000..da31729 --- /dev/null +++ b/src/.idea/workspace.xml @@ -0,0 +1,793 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + gogreen.server.rest.* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -Generated by -Gradle 5.2.1 at 04-Mar-2019 12:16:03

- - - - diff --git a/src/GoGreen/Server/build/reports/tests/test/css/base-style.css b/src/GoGreen/Server/build/reports/tests/test/css/base-style.css deleted file mode 100644 index 4afa73e..0000000 --- a/src/GoGreen/Server/build/reports/tests/test/css/base-style.css +++ /dev/null @@ -1,179 +0,0 @@ - -body { - margin: 0; - padding: 0; - font-family: sans-serif; - font-size: 12pt; -} - -body, a, a:visited { - color: #303030; -} - -#content { - padding-left: 50px; - padding-right: 50px; - padding-top: 30px; - padding-bottom: 30px; -} - -#content h1 { - font-size: 160%; - margin-bottom: 10px; -} - -#footer { - margin-top: 100px; - font-size: 80%; - white-space: nowrap; -} - -#footer, #footer a { - color: #a0a0a0; -} - -#line-wrapping-toggle { - vertical-align: middle; -} - -#label-for-line-wrapping-toggle { - vertical-align: middle; -} - -ul { - margin-left: 0; -} - -h1, h2, h3 { - white-space: nowrap; -} - -h2 { - font-size: 120%; -} - -ul.tabLinks { - padding-left: 0; - padding-top: 10px; - padding-bottom: 10px; - overflow: auto; - min-width: 800px; - width: auto !important; - width: 800px; -} - -ul.tabLinks li { - float: left; - height: 100%; - list-style: none; - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 5px; - margin-bottom: 0; - -moz-border-radius: 7px; - border-radius: 7px; - margin-right: 25px; - border: solid 1px #d4d4d4; - background-color: #f0f0f0; -} - -ul.tabLinks li:hover { - background-color: #fafafa; -} - -ul.tabLinks li.selected { - background-color: #c5f0f5; - border-color: #c5f0f5; -} - -ul.tabLinks a { - font-size: 120%; - display: block; - outline: none; - text-decoration: none; - margin: 0; - padding: 0; -} - -ul.tabLinks li h2 { - margin: 0; - padding: 0; -} - -div.tab { -} - -div.selected { - display: block; -} - -div.deselected { - display: none; -} - -div.tab table { - min-width: 350px; - width: auto !important; - width: 350px; - border-collapse: collapse; -} - -div.tab th, div.tab table { - border-bottom: solid #d0d0d0 1px; -} - -div.tab th { - text-align: left; - white-space: nowrap; - padding-left: 6em; -} - -div.tab th:first-child { - padding-left: 0; -} - -div.tab td { - white-space: nowrap; - padding-left: 6em; - padding-top: 5px; - padding-bottom: 5px; -} - -div.tab td:first-child { - padding-left: 0; -} - -div.tab td.numeric, div.tab th.numeric { - text-align: right; -} - -span.code { - display: inline-block; - margin-top: 0em; - margin-bottom: 1em; -} - -span.code pre { - font-size: 11pt; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 10px; - padding-right: 10px; - margin: 0; - background-color: #f7f7f7; - border: solid 1px #d0d0d0; - min-width: 700px; - width: auto !important; - width: 700px; -} - -span.wrapped pre { - word-wrap: break-word; - white-space: pre-wrap; - word-break: break-all; -} - -label.hidden { - display: none; -} \ No newline at end of file diff --git a/src/GoGreen/Server/build/reports/tests/test/css/style.css b/src/GoGreen/Server/build/reports/tests/test/css/style.css deleted file mode 100644 index 3dc4913..0000000 --- a/src/GoGreen/Server/build/reports/tests/test/css/style.css +++ /dev/null @@ -1,84 +0,0 @@ - -#summary { - margin-top: 30px; - margin-bottom: 40px; -} - -#summary table { - border-collapse: collapse; -} - -#summary td { - vertical-align: top; -} - -.breadcrumbs, .breadcrumbs a { - color: #606060; -} - -.infoBox { - width: 110px; - padding-top: 15px; - padding-bottom: 15px; - text-align: center; -} - -.infoBox p { - margin: 0; -} - -.counter, .percent { - font-size: 120%; - font-weight: bold; - margin-bottom: 8px; -} - -#duration { - width: 125px; -} - -#successRate, .summaryGroup { - border: solid 2px #d0d0d0; - -moz-border-radius: 10px; - border-radius: 10px; -} - -#successRate { - width: 140px; - margin-left: 35px; -} - -#successRate .percent { - font-size: 180%; -} - -.success, .success a { - color: #008000; -} - -div.success, #successRate.success { - background-color: #bbd9bb; - border-color: #008000; -} - -.failures, .failures a { - color: #b60808; -} - -.skipped, .skipped a { - color: #c09853; -} - -div.failures, #successRate.failures { - background-color: #ecdada; - border-color: #b60808; -} - -ul.linkList { - padding-left: 0; -} - -ul.linkList li { - list-style: none; - margin-bottom: 5px; -} diff --git a/src/GoGreen/Server/build/reports/tests/test/index.html b/src/GoGreen/Server/build/reports/tests/test/index.html deleted file mode 100644 index 1b8b764..0000000 --- a/src/GoGreen/Server/build/reports/tests/test/index.html +++ /dev/null @@ -1,133 +0,0 @@ - - - - - -Test results - Test Summary - - - - - -
-

Test Summary

-
- - - - - -
-
- - - - - - - -
-
-
1
-

tests

-
-		 -
-
0
-

failures

-
-		 -
-
0
-

ignored

-
-		 -
-
0.928s
-

duration

-
-
-
-		 -
-
100%
-

successful

-
-
-
-
- -
-

Packages

- - - - - - - - - - - - - - - - - - - - - -
PackageTestsFailuresIgnoredDurationSuccess rate
-gogreen.server.rest -1000.928s100%
-
-
-

Classes

- - - - - - - - - - - - - - - - - - - - - -
ClassTestsFailuresIgnoredDurationSuccess rate
-gogreen.server.rest.UserControllerTest -1000.928s100%
-
-
- -
- - diff --git a/src/GoGreen/Server/build/reports/tests/test/js/report.js b/src/GoGreen/Server/build/reports/tests/test/js/report.js deleted file mode 100644 index 83bab4a..0000000 --- a/src/GoGreen/Server/build/reports/tests/test/js/report.js +++ /dev/null @@ -1,194 +0,0 @@ -(function (window, document) { - "use strict"; - - var tabs = {}; - - function changeElementClass(element, classValue) { - if (element.getAttribute("className")) { - element.setAttribute("className", classValue); - } else { - element.setAttribute("class", classValue); - } - } - - function getClassAttribute(element) { - if (element.getAttribute("className")) { - return element.getAttribute("className"); - } else { - return element.getAttribute("class"); - } - } - - function addClass(element, classValue) { - changeElementClass(element, getClassAttribute(element) + " " + classValue); - } - - function removeClass(element, classValue) { - changeElementClass(element, getClassAttribute(element).replace(classValue, "")); - } - - function initTabs() { - var container = document.getElementById("tabs"); - - tabs.tabs = findTabs(container); - tabs.titles = findTitles(tabs.tabs); - tabs.headers = findHeaders(container); - tabs.select = select; - tabs.deselectAll = deselectAll; - tabs.select(0); - - return true; - } - - function getCheckBox() { - return document.getElementById("line-wrapping-toggle"); - } - - function getLabelForCheckBox() { - return document.getElementById("label-for-line-wrapping-toggle"); - } - - function findCodeBlocks() { - var spans = document.getElementById("tabs").getElementsByTagName("span"); - var codeBlocks = []; - for (var i = 0; i < spans.length; ++i) { - if (spans[i].className.indexOf("code") >= 0) { - codeBlocks.push(spans[i]); - } - } - return codeBlocks; - } - - function forAllCodeBlocks(operation) { - var codeBlocks = findCodeBlocks(); - - for (var i = 0; i < codeBlocks.length; ++i) { - operation(codeBlocks[i], "wrapped"); - } - } - - function toggleLineWrapping() { - var checkBox = getCheckBox(); - - if (checkBox.checked) { - forAllCodeBlocks(addClass); - } else { - forAllCodeBlocks(removeClass); - } - } - - function initControls() { - if (findCodeBlocks().length > 0) { - var checkBox = getCheckBox(); - var label = getLabelForCheckBox(); - - checkBox.onclick = toggleLineWrapping; - checkBox.checked = false; - - removeClass(label, "hidden"); - } - } - - function switchTab() { - var id = this.id.substr(1); - - for (var i = 0; i < tabs.tabs.length; i++) { - if (tabs.tabs[i].id === id) { - tabs.select(i); - break; - } - } - - return false; - } - - function select(i) { - this.deselectAll(); - - changeElementClass(this.tabs[i], "tab selected"); - changeElementClass(this.headers[i], "selected"); - - while (this.headers[i].firstChild) { - this.headers[i].removeChild(this.headers[i].firstChild); - } - - var h2 = document.createElement("H2"); - - h2.appendChild(document.createTextNode(this.titles[i])); - this.headers[i].appendChild(h2); - } - - function deselectAll() { - for (var i = 0; i < this.tabs.length; i++) { - changeElementClass(this.tabs[i], "tab deselected"); - changeElementClass(this.headers[i], "deselected"); - - while (this.headers[i].firstChild) { - this.headers[i].removeChild(this.headers[i].firstChild); - } - - var a = document.createElement("A"); - - a.setAttribute("id", "ltab" + i); - a.setAttribute("href", "#tab" + i); - a.onclick = switchTab; - a.appendChild(document.createTextNode(this.titles[i])); - - this.headers[i].appendChild(a); - } - } - - function findTabs(container) { - return findChildElements(container, "DIV", "tab"); - } - - function findHeaders(container) { - var owner = findChildElements(container, "UL", "tabLinks"); - return findChildElements(owner[0], "LI", null); - } - - function findTitles(tabs) { - var titles = []; - - for (var i = 0; i < tabs.length; i++) { - var tab = tabs[i]; - var header = findChildElements(tab, "H2", null)[0]; - - header.parentNode.removeChild(header); - - if (header.innerText) { - titles.push(header.innerText); - } else { - titles.push(header.textContent); - } - } - - return titles; - } - - function findChildElements(container, name, targetClass) { - var elements = []; - var children = container.childNodes; - - for (var i = 0; i < children.length; i++) { - var child = children.item(i); - - if (child.nodeType === 1 && child.nodeName === name) { - if (targetClass && child.className.indexOf(targetClass) < 0) { - continue; - } - - elements.push(child); - } - } - - return elements; - } - - // Entry point. - - window.onload = function() { - initTabs(); - initControls(); - }; -} (window, window.document)); \ No newline at end of file diff --git a/src/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html b/src/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html deleted file mode 100644 index d248c7f..0000000 --- a/src/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - -Test results - Package gogreen.server.rest - - - - - -
-

Package gogreen.server.rest

-
-all > gogreen.server.rest
-
- - - - - -
-
- - - - - - - -
-
-
1
-

tests

-
-		 -
-
0
-

failures

-
-		 -
-
0
-

ignored

-
-		 -
-
0.928s
-

duration

-
-
-
-		 -
-
100%
-

successful

-
-
-
-
- -
-

Classes

- - - - - - - - - - - - - - - - - - - -
ClassTestsFailuresIgnoredDurationSuccess rate
-UserControllerTest -1000.928s100%
-
-
- -
- - diff --git a/src/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml b/src/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml deleted file mode 100644 index 7b299aa..0000000 --- a/src/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - false]], class annotated with @DirtiesContext [false] with mode [null]. -12:15:53.678 [Test worker] DEBUG org.springframework.test.annotation.ProfileValueUtils - Retrieved @ProfileValueSourceConfiguration [null] for test class [gogreen.server.rest.UserControllerTest] -12:15:53.678 [Test worker] DEBUG org.springframework.test.annotation.ProfileValueUtils - Retrieved ProfileValueSource type [class org.springframework.test.annotation.SystemProfileValueSource] for class [gogreen.server.rest.UserControllerTest] -12:15:54.263 [Test worker] DEBUG org.springframework.test.context.support.DependencyInjectionTestExecutionListener - Performing dependency injection for test context [[DefaultTestContext@36c1eab1 testClass = UserControllerTest, testInstance = gogreen.server.rest.UserControllerTest@568a352d, testMethod = [null], testException = [null], mergedContextConfiguration = [WebMergedContextConfiguration@401b3c92 testClass = UserControllerTest, locations = '{}', classes = '{class gogreen.server.Application, class gogreen.server.Application}', contextInitializerClasses = '[]', activeProfiles = '{}', propertySourceLocations = '{}', propertySourceProperties = '{org.springframework.boot.test.context.SpringBootTestContextBootstrapper=true, server.port=0}', contextCustomizers = set[org.springframework.boot.test.autoconfigure.properties.PropertyMappingContextCustomizer@0, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverContextCustomizerFactory$Customizer@31c67424, org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizer@42d370a7, org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory$DuplicateJsonObjectContextCustomizer@235fcef7, org.springframework.boot.test.mock.mockito.MockitoContextCustomizer@0, org.springframework.boot.test.web.client.TestRestTemplateContextCustomizer@1276e7b2], resourceBasePath = 'src/main/webapp', contextLoader = 'org.springframework.boot.test.context.SpringBootContextLoader', parent = [null]], attributes = map['org.springframework.test.context.web.ServletTestExecutionListener.activateListener' -> false]]]. -12:15:54.307 [Test worker] DEBUG org.springframework.core.env.StandardEnvironment - Adding PropertySource 'systemProperties' with lowest search precedence -12:15:54.307 [Test worker] DEBUG org.springframework.core.env.StandardEnvironment - Adding PropertySource 'systemEnvironment' with lowest search precedence -12:15:54.308 [Test worker] DEBUG org.springframework.core.env.StandardEnvironment - Initialized StandardEnvironment with PropertySources [MapPropertySource@535869477 {name='systemProperties', properties={java.runtime.name=Java(TM) SE Runtime Environment, sun.boot.library.path=C:\Program Files\Java\jdk1.8.0_201\jre\bin, java.vm.version=25.201-b09, java.vm.vendor=Oracle Corporation, java.vendor.url=http://java.oracle.com/, path.separator=;, java.vm.name=Java HotSpot(TM) 64-Bit Server VM, file.encoding.pkg=sun.io, user.script=, sun.java.launcher=SUN_STANDARD, user.country=GB, sun.os.patch.level=, java.vm.specification.name=Java Virtual Machine Specification, user.dir=C:\Users\ceren\Desktop\My Courses\OOP project\OOPP\Server, java.runtime.version=1.8.0_201-b09, java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment, java.endorsed.dirs=C:\Program Files\Java\jdk1.8.0_201\jre\lib\endorsed, os.arch=amd64, java.io.tmpdir=C:\Users\ceren\AppData\Local\Temp\, line.separator= -, java.vm.specification.vendor=Oracle Corporation, user.variant=, os.name=Windows 10, sun.jnu.encoding=Cp1252, java.library.path=C:\Program Files\Java\jdk1.8.0_201\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\iCLS\;C:\Program Files\Intel\Intel(R) Management Engine Components\iCLS\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Users\ceren\scoop\apps\oraclejdk\11.0.2-9\bin;C:\Users\ceren\scoop\apps\idea\current\bin;C:\Users\ceren\scoop\shims;C:\Users\ceren\AppData\Local\Microsoft\WindowsApps;C:\Users\ceren\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\ceren\AppData\Roaming\npm;., java.specification.name=Java Platform API Specification, java.class.version=52.0, org.gradle.native=false, sun.management.compiler=HotSpot 64-Bit Tiered Compilers, os.version=10.0, user.home=C:\Users\ceren, user.timezone=Europe/Berlin, java.awt.printerjob=sun.awt.windows.WPrinterJob, file.encoding=windows-1252, java.specification.version=1.8, java.class.path=C:\Users\ceren\Desktop\My Courses\OOP project\OOPP\Server\build\classes\java\test;C:\Users\ceren\Desktop\My Courses\OOP project\OOPP\Server\build\resources\test;C:\Users\ceren\Desktop\My Courses\OOP project\OOPP\Server\build\classes\java\main;C:\Users\ceren\Desktop\My Courses\OOP project\OOPP\Server\build\resources\main;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter-web\2.0.5.RELEASE\52daa1f1509bd637a737206e54c06a17aabb9504\spring-boot-starter-web-2.0.5.RELEASE.jar;C:\Users\ceren\Desktop\My Courses\OOP project\OOPP\Common\build\libs\Common.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter-data-jpa\2.0.5.RELEASE\c99b58e8ada11478aa5d0c3065745b7e887f094e\spring-boot-starter-data-jpa-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.h2database\h2\1.4.197\bb391050048ca8ae3e32451b5a3714ecd3596a46\h2-1.4.197.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter-test\2.0.5.RELEASE\ab04ca2e76f6a8e786001352a81a10e4b0e7fbc8\spring-boot-starter-test-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.junit.vintage\junit-vintage-engine\5.4.0\247fe2182965c52cda94320563b16f8907e86da6\junit-vintage-engine-5.4.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\junit\junit\4.12\2973d150c0dc1fefe998f834810d68f278ea58ec\junit-4.12.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.junit.jupiter\junit-jupiter-engine\5.4.0\30083adf3fbd7b734f12e6cb4d99dedab99fc34b\junit-jupiter-engine-5.4.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.junit.jupiter\junit-jupiter-api\5.4.0\1a09f25a160f71c267f9ebe3b229b17805c683e9\junit-jupiter-api-5.4.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter-json\2.0.5.RELEASE\d0052ded4733ceb1fb7d927238f22f9a92099227\spring-boot-starter-json-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter-aop\2.0.5.RELEASE\6bc1e8bcc849772d48cae1e8278cd2b471361698\spring-boot-starter-aop-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter-jdbc\2.0.5.RELEASE\9a5370acc7c5e17f4a00578211fbbd212b9a8329\spring-boot-starter-jdbc-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter\2.0.5.RELEASE\1f53487a373be18d064a5815e9bac9882ef15cdc\spring-boot-starter-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter-tomcat\2.0.5.RELEASE\eaac8a5d73b45400bc88cd7f6b5c99b5f0d5e9b7\spring-boot-starter-tomcat-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.hibernate.validator\hibernate-validator\6.0.12.Final\478003e61b056c1f97840ba3e62ff31cdc89597\hibernate-validator-6.0.12.Final.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-webmvc\5.0.9.RELEASE\c18346caaeb8dc648c4cc01874996fd9fef76664\spring-webmvc-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-web\5.0.9.RELEASE\1ea3aab93340849313fa74ec626ddaf1fff9ed8e\spring-web-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\javax.transaction\javax.transaction-api\1.2\d81aff979d603edd90dcd8db2abc1f4ce6479e3e\javax.transaction-api-1.2.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.hibernate\hibernate-core\5.2.17.Final\f2dc36470e7a2ffcf6106bb1625ecf5b54bb5f65\hibernate-core-5.2.17.Final.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.data\spring-data-jpa\2.0.10.RELEASE\a6e644c363d050c6c90f078f4f0ac66892f60d54\spring-data-jpa-2.0.10.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-aspects\5.0.9.RELEASE\dfb2da4c573391d8e8a482f08bdf4d38398e2bb0\spring-aspects-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-test-autoconfigure\2.0.5.RELEASE\54d5e8f9e88c6236fe164474f0aed5a8a1052c43\spring-boot-test-autoconfigure-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-test\2.0.5.RELEASE\ce6353f33217982357a6bdba6576015ea333304c\spring-boot-test-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.jayway.jsonpath\json-path\2.4.0\765a4401ceb2dc8d40553c2075eb80a8fa35c2ae\json-path-2.4.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.assertj\assertj-core\3.9.1\c5ce126b15f28d56cd8f960c1a6a058b9c9aea87\assertj-core-3.9.1.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.mockito\mockito-core\2.15.0\b84bfbbc29cd22c9529409627af6ea2897f4fa85\mockito-core-2.15.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.hamcrest\hamcrest-library\1.3\4785a3c21320980282f9f33d0d1264a69040538f\hamcrest-library-1.3.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.hamcrest\hamcrest-core\1.3\42a25dc3219429f0e5d060061f71acb49bf010a0\hamcrest-core-1.3.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.skyscreamer\jsonassert\1.5.0\6c9d5fe2f59da598d9aefc1cfc6528ff3cf32df3\jsonassert-1.5.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-test\5.0.9.RELEASE\218c8648f898453be92d550252e0ce2a84b54375\spring-test-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-autoconfigure\2.0.5.RELEASE\e5588642799e0c0c04638e255c3d3f31ba400ff4\spring-boot-autoconfigure-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot\2.0.5.RELEASE\19a4624cbd89a318d10c79f289c6c816043850fb\spring-boot-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-context\5.0.9.RELEASE\2501e55acb6c2e84667cda3f845d1d00a0dc4e05\spring-context-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-expression\5.0.9.RELEASE\1f9db5ff3a758102c0434cc3457aa47c50c39a4a\spring-expression-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-orm\5.0.9.RELEASE\bb9265effd7c903f4cc1c98d16b4188b7827a1cc\spring-orm-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-jdbc\5.0.9.RELEASE\2f38726ef2f5ecb72af7e915dac43177b01a8f53\spring-jdbc-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.data\spring-data-commons\2.0.10.RELEASE\64d4e58a2b16b9446d51a2650058d821a5bce98d\spring-data-commons-2.0.10.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-tx\5.0.9.RELEASE\d3a13fc3c56bdddd8144a686ed64f0cdb3ad7305\spring-tx-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-aop\5.0.9.RELEASE\98003b099697fe46b6bdf18c7e3f66d7a1381060\spring-aop-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-beans\5.0.9.RELEASE\65f56fdab1bb90ad059e314d2f2f4cf76f9bdbde\spring-beans-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-core\5.0.9.RELEASE\9f9a828936d81afd49a603bda9cc1aed863a0d85\spring-core-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.xmlunit\xmlunit-core\2.5.1\4ffdb346572a7356f7521cd3119ce5287d2e339d\xmlunit-core-2.5.1.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.junit.platform\junit-platform-engine\1.4.0\b4419dc190a5d82b9cac6b52e0af9140895c3f87\junit-platform-engine-1.4.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.junit.platform\junit-platform-commons\1.4.0\e0b2ed8fac32ad6469d75d034e759f1969db8dda\junit-platform-commons-1.4.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.apiguardian\apiguardian-api\1.0.0\3ef5276905e36f4d8055fe3cb0bdcc7503ffc85d\apiguardian-api-1.0.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.opentest4j\opentest4j\1.1.1\efd9f971e91074491ea55b19f67b13470cf4fcdd\opentest4j-1.1.1.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework.boot\spring-boot-starter-logging\2.0.5.RELEASE\c353e0b9591d0765c687ff0a678478cbebfd5c23\spring-boot-starter-logging-2.0.5.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\javax.annotation\javax.annotation-api\1.3.2\934c04d3cfef185a8008e7bf34331b79730a9d43\javax.annotation-api-1.3.2.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.yaml\snakeyaml\1.19\2d998d3d674b172a588e54ab619854d073f555b5\snakeyaml-1.19.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.datatype\jackson-datatype-jdk8\2.9.6\456895fc91bf7180b216fead220373e6278230c9\jackson-datatype-jdk8-2.9.6.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.datatype\jackson-datatype-jsr310\2.9.6\ea54f6193d224e5e5732bbd4262327eb465397c2\jackson-datatype-jsr310-2.9.6.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.module\jackson-module-parameter-names\2.9.6\129acd77a4b6ee30d62d3a0899b1344c8ec2bff8\jackson-module-parameter-names-2.9.6.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.core\jackson-databind\2.9.6\cfa4f316351a91bfd95cb0644c6a2c95f52db1fc\jackson-databind-2.9.6.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.apache.tomcat.embed\tomcat-embed-websocket\8.5.34\5f86906367c2540b21e6aeecc277d2ce9ec939b0\tomcat-embed-websocket-8.5.34.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.apache.tomcat.embed\tomcat-embed-core\8.5.34\a038040d68a90397f95dd1e11b979fe364a5000f\tomcat-embed-core-8.5.34.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.apache.tomcat.embed\tomcat-embed-el\8.5.34\be71a9a5bdd001db7cf97c47429eec0bdd3b7b88\tomcat-embed-el-8.5.34.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\javax.validation\validation-api\2.0.1.Final\cb855558e6271b1b32e716d24cb85c7f583ce09e\validation-api-2.0.1.Final.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.hibernate.common\hibernate-commons-annotations\5.0.1.Final\71e1cff3fcb20d3b3af4f3363c3ddb24d33c6879\hibernate-commons-annotations-5.0.1.Final.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.jboss.logging\jboss-logging\3.3.2.Final\3789d00e859632e6c6206adc0c71625559e6e3b0\jboss-logging-3.3.2.Final.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.fasterxml\classmate\1.3.4\3d5f48f10bbe4eb7bd862f10c0583be2e0053c6\classmate-1.3.4.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.aspectj\aspectjweaver\1.8.13\ad94df2a28d658a40dc27bbaff6a1ce5fbf04e9b\aspectjweaver-1.8.13.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.zaxxer\HikariCP\2.7.9\a83113d2c091d0d0f853dad3217bd7df3beb6ae3\HikariCP-2.7.9.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.hibernate.javax.persistence\hibernate-jpa-2.1-api\1.0.2.Final\52afb5762c704a6b586e27742470c08f91877fc1\hibernate-jpa-2.1-api-1.0.2.Final.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.javassist\javassist\3.22.0-GA\3e83394258ae2089be7219b971ec21a8288528ad\javassist-3.22.0-GA.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\antlr\antlr\2.7.7\83cd2cd674a217ade95a4bb83a8a14f351f48bd0\antlr-2.7.7.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.jboss\jandex\2.0.3.Final\bfc4d6257dbff7a33a357f0de116be6ff951d849\jandex-2.0.3.Final.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\dom4j\dom4j\1.6.1\5d3ccc056b6f056dbf0dddfdf43894b9065a8f94\dom4j-1.6.1.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\ch.qos.logback\logback-classic\1.2.3\7c4f3c474fb2c041d8028740440937705ebb473a\logback-classic-1.2.3.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-to-slf4j\2.10.0\f7e631ccf49cfc0aefa4a2a728da7d374c05bd3c\log4j-to-slf4j-2.10.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.slf4j\jul-to-slf4j\1.7.25\af5364cd6679bfffb114f0dec8a157aaa283b76\jul-to-slf4j-1.7.25.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.slf4j\slf4j-api\1.7.25\da76ca59f6a57ee3102f8f9bd9cee742973efa8a\slf4j-api-1.7.25.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\net.minidev\json-smart\2.3\7396407491352ce4fa30de92efb158adb76b5b\json-smart-2.3.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\net.bytebuddy\byte-buddy\1.7.11\f02857a4e2c66ccbe7aaad6100a0a6c461bce9b3\byte-buddy-1.7.11.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\net.bytebuddy\byte-buddy-agent\1.7.11\b425a8933ca07edd03c6dbc8bc3b595fba9780de\byte-buddy-agent-1.7.11.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.objenesis\objenesis\2.6\639033469776fd37c08358c6b92a4761feb2af4b\objenesis-2.6.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.vaadin.external.google\android-json\0.0.20131108.vaadin1\fa26d351fe62a6a17f5cda1287c1c6110dec413f\android-json-0.0.20131108.vaadin1.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.springframework\spring-jcl\5.0.9.RELEASE\bc3b5aaae53f0bc03647e53ecbd98a05b47a4e90\spring-jcl-5.0.9.RELEASE.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.core\jackson-annotations\2.9.0\7c10d545325e3a6e72e06381afe469fd40eb701\jackson-annotations-2.9.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.core\jackson-core\2.9.6\4e393793c37c77e042ccc7be5a914ae39251b365\jackson-core-2.9.6.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\net.minidev\accessors-smart\1.2\c592b500269bfde36096641b01238a8350f8aa31\accessors-smart-1.2.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\ch.qos.logback\logback-core\1.2.3\864344400c3d4d92dfeb0a305dc87d953677c03c\logback-core-1.2.3.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-api\2.10.0\fec5797a55b786184a537abd39c3fa1449d752d6\log4j-api-2.10.0.jar;C:\Users\ceren\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm\5.0.4\da08b8cce7bbf903602a25a3a163ae252435795\asm-5.0.4.jar, user.name=ceren, java.vm.specification.version=1.8, sun.java.command=worker.org.gradle.process.internal.worker.GradleWorkerMain 'Gradle Test Executor 4', java.home=C:\Program Files\Java\jdk1.8.0_201\jre, sun.arch.data.model=64, user.language=en, java.specification.vendor=Oracle Corporation, awt.toolkit=sun.awt.windows.WToolkit, java.vm.info=mixed mode, java.version=1.8.0_201, java.ext.dirs=C:\Program Files\Java\jdk1.8.0_201\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext, sun.boot.class.path=C:\Program Files\Java\jdk1.8.0_201\jre\lib\resources.jar;C:\Program Files\Java\jdk1.8.0_201\jre\lib\rt.jar;C:\Program Files\Java\jdk1.8.0_201\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.8.0_201\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.8.0_201\jre\lib\jce.jar;C:\Program Files\Java\jdk1.8.0_201\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.8.0_201\jre\lib\jfr.jar;C:\Program Files\Java\jdk1.8.0_201\jre\classes, java.vendor=Oracle Corporation, org.gradle.test.worker=4, file.separator=\, java.vendor.url.bug=http://bugreport.sun.com/bugreport/, sun.io.unicode.encoding=UnicodeLittle, sun.cpu.endian=little, sun.desktop=windows, sun.cpu.isalist=amd64}}, SystemEnvironmentPropertySource@2041610596 {name='systemEnvironment', properties={GOOGLE_DEFAULT_CLIENT_ID=no, USERDOMAIN_ROAMINGPROFILE=DESKTOP-FATFDSA, PROCESSOR_LEVEL=6, RegionCode=EMEA, SESSIONNAME=Console, ALLUSERSPROFILE=C:\ProgramData, PROCESSOR_ARCHITECTURE=AMD64, GIT_INSTALL_ROOT=C:\Users\ceren\scoop\apps\git\current, GOOGLE_DEFAULT_CLIENT_SECRET=no, PSModulePath=C:\Users\ceren\Documents\WindowsPowerShell\Modules;C:\Program Files\WindowsPowerShell\Modules;C:\WINDOWS\system32\WindowsPowerShell\v1.0\Modules, SystemDrive=C:, USERNAME=ceren, ProgramFiles(x86)=C:\Program Files (x86), PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.CPL, DriverData=C:\Windows\System32\Drivers\DriverData, OneDriveConsumer=C:\Users\ceren\OneDrive, platformcode=AN, ProgramData=C:\ProgramData, ProgramW6432=C:\Program Files, HOMEPATH=\Users\ceren, PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 10, GenuineIntel, ProgramFiles=C:\Program Files, PUBLIC=C:\Users\Public, windir=C:\WINDOWS, =::=::\, LOCALAPPDATA=C:\Users\ceren\AppData\Local, USERDOMAIN=DESKTOP-FATFDSA, LOGONSERVER=\\DESKTOP-FATFDSA, JAVA_HOME=C:\Users\ceren\scoop\apps\oraclejdk\11.0.2-9, OneDrive=C:\Users\ceren\OneDrive, APPDATA=C:\Users\ceren\AppData\Roaming, GOOGLE_API_KEY=no, VBOX_MSI_INSTALL_PATH=C:\Program Files\Oracle\VirtualBox\, CommonProgramFiles=C:\Program Files\Common Files, Path=C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\iCLS\;C:\Program Files\Intel\Intel(R) Management Engine Components\iCLS\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Users\ceren\scoop\apps\oraclejdk\11.0.2-9\bin;C:\Users\ceren\scoop\apps\idea\current\bin;C:\Users\ceren\scoop\shims;C:\Users\ceren\AppData\Local\Microsoft\WindowsApps;C:\Users\ceren\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\ceren\AppData\Roaming\npm, OS=Windows_NT, COMPUTERNAME=DESKTOP-FATFDSA, PTSMINSTALLPATH=c:\Program Files\HP\HP ProtectTools Security Manager\Bin\, OnlineServices=Online Services, PROCESSOR_REVISION=9e0a, CommonProgramW6432=C:\Program Files\Common Files, ComSpec=C:\WINDOWS\system32\cmd.exe, PTSMINSTALLPATH_X86=c:\Program Files (x86)\HP\HP ProtectTools Security Manager\Bin\, SystemRoot=C:\WINDOWS, TEMP=C:\Users\ceren\AppData\Local\Temp, HOMEDRIVE=C:, USERPROFILE=C:\Users\ceren, TMP=C:\Users\ceren\AppData\Local\Temp, CommonProgramFiles(x86)=C:\Program Files (x86)\Common Files, NUMBER_OF_PROCESSORS=12}}] -12:15:54.313 [Test worker] DEBUG org.springframework.test.context.support.TestPropertySourceUtils - Adding inlined properties to environment: {spring.jmx.enabled=false, org.springframework.boot.test.context.SpringBootTestContextBootstrapper=true, server.port=0} -12:15:54.313 [Test worker] DEBUG org.springframework.core.env.StandardEnvironment - Adding PropertySource 'Inlined Test Properties' with highest search precedence - - . ____ _ __ _ _ - /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ -( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ - \\/ ___)| |_)| | | | | || (_| | ) ) ) ) - ' |____| .__|_| |_|_| |_\__, | / / / / - =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v2.0.5.RELEASE) - -2019-03-04 12:15:54.768 INFO 21460 --- [ Test worker] gogreen.server.rest.UserControllerTest : Starting UserControllerTest on DESKTOP-FATFDSA with PID 21460 (started by ceren in C:\Users\ceren\Desktop\My Courses\OOP project\OOPP\Server) -2019-03-04 12:15:54.770 INFO 21460 --- [ Test worker] gogreen.server.rest.UserControllerTest : No active profile set, falling back to default profiles: default -2019-03-04 12:15:54.818 INFO 21460 --- [ Test worker] ConfigServletWebServerApplicationContext : Refreshing org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext@6fe4b9d3: startup date [Mon Mar 04 12:15:54 CET 2019]; root of context hierarchy -2019-03-04 12:15:56.604 INFO 21460 --- [ Test worker] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$9725962d] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2019-03-04 12:15:57.235 INFO 21460 --- [ Test worker] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat initialized with port(s): 0 (http) -2019-03-04 12:15:57.281 INFO 21460 --- [ Test worker] o.apache.catalina.core.StandardService : Starting service [Tomcat] -2019-03-04 12:15:57.281 INFO 21460 --- [ Test worker] org.apache.catalina.core.StandardEngine : Starting Servlet Engine: Apache Tomcat/8.5.34 -2019-03-04 12:15:57.298 INFO 21460 --- [ost-startStop-1] o.a.catalina.core.AprLifecycleListener : The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: [C:\Program Files\Java\jdk1.8.0_201\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\iCLS\;C:\Program Files\Intel\Intel(R) Management Engine Components\iCLS\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Users\ceren\scoop\apps\oraclejdk\11.0.2-9\bin;C:\Users\ceren\scoop\apps\idea\current\bin;C:\Users\ceren\scoop\shims;C:\Users\ceren\AppData\Local\Microsoft\WindowsApps;C:\Users\ceren\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\ceren\AppData\Roaming\npm;.] -2019-03-04 12:15:57.484 INFO 21460 --- [ost-startStop-1] o.a.c.c.C.[Tomcat].[localhost].[/] : Initializing Spring embedded WebApplicationContext -2019-03-04 12:15:57.484 INFO 21460 --- [ost-startStop-1] o.s.web.context.ContextLoader : Root WebApplicationContext: initialization completed in 2669 ms -2019-03-04 12:15:57.590 INFO 21460 --- [ost-startStop-1] o.s.b.w.servlet.ServletRegistrationBean : Servlet dispatcherServlet mapped to [/] -2019-03-04 12:15:57.597 INFO 21460 --- [ost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean : Mapping filter: 'characterEncodingFilter' to: [/*] -2019-03-04 12:15:57.597 INFO 21460 --- [ost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean : Mapping filter: 'hiddenHttpMethodFilter' to: [/*] -2019-03-04 12:15:57.598 INFO 21460 --- [ost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean : Mapping filter: 'httpPutFormContentFilter' to: [/*] -2019-03-04 12:15:57.598 INFO 21460 --- [ost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean : Mapping filter: 'requestContextFilter' to: [/*] -2019-03-04 12:15:57.846 INFO 21460 --- [ Test worker] com.zaxxer.hikari.HikariDataSource : HikariPool-1 - Starting... -2019-03-04 12:15:58.143 INFO 21460 --- [ Test worker] com.zaxxer.hikari.HikariDataSource : HikariPool-1 - Start completed. -2019-03-04 12:15:58.232 INFO 21460 --- [ Test worker] j.LocalContainerEntityManagerFactoryBean : Building JPA container EntityManagerFactory for persistence unit 'default' -2019-03-04 12:15:58.269 INFO 21460 --- [ Test worker] o.hibernate.jpa.internal.util.LogHelper : HHH000204: Processing PersistenceUnitInfo [ - name: default - ...] -2019-03-04 12:15:58.413 INFO 21460 --- [ Test worker] org.hibernate.Version : HHH000412: Hibernate Core {5.2.17.Final} -2019-03-04 12:15:58.415 INFO 21460 --- [ Test worker] org.hibernate.cfg.Environment : HHH000206: hibernate.properties not found -2019-03-04 12:15:58.479 INFO 21460 --- [ Test worker] o.hibernate.annotations.common.Version : HCANN000001: Hibernate Commons Annotations {5.0.1.Final} -2019-03-04 12:15:58.688 INFO 21460 --- [ Test worker] org.hibernate.dialect.Dialect : HHH000400: Using dialect: org.hibernate.dialect.H2Dialect -2019-03-04 12:15:59.747 INFO 21460 --- [ Test worker] o.h.t.schema.internal.SchemaCreatorImpl : HHH000476: Executing import script 'org.hibernate.tool.schema.internal.exec.ScriptSourceInputNonExistentImpl@59abca76' -2019-03-04 12:15:59.751 INFO 21460 --- [ Test worker] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default' -2019-03-04 12:16:00.371 INFO 21460 --- [ Test worker] o.s.w.s.handler.SimpleUrlHandlerMapping : Mapped URL path [/**/favicon.ico] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler] -2019-03-04 12:16:00.729 INFO 21460 --- [ Test worker] s.w.s.m.m.a.RequestMappingHandlerAdapter : Looking for @ControllerAdvice: org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext@6fe4b9d3: startup date [Mon Mar 04 12:15:54 CET 2019]; root of context hierarchy -2019-03-04 12:16:00.801 WARN 21460 --- [ Test worker] aWebConfiguration$JpaWebMvcConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2019-03-04 12:16:00.845 INFO 21460 --- [ Test worker] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/login]}" onto public gogreen.common.UserDTO gogreen.server.rest.UserController.login(java.lang.String,java.lang.String) -2019-03-04 12:16:00.846 INFO 21460 --- [ Test worker] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/registerUser]}" onto public gogreen.common.UserDTO gogreen.server.rest.UserController.registerUser(java.lang.String,java.lang.String) -2019-03-04 12:16:00.849 INFO 21460 --- [ Test worker] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error]}" onto public org.springframework.http.ResponseEntity> org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController.error(javax.servlet.http.HttpServletRequest) -2019-03-04 12:16:00.850 INFO 21460 --- [ Test worker] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error],produces=[text/html]}" onto public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) -2019-03-04 12:16:00.882 INFO 21460 --- [ Test worker] o.s.w.s.handler.SimpleUrlHandlerMapping : Mapped URL path [/webjars/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler] -2019-03-04 12:16:00.882 INFO 21460 --- [ Test worker] o.s.w.s.handler.SimpleUrlHandlerMapping : Mapped URL path [/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler] -2019-03-04 12:16:00.901 INFO 21460 --- [ Test worker] .m.m.a.ExceptionHandlerExceptionResolver : Detected @ExceptionHandler methods in restExceptionHandler -2019-03-04 12:16:01.225 INFO 21460 --- [ Test worker] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat started on port(s): 55036 (http) with context path '' -2019-03-04 12:16:01.229 INFO 21460 --- [ Test worker] gogreen.server.rest.UserControllerTest : Started UserControllerTest in 6.913 seconds (JVM running for 10.219) -2019-03-04 12:16:01.607 INFO 21460 --- [o-auto-1-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/] : Initializing Spring FrameworkServlet 'dispatcherServlet' -2019-03-04 12:16:01.607 INFO 21460 --- [o-auto-1-exec-1] o.s.web.servlet.DispatcherServlet : FrameworkServlet 'dispatcherServlet': initialization started -2019-03-04 12:16:01.634 INFO 21460 --- [o-auto-1-exec-1] o.s.web.servlet.DispatcherServlet : FrameworkServlet 'dispatcherServlet': initialization completed in 27 ms -2019-03-04 12:16:01.734 INFO 21460 --- [o-auto-1-exec-1] o.h.h.i.QueryTranslatorFactoryInitiator : HHH000397: Using ASTQueryTranslatorFactory -2019-03-04 12:16:02.040 INFO 21460 --- [o-auto-1-exec-1] gogreen.server.service.UserService : Created user id=1, name=ceren -2019-03-04 12:16:02.157 WARN 21460 --- [o-auto-1-exec-2] .m.m.a.ExceptionHandlerExceptionResolver : Resolved [gogreen.common.ApplicationException: User already exists] -]]> - - diff --git a/src/GoGreen/Server/build/test-results/test/binary/output.bin b/src/GoGreen/Server/build/test-results/test/binary/output.bin deleted file mode 100644 index e7b7462d3ec4bc01eee8a95ad9742d47843c6251..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35516 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Server/.gitignore b/src/Server/.gitignore deleted file mode 100644 index b7e4f85..0000000 --- a/src/Server/.gitignore +++ /dev/null @@ -1,198 +0,0 @@ - -# Created by https://www.gitignore.io/api/java,gradle,eclipse,intellij -# Edit at https://www.gitignore.io/?templates=java,gradle,eclipse,intellij - -### Eclipse ### - -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath -.recommenders - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# CDT- autotools -.autotools - -# Java annotation processor (APT) -.factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders -.recommenders/ - -# Annotation Processing -.apt_generated/ - -# Scala IDE specific (Scala & Java development for Eclipse) -.cache-main -.scala_dependencies -.worksheet - -### Eclipse Patch ### -# Eclipse Core -.project - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Annotation Processing -.apt_generated - -.sts4-cache/ - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/modules.xml -# .idea/*.iml -# .idea/modules - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### Intellij Patch ### -# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 - -# *.iml -# modules.xml -# .idea/misc.xml -# *.ipr - -# Sonarlint plugin -.idea/sonarlint - -### Java ### -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -### Gradle ### -.gradle -build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - -# Cache of project -.gradletasknamecache - -# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 -# gradle/wrapper/gradle-wrapper.properties - -### Gradle Patch ### -**/build/ - -# End of https://www.gitignore.io/api/java,gradle,eclipse,intellij \ No newline at end of file diff --git a/src/GoGreen/Server/.idea/gradle.xml b/src/Server/.idea/gradle.xml similarity index 100% rename from src/GoGreen/Server/.idea/gradle.xml rename to src/Server/.idea/gradle.xml diff --git a/src/Server/.idea/misc.xml b/src/Server/.idea/misc.xml index 9870be1..5325e36 100644 --- a/src/Server/.idea/misc.xml +++ b/src/Server/.idea/misc.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/src/GoGreen/Server/.idea/workspace.xml b/src/Server/.idea/workspace.xml similarity index 100% rename from src/GoGreen/Server/.idea/workspace.xml rename to src/Server/.idea/workspace.xml diff --git a/src/Server/.project b/src/Server/.project new file mode 100644 index 0000000..1b872bc --- /dev/null +++ b/src/Server/.project @@ -0,0 +1,17 @@ + + + Server + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + diff --git a/src/Server/build.gradle b/src/Server/build.gradle index 5dcedff..50aeedd 100644 --- a/src/Server/build.gradle +++ b/src/Server/build.gradle @@ -13,12 +13,25 @@ apply plugin: 'idea' apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'jacoco' +apply plugin: 'checkstyle' + + +tasks.withType(Checkstyle) { + reports { + html.destination rootProject.file("build/reports/checkstyle.html") + } +} bootJar { baseName = 'gs-rest-service' version = '0.1.0' } +test { + useJUnitPlatform() +} + + repositories { mavenCentral() } @@ -29,4 +42,36 @@ targetCompatibility = 1.8 dependencies { compile("org.springframework.boot:spring-boot-starter-web") testCompile('org.springframework.boot:spring-boot-starter-test') -} \ No newline at end of file + compile project(path: ':src:Common') + compileOnly 'org.projectlombok:lombok:1.18.6' + annotationProcessor 'org.projectlombok:lombok:1.18.6' + compile("org.springframework.boot:spring-boot-starter-data-jpa") + compile("com.h2database:h2") + testCompile( + 'junit:junit:4.12', + 'org.junit.jupiter:junit-jupiter-api:5.4.0' + ) + testRuntime( + 'org.junit.jupiter:junit-jupiter-engine:5.4.0', + 'org.junit.vintage:junit-vintage-engine:5.4.0' + ) +} + +jacoco { + toolVersion = "0.8.3" + reportsDir = file("$buildDir/customJacocoReportDir") +} + +jacocoTestReport { + reports { + xml.enabled false + csv.enabled false + html.destination file("${buildDir}/jacocoHtml") + } +} + +checkstyle { + toolVersion = "7.6.1" +} + + diff --git a/src/GoGreen/Server/src/main/java/gogreen/server/Application.java b/src/Server/src/main/java/gogreen/server/Application.java similarity index 100% rename from src/GoGreen/Server/src/main/java/gogreen/server/Application.java rename to src/Server/src/main/java/gogreen/server/Application.java diff --git a/src/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java b/src/Server/src/main/java/gogreen/server/data/model/User.java similarity index 53% rename from src/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java rename to src/Server/src/main/java/gogreen/server/data/model/User.java index 2152c91..11bb0fb 100644 --- a/src/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java +++ b/src/Server/src/main/java/gogreen/server/data/model/User.java @@ -1,8 +1,8 @@ package gogreen.server.data.model; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -10,7 +10,7 @@ import javax.persistence.Id; @Entity @Data -@AllArgsConstructor +//@AllArgsConstructor @NoArgsConstructor public class User { @@ -19,4 +19,22 @@ public class User { Long id; String name; String password; + + public User(Long id, String name, String password) { + this.id = id; + this.name = name; + this.password = password; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public String getPassword() { + return password; + } } \ No newline at end of file diff --git a/src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java b/src/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java similarity index 100% rename from src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java rename to src/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java diff --git a/src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java b/src/Server/src/main/java/gogreen/server/data/repository/UserRepository.java similarity index 100% rename from src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java rename to src/Server/src/main/java/gogreen/server/data/repository/UserRepository.java diff --git a/src/GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java b/src/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java similarity index 100% rename from src/GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java rename to src/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java diff --git a/src/GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java b/src/Server/src/main/java/gogreen/server/rest/UserController.java similarity index 100% rename from src/GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java rename to src/Server/src/main/java/gogreen/server/rest/UserController.java diff --git a/src/GoGreen/Server/src/main/java/gogreen/server/service/UserService.java b/src/Server/src/main/java/gogreen/server/service/UserService.java similarity index 100% rename from src/GoGreen/Server/src/main/java/gogreen/server/service/UserService.java rename to src/Server/src/main/java/gogreen/server/service/UserService.java diff --git a/src/Server/src/main/java/hello/Greeting.java b/src/Server/src/main/java/hello/Greeting.java deleted file mode 100644 index b4d6218..0000000 --- a/src/Server/src/main/java/hello/Greeting.java +++ /dev/null @@ -1,20 +0,0 @@ -package main.java.hello; - -public class Greeting { - - private final long id; - private final String content; - - public Greeting(long id, String content) { - this.id = id; - this.content = content; - } - - public long getId() { - return id; - } - - public String getContent() { - return content; - } -} \ No newline at end of file diff --git a/src/Server/src/main/java/hello/GreetingController.java b/src/Server/src/main/java/hello/GreetingController.java deleted file mode 100644 index 9de358f..0000000 --- a/src/Server/src/main/java/hello/GreetingController.java +++ /dev/null @@ -1,20 +0,0 @@ -package main.java.hello; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.concurrent.atomic.AtomicLong; - -@RestController -public class GreetingController { - - private static final String template = "Hello, %s!"; - private final AtomicLong counter = new AtomicLong(); - - @RequestMapping("/greeting") - public Greeting greeting(@RequestParam(value="name", defaultValue="World") String name) { - return new Greeting(counter.incrementAndGet(), - String.format(template, name)); - } -} \ No newline at end of file diff --git a/src/Server/src/main/java/hello/ServerApplication.java b/src/Server/src/main/java/hello/ServerApplication.java deleted file mode 100644 index 51639ef..0000000 --- a/src/Server/src/main/java/hello/ServerApplication.java +++ /dev/null @@ -1,12 +0,0 @@ -package main.java.hello; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class ServerApplication { - - public static void main(String[] args) { - SpringApplication.run(ServerApplication.class, args); - } -} \ No newline at end of file diff --git a/src/Server/src/test/java/GreetingControllerTest.java b/src/Server/src/test/java/GreetingControllerTest.java deleted file mode 100644 index 97977a9..0000000 --- a/src/Server/src/test/java/GreetingControllerTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package test.java; - -import main.java.hello.GreetingController; -import org.junit.Assert; -import org.junit.jupiter.api.Test; - -public class GreetingControllerTest { - @Test - void nullTest() { - GreetingController controller = new GreetingController(); -// Assert.assertThat(controller).isNotNull(); - Assert.assertNotNull(controller); - } -} - diff --git a/src/Server/src/test/java/GreetingTest.java b/src/Server/src/test/java/GreetingTest.java deleted file mode 100644 index 8e82f32..0000000 --- a/src/Server/src/test/java/GreetingTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package test.java; - -import main.java.hello.Greeting; -import org.junit.Assert; -import org.junit.jupiter.api.Test; - -public class GreetingTest { - @Test - void testGets() { - Greeting greeting = new Greeting(1, "hello"); - long id = greeting.getId(); - String content = greeting.getContent(); -// assertThat(id).isEqualTo(1); - Assert.assertEquals(id, 1); -// assertThat(content).isEqualTo(content); - Assert.assertEquals(content,content); - } -} \ No newline at end of file diff --git a/src/Server/src/test/java/ServerApplicationTest.java b/src/Server/src/test/java/ServerApplicationTest.java deleted file mode 100644 index d611083..0000000 --- a/src/Server/src/test/java/ServerApplicationTest.java +++ /dev/null @@ -1,8 +0,0 @@ -package test.java; - -import org.junit.Test; -public class ServerApplicationTest { - @Test - public void main() { - } -} \ No newline at end of file diff --git a/src/GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java b/src/Server/src/test/java/gogreen/server/rest/UserControllerTest.java similarity index 100% rename from src/GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java rename to src/Server/src/test/java/gogreen/server/rest/UserControllerTest.java