Merge branch 'develop' into 'master'

Release

See merge request teis/files-service!10

.gitignore

+.gradle
+.idea
+.git
+*.iml
+application-develop.yaml
+application-local.yaml
+
+out
+build
+*.swp

.gitlab-ci.yml

+stages:
+  - test
+  - build
+  - deploy
+
+variables:
+  USE_POSTGRES: "true"
+  USE_RABBIT: "true"
+  USE_S3: "true"
+  BUILD_SERVICE_PROJECT_NAME: "files-service"
+  BUILD_SERVICE_LIB_PROJECT_NAME: "files-service-lib"
+
+include:
+  - project: "teis/dev-ops"
+    file: "/gitlab/java/microservice/.gitlab-ci-microservice-init.yml"
+  - project: "teis/dev-ops"
+    file: "/gitlab/java/common/.gitlab-ci-java-test.yml"
+  - project: "teis/dev-ops"
+    file: "/gitlab/java/microservice/.gitlab-ci-microservice-build.yml"
+  - project: "teis/dev-ops"
+    file: "/gitlab/java/microservice/.gitlab-ci-microservice-deploy.yml"

.gitmodules

+[submodule "dev-ops"]
+	path = dev-ops
+	url = ../dev-ops.git

LICENSE

+MIT License
+
+Copyright (c) 2020 TEHIK
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

build.gradle

+buildscript {
+    repositories {
+
+        mavenLocal()
+        maven {
+            url "${gradle.ext.artifactoryUrl}/${gradle.ext.artifactoryRepoKey}"
+            credentials {
+                username = "${gradle.ext.artifactoryUser}"
+                password = "${gradle.ext.artifactoryPass}"
+            }
+        }
+    }
+    dependencies {
+        classpath("ee.sm.ti.teis:ee.sm.ti.teis.gradle.plugin:${pluginVersion}")
+    }
+    configurations.all {
+        // Check for updates every build
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
+}
+
+apply plugin: 'ee.sm.ti.teis'
+
+allprojects {
+
+    functionalities {
+        base
+    }
+
+    repositories {
+        mavenLocal()
+        maven {
+            url "${gradle.ext.artifactoryUrl}/${gradle.ext.artifactoryRepoKey}"
+            credentials {
+                username = "${gradle.ext.artifactoryUser}"
+                password = "${gradle.ext.artifactoryPass}"
+            }
+        }
+        jcenter()
+    }
+
+    group = "${theGroup}"
+    version = "${theVersion}"
+
+    sourceCompatibility = 11
+    targetCompatibility = 11
+
+    jar {
+        manifest {
+            attributes('Implementation-Title': project.name,
+                    'Implementation-Version': project.version)
+        }
+    }
+
+    apply from: this.getClass().getClassLoader().getResource('teis.test-sonar.gradle')
+
+    dependencies {
+        // TEiS
+        compile "ee.sm.ti.teis:service-common-lib:${commonsVersion}"
+        compile "ee.sm.ti.teis:common-api-gateway-lib:${commonApiGatewayVersion}"
+        compile "ee.sm.ti.teis:domain-cache-lib:${commonsVersion}"
+
+        implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+        annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
+        testAnnotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
+    }
+}
\ No newline at end of file

dev-ops @ ea6a5ec3

+Subproject commit ea6a5ec3ed936121c971ce84c1cc87ade857c3e1

gradle.properties

+theGroup=ee.sm.ti.teis
+theVersion=0.6.0
+pluginVersion=0.0.19-SNAPSHOT
+commonsVersion=0.23.0
+commonApiGatewayVersion=0.24.0
+mapstructVersion=1.3.0.Final
+querydslVersion=4.1.3

gradle/wrapper/gradle-wrapper.properties

+#Tue Nov 12 11:52:19 EET 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

gradlew

+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+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
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+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
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

lombok.config

+lombok.addLombokGeneratedAnnotation = true

service-lib/build.gradle

+functionalities{
+    library
+}
+description = """files-service-lib"""
+
+dependencies {
+    implementation 'org.hibernate:hibernate-core:5.3.10.Final'
+    // MapStruct
+    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+}
+
+apply from: this.getClass().getClassLoader().getResource('teis.publishLib.gradle')
\ No newline at end of file

service-lib/settings.gradle

+gradle.ext.artifactoryUrl = hasProperty('ARTIFACTORY_URL') ? ARTIFACTORY_URL : System.getenv('ARTIFACTORY_URL')
+gradle.ext.artifactoryUser = hasProperty('ARTIFACTORY_USER') ? ARTIFACTORY_USER : System.getenv('ARTIFACTORY_USER')
+gradle.ext.artifactoryPass = hasProperty('ARTIFACTORY_PASS') ? ARTIFACTORY_PASS : System.getenv('ARTIFACTORY_PASS')
+gradle.ext.artifactoryRepoKey = hasProperty('ARTIFACTORY_REPO_KEY') ? ARTIFACTORY_REPO_KEY : System.getenv('ARTIFACTORY_REPO_KEY')
+
+rootProject.name='files-service-lib'

service-lib/src/main/java/ee/sm/ti/teis/file/FileNotifyService.java

+package ee.sm.ti.teis.file;
+
+import ee.sm.ti.teis.ErrorDTO;
+import ee.sm.ti.teis.domainrequest.DomainDeleteDTO;
+import ee.sm.ti.teis.domainrequest.DomainResponseDTO;
+import ee.sm.ti.teis.domainrequest.rabbit.TeisRabbitClient;
+import ee.sm.ti.teis.file.domain.DeleteFile;
+import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.UUID;
+
+@Service
+public class FileNotifyService extends TeisRabbitClient<DeleteFile> {
+
+    public FileNotifyService(RabbitTemplate msRabbitTemplate) {
+        super(msRabbitTemplate);
+    }
+
+    public void notifyDelete(UUID fileId, UUID objectId, boolean hard, RequestMetaDTO requestMetaDTO) {
+        DeleteFile deleteFile = new DeleteFile();
+        deleteFile.setFileId(fileId);
+        deleteFile.setObjectId(objectId);
+        deleteFile.setHardDelete(hard);
+
+        DeleteFileRequest request = new DeleteFileRequest();
+        request.setPayload(deleteFile, requestMetaDTO);
+
+        deleteItem(deleteFile, DeleteFileResponse.class, requestMetaDTO);
+    }
+
+    public static class DeleteFileResponse extends DomainResponseDTO<DeleteFile, ErrorDTO> {
+    }
+
+    public class DeleteFileRequest extends DomainDeleteDTO<DeleteFile, ErrorDTO> {
+    }
+}

service-lib/src/main/java/ee/sm/ti/teis/file/FileService.java

+package ee.sm.ti.teis.file;
+
+import ee.sm.ti.teis.ErrorDTO;
+import ee.sm.ti.teis.domainrequest.DomainResponseDTO;
+import ee.sm.ti.teis.domainrequest.rabbit.TeisRabbitClient;
+import ee.sm.ti.teis.file.domain.FileMetadata;
+import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class FileService extends TeisRabbitClient<FileMetadata> {
+
+    public FileService(RabbitTemplate msRabbitTemplate) {
+        super(msRabbitTemplate);
+    }
+
+    public FileMetadata getFileMetadata(FileMetadata domain, RequestMetaDTO requestMetaDTO) {
+        return getItem(domain, FileResponse.class, requestMetaDTO);
+    }
+
+    public static class FileResponse extends DomainResponseDTO<FileMetadata, ErrorDTO> {
+    }
+}

service-lib/src/main/java/ee/sm/ti/teis/file/classifier/FileReferenceClassifierMapper.java

+package ee.sm.ti.teis.file.classifier;
+
+import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
+import ee.sm.ti.teis.domain.ClassifierItem;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface FileReferenceClassifierMapper {
+    ClassifierItemLightDto toGwLightDto(ClassifierItem item);
+}

service-lib/src/main/java/ee/sm/ti/teis/file/domain/DeleteFile.java

+package ee.sm.ti.teis.file.domain;
+
+import ee.sm.ti.teis.domain.AbstractDomain;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class DeleteFile extends AbstractDomain {
+
+    private UUID fileId;
+    private UUID objectId;
+    private boolean hardDelete;
+}

service-lib/src/main/java/ee/sm/ti/teis/file/domain/File.java

+package ee.sm.ti.teis.file.domain;
+
+import ee.sm.ti.teis.domain.AbstractDomain;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class File extends AbstractDomain {
+
+    private UUID fileId;
+    private UUID objectId;
+}

service-lib/src/main/java/ee/sm/ti/teis/file/domain/FileMetadata.java

+package ee.sm.ti.teis.file.domain;
+
+import ee.sm.ti.teis.domain.AbstractDomain;
+import ee.sm.ti.teis.types.enums.FileStatusType;
+import ee.sm.ti.teis.types.enums.ObjectStatus;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.UUID;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(callSuper = false)
+public class FileMetadata extends AbstractDomain {
+
+    private static final long serialVersionUID = -6562235756310268014L;
+
+    private UUID fileId;
+    private UUID objectId;
+    private String fileName;
+    private String contentType;
+    private Long size;
+    private FileStatusType fileStatusType;
+    private Boolean signed;
+    private LocalDateTime signedAt;
+    private ObjectStatus objectStatus;
+    private Map<String, String> thumbnails;
+}