diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e6ad171 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,39 @@ +name: Build +on: + push: + branches: + - master + - features + pull_request: + types: [opened, synchronize, reopened] + paths: + -"Spring-Final/**" +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Cache SonarCloud packages + uses: actions/cache@v1 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Maven packages + uses: actions/cache@v1 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=Spring diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..c1dd12f Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b7cb93e --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/README.md b/README.md index 9b3e613..342b34b 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,6 @@ ## Description A simple blog app using Spring Boot JPA and Thymeleaf with Spring Security. App has performs all Crud operations. + + +[![Quality gate](https://sonarcloud.io/api/project_badges/quality_gate?project=Spring)](https://sonarcloud.io/summary/new_code?id=Spring) diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/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 +# +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven 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 /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + 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 Mingw, 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)`" +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="`\\unset -f command; \\command -v 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 + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +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 + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@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 https://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 Maven 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 keystroke 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 set title of command window +title %0 +@REM enable echoing by 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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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 + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0542562 --- /dev/null +++ b/pom.xml @@ -0,0 +1,124 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.6 + + + com.zemoso.springdemo + spring-final-app + 0.0.1-SNAPSHOT + spring-final-app + Demo project for Spring Boot + + 11 + mdtabraiz + https://sonarcloud.io + src/main/java,src/main/resources/templates + src/test + 0.8.6 + jacoco + reuseReports + ${project.basedir}/../target/jacoco.exec + java + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.security + spring-security-test + test + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity5 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + mysql + mysql-connector-java + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + com.h2database + h2 + test + + + org.jacoco + jacoco-maven-plugin + 0.8.6 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + + + + diff --git a/sql-scripts/create-table.sql b/sql-scripts/create-table.sql new file mode 100644 index 0000000..804e868 --- /dev/null +++ b/sql-scripts/create-table.sql @@ -0,0 +1,26 @@ +CREATE DATABASE IF NOT EXISTS `blog_directory`; +USE `blog_directory`; + +-- + +-- + +DROP TABLE IF EXISTS `blog`; + +CREATE TABLE `blog` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `title` varchar(100) DEFAULT NULL, + `author_name` varchar(45) DEFAULT NULL, + `content` MEDIUMTEXT DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1; + +-- +-- Data for table `employee` +-- + +INSERT INTO `blog` VALUES + (1,'Time','Andrews Smith','about the time '), + (2,'Food','John Baumgarten','about food '), + (3,'Travel','Veena Gupta','about travel '); + diff --git a/src/main/java/com/zemoso/springdemo/SpringFinalAppApplication.java b/src/main/java/com/zemoso/springdemo/SpringFinalAppApplication.java new file mode 100644 index 0000000..1366401 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/SpringFinalAppApplication.java @@ -0,0 +1,13 @@ +package com.zemoso.springdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringFinalAppApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringFinalAppApplication.class, args); + } + +} diff --git a/src/main/java/com/zemoso/springdemo/constants/Constant.java b/src/main/java/com/zemoso/springdemo/constants/Constant.java new file mode 100644 index 0000000..24af5aa --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/constants/Constant.java @@ -0,0 +1,11 @@ +package com.zemoso.springdemo.constants; + +public class Constant { + + private Constant(){ + throw new UnsupportedOperationException("This is a utility class and cannot be instantiated"); + } + public static final String ADMIN_BLOG_FORM = "blog-form"; + public static final String USER_BLOG_FORM = "user-blog-form"; + public static final String SIGNUP_FORM = "signup"; +} diff --git a/src/main/java/com/zemoso/springdemo/controller/BlogAdminController.java b/src/main/java/com/zemoso/springdemo/controller/BlogAdminController.java new file mode 100644 index 0000000..738f040 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/controller/BlogAdminController.java @@ -0,0 +1,78 @@ +package com.zemoso.springdemo.controller; + +import com.zemoso.springdemo.constants.Constant; +import com.zemoso.springdemo.dto.BlogDTO; +import com.zemoso.springdemo.entity.Blog; +import com.zemoso.springdemo.service.BlogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.propertyeditors.StringTrimmerEditor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.security.Principal; +import java.util.List; + +@Controller +@RequestMapping("/blogs/admin") +public class BlogAdminController { + + @Autowired + private BlogService blogService; + + @InitBinder + public void initBinder(WebDataBinder dataBinder){ + StringTrimmerEditor editor = new StringTrimmerEditor(true); + dataBinder.registerCustomEditor(String.class,editor); + } + + @GetMapping("/master-list") + public String masterBlogsList(Model model){ + List blogs = blogService.findAll(); + model.addAttribute("blogs",blogs); + + return "blog-list"; + } + + @GetMapping("/showFormForAdd") + public String showFormForAdd(Model model, Principal principal){ + BlogDTO theblog = new BlogDTO(); + theblog.setBlogAuthorName(principal.getName()); + model.addAttribute("theblog",theblog); + + return Constant.ADMIN_BLOG_FORM; + } + + @PostMapping("/save") + public String saveBlog(@Valid @ModelAttribute("theblog") BlogDTO blog, BindingResult result){ + + if(result.hasErrors()){ + return Constant.ADMIN_BLOG_FORM; + }else{ + blogService.save(blog.toEntity()); + return "redirect:/blogs/admin/master-list"; + } + } + @GetMapping("/showFormForUpdate") + public String showFormForUpdate(@RequestParam("blogId") int theId, Model model){ + + Blog blog = blogService.findById(theId); + + BlogDTO blogDTO = blog.toDto(); + + model.addAttribute("theblog",blogDTO); + + return Constant.ADMIN_BLOG_FORM; + } + + @GetMapping("/delete") + public String delete(@RequestParam("blogId") int theId){ + + blogService.deleteById(theId); + return "redirect:/blogs/admin/master-list"; + } + +} diff --git a/src/main/java/com/zemoso/springdemo/controller/BlogUserController.java b/src/main/java/com/zemoso/springdemo/controller/BlogUserController.java new file mode 100644 index 0000000..a5e50b1 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/controller/BlogUserController.java @@ -0,0 +1,81 @@ +package com.zemoso.springdemo.controller; + +import com.zemoso.springdemo.constants.Constant; +import com.zemoso.springdemo.dto.BlogDTO; + +import com.zemoso.springdemo.entity.Blog; +import com.zemoso.springdemo.service.BlogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.propertyeditors.StringTrimmerEditor; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.security.Principal; +import java.util.List; + +@Controller +@RequestMapping("/blogs/user") +public class BlogUserController { + + @Autowired + private BlogService blogService; + + @InitBinder + public void initBinder(WebDataBinder dataBinder){ + StringTrimmerEditor editor = new StringTrimmerEditor(true); + dataBinder.registerCustomEditor(String.class,editor); + } + + @GetMapping("/list") + public String blogsList(Model model, Principal principal){ + List blogs = blogService.findByAuthor(principal.getName()); + List allBlogs = blogService.findAll(); + + model.addAttribute("blogs",blogs); + model.addAttribute("allBlogs",allBlogs); + return "user-list"; + } + + @GetMapping("/showFormForAdd") + public String showFormForAdd(Model model,Principal principal){ + BlogDTO blogDTO = new BlogDTO(); + blogDTO.setBlogAuthorName(principal.getName()); + model.addAttribute("theblog",blogDTO); + + return Constant.USER_BLOG_FORM; + } + + @PostMapping("/save") + public String saveBlog(@Valid @ModelAttribute("theblog") BlogDTO blog, BindingResult result){ + + if(result.hasErrors()){ + return Constant.USER_BLOG_FORM; + }else{ + blogService.save(blog.toEntity()); + return "redirect:/blogs/user/list"; + } + } + @GetMapping("/showFormForUpdate") + public String showFormForUpdate(@RequestParam("blogId") int theId, Model model){ + + Blog blog = blogService.findById(theId); + BlogDTO blogDTO = blog.toDto(); + + model.addAttribute("theblog",blogDTO); + + return Constant.USER_BLOG_FORM; + } + + @GetMapping("/delete") + public String delete(@RequestParam("blogId") int theId){ + + blogService.deleteById(theId); + return "redirect:/blogs/user/list"; + } + +} diff --git a/src/main/java/com/zemoso/springdemo/controller/LoginController.java b/src/main/java/com/zemoso/springdemo/controller/LoginController.java new file mode 100644 index 0000000..868f33d --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/controller/LoginController.java @@ -0,0 +1,40 @@ +package com.zemoso.springdemo.controller; + +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@Controller +@RequestMapping("/blogs") +public class LoginController { + + @GetMapping("/showMyLoginPage") + public String showLoginPage(){ + return "login"; + } + + @GetMapping("/access-denied") + public String showAccessDenied(){ + return "access-denied"; + } + + @RequestMapping("/success") + public void loginPageRedirect(HttpServletRequest request, HttpServletResponse response, + Authentication authResult) throws IOException { + + String role = authResult.getAuthorities().toString(); + + if(role.contains("ROLE_ADMIN")){ + response.sendRedirect(response.encodeRedirectURL(request.getContextPath() + "/blogs/admin/master-list")); + } + else if(role.contains("ROLE_USER")) { + response.sendRedirect(response.encodeRedirectURL(request.getContextPath() + "/blogs/user/list")); + } + } + +} diff --git a/src/main/java/com/zemoso/springdemo/controller/SignUpController.java b/src/main/java/com/zemoso/springdemo/controller/SignUpController.java new file mode 100644 index 0000000..975d626 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/controller/SignUpController.java @@ -0,0 +1,59 @@ +package com.zemoso.springdemo.controller; + +import com.zemoso.springdemo.constants.Constant; +import com.zemoso.springdemo.dto.UserDTO; + +import com.zemoso.springdemo.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.propertyeditors.StringTrimmerEditor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +@Controller +@RequestMapping("/blogs/signup") +public class SignUpController { + + @Autowired + private UserService userService; + + @InitBinder + public void initBinder(WebDataBinder dataBinder){ + StringTrimmerEditor editor = new StringTrimmerEditor(true); + dataBinder.registerCustomEditor(String.class,editor); + } + + + @GetMapping("/showFormForSignup") + public String showSignupForm(Model model){ + + UserDTO user = new UserDTO(); + model.addAttribute("theuser",user); + + return Constant.SIGNUP_FORM; + } + + @PostMapping("/save") + public String saveUser(@Valid @ModelAttribute("theuser") UserDTO user, + BindingResult result,Model model){ + + + if(result.hasErrors()){ + return Constant.SIGNUP_FORM; + }else if(userService.findUser(user.getUserDtoUsername())){ + model.addAttribute("userExists","Username Already Exists! " + + "Enter different one"); + + return Constant.SIGNUP_FORM; + } + else{ + userService.save(user.toEntity()); + return "redirect:/blogs/showMyLoginPage"; + } + } + +} diff --git a/src/main/java/com/zemoso/springdemo/dao/BlogRepository.java b/src/main/java/com/zemoso/springdemo/dao/BlogRepository.java new file mode 100644 index 0000000..6e848d6 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/dao/BlogRepository.java @@ -0,0 +1,10 @@ +package com.zemoso.springdemo.dao; + +import com.zemoso.springdemo.entity.Blog; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface BlogRepository extends JpaRepository { + public List findByAuthorName(String name); +} diff --git a/src/main/java/com/zemoso/springdemo/dao/UserAndRoleRepository.java b/src/main/java/com/zemoso/springdemo/dao/UserAndRoleRepository.java new file mode 100644 index 0000000..90905f1 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/dao/UserAndRoleRepository.java @@ -0,0 +1,7 @@ +package com.zemoso.springdemo.dao; + +import com.zemoso.springdemo.entity.Authorities; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserAndRoleRepository extends JpaRepository { +} diff --git a/src/main/java/com/zemoso/springdemo/dto/BlogDTO.java b/src/main/java/com/zemoso/springdemo/dto/BlogDTO.java new file mode 100644 index 0000000..c462bbf --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/dto/BlogDTO.java @@ -0,0 +1,59 @@ +package com.zemoso.springdemo.dto; + + +import com.zemoso.springdemo.entity.Blog; + +import javax.validation.constraints.NotNull; + +public class BlogDTO { + + private int blogId; + @NotNull(message = "Title is required") + private String blogTitle; + @NotNull(message = "Author name is required") + private String blogAuthorName; + @NotNull(message = "Content is required") + private String blogContent; + + public Blog toEntity(){ + Blog blog = new Blog(); + blog.setId(this.blogId); + blog.setTitle(this.blogTitle); + blog.setAuthorName(this.blogAuthorName); + blog.setContent(this.blogContent); + + return blog; + } + + public int getBlogId() { + return blogId; + } + + public void setBlogId(int blogId) { + this.blogId = blogId; + } + + public String getBlogTitle() { + return blogTitle; + } + + public void setBlogTitle(String blogTitle) { + this.blogTitle = blogTitle; + } + + public String getBlogAuthorName() { + return blogAuthorName; + } + + public void setBlogAuthorName(String blogAuthorName) { + this.blogAuthorName = blogAuthorName; + } + + public String getBlogContent() { + return blogContent; + } + + public void setBlogContent(String blogContent) { + this.blogContent = blogContent; + } +} diff --git a/src/main/java/com/zemoso/springdemo/dto/UserDTO.java b/src/main/java/com/zemoso/springdemo/dto/UserDTO.java new file mode 100644 index 0000000..cc05d8c --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/dto/UserDTO.java @@ -0,0 +1,60 @@ +package com.zemoso.springdemo.dto; + +import com.zemoso.springdemo.entity.User; + +import javax.validation.constraints.NotNull; + +public class UserDTO { + + @NotNull(message = "Username is required") + private String userDtoUsername; + + @NotNull(message = "Password is required") + private String userDtoPassword; + + private int userDtoEnabled =1; + @NotNull(message = "Select a Role") + private String userDtoRole; + + public User toEntity(){ + User user = new User(); + user.setUsername(this.userDtoUsername); + user.setPassword(this.userDtoPassword); + user.setEnabled(this.userDtoEnabled); + user.setRole(this.userDtoRole); + + return user; + } + + public String getUserDtoUsername() { + return userDtoUsername; + } + + public void setUserDtoUsername(String userDtoUsername) { + this.userDtoUsername = userDtoUsername; + } + + public String getUserDtoPassword() { + return userDtoPassword; + } + + public void setUserDtoPassword(String userDtoPassword) { + this.userDtoPassword = userDtoPassword; + } + + public int getUserDtoEnabled() { + return userDtoEnabled; + } + + public void setUserDtoEnabled(int userDtoEnabled) { + this.userDtoEnabled = userDtoEnabled; + } + + public String getUserDtoRole() { + return userDtoRole; + } + + public void setUserDtoRole(String userDtoRole) { + this.userDtoRole = userDtoRole; + } +} diff --git a/src/main/java/com/zemoso/springdemo/entity/Authorities.java b/src/main/java/com/zemoso/springdemo/entity/Authorities.java new file mode 100644 index 0000000..f0b8dbe --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/entity/Authorities.java @@ -0,0 +1,50 @@ +package com.zemoso.springdemo.entity; + +import javax.persistence.*; +import java.util.logging.Logger; + + +@Entity +@Table(name = "authorities") +public class Authorities { + + @Id + @Column(name = "username") + private String username; + + @Column(name = "authority") + private String authority; + + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name="username") + private User user; + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public Authorities(){ + Logger logger = Logger.getLogger(getClass().getName()); + logger.info("Authorities Instantiated"); + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } +} diff --git a/src/main/java/com/zemoso/springdemo/entity/Blog.java b/src/main/java/com/zemoso/springdemo/entity/Blog.java new file mode 100644 index 0000000..4117771 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/entity/Blog.java @@ -0,0 +1,74 @@ +package com.zemoso.springdemo.entity; + +import com.zemoso.springdemo.dto.BlogDTO; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.logging.Logger; + +@Entity +@Table(name = "blog") +public class Blog { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @NotNull(message = "Title is required") + @Column(name = "title") + private String title; + + @NotNull(message = "Author name is required") + @Column(name = "author_name") + private String authorName; + + @NotNull(message = "Content is required") + @Column(name = "content") + private String content; + + public Blog() { + Logger logger = Logger.getLogger(getClass().getName()); + logger.info("Blog Instantiated"); + } + + public BlogDTO toDto(){ + BlogDTO blogDTO = new BlogDTO(); + blogDTO.setBlogId(this.id); + blogDTO.setBlogTitle(this.title); + blogDTO.setBlogContent(this.content); + blogDTO.setBlogAuthorName(this.authorName); + return blogDTO; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getAuthorName() { + return authorName; + } + + public void setAuthorName(String authorName) { + this.authorName = authorName; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } +} diff --git a/src/main/java/com/zemoso/springdemo/entity/User.java b/src/main/java/com/zemoso/springdemo/entity/User.java new file mode 100644 index 0000000..930e7a6 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/entity/User.java @@ -0,0 +1,65 @@ +package com.zemoso.springdemo.entity; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.logging.Logger; + + +@Entity +@Table(name = "users") +public class User { + + + @Id + @NotNull(message = "Username is required") + @Column(name = "username") + private String username; + + @NotNull(message = "Password is required") + @Column(name = "password") + private String password; + + @Column(name = "enabled") + private int enabled=1; + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Transient + private String role; + + public User(){ + Logger logger = Logger.getLogger(getClass().getName()); + logger.info("User Instantiated"); + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public int getEnabled() { + return enabled; + } + + public void setEnabled(int enabled) { + this.enabled = enabled; + } + +} diff --git a/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogErrorResponse.java b/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogErrorResponse.java new file mode 100644 index 0000000..859b415 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogErrorResponse.java @@ -0,0 +1,43 @@ +package com.zemoso.springdemo.exceptionhandler; + + +public class BlogErrorResponse { + + private int status; + private String message; + private long timestamp; + + public BlogErrorResponse(){ + + } + + public BlogErrorResponse(int status, String message, long timestamp) { + this.status = status; + this.message = message; + this.timestamp = timestamp; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public long getTimestamp() { + return timestamp; + } + + public void setTimestamp(long timestamp) { + this.timestamp = timestamp; + } +} \ No newline at end of file diff --git a/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogNotFoundException.java b/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogNotFoundException.java new file mode 100644 index 0000000..5059da9 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogNotFoundException.java @@ -0,0 +1,16 @@ +package com.zemoso.springdemo.exceptionhandler; + +public class BlogNotFoundException extends RuntimeException { + + public BlogNotFoundException(String message) { + super(message); + } + + public BlogNotFoundException(String message, Throwable cause) { + super(message, cause); + } + + public BlogNotFoundException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogRestExceptionHandler.java b/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogRestExceptionHandler.java new file mode 100644 index 0000000..4bf959c --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/exceptionhandler/BlogRestExceptionHandler.java @@ -0,0 +1,30 @@ +package com.zemoso.springdemo.exceptionhandler; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class BlogRestExceptionHandler { + + @ExceptionHandler + public ResponseEntity handleException(BlogNotFoundException exc){ + + BlogErrorResponse error = new BlogErrorResponse( + HttpStatus.NOT_FOUND.value(), exc.getMessage(), System.currentTimeMillis() + ); + + return new ResponseEntity<>(error,HttpStatus.NOT_FOUND); + } + + @ExceptionHandler + public ResponseEntity handleException(Exception exc){ + + BlogErrorResponse error = new BlogErrorResponse( + HttpStatus.BAD_REQUEST.value(), exc.getMessage(), System.currentTimeMillis() + ); + + return new ResponseEntity<>(error,HttpStatus.BAD_REQUEST); + } +} diff --git a/src/main/java/com/zemoso/springdemo/rest/BlogRestController.java b/src/main/java/com/zemoso/springdemo/rest/BlogRestController.java new file mode 100644 index 0000000..5f451a8 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/rest/BlogRestController.java @@ -0,0 +1,60 @@ +package com.zemoso.springdemo.rest; + +import com.zemoso.springdemo.dto.BlogDTO; +import com.zemoso.springdemo.entity.Blog; +import com.zemoso.springdemo.exceptionhandler.BlogNotFoundException; +import com.zemoso.springdemo.service.BlogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +import java.util.List; + +@RestController +@RequestMapping("/api") +public class BlogRestController { + + + @Autowired + private BlogService blogService; + + @GetMapping("/blogs") + public List getBlogs(){ + return blogService.findAll(); + } + + @GetMapping("/blogs/{blogId}") + public Blog getBlog(@PathVariable int blogId){ + + Blog blog = blogService.findById(blogId); + + if(blog==null){ + throw new BlogNotFoundException("No Blog found with the id - "+blogId); + } + return blog; + } + + @PostMapping("/blogs") + public void addBlog(@RequestBody BlogDTO blog){ + blogService.save(blog.toEntity()); + } + + @PutMapping("/blogs") + public void updateBlog(@RequestBody BlogDTO blog){ + blogService.save(blog.toEntity()); + } + + @DeleteMapping("/blogs/{blogId}") + public String deleteBlog(@PathVariable int blogId){ + Blog blog = blogService.findById(blogId); + + if(blog==null){ + throw new BlogNotFoundException("No Blog found with the id - "+blogId); + } + + blogService.deleteById(blogId); + + return "Blog deleted with id "+blogId; + } + +} diff --git a/src/main/java/com/zemoso/springdemo/security/SecurityConfig.java b/src/main/java/com/zemoso/springdemo/security/SecurityConfig.java new file mode 100644 index 0000000..296782f --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/security/SecurityConfig.java @@ -0,0 +1,51 @@ +package com.zemoso.springdemo.security; + +import org.springframework.beans.factory.annotation.Autowired; +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.crypto.bcrypt.BCryptPasswordEncoder; + + +import javax.sql.DataSource; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + private DataSource dataSource; + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + + auth.jdbcAuthentication().dataSource(dataSource).passwordEncoder(new BCryptPasswordEncoder(12)); + } + @Override + protected void configure(HttpSecurity http) throws Exception { + + http.authorizeRequests() + .antMatchers("/blogs/user/**").hasRole("USER") + .antMatchers("/blogs/admin/**").hasRole("ADMIN") + .and().formLogin().loginPage("/blogs/showMyLoginPage") + .loginProcessingUrl("/authenticateTheUser").defaultSuccessUrl("/blogs/success", true) + .permitAll().and().logout().permitAll() + .and().exceptionHandling().accessDeniedPage("/blogs/access-denied"); + } +} + + + + + + + + + + + + + + diff --git a/src/main/java/com/zemoso/springdemo/service/BlogService.java b/src/main/java/com/zemoso/springdemo/service/BlogService.java new file mode 100644 index 0000000..fbb088c --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/service/BlogService.java @@ -0,0 +1,18 @@ +package com.zemoso.springdemo.service; + +import com.zemoso.springdemo.entity.Blog; + +import java.util.List; + +public interface BlogService { + + public List findAll(); + + public Blog findById(int theId); + + public void save(Blog blog); + + public List findByAuthor(String name); + + public void deleteById(int theId); +} diff --git a/src/main/java/com/zemoso/springdemo/service/BlogServiceImpl.java b/src/main/java/com/zemoso/springdemo/service/BlogServiceImpl.java new file mode 100644 index 0000000..59133ee --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/service/BlogServiceImpl.java @@ -0,0 +1,49 @@ +package com.zemoso.springdemo.service; + +import com.zemoso.springdemo.dao.BlogRepository; +import com.zemoso.springdemo.entity.Blog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class BlogServiceImpl implements BlogService{ + + @Autowired + private BlogRepository blogRepository; + + @Override + public List findAll() { + return blogRepository.findAll(); + } + + @Override + public Blog findById(int theId) { + Optional result = blogRepository.findById(theId); + + Blog blog = null; + + if(result.isPresent()){ + blog = result.get(); + } + + return blog; + } + + @Override + public void save(Blog blog) { + blogRepository.save(blog); + } + + @Override + public List findByAuthor(String name) { + return blogRepository.findByAuthorName(name); + } + + @Override + public void deleteById(int theId) { + blogRepository.deleteById(theId); + } +} diff --git a/src/main/java/com/zemoso/springdemo/service/UserService.java b/src/main/java/com/zemoso/springdemo/service/UserService.java new file mode 100644 index 0000000..7ed05a7 --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/service/UserService.java @@ -0,0 +1,13 @@ +package com.zemoso.springdemo.service; + + + +import com.zemoso.springdemo.entity.User; + +public interface UserService { + + public void save(User user); + + public boolean findUser(String username); + +} diff --git a/src/main/java/com/zemoso/springdemo/service/UserServiceImpl.java b/src/main/java/com/zemoso/springdemo/service/UserServiceImpl.java new file mode 100644 index 0000000..5a14ccf --- /dev/null +++ b/src/main/java/com/zemoso/springdemo/service/UserServiceImpl.java @@ -0,0 +1,47 @@ +package com.zemoso.springdemo.service; + +import com.zemoso.springdemo.dao.UserAndRoleRepository; +import com.zemoso.springdemo.entity.Authorities; +import com.zemoso.springdemo.entity.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class UserServiceImpl implements UserService{ + + @Autowired + UserAndRoleRepository userAndRoleRepository; + + @Override + public void save(User user) { + + Authorities authorities = new Authorities(); + authorities.setAuthority(user.getRole()); + authorities.setUsername(user.getUsername()); + authorities.setUser(user); + user.setPassword(encodePassword(user.getPassword())); + userAndRoleRepository.save(authorities); + } + + @Override + public boolean findUser(String username) { + Optional result = userAndRoleRepository.findById(username); + boolean userExists = false; + + if(result.isPresent()){ + userExists = true; + } + return userExists; + } + + + private String encodePassword(String password){ + String encodedPassword = ""; + BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); + encodedPassword = bCryptPasswordEncoder.encode(password); + return encodedPassword; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..178e8bf --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:mysql://localhost:3306/blog_directory?useSSL=false&serverTimezone=UTC +spring.datasource.username=springstudent +spring.datasource.password=SpringStudent$123 +spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect +spring.jpa.show-sql=true diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html new file mode 100644 index 0000000..6e15715 --- /dev/null +++ b/src/main/resources/static/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/resources/templates/access-denied.html b/src/main/resources/templates/access-denied.html new file mode 100644 index 0000000..318f883 --- /dev/null +++ b/src/main/resources/templates/access-denied.html @@ -0,0 +1,17 @@ + + + + Access Denied + + + +

Access Denied

+

You are not authorized to access this resources

+
+ Back to Login + + \ No newline at end of file diff --git a/src/main/resources/templates/blog-form.html b/src/main/resources/templates/blog-form.html new file mode 100644 index 0000000..09351af --- /dev/null +++ b/src/main/resources/templates/blog-form.html @@ -0,0 +1,40 @@ + + + + + + + + Add Blog + + +
+
+

Save Blog

+
+
+ + + + +

+ + +

+ +