diff --git a/README.md b/README.md index 159e1ce5760ce5eb2eb33962bedb5c1de0291990..758325288737f202a9bc30fbbf909ff7183001d7 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,5 @@ * Expose git information with Spring Boot’s Actuator ([Blog](https://rieckpil.de/howto-expose-git-information-with-spring-boots-actuator/), [Sources](https://github.com/rieckpil/blog-tutorials/tree/master/expose-git-information-actuator)) * Write Spring Boot integration tests with a ‘real’ database ([Blog](https://rieckpil.de/howto-write-spring-boot-integration-tests-with-a-real-database/), [Sources](https://github.com/rieckpil/blog-tutorials/tree/master/testcontainers)) * Avoid repeating attributes in JPA entities ([Blog](https://rieckpil.de/howto-avoid-repeating-attributes-in-jpa-entities/), [Sources](https://github.com/rieckpil/blog-tutorials/tree/master/avoid-repeating-attributes-in-jpa-entities)) -* Lazy Loading of JPA attributes with Hibernate([Blog](https://rieckpil.de/how-to-lazy-loading-of-jpa-attributes-with-hibernate/), [Sources](https://github.com/rieckpil/blog-tutorials/tree/master/lazy-loading-of-jpa-attributes-with-hibernate)) \ No newline at end of file +* Lazy Loading of JPA attributes with Hibernate([Blog](https://rieckpil.de/how-to-lazy-loading-of-jpa-attributes-with-hibernate/), [Sources](https://github.com/rieckpil/blog-tutorials/tree/master/lazy-loading-of-jpa-attributes-with-hibernate)) +* Deploy a Spring Boot Uber-Jar application within Open Liberty ([Blog](https://rieckpil.de/howto-run-spring-boot-uber-jar-application-within-open-liberty/), [Sources](https://github.com/rieckpil/blog-tutorials/tree/master/spring-boot-with-open-liberty/) \ No newline at end of file diff --git a/spring-boot-with-open-liberty/.gitignore b/spring-boot-with-open-liberty/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..82eca336e352c9026decda294ff678968050edfc --- /dev/null +++ b/spring-boot-with-open-liberty/.gitignore @@ -0,0 +1,25 @@ +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/build/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ \ No newline at end of file diff --git a/spring-boot-with-open-liberty/.mvn/wrapper/maven-wrapper.jar b/spring-boot-with-open-liberty/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..9cc84ea9b4d95453115d0c26488d6a78694e0bc6 Binary files /dev/null and b/spring-boot-with-open-liberty/.mvn/wrapper/maven-wrapper.jar differ diff --git a/spring-boot-with-open-liberty/.mvn/wrapper/maven-wrapper.properties b/spring-boot-with-open-liberty/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..b573bb50d56e8c19282593cbf5b081e211923a83 --- /dev/null +++ b/spring-boot-with-open-liberty/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/spring-boot-with-open-liberty/README.md b/spring-boot-with-open-liberty/README.md new file mode 100644 index 0000000000000000000000000000000000000000..8cd0e6fed1f29f4d460795ef3c11aefda3a71fa6 --- /dev/null +++ b/spring-boot-with-open-liberty/README.md @@ -0,0 +1,27 @@ +# Codebase for the blog post [#HOWTO: Deploy a Spring Boot Uber-Jar application within Open Liberty](https://rieckpil.de/howto-run-spring-boot-uber-jar-application-within-open-liberty/) + +Steps to run this project: + +1. Clone this Git repository +2. Navigate to the folder `spring-boot-with-open-liberty` +3. Build the project with `mvn clean package` +4. Download the latest Open Liberty (at least 18.0.0.2) from https://openliberty.io/downloads/ and extract the zip +5. Navigate to the `wlp` folder you extracted and run `bin/server start defaultServer` or `bin/server.bat start defaultServer` for Windows +6. Open the `server.xml` file in `wlp/usr/server/defaultServer` and replace the content with the following configuration: +``` + + + + springBoot-2.0 + servlet-4.0 + websocket-1.1 + + + + + +``` +7. Copy the already built (step 3.) `spring-boot-with-open-liberty.jar` to `wlp/usr/server/defaultServer/apps` +8. Visit `http://localhost:9080` for chatting and `http://localhost:9080/api/messages` to get all chat messages \ No newline at end of file diff --git a/spring-boot-with-open-liberty/mvnw b/spring-boot-with-open-liberty/mvnw new file mode 100755 index 0000000000000000000000000000000000000000..5bf251c0774593ca4f5335acf0f7483eaa162e8f --- /dev/null +++ b/spring-boot-with-open-liberty/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + 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 + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-boot-with-open-liberty/mvnw.cmd b/spring-boot-with-open-liberty/mvnw.cmd new file mode 100644 index 0000000000000000000000000000000000000000..019bd74d766ebd4c033528112148d866555b5c9e --- /dev/null +++ b/spring-boot-with-open-liberty/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/spring-boot-with-open-liberty/pom.xml b/spring-boot-with-open-liberty/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..4d83abc053d1dd8e7d3f528fae832c150331140b --- /dev/null +++ b/spring-boot-with-open-liberty/pom.xml @@ -0,0 +1,101 @@ + + + 4.0.0 + + de.rieckpil.blog + spring-boot-with-open-liberty + 0.0.1-SNAPSHOT + jar + + spring-boot-with-open-liberty + Demo project for Spring Boot within Open Liberty + + + org.springframework.boot + spring-boot-starter-parent + 2.0.3.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-websocket + + + + com.h2database + h2 + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-devtools + + + + + + org.webjars + webjars-locator-core + + + org.webjars + sockjs-client + 1.0.2 + + + org.webjars + stomp-websocket + 2.3.3 + + + org.webjars + bootstrap + 3.3.7 + + + org.webjars + jquery + 3.1.0 + + + + + + spring-boot-with-open-liberty + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/ChatMessage.java b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/ChatMessage.java new file mode 100644 index 0000000000000000000000000000000000000000..4145ae3efbf684e8db7931e3726765ae02076653 --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/ChatMessage.java @@ -0,0 +1,16 @@ +package de.rieckpil.blog.springbootwithopenliberty; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@Data +public class ChatMessage { + + @NotEmpty + private String content; + + @NotEmpty + private String username; +} diff --git a/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/Message.java b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/Message.java new file mode 100644 index 0000000000000000000000000000000000000000..a560c7271466b1b01046baa7f76262debd16f4e1 --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/Message.java @@ -0,0 +1,25 @@ +package de.rieckpil.blog.springbootwithopenliberty; + +import lombok.Data; +import org.hibernate.annotations.CreationTimestamp; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import java.time.Instant; + +@Entity +@Data +public class Message { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String content; + private String user; + + @CreationTimestamp + private Instant createdAt; +} diff --git a/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageRepository.java b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..c064fc00642d17245b8f44e9fcb3ba0d50013365 --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageRepository.java @@ -0,0 +1,6 @@ +package de.rieckpil.blog.springbootwithopenliberty; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MessageRepository extends JpaRepository { +} diff --git a/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageRestController.java b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageRestController.java new file mode 100644 index 0000000000000000000000000000000000000000..7a612b861bc69509f9b61c6d31ce33aaaba712ff --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageRestController.java @@ -0,0 +1,23 @@ +package de.rieckpil.blog.springbootwithopenliberty; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +public class MessageRestController { + + private final MessageRepository messageRepository; + + public MessageRestController(MessageRepository messageRepository) { + this.messageRepository = messageRepository; + } + + @GetMapping("/api/messages") + public List getAllMessages() { + + return messageRepository.findAll(); + + } +} diff --git a/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageWebSocketController.java b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageWebSocketController.java new file mode 100644 index 0000000000000000000000000000000000000000..ac5d52a89bb60c6ebb00e83f77343dd675a3200d --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/MessageWebSocketController.java @@ -0,0 +1,30 @@ +package de.rieckpil.blog.springbootwithopenliberty; + +import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.messaging.handler.annotation.SendTo; +import org.springframework.stereotype.Controller; + +import javax.validation.Valid; + +@Controller +public class MessageWebSocketController { + + private final MessageRepository messageRepository; + + public MessageWebSocketController(MessageRepository messageRepository) { + this.messageRepository = messageRepository; + } + + @MessageMapping("/chat") + @SendTo("/topic/messages") + public Message receiveNewChatMessage(@Valid ChatMessage chatMessage) { + + Message newMessage = new Message(); + newMessage.setContent(chatMessage.getContent()); + newMessage.setUser(chatMessage.getUsername()); + + messageRepository.save(newMessage); + + return newMessage; + } +} diff --git a/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/SpringBootWithOpenLibertyApplication.java b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/SpringBootWithOpenLibertyApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..d7189bbd7850487c4e199ab2c4609250eaad7d56 --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/SpringBootWithOpenLibertyApplication.java @@ -0,0 +1,12 @@ +package de.rieckpil.blog.springbootwithopenliberty; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringBootWithOpenLibertyApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringBootWithOpenLibertyApplication.class, args); + } +} diff --git a/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/WebSocketConfig.java b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/WebSocketConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..3766e55cee0ba91f166bf11771e5d094db03b31c --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/java/de/rieckpil/blog/springbootwithopenliberty/WebSocketConfig.java @@ -0,0 +1,24 @@ +package de.rieckpil.blog.springbootwithopenliberty; + +import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; +import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; +import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; + +@Configuration +@EnableWebSocketMessageBroker +public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { + + @Override + public void configureMessageBroker(MessageBrokerRegistry config) { + config.enableSimpleBroker("/topic"); + config.setApplicationDestinationPrefixes("/app"); + } + + @Override + public void registerStompEndpoints(StompEndpointRegistry registry) { + registry.addEndpoint("/ws").setAllowedOrigins("*").withSockJS(); + } +} \ No newline at end of file diff --git a/spring-boot-with-open-liberty/src/main/resources/application.properties b/spring-boot-with-open-liberty/src/main/resources/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/spring-boot-with-open-liberty/src/main/resources/static/app.js b/spring-boot-with-open-liberty/src/main/resources/static/app.js new file mode 100644 index 0000000000000000000000000000000000000000..b77b420ab973c497f6da13beb19628b250bc8449 --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/resources/static/app.js @@ -0,0 +1,59 @@ +var stompClient = null; + +function setConnected(connected) { + $("#connect").prop("disabled", connected); + $("#disconnect").prop("disabled", !connected); + if (connected) { + $("#conversation").show(); + } + else { + $("#conversation").hide(); + } + $("#messages").html(""); +} + +function connect() { + var socket = new SockJS('/ws'); + stompClient = Stomp.over(socket); + stompClient.connect({}, function (frame) { + setConnected(true); + console.log('Connected: ' + frame); + stompClient.subscribe('/topic/messages', function (message) { + showMessage(JSON.parse(message.body)); + }); + }); +} + +function disconnect() { + if (stompClient !== null) { + stompClient.disconnect(); + } + setConnected(false); + console.log("Disconnected"); +} + +function sendMessage() { + stompClient.send("/app/chat", {}, JSON.stringify({'username': $("#name").val(), 'content': $("#content").val()})); +} + +function showMessage(message) { + + var date = new Date(message.createdAt); + + $("#messages").append("" + date.getHours() + ":" + date.getHours() + " Uhr" + message.user + " " + message.content + ""); +} + +$(function () { + $("form").on('submit', function (e) { + e.preventDefault(); + }); + $("#connect").click(function () { + connect(); + }); + $("#disconnect").click(function () { + disconnect(); + }); + $("#send").click(function () { + sendMessage(); + }); +}); \ No newline at end of file diff --git a/spring-boot-with-open-liberty/src/main/resources/static/index.html b/spring-boot-with-open-liberty/src/main/resources/static/index.html new file mode 100644 index 0000000000000000000000000000000000000000..fc2e505d09824b276a1a16c9d3bae60533af96bd --- /dev/null +++ b/spring-boot-with-open-liberty/src/main/resources/static/index.html @@ -0,0 +1,58 @@ + + + + Hello WebSocket + + + + + + + + +
+
+
+
+
+ + + +
+
+
+
+
+
+ + +
+
+ + +
+ +
+
+
+
+
+ + + + + + + + + + +
TimeUsernameMessage
+
+
+
+ + \ No newline at end of file diff --git a/spring-boot-with-open-liberty/src/test/java/de/rieckpil/blog/springbootwithopenliberty/SpringBootWithOpenLibertyApplicationTests.java b/spring-boot-with-open-liberty/src/test/java/de/rieckpil/blog/springbootwithopenliberty/SpringBootWithOpenLibertyApplicationTests.java new file mode 100644 index 0000000000000000000000000000000000000000..a5aaae94069cd3a9f790195e52a95746b2cc0dfa --- /dev/null +++ b/spring-boot-with-open-liberty/src/test/java/de/rieckpil/blog/springbootwithopenliberty/SpringBootWithOpenLibertyApplicationTests.java @@ -0,0 +1,16 @@ +package de.rieckpil.blog.springbootwithopenliberty; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class SpringBootWithOpenLibertyApplicationTests { + + @Test + public void contextLoads() { + } + +}