diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fbafe9b --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..8a68d55 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4cb7457 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 639900d..cf5ce5a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,11 @@ - + + + + + + \ No newline at end of file diff --git a/Messageries/.gitattributes b/Messageries/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/Messageries/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/Messageries/.gitignore b/Messageries/.gitignore new file mode 100644 index 0000000..5a979af --- /dev/null +++ b/Messageries/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Kotlin ### +.kotlin diff --git a/Messageries/build.gradle.kts b/Messageries/build.gradle.kts new file mode 100644 index 0000000..512cd73 --- /dev/null +++ b/Messageries/build.gradle.kts @@ -0,0 +1,41 @@ +plugins { + kotlin("jvm") version "1.9.25" + kotlin("plugin.spring") version "1.9.25" + id("org.springframework.boot") version "3.4.4" + id("io.spring.dependency-management") version "1.1.7" +} + +group = "fr.teamflash" +version = "0.0.1-SNAPSHOT" + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-thymeleaf") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("org.jetbrains.kotlin:kotlin-reflect") + developmentOnly("org.springframework.boot:spring-boot-devtools") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.+") +} + +kotlin { + compilerOptions { + freeCompilerArgs.addAll("-Xjsr305=strict") + } +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/Messageries/gradle/wrapper/gradle-wrapper.jar b/Messageries/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..9bbc975 Binary files /dev/null and b/Messageries/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Messageries/gradle/wrapper/gradle-wrapper.properties b/Messageries/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..37f853b --- /dev/null +++ b/Messageries/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/Messageries/gradlew b/Messageries/gradlew new file mode 100644 index 0000000..faf9300 --- /dev/null +++ b/Messageries/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Messageries/gradlew.bat b/Messageries/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/Messageries/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Messageries/settings.gradle.kts b/Messageries/settings.gradle.kts new file mode 100644 index 0000000..25e9993 --- /dev/null +++ b/Messageries/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "Messageries" diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/MessageriesApplication.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/MessageriesApplication.kt new file mode 100644 index 0000000..bec9f85 --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/MessageriesApplication.kt @@ -0,0 +1,11 @@ +package fr.teamflash.messageries + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class MessageriesApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/models/MessageBean.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/models/MessageBean.kt new file mode 100644 index 0000000..2500274 --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/models/MessageBean.kt @@ -0,0 +1,6 @@ +package fr.teamflash.messageries.models + +data class MessageBean( + var name :String = "", + var message :String = "" +) diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/models/StudentBean.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/models/StudentBean.kt new file mode 100644 index 0000000..f3b226f --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/models/StudentBean.kt @@ -0,0 +1,6 @@ +package fr.teamflash.messageries.models + +data class StudentBean( + var name :String = "", + var note :Int = 0 +) diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/models/UserBean.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/models/UserBean.kt new file mode 100644 index 0000000..240d100 --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/models/UserBean.kt @@ -0,0 +1,9 @@ +package fr.teamflash.messageries.models + +import jakarta.validation.constraints.Size + +data class UserBean( + var id :Long? = null, + var login :String = "", + @field:Size(min = 3, message = "Il faut au moins 3 caractères") var password: String = "" +) diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/MyRestController.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/MyRestController.kt new file mode 100644 index 0000000..9114f5d --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/MyRestController.kt @@ -0,0 +1,14 @@ +package fr.teamflash.messageries.restControllers + +import org.springframework.web.bind.annotation.RestController +import org.springframework.web.bind.annotation.GetMapping + + +@RestController +class MyRestController { + //http://localhost:8080/test + @GetMapping("/test") + fun testMethode(): String { + return "helloWorld" + } +} \ No newline at end of file diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/StudentRestController.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/StudentRestController.kt new file mode 100644 index 0000000..be6abdb --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/StudentRestController.kt @@ -0,0 +1,22 @@ +package fr.teamflash.messageries.restControllers + +import fr.teamflash.messageries.models.StudentBean +import org.springframework.web.bind.annotation.* + +@RestController +@RequestMapping("/student") +class StudentRestController { + //http://localhost:8080/student/getStudent + @GetMapping("/getStudent") + fun getStudent(): StudentBean { + var student = StudentBean("toto", 12) + + return student + } + + //http://localhost:8080/student/receiveStudent + @PostMapping("/receiveStudent") + fun receiveStudent(@RequestBody student: StudentBean) { + println("/receiveStudent : $student") + } +} \ No newline at end of file diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/TchatRestController.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/TchatRestController.kt new file mode 100644 index 0000000..43f2821 --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/TchatRestController.kt @@ -0,0 +1,31 @@ +package fr.teamflash.messageries.restControllers + +import fr.teamflash.messageries.models.MessageBean +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + + +@RestController +@RequestMapping("/tchat") +class TchatRestController { + var messageBean : ArrayList = ArrayList() + + //http://localhost:8080/tchat/saveMessage + @PostMapping("/saveMessage") + fun saveMessage(@RequestBody message : MessageBean) { + messageBean.add(message) + } + + //http://localhost:8080/tchat/allMessages?lim=5 + @GetMapping("/allMessages") + fun allMessages(lim :Int?):List{ + if (lim != null) { + return messageBean.take(10) + } else { + return messageBean + } + } +} \ No newline at end of file diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/UserRestController.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/UserRestController.kt new file mode 100644 index 0000000..09eaed1 --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/restControllers/UserRestController.kt @@ -0,0 +1,62 @@ +package fr.teamflash.messageries.restControllers + +import fr.teamflash.messageries.models.UserBean +import fr.teamflash.messageries.services.UserService +import fr.teamflash.messageries.services.UserService.findById +import jakarta.servlet.http.HttpServletResponse +import jakarta.validation.Valid +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.* + +@RestController +@RequestMapping("/users") +class UserRestController { + + //http://localhost:8080/users + @GetMapping("") + fun getUser(): ArrayList { + return UserService.load() + } + + //http://localhost:8080/users + @PostMapping("") + fun addUser(@Valid @RequestBody userBean: UserBean): ResponseEntity { + return ResponseEntity(UserService.save(userBean), HttpStatus.CREATED) + } + + //http://localhost:8080/users/12 + @GetMapping("/{id}") + fun getUserById(@PathVariable id: Long?): ResponseEntity { + return if (id != null) { + ResponseEntity(UserService.findById(id), HttpStatus.CREATED) + } else { + ResponseEntity.notFound().build() + } + } + + //http://localhost:8080/users/12 + @PutMapping("/{id}") + fun putUserById(@PathVariable id: Long, @Valid @RequestBody newUser: UserBean): ResponseEntity { + val user = UserService.findById(id) + return if (user != null) { + newUser.id = id //écrase celui reçu dans le JSON au cas ou + UserService.save(newUser) + ResponseEntity(newUser, HttpStatus.OK) + } + else { + ResponseEntity(HttpStatus.NOT_FOUND) + } + } + + //http://localhost:8080/users/12 + @DeleteMapping("/{id}") + fun putUserById(@PathVariable id: Long): ResponseEntity { + return if (UserService.deleteById(id)) { + ResponseEntity(HttpStatus.NO_CONTENT) + } + else { + ResponseEntity(HttpStatus.NOT_FOUND) + } + } +} \ No newline at end of file diff --git a/Messageries/src/main/kotlin/fr/teamflash/messageries/services/UserService.kt b/Messageries/src/main/kotlin/fr/teamflash/messageries/services/UserService.kt new file mode 100644 index 0000000..c3001eb --- /dev/null +++ b/Messageries/src/main/kotlin/fr/teamflash/messageries/services/UserService.kt @@ -0,0 +1,44 @@ +package fr.teamflash.messageries.services + +import fr.teamflash.messageries.models.UserBean + +fun main() { + UserService.save(UserBean(null, "Toto", "abcd")) + println(UserService.load()) +} + +object UserService { + private val list = ArrayList() + private var idNumber = 1L + + //Jeu de donnée si besoin +// init { +// list.add(UserBean(1, "toto", "aaa")); +// list.add(UserBean(2, "tata", "bbb")); +// } + + //Sauvegarde Create or Update + fun save(user: UserBean): UserBean { + //On regarde s'il n'est pas déjà en base + val userRegister = findById(user.id) + if (userRegister != null) { + //on retire celui en base pour remplacer par celui la + list.remove(userRegister) + } + else { + //on ajoute un id généré + user.id = idNumber++ + } + list.add(user) + return user + } + + //Retourne la liste + fun load() = list + + //Permet de trouver l'utilisateur qui utilise cette session + fun findById(id: Long?) = list.firstOrNull { it.id == id } + + //Supprime l'élément.Retourne true si la liste a changé + fun deleteById(id: Long) = list.removeIf { it.id == id } +} \ No newline at end of file diff --git a/Messageries/src/main/resources/application.properties b/Messageries/src/main/resources/application.properties new file mode 100644 index 0000000..9310620 --- /dev/null +++ b/Messageries/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=Messageries diff --git a/Messageries/src/test/kotlin/fr/teamflash/messageries/MessageriesApplicationTests.kt b/Messageries/src/test/kotlin/fr/teamflash/messageries/MessageriesApplicationTests.kt new file mode 100644 index 0000000..67abda8 --- /dev/null +++ b/Messageries/src/test/kotlin/fr/teamflash/messageries/MessageriesApplicationTests.kt @@ -0,0 +1,13 @@ +package fr.teamflash.messageries + +import org.junit.jupiter.api.Test +import org.springframework.boot.test.context.SpringBootTest + +@SpringBootTest +class MessageriesApplicationTests { + + @Test + fun contextLoads() { + } + +} diff --git a/Messageries/src/test/test.http b/Messageries/src/test/test.http new file mode 100644 index 0000000..bcdef2e --- /dev/null +++ b/Messageries/src/test/test.http @@ -0,0 +1,60 @@ +//Création +POST http://localhost:8080/users +Content-Type: application/json + +{"login":"toto", "password":"bobby"} + +> {% + client.test("Request executed successfully", function() { + client.assert(response.status === 201, "Answer not expected"); + }); +%} + +### + +//GET 1 +GET http://localhost:8080/users/1 +Content-Type: application/json + +> {% + client.test("Request executed successfully", function() { + client.assert(response.status === 200, "Answer not expected"); + }); +%} +### + +//Remplace +PUT http://localhost:8080/users/1 +Content-Type: application/json + +{"login":"blabla" , "password":"bobby"} + +> {% + client.test("Request executed successfully", function() { + client.assert(response.status === 200, "Answer not expected"); + }); +%} + +### + +//GET All +GET http://localhost:8080/users +Content-Type: application/json + +> {% + client.test("Request executed successfully", function() { + client.assert(response.status === 200, "Answer not expected"); + }); +%} +### + +//Suppression +DELETE http://localhost:8080/users/1 +Content-Type: application/json + +> {% + client.test("Request executed successfully", function() { + client.assert(response.status === 204, "Answer not expected"); + }); +%} +### \ No newline at end of file