From 43a491588fcc0bee0d67d52a9e93806034b5cc9a Mon Sep 17 00:00:00 2001 From: andre.guimaraes Date: Tue, 22 May 2018 16:43:49 -0300 Subject: [PATCH] Cria datasource por arquivo -ds.xml --- .gitignore | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .gitmessage | 23 +++++++++++++++++++++++ pom.xml | 2 +- src/main/java/br/gov/ans/templates/dao/TemplatesDAO.java | 41 +++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/templates/rest/TemplateResource.java | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- src/main/webapp/WEB-INF/templates-ds.xml | 21 +++++++++++++++++++++ src/main/webapp/api-docs/api_data.js | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- src/main/webapp/api-docs/api_data.json | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- src/main/webapp/api-docs/api_project.js | 2 +- src/main/webapp/api-docs/api_project.json | 2 +- 10 files changed, 680 insertions(+), 74 deletions(-) create mode 100644 .gitignore create mode 100644 .gitmessage create mode 100644 src/main/webapp/WEB-INF/templates-ds.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e578a6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,132 @@ +#---------------------------------------# +# Project Ignores # +#---------------------------------------# + +# Maven +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties + +!/.mvn/wrapper/maven-wrapper.jar + +# Ant +build/ +dist/ +bin/ + +# Compiled class file +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files +*.jar +*.war +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# misc +*.log +log/ +logs/ + + +#---------------------------------------# +# IDEs & Editors Ignores # +#---------------------------------------# + +# Sublime Text +/*.sublime* +.sublime-gulp.cache + +# VS Code +/.vscode + +# JetBrains IDEs +.idea/ +*.iml + +# Eclipse +.project +.classpath +.settings +.tern-project + +# Netbeans +nbactions*.xml +nb-configuration*.xml + +# BlueJ +*.ctxt + + +#---------------------------------------# +# General Ignores # +#---------------------------------------# + +*~ +*.orig +.vagrant + + +#---------------------------------------# +# Linux Ignores # +#---------------------------------------# + +# KDE directory preferences +.directory + + +#---------------------------------------# +# OSX Ignores # +#---------------------------------------# + +.DS_Store +.AppleDouble +.LSOverride +.localized + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + + +#---------------------------------------# +# Windows Ignores # +#---------------------------------------# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ \ No newline at end of file diff --git a/.gitmessage b/.gitmessage new file mode 100644 index 0000000..24cfbaa --- /dev/null +++ b/.gitmessage @@ -0,0 +1,23 @@ +# Faça um breve resumo das alterações +# Devemos escrever nosso comentário de forma a completar a frase abaixo, utilizando o verbo no presente. +# Esse commit: +# +# Exemplos: +# Corrige erro de sessão +# Adiciona funcionalidade de cadastro de livros +# |<---- Use no máximo 50 caracteres ---->| + + +# +# Descreva o que foi realizado no commit. +# +# Procure responder as três perguntas: "O que?", "Como?" e "Porquê?" +# |<--- Tente limitar as linhas para terem no maximo 72 caracteres --->| + + +# +# Número do ticket da ferramenta de controle utilizada. +# Exemplo: +# OTRS - 2017030220001019 +# OS - 050/2016 + diff --git a/pom.xml b/pom.xml index 0c07bff..cd692d6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.gov.ans templates-broker - 1.0 + 1.1 war templates-broker Sistema de gerenciamento de templates. diff --git a/src/main/java/br/gov/ans/templates/dao/TemplatesDAO.java b/src/main/java/br/gov/ans/templates/dao/TemplatesDAO.java index a3746cd..ceb1673 100644 --- a/src/main/java/br/gov/ans/templates/dao/TemplatesDAO.java +++ b/src/main/java/br/gov/ans/templates/dao/TemplatesDAO.java @@ -48,6 +48,29 @@ public class TemplatesDAO { return query.getResultList(); } + @SuppressWarnings("unchecked") + public List