diff --git a/.gitignore b/.gitignore index 851ae2e..032be40 100644 --- a/.gitignore +++ b/.gitignore @@ -19,10 +19,11 @@ # 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 ### @@ -215,4 +216,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/build.gradle b/build.gradle index 16fa58a..9737a85 100644 --- a/build.gradle +++ b/build.gradle @@ -40,4 +40,8 @@ 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 +} + +bootJar { + mainClassName = 'GUI.LoginController' +} diff --git a/settings.gradle b/settings.gradle index f310c3a..4e07248 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ -rootProject.name = 'OOPP' \ No newline at end of file +rootProject.name = 'OOPP' + +include 'src:GoGreen' \ No newline at end of file diff --git a/src/Client/.gitignore b/src/Client/.gitignore deleted file mode 100644 index b7e4f85..0000000 --- a/src/Client/.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/Client/.idea/checkstyle-idea.xml b/src/Client/.idea/checkstyle-idea.xml deleted file mode 100644 index ef7efd6..0000000 --- a/src/Client/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Client/.idea/compiler.xml b/src/Client/.idea/compiler.xml deleted file mode 100644 index 3d94435..0000000 --- a/src/Client/.idea/compiler.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Client/.idea/encodings.xml b/src/Client/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/src/Client/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Client/.idea/misc.xml b/src/Client/.idea/misc.xml deleted file mode 100644 index 9870be1..0000000 --- a/src/Client/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Client/.idea/modules.xml b/src/Client/.idea/modules.xml deleted file mode 100644 index 46edb73..0000000 --- a/src/Client/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Client/.idea/modules/Client.iml b/src/Client/.idea/modules/Client.iml deleted file mode 100644 index 642f2c3..0000000 --- a/src/Client/.idea/modules/Client.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Client/.idea/modules/Client.main.iml b/src/Client/.idea/modules/Client.main.iml deleted file mode 100644 index 046df4e..0000000 --- a/src/Client/.idea/modules/Client.main.iml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Client/.idea/modules/Client.test.iml b/src/Client/.idea/modules/Client.test.iml deleted file mode 100644 index ae12b55..0000000 --- a/src/Client/.idea/modules/Client.test.iml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Client/.idea/vcs.xml b/src/Client/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/src/Client/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Client/build.gradle b/src/Client/build.gradle deleted file mode 100644 index 6575086..0000000 --- a/src/Client/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE") - } -} - -apply plugin: 'java' -apply plugin: 'eclipse' -apply plugin: 'idea' -apply plugin: 'org.springframework.boot' -apply plugin: 'io.spring.dependency-management' -apply plugin: 'jacoco' - -bootJar { - baseName = 'gs-consuming-rest' - version = '0.1.0' -} - -repositories { - mavenCentral() -} - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -dependencies { - compile("org.springframework.boot:spring-boot-starter") - compile("org.springframework:spring-web") - compile("com.fasterxml.jackson.core:jackson-databind") - testCompile("junit:junit") -} \ No newline at end of file diff --git a/src/Client/src/main/java/hello/Application.java b/src/Client/src/main/java/hello/Application.java deleted file mode 100644 index c194ad3..0000000 --- a/src/Client/src/main/java/hello/Application.java +++ /dev/null @@ -1,34 +0,0 @@ -package main.java.hello; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; - -/* -Application that connects to the server - */ -@SpringBootApplication -public class Application { - private static final Logger log = LoggerFactory.getLogger(Application.class); - - public static void main(String[] args) { - SpringApplication.run(Application.class); - } - - @Bean - public RestTemplate restTemplate(RestTemplateBuilder builder) { - return builder.build(); - } - @Bean - public CommandLineRunner run(RestTemplate restTemplate) throws Exception { - return args -> { - Message message = restTemplate.getForObject("http://localhost:8080/greeting?name=Ceren", Message.class); - log.info(message.toString()); - }; - } -} \ No newline at end of file diff --git a/src/Client/src/main/java/hello/Message.java b/src/Client/src/main/java/hello/Message.java deleted file mode 100644 index b32368e..0000000 --- a/src/Client/src/main/java/hello/Message.java +++ /dev/null @@ -1,37 +0,0 @@ -package main.java.hello; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class Message { - - private long id; - private String content; - - public Message() { - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - @Override - public String toString() { - return "Message{" - + "id='" + id + '\'' - + ", content=" + content - + '}'; - } -} \ No newline at end of file diff --git a/src/Client/src/test/java/ApplicationTest.java b/src/Client/src/test/java/ApplicationTest.java deleted file mode 100644 index 162aa0f..0000000 --- a/src/Client/src/test/java/ApplicationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package test.java; - -import org.junit.Test; - -public class ApplicationTest { - @Test - public void main() { - } - - @Test - public void restTemplateTest() { - - } - - @Test - public void runTest() {} - -} diff --git a/src/Client/src/test/java/MessageTest.java b/src/Client/src/test/java/MessageTest.java deleted file mode 100644 index c5fb96f..0000000 --- a/src/Client/src/test/java/MessageTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package test.java; - - - -import main.java.hello.Message; -import org.junit.Assert; -import org.junit.jupiter.api.Test; - -public class MessageTest { - @Test - void testGets() { - Message message = new Message(); - message.setId(12345678910L); - message.setContent("hello"); - long id = message.getId(); - String content = message.getContent(); - Assert.assertEquals(id, 12345678910L); - Assert.assertEquals(content, "hello"); - } - - @Test - void toStringTest() { - Message message = new Message(); - message.setId(12345678910L); - message.setContent("hello"); - Assert.assertEquals(message.toString(), "Message{id='12345678910', content=hello}" ); - } -} \ No newline at end of file diff --git a/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin b/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin deleted file mode 100644 index 45d0351..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock b/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock deleted file mode 100644 index 5d64d44..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin b/src/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock b/src/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock deleted file mode 100644 index e9e3bf4..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin deleted file mode 100644 index 403e8af..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock deleted file mode 100644 index 2ae5f40..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 7864b9a..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/gc.properties b/src/GoGreen/Client/.gradle/5.2.1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin deleted file mode 100644 index d42b70d..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin deleted file mode 100644 index e4372a4..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock deleted file mode 100644 index e0635d3..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin deleted file mode 100644 index 58d1af4..0000000 Binary files a/src/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 95ab148..0000000 Binary files a/src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties b/src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index b2dd231..0000000 --- a/src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Thu Feb 21 00:34:57 CET 2019 -gradle.version=5.2.1 diff --git a/src/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin b/src/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index dc2b305..0000000 Binary files a/src/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/src/GoGreen/Client/.gradle/vcs-1/gc.properties b/src/GoGreen/Client/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/GoGreen/Client/.idea/compiler.xml b/src/GoGreen/Client/.idea/compiler.xml deleted file mode 100644 index 3d94435..0000000 --- a/src/GoGreen/Client/.idea/compiler.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/GoGreen/Client/.idea/encodings.xml b/src/GoGreen/Client/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/src/GoGreen/Client/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/GoGreen/Client/.idea/gradle.xml b/src/GoGreen/Client/.idea/gradle.xml deleted file mode 100644 index d1f1d89..0000000 --- a/src/GoGreen/Client/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/GoGreen/Client/.idea/misc.xml b/src/GoGreen/Client/.idea/misc.xml deleted file mode 100644 index 9870be1..0000000 --- a/src/GoGreen/Client/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/GoGreen/Client/.idea/modules.xml b/src/GoGreen/Client/.idea/modules.xml deleted file mode 100644 index cde60df..0000000 --- a/src/GoGreen/Client/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/GoGreen/Client/.idea/uiDesigner.xml b/src/GoGreen/Client/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/src/GoGreen/Client/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/GoGreen/Client/.idea/workspace.xml b/src/GoGreen/Client/.idea/workspace.xml deleted file mode 100644 index 06551d4..0000000 --- a/src/GoGreen/Client/.idea/workspace.xml +++ /dev/null @@ -1,489 +0,0 @@ - - - - - - - - - - - - - hello.* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - 1550791437583 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 10 - - - - - - - - main|com.bettercoding.jfx.Client - - - - - - - - 10 - - - - - - - - Gradle: ch.qos.logback:logback-classic:1.2.3 - - - - - - - - \ No newline at end of file diff --git a/src/GoGreen/Client/build.gradle b/src/GoGreen/Client/build.gradle index feb783b..c521264 100644 --- a/src/GoGreen/Client/build.gradle +++ b/src/GoGreen/Client/build.gradle @@ -80,4 +80,6 @@ jacocoTestReport { csv.enabled false html.destination file("${buildDir}/jacocoHtml") } -} \ No newline at end of file +} + +//mainClassName ='main.java.gogreen.client.Application' \ No newline at end of file diff --git a/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin b/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin deleted file mode 100644 index bc6be0b..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock b/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock deleted file mode 100644 index 7abec36..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin b/src/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock b/src/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock deleted file mode 100644 index b18cf80..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin deleted file mode 100644 index 96c158b..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock deleted file mode 100644 index 9d0e684..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 0448de7..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/gc.properties b/src/GoGreen/Server/.gradle/5.2.1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin deleted file mode 100644 index a858ec9..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin deleted file mode 100644 index 2512b25..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock deleted file mode 100644 index 98305c0..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin deleted file mode 100644 index 0bcd67b..0000000 Binary files a/src/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 532bc62..0000000 Binary files a/src/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties b/src/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 37d9125..0000000 --- a/src/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Wed Feb 20 23:42:38 CET 2019 -gradle.version=5.2.1 diff --git a/src/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin b/src/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 9dbe785..0000000 Binary files a/src/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/src/GoGreen/Server/.gradle/vcs-1/gc.properties b/src/GoGreen/Server/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/GoGreen/Server/.idea/encodings.xml b/src/GoGreen/Server/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/src/GoGreen/Server/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/GoGreen/Server/.idea/gradle.xml b/src/GoGreen/Server/.idea/gradle.xml deleted file mode 100644 index d1f1d89..0000000 --- a/src/GoGreen/Server/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/GoGreen/Server/.idea/misc.xml b/src/GoGreen/Server/.idea/misc.xml deleted file mode 100644 index 5325e36..0000000 --- a/src/GoGreen/Server/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/GoGreen/Server/.idea/workspace.xml b/src/GoGreen/Server/.idea/workspace.xml deleted file mode 100644 index df47619..0000000 --- a/src/GoGreen/Server/.idea/workspace.xml +++ /dev/null @@ -1,443 +0,0 @@ - - - - - - - - - - - hello.* - - - - - hello.* - - - - - - - - hello.* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1550790895238 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - - - - - - - - \ No newline at end of file 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/Server/.idea/encodings.xml b/src/Server/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/src/Server/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Server/.idea/misc.xml b/src/Server/.idea/misc.xml deleted file mode 100644 index 9870be1..0000000 --- a/src/Server/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Server/build.gradle b/src/Server/build.gradle deleted file mode 100644 index 5dcedff..0000000 --- a/src/Server/build.gradle +++ /dev/null @@ -1,32 +0,0 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE") - } -} - -apply plugin: 'java' -apply plugin: 'eclipse' -apply plugin: 'idea' -apply plugin: 'org.springframework.boot' -apply plugin: 'io.spring.dependency-management' -apply plugin: 'jacoco' - -bootJar { - baseName = 'gs-rest-service' - version = '0.1.0' -} - -repositories { - mavenCentral() -} - -sourceCompatibility = 1.8 -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 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