diff --git a/Client/.gradle/5.2.1/executionHistory/executionHistory.bin b/Client/.gradle/5.2.1/executionHistory/executionHistory.bin deleted file mode 100644 index 53dceb7..0000000 Binary files a/Client/.gradle/5.2.1/executionHistory/executionHistory.bin and /dev/null differ diff --git a/Client/.gradle/5.2.1/executionHistory/executionHistory.lock b/Client/.gradle/5.2.1/executionHistory/executionHistory.lock deleted file mode 100644 index cb37681..0000000 Binary files a/Client/.gradle/5.2.1/executionHistory/executionHistory.lock and /dev/null differ diff --git a/Client/.gradle/5.2.1/fileHashes/fileHashes.lock b/Client/.gradle/5.2.1/fileHashes/fileHashes.lock deleted file mode 100644 index 5b2c181..0000000 Binary files a/Client/.gradle/5.2.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/Client/.gradle/5.2.1/javaCompile/javaCompile.lock b/Client/.gradle/5.2.1/javaCompile/javaCompile.lock deleted file mode 100644 index 9ef821e..0000000 Binary files a/Client/.gradle/5.2.1/javaCompile/javaCompile.lock and /dev/null differ diff --git a/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 2a3f2f8..0000000 Binary files a/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/Client/src/main/java/hello/Application.java b/Client/src/main/java/hello/Application.java deleted file mode 100644 index c660f5e..0000000 --- a/Client/src/main/java/hello/Application.java +++ /dev/null @@ -1,35 +0,0 @@ -package 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.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; - -@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/Client/src/main/java/hello/Message.java b/Client/src/main/java/hello/Message.java deleted file mode 100644 index 95f092e..0000000 --- a/Client/src/main/java/hello/Message.java +++ /dev/null @@ -1,37 +0,0 @@ -package hello; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class Message { - - private static long id; - private static String content; - - public Message() { - } - - public static long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public static 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/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.bin b/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000..45d0351 Binary files /dev/null and b/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.bin differ diff --git a/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.lock b/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000..5d64d44 Binary files /dev/null and b/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.lock differ diff --git a/Client/.gradle/5.2.1/fileChanges/last-build.bin b/OOPP/Client/.gradle/5.2.1/fileChanges/last-build.bin similarity index 100% rename from Client/.gradle/5.2.1/fileChanges/last-build.bin rename to OOPP/Client/.gradle/5.2.1/fileChanges/last-build.bin diff --git a/Client/.gradle/5.2.1/fileContent/fileContent.lock b/OOPP/Client/.gradle/5.2.1/fileContent/fileContent.lock similarity index 100% rename from Client/.gradle/5.2.1/fileContent/fileContent.lock rename to OOPP/Client/.gradle/5.2.1/fileContent/fileContent.lock diff --git a/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.bin b/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000..403e8af Binary files /dev/null and b/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.bin differ diff --git a/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.lock b/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000..2ae5f40 Binary files /dev/null and b/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.lock differ diff --git a/Client/.gradle/5.2.1/fileHashes/fileHashes.bin b/OOPP/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin similarity index 92% rename from Client/.gradle/5.2.1/fileHashes/fileHashes.bin rename to OOPP/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin index 879989b..7864b9a 100644 Binary files a/Client/.gradle/5.2.1/fileHashes/fileHashes.bin and b/OOPP/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin differ diff --git a/Client/.gradle/5.2.1/gc.properties b/OOPP/Client/.gradle/5.2.1/gc.properties similarity index 100% rename from Client/.gradle/5.2.1/gc.properties rename to OOPP/Client/.gradle/5.2.1/gc.properties diff --git a/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin b/OOPP/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin similarity index 75% rename from Client/.gradle/5.2.1/javaCompile/classAnalysis.bin rename to OOPP/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin index dc515f1..d42b70d 100644 Binary files a/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin and b/OOPP/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin differ diff --git a/Client/.gradle/5.2.1/javaCompile/taskHistory.bin b/OOPP/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin similarity index 81% rename from Client/.gradle/5.2.1/javaCompile/taskHistory.bin rename to OOPP/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin index 6914c92..e4372a4 100644 Binary files a/Client/.gradle/5.2.1/javaCompile/taskHistory.bin and b/OOPP/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin differ diff --git a/OOPP/Client/.gradle/5.2.1/javaCompile/javaCompile.lock b/OOPP/Client/.gradle/5.2.1/javaCompile/javaCompile.lock new file mode 100644 index 0000000..e0635d3 Binary files /dev/null and b/OOPP/Client/.gradle/5.2.1/javaCompile/javaCompile.lock differ diff --git a/OOPP/Client/.gradle/5.2.1/javaCompile/taskHistory.bin b/OOPP/Client/.gradle/5.2.1/javaCompile/taskHistory.bin new file mode 100644 index 0000000..58d1af4 Binary files /dev/null and b/OOPP/Client/.gradle/5.2.1/javaCompile/taskHistory.bin differ diff --git a/OOPP/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/OOPP/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..95ab148 Binary files /dev/null and b/OOPP/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Client/.gradle/buildOutputCleanup/cache.properties b/OOPP/Client/.gradle/buildOutputCleanup/cache.properties similarity index 100% rename from Client/.gradle/buildOutputCleanup/cache.properties rename to OOPP/Client/.gradle/buildOutputCleanup/cache.properties diff --git a/Client/.gradle/buildOutputCleanup/outputFiles.bin b/OOPP/Client/.gradle/buildOutputCleanup/outputFiles.bin similarity index 93% rename from Client/.gradle/buildOutputCleanup/outputFiles.bin rename to OOPP/Client/.gradle/buildOutputCleanup/outputFiles.bin index 2c3f78f..dc2b305 100644 Binary files a/Client/.gradle/buildOutputCleanup/outputFiles.bin and b/OOPP/Client/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/Client/.gradle/vcs-1/gc.properties b/OOPP/Client/.gradle/vcs-1/gc.properties similarity index 100% rename from Client/.gradle/vcs-1/gc.properties rename to OOPP/Client/.gradle/vcs-1/gc.properties diff --git a/Client/.idea/compiler.xml b/OOPP/Client/.idea/compiler.xml similarity index 100% rename from Client/.idea/compiler.xml rename to OOPP/Client/.idea/compiler.xml diff --git a/Client/.idea/encodings.xml b/OOPP/Client/.idea/encodings.xml similarity index 100% rename from Client/.idea/encodings.xml rename to OOPP/Client/.idea/encodings.xml diff --git a/Client/.idea/gradle.xml b/OOPP/Client/.idea/gradle.xml similarity index 100% rename from Client/.idea/gradle.xml rename to OOPP/Client/.idea/gradle.xml diff --git a/Client/.idea/misc.xml b/OOPP/Client/.idea/misc.xml similarity index 100% rename from Client/.idea/misc.xml rename to OOPP/Client/.idea/misc.xml diff --git a/Client/.idea/modules.xml b/OOPP/Client/.idea/modules.xml similarity index 100% rename from Client/.idea/modules.xml rename to OOPP/Client/.idea/modules.xml diff --git a/Client/.idea/uiDesigner.xml b/OOPP/Client/.idea/uiDesigner.xml similarity index 100% rename from Client/.idea/uiDesigner.xml rename to OOPP/Client/.idea/uiDesigner.xml diff --git a/Client/.idea/workspace.xml b/OOPP/Client/.idea/workspace.xml similarity index 72% rename from Client/.idea/workspace.xml rename to OOPP/Client/.idea/workspace.xml index 8e8f505..06551d4 100644 --- a/Client/.idea/workspace.xml +++ b/OOPP/Client/.idea/workspace.xml @@ -18,7 +18,7 @@ hello.* - + @@ -65,57 +65,33 @@ - - + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -133,10 +109,10 @@ @@ -147,7 +123,7 @@ - - - - - + - + + @@ -233,7 +157,7 @@ - + - + @@ -321,15 +245,6 @@ - - - - - - - - - @@ -351,12 +266,21 @@ + + + + + + + + + - + - + @@ -365,17 +289,17 @@ - + - + - + - + @@ -428,50 +352,47 @@ - + - - - - - - - - - - - - - - - + + - - + + + + + - + - - + + + + + + + + + - - + + - - - - + + + + diff --git a/Client/build.gradle b/OOPP/Client/build.gradle similarity index 62% rename from Client/build.gradle rename to OOPP/Client/build.gradle index 9a17529..feb783b 100644 --- a/Client/build.gradle +++ b/OOPP/Client/build.gradle @@ -13,6 +13,28 @@ apply plugin: 'idea' apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'jacoco' +//apply plugin: 'checkstyle' +// +//checkstyle { +// version = '7.8.1' +// config = 'checkstyle/checkstyle.xml' as File +//} +// +//checkstyleMain { +// source ='src/main/java' +//} +// +//checkstyleTest { +// source ='src/test/java' +//} +// +//tasks.withType(Checkstyle) { +// reports { +// xml.enabled false +// html.enabled true +// html.stylesheet resources.text.fromFile('config/xsl/checkstyle-custom.xsl') +// } +//} sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -31,7 +53,11 @@ repositories { } dependencies { - compile("org.springframework.boot:spring-boot-starter-web") + compile("org.springframework.boot:spring-boot-starter") + compile("org.springframework:spring-web") + compile("com.fasterxml.jackson.core:jackson-databind") + testCompile("junit:junit") + compile project(':Common') testCompile('org.springframework.boot:spring-boot-starter-test') testCompile( 'junit:junit:4.12', diff --git a/Pictures Group Members/.gitkeep b/OOPP/Client/build/resources/main/application.properties similarity index 100% rename from Pictures Group Members/.gitkeep rename to OOPP/Client/build/resources/main/application.properties diff --git a/OOPP/Client/build/resources/main/fxml/dashboard.fxml b/OOPP/Client/build/resources/main/fxml/dashboard.fxml new file mode 100644 index 0000000..e40f1e1 --- /dev/null +++ b/OOPP/Client/build/resources/main/fxml/dashboard.fxml @@ -0,0 +1,6 @@ + + + + + + diff --git a/OOPP/Client/build/resources/main/fxml/sample.fxml b/OOPP/Client/build/resources/main/fxml/sample.fxml new file mode 100644 index 0000000..f0dc2db --- /dev/null +++ b/OOPP/Client/build/resources/main/fxml/sample.fxml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + +