Initial commit

This commit is contained in:
Sebastien Deleuze
2016-03-13 15:52:25 +01:00
commit d04ed2b178
18 changed files with 570 additions and 0 deletions

4
.gitignore vendored Normal file
View File

@@ -0,0 +1,4 @@
.idea/
.gradle/
*.iml
build/

0
README.md Normal file
View File

56
build.gradle Normal file
View File

@@ -0,0 +1,56 @@
buildscript {
ext {
springBootVersion = '1.3.3.RELEASE'
kotlinVersion = '1.0.0'
}
repositories {
mavenCentral()
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
}
}
repositories {
mavenCentral()
maven { url 'http://repo.spring.io/snapshot' }
maven { url 'https://dl.bintray.com/sdeleuze/maven/' }
mavenLocal()
}
apply plugin: 'kotlin'
apply plugin: 'spring-boot'
jar {
baseName = 'geospatial-messenger'
version = '0.0.1-SNAPSHOT'
}
sourceCompatibility = 1.8
targetCompatibility = 1.8
ext['spring.version'] = '4.3.0.BUILD-SNAPSHOT'
ext['jackson.version'] = '2.7.1'
dependencies {
compile('org.springframework.boot:spring-boot-starter-web')
compile('org.springframework.boot:spring-boot-starter-jdbc')
compile('cz.jirutka.spring:spring-data-jdbc-repository:0.5.1')
compile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
// Always use the latest "dash revision", here -2
compile('com.fasterxml.jackson.module:jackson-module-kotlin:2.7.1-2')
compile('org.postgresql:postgresql:9.4.1208')
compile('net.postgis:postgis-jdbc:2.2.0') {
exclude module: 'postgresql'
}
compile('com.github.mayconbordin:postgis-geojson:1.1')
testCompile('org.springframework.boot:spring-boot-starter-test')
}
task wrapper(type: Wrapper) {
gradleVersion = '2.11'
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file

Binary file not shown.

View File

@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

160
gradlew vendored Executable file
View File

@@ -0,0 +1,160 @@
#!/usr/bin/env bash
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# 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
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# 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\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
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" ] ; 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, switch paths to Windows format before running java
if $cygwin ; 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=$((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
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

90
gradlew.bat vendored Normal file
View File

@@ -0,0 +1,90 @@
@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
@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=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@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 Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_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=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
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

View File

@@ -0,0 +1,21 @@
package io.spring.messenger
import com.fasterxml.jackson.module.kotlin.KotlinModule
import org.postgis.geojson.PostGISModule
import org.springframework.boot.SpringApplication
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.context.annotation.Bean
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
@SpringBootApplication
open class Application {
@Bean
open fun objectMapperBuilder(): Jackson2ObjectMapperBuilder
= Jackson2ObjectMapperBuilder().modulesToInstall(PostGISModule(), KotlinModule())
}
fun main(args: Array<String>) {
SpringApplication.run(Application::class.java, *args)
}

View File

@@ -0,0 +1,46 @@
package io.spring.messenger.config
import io.spring.messenger.domain.Message
import io.spring.messenger.domain.User
import io.spring.messenger.repository.MessageRepository
import io.spring.messenger.repository.UserRepository
import org.springframework.boot.CommandLineRunner
import javax.sql.DataSource
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.jdbc.datasource.DataSourceTransactionManager
import org.springframework.transaction.PlatformTransactionManager
import org.springframework.transaction.annotation.EnableTransactionManagement
@EnableTransactionManagement
@Configuration
open class DatabaseConfig {
@Bean
open fun transactionManager(dataSource: DataSource): PlatformTransactionManager {
return DataSourceTransactionManager(dataSource)
}
@Bean
open fun init(userRepository: UserRepository, messageRepository: MessageRepository) = CommandLineRunner {
val jbauer = User("jbauer", "Jack", "Bauer")
val cobrian = User("cobrian", "Chloe", "O'Brian")
val kbauer = User("kbauer", "Kim", "Bauer")
val dpalmer = User("dpalmer", "David", "Palmer")
val mdessler = User("mdessler", "Michelle", "Dessler")
if(userRepository.count() == 0L) {
userRepository.create(jbauer)
userRepository.create(cobrian)
userRepository.create(kbauer)
userRepository.create(dpalmer)
userRepository.create(mdessler)
}
if(messageRepository.count() == 0L) {
messageRepository.create(Message("This is a test!", jbauer))
}
}
}

View File

@@ -0,0 +1,11 @@
package io.spring.messenger.domain
import org.postgis.Point
import org.springframework.data.annotation.Id
data class Message(
var content: String,
var author: User,
var location: Point? = null,
@Id var id: Long? = null
)

View File

@@ -0,0 +1,11 @@
package io.spring.messenger.domain
import org.postgis.Point
import org.springframework.data.annotation.Id
data class User(
@Id var userName: String,
var firstName: String,
var lastName: String,
var location: Point? = null
)

View File

@@ -0,0 +1,47 @@
package io.spring.messenger.repository
import com.nurkiewicz.jdbcrepository.JdbcRepository
import com.nurkiewicz.jdbcrepository.RowUnmapper
import com.nurkiewicz.jdbcrepository.TableDescription
import io.spring.messenger.domain.Message
import org.postgis.PGgeometry
import org.postgis.Point
import org.springframework.jdbc.core.RowMapper
import org.springframework.stereotype.Repository
import java.sql.ResultSet
@Repository
open class MessageRepository : JdbcRepository<Message, Long>(MessageRowMapper(), MessageRowUnmapper(),
TableDescription("messages", "messages JOIN users ON messages.author = users.user_name", "id")) {
class MessageRowMapper : RowMapper<Message> {
val userRowMapper = UserRepository.UserRowMaper()
override fun mapRow(rs: ResultSet, rowNum: Int)
= Message(
rs.getString("content"),
userRowMapper.mapRow(rs, rowNum),
(rs.getObject("location") as PGgeometry?)?.geometry as Point?,
rs.getLong("id"))
}
class MessageRowUnmapper : RowUnmapper<Message> {
override fun mapColumns(message: Message): Map<String, Any?> {
val map = mutableMapOf(
Pair("id", message.id),
Pair("content", message.content),
Pair("author", message.author?.userName)
)
if (message.location != null) {
message.location!!.srid = 4326
map["location"] = PGgeometry(message.location)
}
return map
}
}
override fun <S : Message> postCreate(entity: S, generatedId: Number?): S {
if (generatedId != null) entity.id = generatedId.toLong()
return entity
}
}

View File

@@ -0,0 +1,38 @@
package io.spring.messenger.repository
import com.nurkiewicz.jdbcrepository.JdbcRepository
import com.nurkiewicz.jdbcrepository.RowUnmapper
import io.spring.messenger.domain.User
import org.postgis.PGgeometry
import org.postgis.Point
import org.springframework.jdbc.core.RowMapper
import org.springframework.stereotype.Repository
import java.sql.ResultSet
@Repository
open class UserRepository : JdbcRepository<User, String>(UserRowMaper(), UserRowUnmapper(), "\"users\"") {
class UserRowMaper : RowMapper<User> {
override fun mapRow(rs: ResultSet, rowNum: Int)
= User(
rs.getString("user_name"),
rs.getString("first_name"),
rs.getString("last_name"),
(rs.getObject("location") as PGgeometry?)?.geometry as Point?)
}
class UserRowUnmapper() : RowUnmapper<User> {
override fun mapColumns(user: User): Map<String, Any> {
val map = mutableMapOf<String, Any>(
Pair("user_name", user.userName),
Pair("first_name", user.firstName),
Pair("last_name", user.lastName))
if (user.location != null) {
user.location!!.srid = 4326
map["location"] = PGgeometry(user.location)
}
return map;
}
}
}

View File

@@ -0,0 +1,14 @@
package io.spring.messenger.web
import io.spring.messenger.repository.MessageRepository
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.web.bind.annotation.*
@RestController
@RequestMapping("/message")
class MessageController @Autowired constructor(val repository: MessageRepository) {
@GetMapping
fun findMessages() = repository.findAll()
}

View File

@@ -0,0 +1,18 @@
package io.spring.messenger.web
import io.spring.messenger.domain.User
import io.spring.messenger.repository.UserRepository
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.web.bind.annotation.*
@RestController
@RequestMapping("/user")
class UserController @Autowired constructor(val repository: UserRepository) {
@GetMapping
fun findUsers() = repository.findAll()
@PostMapping
fun createUser(@RequestBody user: User) = repository.create(user)
}

View File

@@ -0,0 +1,7 @@
spring:
datasource:
platform: "postgis"
driver-class-name: "org.postgis.DriverWrapper"
url: "jdbc:postgresql_postGIS://localhost/seb"
username: "postgres"

View File

@@ -0,0 +1,22 @@
CREATE EXTENSION IF NOT EXISTS postgis;
CREATE TABLE IF NOT EXISTS "users" (
user_name text PRIMARY KEY,
first_name text,
last_name text,
location GEOMETRY(Point, 4326)
);
CREATE INDEX IF NOT EXISTS users_gix
ON "users"
USING GIST (location);
CREATE TABLE IF NOT EXISTS messages (
id SERIAL PRIMARY KEY,
content text NOT NULL,
author text REFERENCES users(user_name),
location GEOMETRY(Point, 4326)
);
CREATE INDEX IF NOT EXISTS messages_gix
ON messages
USING GIST (location);

View File

@@ -0,0 +1,20 @@
package io.spring.messenger
import io.spring.messenger.Application
import org.junit.Test
import org.junit.runner.RunWith
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.boot.test.SpringApplicationConfiguration
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
@RunWith(SpringJUnit4ClassRunner::class)
@SpringApplicationConfiguration(classes = arrayOf(Application::class))
@WebAppConfiguration
class ApplicationTests {
@Test
fun contextLoads() {
}
}