commit ec1193713915de1b924ef70f20d6eac7f0c3ca09 Author: Chantha Date: Fri May 8 16:54:31 2020 +0700 Starting with kotlin day2 diff --git a/.idea/mini.iml b/.idea/mini.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/mini.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..6cc8545 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..0808e6f --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + 1588911312881 + + + + + + + + + + + + \ No newline at end of file diff --git a/mini/.gitignore b/mini/.gitignore new file mode 100644 index 0000000..6c01878 --- /dev/null +++ b/mini/.gitignore @@ -0,0 +1,32 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/mini/build.gradle.kts b/mini/build.gradle.kts new file mode 100644 index 0000000..8705f19 --- /dev/null +++ b/mini/build.gradle.kts @@ -0,0 +1,43 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + id("org.springframework.boot") version "2.2.7.RELEASE" + id("io.spring.dependency-management") version "1.0.9.RELEASE" + kotlin("jvm") version "1.3.72" + kotlin("plugin.spring") version "1.3.72" +} + +group = "com.chantha" +version = "0.0.1-SNAPSHOT" +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-thymeleaf") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + + + implementation("org.postgresql:postgresql") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude(group = "org.junit.vintage", module = "junit-vintage-engine") + } +} + +tasks.withType { + useJUnitPlatform() +} + +tasks.withType { + kotlinOptions { + freeCompilerArgs = listOf("-Xjsr305=strict") + jvmTarget = "1.8" + } +} diff --git a/mini/gradle/wrapper/gradle-wrapper.jar b/mini/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f3d88b1 Binary files /dev/null and b/mini/gradle/wrapper/gradle-wrapper.jar differ diff --git a/mini/gradle/wrapper/gradle-wrapper.properties b/mini/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a4b4429 --- /dev/null +++ b/mini/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/mini/gradlew b/mini/gradlew new file mode 100644 index 0000000..2fe81a7 --- /dev/null +++ b/mini/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> $.*$$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/mini/gradlew.bat b/mini/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/mini/gradlew.bat @@ -0,0 +1,103 @@ +@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 + +@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=. +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%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/mini/settings.gradle.kts b/mini/settings.gradle.kts new file mode 100644 index 0000000..e1840b2 --- /dev/null +++ b/mini/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "mini" diff --git a/mini/src/main/kotlin/com/chantha/mini/MiniApplication.kt b/mini/src/main/kotlin/com/chantha/mini/MiniApplication.kt new file mode 100644 index 0000000..8f55637 --- /dev/null +++ b/mini/src/main/kotlin/com/chantha/mini/MiniApplication.kt @@ -0,0 +1,11 @@ +package com.chantha.mini + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class MiniApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/mini/src/main/kotlin/com/chantha/mini/config/WebSecurityConfig.kt b/mini/src/main/kotlin/com/chantha/mini/config/WebSecurityConfig.kt new file mode 100644 index 0000000..3b05fea --- /dev/null +++ b/mini/src/main/kotlin/com/chantha/mini/config/WebSecurityConfig.kt @@ -0,0 +1,31 @@ +package com.chantha.mini.config + +import org.springframework.context.annotation.Configuration +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter +import org.springframework.security.web.util.matcher.AntPathRequestMatcher + + +@Configuration +@EnableWebSecurity +class WebSecurityConfig : WebSecurityConfigurerAdapter() { + @Throws(Exception::class) + override fun configure(auth: AuthenticationManagerBuilder) { + auth.inMemoryAuthentication().withUser("admin").password("{noop}admin").roles("ADMIN") + .and().withUser("dba").password("dba").roles("DBA") + .and().withUser("user").password("user").roles("USER") + } + + @Throws(Exception::class) + override fun configure(http: HttpSecurity) { + http.formLogin() + http.logout().logoutRequestMatcher(AntPathRequestMatcher("/logout")) + http.authorizeRequests() + .antMatchers("/admin/**").hasAnyRole("ADMIN") + .antMatchers("/dba/**").hasAnyRole("ADMIN", "DBA") + .antMatchers("/user/**").hasAnyRole("ADMIN", "DBA", "USER") + http.csrf().disable() + } +} \ No newline at end of file diff --git a/mini/src/main/kotlin/com/chantha/mini/controller/MainController.kt b/mini/src/main/kotlin/com/chantha/mini/controller/MainController.kt new file mode 100644 index 0000000..6c0ec47 --- /dev/null +++ b/mini/src/main/kotlin/com/chantha/mini/controller/MainController.kt @@ -0,0 +1,20 @@ +package com.chantha.mini.controller + +import com.chantha.mini.route.MainRoute +import org.springframework.security.access.prepost.PreAuthorize +import org.springframework.stereotype.Controller +import org.springframework.ui.Model +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@Controller +class MainController { + + @PreAuthorize("hasRole('ADMIN')") + @GetMapping(MainRoute.HOME_PAGE) + fun index(): String { + return "index" + } + +} \ No newline at end of file diff --git a/mini/src/main/kotlin/com/chantha/mini/controller/UserController.kt b/mini/src/main/kotlin/com/chantha/mini/controller/UserController.kt new file mode 100644 index 0000000..c9274e0 --- /dev/null +++ b/mini/src/main/kotlin/com/chantha/mini/controller/UserController.kt @@ -0,0 +1,24 @@ +package com.chantha.mini.controller + +import com.chantha.mini.dto.UserDto +import com.chantha.mini.service.UserService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RestController + +@RestController +class UserController @Autowired constructor(private val userService: UserService){ + + @GetMapping("/api/user/{firstName}/{lastName}") + fun findByFirstNameAndLastName(@PathVariable firstName:String ?="",@PathVariable lastName:String?=""):UserDto{ + println(lastName+" "+firstName) + return userService.findByFirstNameAndLastName(firstName,lastName) + } + + @GetMapping("/api/user") + fun findAllRecord():List{ + return userService.findAllRecord().orEmpty() + } +} \ No newline at end of file diff --git a/mini/src/main/kotlin/com/chantha/mini/dto/User.kt b/mini/src/main/kotlin/com/chantha/mini/dto/User.kt new file mode 100644 index 0000000..66f99e8 --- /dev/null +++ b/mini/src/main/kotlin/com/chantha/mini/dto/User.kt @@ -0,0 +1,22 @@ +package com.chantha.mini.dto + +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.databind.annotation.JsonDeserialize +import org.intellij.lang.annotations.Identifier +import java.util.* +import javax.annotation.processing.Generated +import javax.persistence.* + + +@Entity +@Table(name="tb_user") +data class UserDto +( + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + var id:Long= -1, + var firstname: String? = "", + var lastname:String? = "", + var img:String? = "" +) + diff --git a/mini/src/main/kotlin/com/chantha/mini/repo/UserRepo.kt b/mini/src/main/kotlin/com/chantha/mini/repo/UserRepo.kt new file mode 100644 index 0000000..38e3475 --- /dev/null +++ b/mini/src/main/kotlin/com/chantha/mini/repo/UserRepo.kt @@ -0,0 +1,13 @@ +package com.chantha.mini.repo + +import com.chantha.mini.dto.UserDto +import org.springframework.stereotype.Repository +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.data.jpa.repository.Query + +@Repository +interface UserRepo : JpaRepository { + + @Query("SELECT * FROM user_dto WHERE firstName=?1 AND lastName=?2",nativeQuery = true) + fun findByFirstnameAndLastname(firstName:String?="",lastName:String?=""):UserDto +} \ No newline at end of file diff --git a/mini/src/main/kotlin/com/chantha/mini/route/MainRoute.kt b/mini/src/main/kotlin/com/chantha/mini/route/MainRoute.kt new file mode 100644 index 0000000..1846c4f --- /dev/null +++ b/mini/src/main/kotlin/com/chantha/mini/route/MainRoute.kt @@ -0,0 +1,8 @@ +package com.chantha.mini.route + + +object MainRoute { + + + const val HOME_PAGE="/home" +} \ No newline at end of file diff --git a/mini/src/main/kotlin/com/chantha/mini/service/UserService.kt b/mini/src/main/kotlin/com/chantha/mini/service/UserService.kt new file mode 100644 index 0000000..b92ccc4 --- /dev/null +++ b/mini/src/main/kotlin/com/chantha/mini/service/UserService.kt @@ -0,0 +1,17 @@ +package com.chantha.mini.service + +import com.chantha.mini.dto.UserDto +import com.chantha.mini.repo.UserRepo +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service + +@Service +class UserService @Autowired constructor(private val userRepo: UserRepo) { + + fun findByFirstNameAndLastName(firstName: String? = "", lastName: String? = ""):UserDto { + return userRepo.findByFirstnameAndLastname(firstName,lastName) + } + fun findAllRecord():List{ + return userRepo.findAll() + } +} \ No newline at end of file diff --git a/mini/src/main/resources/application.properties b/mini/src/main/resources/application.properties new file mode 100644 index 0000000..b910514 --- /dev/null +++ b/mini/src/main/resources/application.properties @@ -0,0 +1,14 @@ +## default connection pool +spring.datasource.hikari.connectionTimeout=20000 +spring.datasource.hikari.maximumPoolSize=5 + +## PostgreSQL +spring.datasource.url=jdbc:postgresql://localhost:5432/dbapi +spring.datasource.username=postgres +spring.datasource.password=root + +#drop n create table again, good for testing, comment this in production +spring.jpa.hibernate.ddl-auto=update + +spring.jpa.open-in-view=true +server.port=8081 \ No newline at end of file diff --git a/mini/src/main/resources/templates/index.html b/mini/src/main/resources/templates/index.html new file mode 100644 index 0000000..5c5e556 --- /dev/null +++ b/mini/src/main/resources/templates/index.html @@ -0,0 +1,11 @@ + + + + + Title + + +

Index Form

+ + \ No newline at end of file diff --git a/mini/src/test/kotlin/com/chantha/mini/MiniApplicationTests.kt b/mini/src/test/kotlin/com/chantha/mini/MiniApplicationTests.kt new file mode 100644 index 0000000..451676d --- /dev/null +++ b/mini/src/test/kotlin/com/chantha/mini/MiniApplicationTests.kt @@ -0,0 +1,13 @@ +package com.chantha.mini + +import org.junit.jupiter.api.Test +import org.springframework.boot.test.context.SpringBootTest + +@SpringBootTest +class MiniApplicationTests { + + @Test + fun contextLoads() { + } + +}