From 75fef6726f8282fff04e35b6eea600a88012a2b9 Mon Sep 17 00:00:00 2001 From: "valentin.degauchy.etu@univ-lille.fr" <valentin.degauchy.etu@univ-lille.fr> Date: Mon, 11 Nov 2019 19:15:55 +0100 Subject: [PATCH] clean + easter egg --- tpkotlin/pom.xml | 11 ---- .../tpkotlin/controller/SimpleController.java | 5 ++ .../glhf/tpkotlin/config/BlogConfiguration.kt | 36 ------------- .../tpkotlin/controller/HtmlController.kt | 52 ------------------- .../tpkotlin/controller/HttpController.kt | 35 ------------- .../tpKotlin/glhf/tpkotlin/entity/Entities.kt | 26 ---------- .../glhf/tpkotlin/extension/Extensions.kt | 33 ------------ .../tpkotlin/repositories/Repositories.kt | 14 ----- tpkotlin/src/main/webapp/WEB-INF/jsp/ex5.jsp | 8 +-- 9 files changed, 10 insertions(+), 210 deletions(-) delete mode 100644 tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/config/BlogConfiguration.kt delete mode 100644 tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/controller/HtmlController.kt delete mode 100644 tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/controller/HttpController.kt delete mode 100644 tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/extension/Extensions.kt delete mode 100644 tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/repositories/Repositories.kt diff --git a/tpkotlin/pom.xml b/tpkotlin/pom.xml index 50aa1ce..1863d63 100644 --- a/tpkotlin/pom.xml +++ b/tpkotlin/pom.xml @@ -20,11 +20,6 @@ </properties> <dependencies> - <!-- <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - </dependency> --> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> @@ -68,12 +63,6 @@ <optional>true</optional> </dependency> - <!-- <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> --> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> diff --git a/tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java b/tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java index b3f0e8c..e90504f 100644 --- a/tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java +++ b/tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java @@ -45,4 +45,9 @@ public class SimpleController { mav.addObject("dirfav", s ); return mav; } + + @RequestMapping("/ex5") + public ModelAndView exo5() { + return new ModelAndView("ex5"); + } } diff --git a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/config/BlogConfiguration.kt b/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/config/BlogConfiguration.kt deleted file mode 100644 index 471e3dc..0000000 --- a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/config/BlogConfiguration.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.tpKotlin.glhf.tpkotlin.config - -import org.springframework.boot.ApplicationRunner -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import com.tpKotlin.glhf.tpkotlin.repositories.* -import com.tpKotlin.glhf.tpkotlin.entity.* - -//@Configuration -//open class BlogConfiguration { -// -// @Bean -// open fun databaseInitializer( -// userRepository: UserRepository, -// articleRepository: ArticleRepository -// ) = ApplicationRunner { -// val smaldini = userRepository.save(User("smaldini", "Stéphane", "Maldini")) -// -// articleRepository.save( -// Article( -// title = "Premier chaton cloné sacrifié en la gloire de...", -// headline = "Garlic, 7 ans, impressionne le Démon tant sa chair est tendre", -// content = "todo chaton", -// author = smaldini -// ) -// ) -// articleRepository.save( -// Article( -// title = "Un groupe de jeunes se réunissent pour invoqu...", -// headline = "Un groupe de jeunes adeptes s'entraînent dans le parc régional", -// content = "todo invoquer", -// author = smaldini -// ) -// ) -// } -//} \ No newline at end of file diff --git a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/controller/HtmlController.kt b/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/controller/HtmlController.kt deleted file mode 100644 index 3b50cfb..0000000 --- a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/controller/HtmlController.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.tpKotlin.glhf.tpkotlin.controller - -import org.springframework.stereotype.Controller -import org.springframework.ui.Model -import org.springframework.ui.set -import org.springframework.web.bind.annotation.* -import com.tpKotlin.glhf.tpkotlin.entity.* -import com.tpKotlin.glhf.tpkotlin.extension.* -//import com.tpKotlin.glhf.tpkotlin.repositories.ArticleRepository -import org.springframework.web.server.ResponseStatusException -import org.springframework.http.HttpStatus - -//@Controller -//class HtmlController(private val repository: ArticleRepository) { -// -// @GetMapping("/") -// fun blog(model: Model): String { -// model["title"] = "Blog" //model.addAttribute("title", "tp kotlin"); -// model["articles"] = repository.findAllByOrderByAddedAtDesc().map { it.render() } -// return "blog" -// } -// -// @GetMapping("/article/{slug}") -// fun article(@PathVariable slug: String, model: Model): String { -// val article = repository -// .findBySlug(slug) -// ?.render() -// ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "This article does not exist") -// model["title"] = article.title -// model["article"] = article -// return "article" -// } -// -// fun Article.render() = RenderedArticle( -// slug, -// title, -// headline, -// content, -// author, -// addedAt.format() -// ) -// -// data class RenderedArticle( -// val slug: String, -// val title: String, -// val headline: String, -// val content: String, -// val author: User, -// val addedAt: String -// ) -// -//} \ No newline at end of file diff --git a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/controller/HttpController.kt b/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/controller/HttpController.kt deleted file mode 100644 index e9138f7..0000000 --- a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/controller/HttpController.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.tpKotlin.glhf.tpkotlin.controller - -//import com.tpKotlin.glhf.tpkotlin.repositories.ArticleRepository -//import com.tpKotlin.glhf.tpkotlin.repositories.UserRepository -import org.springframework.http.HttpStatus -import org.springframework.web.bind.annotation.GetMapping -import org.springframework.web.bind.annotation.PathVariable -import org.springframework.web.bind.annotation.RequestMapping -import org.springframework.web.bind.annotation.RestController -import org.springframework.web.server.ResponseStatusException - -//@RestController -//@RequestMapping("/api/article") -//class ArticleController(private val repository: ArticleRepository) { -// -// @GetMapping("/") -// fun findAll() = repository.findAllByOrderByAddedAtDesc() -// -// @GetMapping("/{slug}") -// fun findOne(@PathVariable slug: String) = -// repository.findBySlug(slug) ?: ResponseStatusException(HttpStatus.NOT_FOUND, "This article does not exist") -// -//} -// -//@RestController -//@RequestMapping("/api/user") -//class UserController(private val repository: UserRepository) { -// -// @GetMapping("/") -// fun findAll() = repository.findAll() -// -// @GetMapping("/{login}") -// fun findOne(@PathVariable login: String) = -// repository.findByLogin(login) ?: ResponseStatusException(HttpStatus.NOT_FOUND, "This user does not exist") -//} \ No newline at end of file diff --git a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/entity/Entities.kt b/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/entity/Entities.kt index 5f26373..af5c5ea 100644 --- a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/entity/Entities.kt +++ b/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/entity/Entities.kt @@ -1,34 +1,8 @@ package com.tpKotlin.glhf.tpkotlin.entity -//import javax.persistence.* import java.time.LocalDateTime import com.tpKotlin.glhf.tpkotlin.tools.FileManager -//import com.tpKotlin.glhf.tpkotlin.extension.toSlug - -//@Entity -//open class Article( -// open var title: String = "default", -// open var headline: String = "default", -// open var content: String = "default", -// @ManyToOne open var author: User = User(), -// open var slug: String = title.toSlug(), -// open var addedAt: LocalDateTime = LocalDateTime.now(), -// @Id @GeneratedValue open var id: Long? = null -//) -// -//@Entity -//open class User( -// open var login: String = "default", -// open var firstname: String = "default", -// open var lastname: String = "default", -// open var description: String? = null, -// @Id @GeneratedValue open var id: Long? = null -//) -// -//@Entity -//open class Bidon(open var nom: String, @Id @GeneratedValue open var id: Long? = null) - object FavDir { val list: MutableList<Meme> = mutableListOf() diff --git a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/extension/Extensions.kt b/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/extension/Extensions.kt deleted file mode 100644 index 42e5551..0000000 --- a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/extension/Extensions.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.tpKotlin.glhf.tpkotlin.extension - -import java.time.LocalDateTime -import java.time.format.DateTimeFormatterBuilder -import java.time.temporal.ChronoField -import java.util.Locale - -//fun LocalDateTime.format() = this.format(englishDateFormatter) -// -//private val daysLookup = (1..31).associate { it.toLong() to getOrdinal(it) } -// -//private val englishDateFormatter = DateTimeFormatterBuilder() -// .appendPattern("yyyy-MM-dd") -// .appendLiteral(" ") -// .appendText(ChronoField.DAY_OF_MONTH, daysLookup) -// .appendLiteral(" ") -// .appendPattern("yyyy") -// .toFormatter(Locale.ENGLISH) -// -//private fun getOrdinal(n: Int) = when { -// n in 11..13 -> "${n}th" -// n % 10 == 1 -> "${n}st" -// n % 10 == 2 -> "${n}nd" -// n % 10 == 3 -> "${n}rd" -// else -> "${n}th" -//} -// -//fun String.toSlug() = toLowerCase() -// .replace("\n", " ") -// .replace("[^a-z\\d\\s]".toRegex(), " ") -// .split(" ") -// .joinToString("-") -// .replace("-+".toRegex(), "-") \ No newline at end of file diff --git a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/repositories/Repositories.kt b/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/repositories/Repositories.kt deleted file mode 100644 index c6d6e0e..0000000 --- a/tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/repositories/Repositories.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.tpKotlin.glhf.tpkotlin.repositories - -//import org.springframework.data.repository.CrudRepository -//import com.tpKotlin.glhf.tpkotlin.entity.Article -//import com.tpKotlin.glhf.tpkotlin.entity.User - -//interface ArticleRepository : CrudRepository<Article, Long> { -// fun findBySlug(slug: String): Article? -// fun findAllByOrderByAddedAtDesc(): Iterable<Article> -//} -// -//interface UserRepository : CrudRepository<User, Long> { -// fun findByLogin(login: String): User? -//} \ No newline at end of file diff --git a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex5.jsp b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex5.jsp index 5cd3d29..cbc968f 100644 --- a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex5.jsp +++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex5.jsp @@ -9,8 +9,10 @@ <title>Exercice 5</title> </head> <body> - - <c:import url="/WEB-INF/jsp/footer.jsp" /> - + <br><br><br><br> + <h1 class="center">PRANKED + <br><br> + <img src="https://media1.tenor.com/images/04017b0c56665c471ec3dc1d84e15c23/tenor.gif?itemid=5132217"/> + </h1> </body> </html> \ No newline at end of file -- GitLab