diff --git a/desafio/.gitignore b/desafio/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/desafio/.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/desafio/.mvn/wrapper/MavenWrapperDownloader.java b/desafio/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..e76d1f3 --- /dev/null +++ b/desafio/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/desafio/.mvn/wrapper/maven-wrapper.jar b/desafio/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..2cc7d4a Binary files /dev/null and b/desafio/.mvn/wrapper/maven-wrapper.jar differ diff --git a/desafio/.mvn/wrapper/maven-wrapper.properties b/desafio/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/desafio/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/desafio/mvnw b/desafio/mvnw new file mode 100755 index 0000000..a16b543 --- /dev/null +++ b/desafio/mvnw @@ -0,0 +1,310 @@ +#!/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 /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="`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 + +########################################################################################## +# 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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/desafio/mvnw.cmd b/desafio/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/desafio/mvnw.cmd @@ -0,0 +1,182 @@ +@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 "%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 + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%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/desafio/pom.xml b/desafio/pom.xml new file mode 100644 index 0000000..ef7e31a --- /dev/null +++ b/desafio/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.1.RELEASE + + + com.indra.desafio + desafio + 1.0.0-SNAPSHOT + desafio + Desafio Indra + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.h2database + h2 + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + io.springfox + springfox-swagger2 + 2.7.0 + + + io.springfox + springfox-swagger-ui + 2.7.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/desafio/src/main/java/META-INF/additional-spring-configuration-metadata.json b/desafio/src/main/java/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..3c8c6f4 --- /dev/null +++ b/desafio/src/main/java/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,22 @@ +{"properties": [ + { + "name": "contato.disco.raiz", + "type": "java.lang.String", + "description": "A description for 'contato.disco.raiz'" + }, + { + "name": "contato.disco.diretorio-arquivos", + "type": "java.lang.String", + "description": "A description for 'contato.disco.diretorio-arquivos'" + }, + { + "name": "arquivo.disco.raiz", + "type": "java.lang.String", + "description": "A description for 'arquivo.disco.raiz'" + }, + { + "name": "arquivo.disco.diretorio-arquivos", + "type": "java.lang.String", + "description": "A description for 'arquivo.disco.diretorio-arquivos'" + } +]} \ No newline at end of file diff --git a/desafio/src/main/java/com/indra/desafio/DesafioApplication.java b/desafio/src/main/java/com/indra/desafio/DesafioApplication.java new file mode 100644 index 0000000..3a0dc22 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/DesafioApplication.java @@ -0,0 +1,13 @@ +package com.indra.desafio; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DesafioApplication { + + public static void main(String[] args) { + SpringApplication.run(DesafioApplication.class, args); + } + +} diff --git a/desafio/src/main/java/com/indra/desafio/controller/config/SwaggerConfig.java b/desafio/src/main/java/com/indra/desafio/controller/config/SwaggerConfig.java new file mode 100644 index 0000000..79a606a --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/controller/config/SwaggerConfig.java @@ -0,0 +1,47 @@ +package com.indra.desafio.controller.config; + +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import java.util.ArrayList; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.service.VendorExtension; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import static springfox.documentation.builders.PathSelectors.regex; + +@Configuration +@EnableSwagger2 +public class SwaggerConfig { + + @Bean + public Docket productApi() { + return new Docket(DocumentationType.SWAGGER_2) + .select() + .apis(RequestHandlerSelectors.basePackage("com.indra.desafio")) + .paths(regex("/.*")) + .build() + .apiInfo(metaInfo()); + } + + private ApiInfo metaInfo() { + + ApiInfo apiInfo = new ApiInfo( + "Desafio Indra API REST", + "API REST desafio Indra.", + "1.0", + "Terms of Service", + new Contact("Rodolfo Abrantes", "", "rodolfo.abrantes@gmail.com"), + "", + "", new ArrayList() + ); + + return apiInfo; + } + +} \ No newline at end of file diff --git a/desafio/src/main/java/com/indra/desafio/controller/exceptionhandler/ResourceExceptionHandle.java b/desafio/src/main/java/com/indra/desafio/controller/exceptionhandler/ResourceExceptionHandle.java new file mode 100644 index 0000000..0d0a1e1 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/controller/exceptionhandler/ResourceExceptionHandle.java @@ -0,0 +1,80 @@ +package com.indra.desafio.controller.exceptionhandler; + +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.MessageSource; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.validation.ObjectError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +import com.indra.desafio.domain.exceptions.UsuarioExistenteException; +import com.indra.desafio.domain.exceptions.NegocioNaoEncontradoException; +import com.indra.desafio.domain.model.ErroDetalhado; + +@ControllerAdvice +public class ResourceExceptionHandle extends ResponseEntityExceptionHandler { + + @Autowired + private MessageSource messageSource; + + @ExceptionHandler(UsuarioExistenteException.class) + public ResponseEntity handleUsuarioExistenteException(UsuarioExistenteException ex, + WebRequest request){ + + HttpStatus status = HttpStatus.CONFLICT; + + ErroDetalhado errorDetails = new ErroDetalhado(); + errorDetails.setStatus(status.value()); + errorDetails.setTitulo(ex.getMessage()); + errorDetails.setDataHora(OffsetDateTime.now()); + + return handleExceptionInternal(ex, errorDetails, new HttpHeaders(), status, request); + } + + @ExceptionHandler(NegocioNaoEncontradoException.class) + public ResponseEntity handleUsuarioNaoEncontrado(NegocioNaoEncontradoException ex, + WebRequest request){ + + HttpStatus status = HttpStatus.BAD_REQUEST; + + ErroDetalhado errorDetails = new ErroDetalhado(); + errorDetails.setStatus(status.value()); + errorDetails.setTitulo(ex.getMessage()); + errorDetails.setDataHora(OffsetDateTime.now()); + + return handleExceptionInternal(ex, errorDetails, new HttpHeaders(), status, request); + } + + @Override + protected ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotValidException ex, + HttpHeaders headers, HttpStatus status, WebRequest request) { + + List campos = new ArrayList(); + + for (ObjectError error : ex.getBindingResult().getAllErrors()) { + String nome = ((FieldError) error).getField(); + String mensagem = messageSource.getMessage(error, LocaleContextHolder.getLocale()); + + campos.add(new ErroDetalhado.Campo(nome, mensagem)); + } + + ErroDetalhado errorDetails = new ErroDetalhado(); + errorDetails.setStatus(status.value()); + errorDetails.setTitulo("Um ou mais campos estão inválidos"); + errorDetails.setDataHora(OffsetDateTime.now()); + errorDetails.setCampos(campos); + + return handleExceptionInternal(ex, errorDetails, new HttpHeaders(), status, request); + } +} diff --git a/desafio/src/main/java/com/indra/desafio/controller/resource/ArquivoResource.java b/desafio/src/main/java/com/indra/desafio/controller/resource/ArquivoResource.java new file mode 100644 index 0000000..2caa3de --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/controller/resource/ArquivoResource.java @@ -0,0 +1,31 @@ +package com.indra.desafio.controller.resource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import com.indra.desafio.domain.service.ArquivoService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +@CrossOrigin(origins = "*") +@RestController +@RequestMapping("/arquivos") +@Api(value="API REST desafioIndra") +public class ArquivoResource { + + @Autowired + private ArquivoService arquivoService; + + @ApiOperation(value="Salva um arquivo") + @PostMapping + public void upload(@RequestParam MultipartFile arquivo) { + arquivoService.salvarArquivo(arquivo); + } + +} diff --git a/desafio/src/main/java/com/indra/desafio/controller/resource/CombustivelResource.java b/desafio/src/main/java/com/indra/desafio/controller/resource/CombustivelResource.java new file mode 100644 index 0000000..0c79466 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/controller/resource/CombustivelResource.java @@ -0,0 +1,76 @@ +package com.indra.desafio.controller.resource; + +import java.net.URI; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import com.indra.desafio.domain.model.CombustivelModel; +import com.indra.desafio.domain.service.CombustivelService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +@CrossOrigin(origins = "*") +@RestController +@RequestMapping("/combustivel") +@Api(value = "API REST desafioIndra") +public class CombustivelResource { + + @Autowired + private CombustivelService combustivelService; + + @ApiOperation(value = "Retorna uma lista completa de combustíveis") + @GetMapping + public ResponseEntity> ListarCombustiveis() { + return ResponseEntity.status(HttpStatus.OK).body(combustivelService.listarCombustiveis()); + } + + @ApiOperation(value = "Salva informações completas de combustível") + @PostMapping + public ResponseEntity salvarCombustivel(@RequestBody CombustivelModel combustivel) { + combustivel = combustivelService.salvarCombustivel(combustivel); + + URI uri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(combustivel.getId()) + .toUri(); + + return ResponseEntity.created(uri).body(combustivel); + } + + @ApiOperation(value = "Returna média de preço por município") + @GetMapping("/media-de-preco/{municipio}") + public ResponseEntity mediaDePrecoPorMunicipio(@PathVariable String municipio) { + return new ResponseEntity(this.combustivelService.mediaDePrecoPorMunicipio(municipio), HttpStatus.OK); + } + + @ApiOperation(value = "Returna dados por região") + @GetMapping("/dados-por-sigla-regiao/{siglaRegiao}") + public ResponseEntity> listartDadosPorsiglaRegiao(@PathVariable String siglaRegiao) { + return ResponseEntity.status(HttpStatus.OK) + .body(combustivelService.listarMunicipiospPorSiglaRegiao(siglaRegiao)); + } + + @ApiOperation(value = "Returna dados por município") + @GetMapping("/dados-por-sigla-estado/{siglaEstado}") + public ResponseEntity> listartDadosPorSiglaEstado(@PathVariable String siglaEstado) { + return ResponseEntity.status(HttpStatus.OK) + .body(combustivelService.listarMunicipiospPorSiglaEstado(siglaEstado)); + } + + @ApiOperation(value = "Retorna todas as informações por data de coleta") + @GetMapping("/dados-por-data-coleta") + public ResponseEntity> dadosAgrupadosPorDataColeta() { + return ResponseEntity.status(HttpStatus.OK).body(combustivelService.getDadosAgrupadosPorDataColeta()); + } + +} diff --git a/desafio/src/main/java/com/indra/desafio/controller/resource/HistoricoDePrecoDeCombustivelResource.java b/desafio/src/main/java/com/indra/desafio/controller/resource/HistoricoDePrecoDeCombustivelResource.java new file mode 100644 index 0000000..fd25e7f --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/controller/resource/HistoricoDePrecoDeCombustivelResource.java @@ -0,0 +1,79 @@ +package com.indra.desafio.controller.resource; + +import java.net.URI; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import com.indra.desafio.domain.model.HistoricoDePrecoDeCombustivel; +import com.indra.desafio.domain.service.HistoricoDePrecoDeCombustivelService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +@CrossOrigin(origins = "*") +@RestController +@RequestMapping("/historico-combustivel") +@Api(value="API REST desafioIndra") +public class HistoricoDePrecoDeCombustivelResource { + + @Autowired + private HistoricoDePrecoDeCombustivelService historicoService; + + @ApiOperation(value="Retorna uma lista de historico") + @GetMapping + public ResponseEntity> listarHistorico(){ + return ResponseEntity.status(HttpStatus.OK).body(historicoService + .listarHistorico()); + } + + @ApiOperation(value="Salva um historico") + @PostMapping + public ResponseEntity salvarHistorico(@Valid + @RequestBody HistoricoDePrecoDeCombustivel historico){ + + historico = historicoService.salvarHistorico(historico); + + URI uri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}") + .buildAndExpand(historico.getId()).toUri(); + + return ResponseEntity.created(uri).body(historico); + } + + @ApiOperation(value="Retorna um historico recebendo um id como parâmetro") + @GetMapping("/{id}") + public ResponseEntity buscarHistorico(@PathVariable Long id){ + return ResponseEntity.status(HttpStatus.OK).body(historicoService.buscarHistorico(id)); + } + + @ApiOperation(value="Deleta um historico") + @DeleteMapping("/{id}") + public ResponseEntity deletarHistorico(@PathVariable Long id){ + historicoService.deletarHistorico(id); + return ResponseEntity.noContent().build(); + } + + @ApiOperation(value="Atualiza um historico") + @PutMapping("/{id}") + public ResponseEntity atualizarHistorico(@PathVariable Long id, + @Valid @RequestBody HistoricoDePrecoDeCombustivel historico){ + historicoService.atualizarHistorico(id, historico); + + return ResponseEntity.noContent().build(); + } + +} diff --git a/desafio/src/main/java/com/indra/desafio/controller/resource/UsuarioResource.java b/desafio/src/main/java/com/indra/desafio/controller/resource/UsuarioResource.java new file mode 100644 index 0000000..09a7bd6 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/controller/resource/UsuarioResource.java @@ -0,0 +1,78 @@ +package com.indra.desafio.controller.resource; + +import java.net.URI; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import com.indra.desafio.domain.model.UsuarioModel; +import com.indra.desafio.domain.service.UsuarioService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +@CrossOrigin(origins = "*") +@RestController +@RequestMapping("/usuarios") +@Api(value="API REST desafioIndra") +public class UsuarioResource { + + @Autowired + private UsuarioService usuarioService; + + @ApiOperation(value="Retorna uma lista de Usuários") + @GetMapping + public ResponseEntity> listarUsuarios(){ + return ResponseEntity.status(HttpStatus.OK).body(usuarioService + .listarUsuarios()); + } + + @ApiOperation(value="Salva um Usuário") + @PostMapping + public ResponseEntity cadastrarUsuario(@Valid @RequestBody UsuarioModel usuario){ + + usuario = usuarioService.cadastrarUsuario(usuario); + + URI uri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}") + .buildAndExpand(usuario.getId()).toUri(); + + return ResponseEntity.created(uri).body(usuario); + } + + @ApiOperation(value="Retorna um Usuário passando um id como parâmetro") + @GetMapping("/{id}") + public ResponseEntity buscarUsuario(@PathVariable Long id){ + return ResponseEntity.status(HttpStatus.OK).body(usuarioService.buscarUsuario(id)); + } + + @ApiOperation(value="Deleta um Usuário passando id como parâmetro") + @DeleteMapping("/{id}") + public ResponseEntity deletarUsuario(@PathVariable Long id){ + usuarioService.deletarUsuario(id); + return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); + } + + @ApiOperation(value="Atualiza um Usuário") + @PutMapping("/{id}") + public ResponseEntity atualizarUsuario(@PathVariable Long id, + @Valid @RequestBody UsuarioModel usuario){ + usuario = usuarioService.atualizarUsuario(id, usuario); + + return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); + } + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/exceptions/NegocioNaoEncontradoException.java b/desafio/src/main/java/com/indra/desafio/domain/exceptions/NegocioNaoEncontradoException.java new file mode 100644 index 0000000..e80becd --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/exceptions/NegocioNaoEncontradoException.java @@ -0,0 +1,11 @@ +package com.indra.desafio.domain.exceptions; + +public class NegocioNaoEncontradoException extends RuntimeException { + + private static final long serialVersionUID = 4135178589974813239L; + + public NegocioNaoEncontradoException(String mensagem) { + super(mensagem); + } + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/exceptions/UsuarioExistenteException.java b/desafio/src/main/java/com/indra/desafio/domain/exceptions/UsuarioExistenteException.java new file mode 100644 index 0000000..227bd9f --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/exceptions/UsuarioExistenteException.java @@ -0,0 +1,11 @@ +package com.indra.desafio.domain.exceptions; + +public class UsuarioExistenteException extends RuntimeException { + + private static final long serialVersionUID = 9194043626684081918L; + + public UsuarioExistenteException(String mensagem) { + super(mensagem); + } + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/model/CombustivelModel.java b/desafio/src/main/java/com/indra/desafio/domain/model/CombustivelModel.java new file mode 100644 index 0000000..f7f6e9e --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/model/CombustivelModel.java @@ -0,0 +1,35 @@ +package com.indra.desafio.domain.model; + +import java.math.BigDecimal; +import java.time.OffsetDateTime; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import lombok.Getter; +import lombok.Setter; + +@Entity +@Getter +@Setter +@Table(name = "combustivel") +public class CombustivelModel { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String siglaRegiao; + private String siglaEstado; + private String municipio; + private String revenda; + private String cnpjRevenda; + private String produto; + private OffsetDateTime dataColeta; + private BigDecimal valorVenda; + private BigDecimal valorCompra; + private Integer unidadeMedida; + private String bandeira; +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/model/EnderecoModel.java b/desafio/src/main/java/com/indra/desafio/domain/model/EnderecoModel.java new file mode 100644 index 0000000..0f12cff --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/model/EnderecoModel.java @@ -0,0 +1,22 @@ +package com.indra.desafio.domain.model; + +import javax.persistence.Embeddable; +import javax.persistence.Table; + +import lombok.Getter; +import lombok.Setter; + +@Embeddable +@Getter +@Setter +@Table(name = "endereco") +public class EnderecoModel { + + private String logradouro; + private String numero; + private String bairro; + private String cep; + private String cidade; + private String estado; + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/model/ErroDetalhado.java b/desafio/src/main/java/com/indra/desafio/domain/model/ErroDetalhado.java new file mode 100644 index 0000000..b58e18d --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/model/ErroDetalhado.java @@ -0,0 +1,77 @@ +package com.indra.desafio.domain.model; + +import java.time.OffsetDateTime; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; + +@JsonInclude(Include.NON_NULL) +public class ErroDetalhado { + + private Integer status; + private String titulo; + private OffsetDateTime dataHora; + private List campos; + + public static class Campo { + + private String nome; + private String mensagem; + + public Campo(String nome, String mensagem) { + super(); + this.nome = nome; + this.mensagem = mensagem; + } + + public String getNome() { + return nome; + } + + public void setNome(String nome) { + this.nome = nome; + } + + public String getMensagem() { + return mensagem; + } + + public void setMensagem(String mensagem) { + this.mensagem = mensagem; + } + + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getTitulo() { + return titulo; + } + + public void setTitulo(String titulo) { + this.titulo = titulo; + } + + public OffsetDateTime getDataHora() { + return dataHora; + } + + public void setDataHora(OffsetDateTime dataHora) { + this.dataHora = dataHora; + } + + public List getCampos() { + return campos; + } + + public void setCampos(List campos) { + this.campos = campos; + } +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/model/HistoricoDePrecoDeCombustivel.java b/desafio/src/main/java/com/indra/desafio/domain/model/HistoricoDePrecoDeCombustivel.java new file mode 100644 index 0000000..f6b50e2 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/model/HistoricoDePrecoDeCombustivel.java @@ -0,0 +1,48 @@ +package com.indra.desafio.domain.model; + +import java.time.OffsetDateTime; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty.Access; +import javax.persistence.Table; + +import lombok.Getter; +import lombok.Setter; + +@Entity +@Getter +@Setter +@Table(name = "historico_de_preco_combustivel") +public class HistoricoDePrecoDeCombustivel { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotBlank + @Size(max = 30) + private String tipoCombustivel; + + @NotBlank + @Size(max = 100) + private String posto; + + @NotNull + private Double preco; + + @JsonProperty(access = Access.READ_ONLY) + @JsonFormat(pattern="dd-MM-yyyy'T'HH:mm") + private OffsetDateTime data; + + + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/model/UsuarioModel.java b/desafio/src/main/java/com/indra/desafio/domain/model/UsuarioModel.java new file mode 100644 index 0000000..c536371 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/model/UsuarioModel.java @@ -0,0 +1,44 @@ +package com.indra.desafio.domain.model; + +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; + +import lombok.Getter; +import lombok.Setter; + +@Entity +@Getter +@Setter +@Table(name = "usuario") +public class UsuarioModel { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotBlank + @Size(max = 150) + private String nome; + + @NotBlank + @Size(max = 150) + @Email + private String email; + + @NotBlank + private String login; + + @NotBlank + private String senha; + + @Embedded + private EnderecoModel endereco; + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/repository/CombustivelRepository.java b/desafio/src/main/java/com/indra/desafio/domain/repository/CombustivelRepository.java new file mode 100644 index 0000000..ed04c49 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/repository/CombustivelRepository.java @@ -0,0 +1,28 @@ +package com.indra.desafio.domain.repository; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import com.indra.desafio.domain.model.CombustivelModel; + +@Repository +public interface CombustivelRepository extends JpaRepository { + + @Query("select c from CombustivelModel c order by c.dataColeta") + List getDadosAgrupadosPorDataColeta(); + + @Query("select avg(c.valorVenda) from CombustivelModel c where c.municipio = ?1") + float mediaDePrecoPorMunicipio(String nomeMunicipio); + + @Query("select c from CombustivelModel c where c.siglaRegiao = ?1") + List findBysiglaRegiao(String siglaRegiao); + + @Query("select c from CombustivelModel c where c.siglaEstado = ?1") + List findBysiglaEstado(String siglaEstado); + + + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/repository/HistoricoDePrecoDeCombustivelRepository.java b/desafio/src/main/java/com/indra/desafio/domain/repository/HistoricoDePrecoDeCombustivelRepository.java new file mode 100644 index 0000000..73263e4 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/repository/HistoricoDePrecoDeCombustivelRepository.java @@ -0,0 +1,11 @@ +package com.indra.desafio.domain.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.indra.desafio.domain.model.HistoricoDePrecoDeCombustivel; + +@Repository +public interface HistoricoDePrecoDeCombustivelRepository extends JpaRepository { + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/repository/UsuarioRepository.java b/desafio/src/main/java/com/indra/desafio/domain/repository/UsuarioRepository.java new file mode 100644 index 0000000..bce0d34 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/repository/UsuarioRepository.java @@ -0,0 +1,12 @@ +package com.indra.desafio.domain.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.indra.desafio.domain.model.UsuarioModel; + +@Repository +public interface UsuarioRepository extends JpaRepository { + + Boolean existsByEmail(String email); +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/service/ArquivoService.java b/desafio/src/main/java/com/indra/desafio/domain/service/ArquivoService.java new file mode 100644 index 0000000..9a57302 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/service/ArquivoService.java @@ -0,0 +1,36 @@ +package com.indra.desafio.domain.service; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +@Component +public class ArquivoService { + + @Value("${arquivo.disco.raiz}") + private String raiz; + + @Value("${arquivo.disco.diretorio-arquivos}") + private String diretorioArquivos; + + public void salvarArquivo(MultipartFile arquivo) { + this.salvar(this.diretorioArquivos, arquivo); + } + + public void salvar(String diretorio, MultipartFile arquivo) { + Path diretorioPath = Paths.get(this.raiz, diretorio); + Path arquivoPath = diretorioPath.resolve(arquivo.getOriginalFilename()); + + try { + Files.createDirectories(diretorioPath); + arquivo.transferTo(arquivoPath.toFile()); + } catch (IOException e) { + throw new RuntimeException("Problemas na tentativa de salvar arquivo.", e); + } + } +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/service/CombustivelService.java b/desafio/src/main/java/com/indra/desafio/domain/service/CombustivelService.java new file mode 100644 index 0000000..41105a9 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/service/CombustivelService.java @@ -0,0 +1,45 @@ +package com.indra.desafio.domain.service; + +import java.time.OffsetDateTime; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.indra.desafio.domain.model.CombustivelModel; +import com.indra.desafio.domain.repository.CombustivelRepository; + +@Service +public class CombustivelService { + + @Autowired + private CombustivelRepository combustivelRepository; + + public List listarCombustiveis(){ + return combustivelRepository.findAll(); + } + + public CombustivelModel salvarCombustivel(CombustivelModel combustivel) { + combustivel.setId(null); + combustivel.setDataColeta(OffsetDateTime.now()); + return combustivelRepository.save(combustivel); + } + + public float mediaDePrecoPorMunicipio(String municipio) { + return combustivelRepository.mediaDePrecoPorMunicipio(municipio); + } + + public List listarMunicipiospPorSiglaRegiao(String siglaRegiao){ + return combustivelRepository.findBysiglaRegiao(siglaRegiao); + } + + public List listarMunicipiospPorSiglaEstado(String siglaEstado){ + return combustivelRepository.findBysiglaEstado(siglaEstado); + } + + public List getDadosAgrupadosPorDataColeta() { + return combustivelRepository.getDadosAgrupadosPorDataColeta(); + } + + +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/service/HistoricoDePrecoDeCombustivelService.java b/desafio/src/main/java/com/indra/desafio/domain/service/HistoricoDePrecoDeCombustivelService.java new file mode 100644 index 0000000..d601d86 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/service/HistoricoDePrecoDeCombustivelService.java @@ -0,0 +1,59 @@ +package com.indra.desafio.domain.service; + +import java.time.OffsetDateTime; +import java.util.List; + +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.indra.desafio.domain.exceptions.NegocioNaoEncontradoException; +import com.indra.desafio.domain.model.HistoricoDePrecoDeCombustivel; +import com.indra.desafio.domain.repository.HistoricoDePrecoDeCombustivelRepository; + +@Service +public class HistoricoDePrecoDeCombustivelService { + + @Autowired + private HistoricoDePrecoDeCombustivelRepository historicoRepository; + + public List listarHistorico(){ + return historicoRepository.findAll(); + } + + public HistoricoDePrecoDeCombustivel salvarHistorico(HistoricoDePrecoDeCombustivel + historico) { + historico.setId(null); + historico.setData(OffsetDateTime.now()); + return historicoRepository.save(historico); + } + + public HistoricoDePrecoDeCombustivel buscarHistorico(Long id) { + + HistoricoDePrecoDeCombustivel historico = historicoRepository.findById(id) + .orElseThrow(() -> new NegocioNaoEncontradoException("Histórico não encontrado!")); + + return historico; + } + + public void deletarHistorico(Long id) { + existeHistorico(id); + + historicoRepository.deleteById(id); + } + + public void atualizarHistorico(Long id, HistoricoDePrecoDeCombustivel historico) { + HistoricoDePrecoDeCombustivel historicoSalvo = historicoRepository.findById(id) + .orElseThrow(()-> new NegocioNaoEncontradoException("Histórico não encontrado!")); + + historico.setId(id); + BeanUtils.copyProperties(historico, historicoSalvo, "data"); + historicoRepository.save(historicoSalvo); + } + + private void existeHistorico(Long id) { + if(!historicoRepository.existsById(id)) { + throw new NegocioNaoEncontradoException("Histórico não encontrado!"); + } + } +} diff --git a/desafio/src/main/java/com/indra/desafio/domain/service/UsuarioService.java b/desafio/src/main/java/com/indra/desafio/domain/service/UsuarioService.java new file mode 100644 index 0000000..9199a17 --- /dev/null +++ b/desafio/src/main/java/com/indra/desafio/domain/service/UsuarioService.java @@ -0,0 +1,57 @@ +package com.indra.desafio.domain.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.indra.desafio.domain.exceptions.UsuarioExistenteException; +import com.indra.desafio.domain.exceptions.NegocioNaoEncontradoException; +import com.indra.desafio.domain.model.UsuarioModel; +import com.indra.desafio.domain.repository.UsuarioRepository; + +@Service +public class UsuarioService { + + @Autowired + private UsuarioRepository usuarioRepository; + + public List listarUsuarios() { + return usuarioRepository.findAll(); + } + + public UsuarioModel cadastrarUsuario(UsuarioModel usuario) { + + if (usuarioRepository.existsByEmail(usuario.getEmail())) { + throw new UsuarioExistenteException("Usuário já cadastrado!"); + } + + usuario.setId(null); + return usuarioRepository.save(usuario); + } + + public UsuarioModel buscarUsuario(Long id) { + UsuarioModel usuario = buscar(id); + + return usuario; + } + + public void deletarUsuario(Long id) { + UsuarioModel usuario = buscar(id); + usuarioRepository.delete(usuario); + } + + public UsuarioModel atualizarUsuario(Long id, UsuarioModel usuario) { + + if(!usuarioRepository.existsById(id)) { + throw new NegocioNaoEncontradoException("Usuario não encontrado!"); + } + + usuario.setId(id); + return usuarioRepository.save(usuario); + } + + private UsuarioModel buscar(Long id) { + return usuarioRepository.findById(id).orElseThrow(() -> new NegocioNaoEncontradoException("Usuário não encontrado!")); + } +} diff --git a/desafio/src/main/resources/application.properties b/desafio/src/main/resources/application.properties new file mode 100644 index 0000000..cd08662 --- /dev/null +++ b/desafio/src/main/resources/application.properties @@ -0,0 +1,12 @@ +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.username=sa +spring.datasource.password= + +spring.jackson.deserialization.fail-on-unknown-properties=true + +spring.servlet.multipart.max-file-size=200MB +spring.servlet.multipart.max-request-size=200MB +spring.servlet.multipart.enabled=true + +arquivo.disco.raiz=/Users/abrantes/Downloads +arquivo.disco.diretorio-arquivos=arquivos diff --git a/desafio/src/main/resources/messages.properties b/desafio/src/main/resources/messages.properties new file mode 100644 index 0000000..e0e1c99 --- /dev/null +++ b/desafio/src/main/resources/messages.properties @@ -0,0 +1,4 @@ +NotNull=campo não pode ser nulo +Email=não está em um formato de E-mail válido +Size=deve conter no mínimo {2} e no máximo {1} caracteres +NotBlank=não pode ser vazio \ No newline at end of file diff --git a/desafio/src/test/java/com/indra/desafio/DesafioApplicationTests.java b/desafio/src/test/java/com/indra/desafio/DesafioApplicationTests.java new file mode 100644 index 0000000..372fa9a --- /dev/null +++ b/desafio/src/test/java/com/indra/desafio/DesafioApplicationTests.java @@ -0,0 +1,13 @@ +package com.indra.desafio; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DesafioApplicationTests { + + @Test + void contextLoads() { + } + +}