diff --git a/.gitignore b/.gitignore index c2a725138e..9edc2a12c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,60 @@ -# Created by https://www.gitignore.io/api/intellij +# Created by https://www.toptal.com/developers/gitignore/api/intellij +# Edit at https://www.toptal.com/developers/gitignore?templates=intellij ### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -# User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml -.idea/dictionaries -.idea/vcs.xml -.idea/jsLibraryMappings.xml -.shelf/* +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf -# Sensitive or high-churn files: -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml +# AWS User-specific +.idea/**/aws.xml -# Gradle: -.idea/gradle.xml -.idea/libraries +# Generated files +.idea/**/contentModel.xml -# Mongo Explorer plugin: -.idea/mongoSettings.xml +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml -## File-based project format: +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format *.iws -## Plugin-specific files: - # IntelliJ -/out/ +out/ # mpeltonen/sbt-idea plugin .idea_modules/ @@ -41,18 +62,59 @@ # JIRA plugin atlassian-ide-plugin.xml +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + # Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml crashlytics.properties crashlytics-build.properties fabric.properties +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + ### Intellij Patch ### # Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 -*.iml -modules.xml +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +# Azure Toolkit for IntelliJ plugin +# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij +.idea/**/azureSettings.xml + +# End of https://www.toptal.com/developers/gitignore/api/intellij # Integry */target/* diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..35eb1ddfbb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ems-core/src/main/java/it/integry/ems/controller/EmsResponseEntityExceptionHandler.java b/ems-core/src/main/java/it/integry/ems/controller/EmsResponseEntityExceptionHandler.java index e408c69cbc..2ab2170d0c 100644 --- a/ems-core/src/main/java/it/integry/ems/controller/EmsResponseEntityExceptionHandler.java +++ b/ems-core/src/main/java/it/integry/ems/controller/EmsResponseEntityExceptionHandler.java @@ -30,6 +30,6 @@ public class EmsResponseEntityExceptionHandler extends ResponseEntityExceptionHa logger.error("Eccezione non gestita", ex); ServiceRestResponse serviceRestResponse = ServiceRestResponse.createNegativeResponse(ex); - return new ResponseEntity(serviceRestResponse, headers, status); + return new ResponseEntity<>(serviceRestResponse, headers, status); } } diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/CtbAmacHistory.java b/ems-core/src/main/java/it/integry/ems_model/entity/CtbAmacHistory.java index a49de1735c..ed9c797ea1 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/CtbAmacHistory.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/CtbAmacHistory.java @@ -5,6 +5,8 @@ import it.integry.common.var.CommonConstants; import it.integry.ems_model.annotation.*; import it.integry.ems_model.base.EntityBase; import org.kie.api.definition.type.PropertyReactive; + +import java.time.LocalDateTime; import java.util.Date; @Master @@ -30,7 +32,7 @@ public class CtbAmacHistory extends EntityBase { private String codCmac; @SqlField(value = "created_at", nullable = false, defaultObjectValue = CommonConstants.TIMESTAMP) - private Date createdAt; + private LocalDateTime createdAt; @SqlField(value = "data_ord", nullable = true) private Date dataOrd; @@ -71,11 +73,11 @@ public class CtbAmacHistory extends EntityBase { return this; } - public Date getCreatedAt() { + public LocalDateTime getCreatedAt() { return createdAt; } - public CtbAmacHistory setCreatedAt(Date createdAt) { + public CtbAmacHistory setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; return this; }