Commit f2678ff3 authored by Enriko Käsper's avatar Enriko Käsper

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Enriko Käsper

See merge request teis/commons!98
parents c1779afa ffb4dd4a
Pipeline #1182 failed
# Changelog
## [1.16.0] - 2020-12-14
* added TeisStorageException class for handling S3 specific exceptions.
* updated file hash, virus scan and thumbnail related domain objects.
## [1.15.0] - 2020-11-27
* New File VirusScan classes and FileScanStatusType.INCOMPLETE enum value.
......
......@@ -13,8 +13,8 @@ public enum DataObjectType {
CLASSIFIERITEMS,
OFFICIAL_USERS,
PAYMENTS,
PROCEDURALACTS,
PROCEDURALACTCOMMENTS,
PROCEDURALACTS,
PROCEEDINGS,
RECONCILIATIONS,
RELATEDBUSINESSTYPES,
......@@ -26,7 +26,8 @@ public enum DataObjectType {
ROLEDEFINITIONS,
ROLEPRIVILEGES,
SUPERVISIONPLANS,
VIOLATIONS,
VIOLATION_ACTS,
VIOLATION_ELIMINATION_DEADLINES,
VIOLATIONS
VIOLATION_ACT_ACCESS_RESTRICTIONS,
VIOLATION_ELIMINATION_DEADLINES
}
package ee.sm.ti.teis.types.enums;
public enum FileScanStatusType {
UNCHECKED, CLEAN, INFECTED, INCOMPLETE
UNCHECKED, CLEAN, INFECTED, INCOMPLETE, SYSTEM_ERROR
}
......@@ -21,7 +21,7 @@ public enum RolePrivilegeCode {
TI_MANAGE_SYSTEM_JOBS, TI_VIEW_SYSTEM_JOBS,
TI_MANAGE_TASK_MESSAGE_DEFINITIONS,
TI_MANAGE_TASKDEFINITIONS,
TI_MANAGE_VIOLATION, TI_VIEW_VIOLATION,
TI_MANAGE_VIOLATION, TI_VIEW_VIOLATION, TI_MANAGE_VIOLATION_ACT_ACCESS_RESTRICTION,
EX_MANAGE_AUTHORITIES, EX_VIEW_AUTHORITIES,
EX_VIEW_DASHBOARD,
......
......@@ -2,13 +2,10 @@ package ee.sm.ti.teis.domain.file;
import ee.sm.ti.teis.domain.AbstractDomain;
import ee.sm.ti.teis.domain.ClassifierItemLight;
import ee.sm.ti.teis.types.enums.FileScanStatusType;
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 lombok.*;
import java.time.LocalDateTime;
import java.util.Map;
......@@ -31,6 +28,7 @@ public class FileReference extends AbstractDomain {
private ClassifierItemLight creatorType;
private String fileName;
private FileStatusType fileStatus;
private FileScanStatusType scanStatus;
private ObjectStatus objectStatus;
private LocalDateTime createdAt;
}
package ee.sm.ti.teis.domain.filesvirusscan;
import ee.sm.ti.teis.domain.AbstractDomain;
import ee.sm.ti.teis.types.enums.FileScanStatusType;
import lombok.*;
import java.util.UUID;
......@@ -12,7 +13,8 @@ import java.util.UUID;
@EqualsAndHashCode(callSuper = false)
public class PollScanResultFailed extends AbstractDomain {
private static final long serialVersionUID = 5925736490489428358L;
private static final long serialVersionUID = 4714827436927421667L;
private UUID fileId;
private FileScanStatusType status;
}
......@@ -12,7 +12,7 @@ import java.util.UUID;
@EqualsAndHashCode(callSuper = false)
public class PollVirusScanResult extends AbstractDomain {
private static final long serialVersionUID = 5925736490489428358L;
private static final long serialVersionUID = 499114529804463243L;
private UUID fileId;
private String dataId;
......
......@@ -12,7 +12,7 @@ import java.util.UUID;
@EqualsAndHashCode(callSuper = false)
public class StartVirusScan extends AbstractDomain {
private static final long serialVersionUID = 65339842100365943L;
private static final long serialVersionUID = -4802097848558661746L;
private UUID fileId;
private String fileName;
......
......@@ -12,7 +12,7 @@ import java.util.UUID;
@EqualsAndHashCode(callSuper = false)
public class VirusScanFailed extends AbstractDomain {
private static final long serialVersionUID = 5925736490489428358L;
private static final long serialVersionUID = 6013510760581703022L;
private UUID fileId;
}
......@@ -13,7 +13,7 @@ import java.util.UUID;
@EqualsAndHashCode(callSuper = false)
public class VirusScanResult extends AbstractDomain {
private static final long serialVersionUID = 5925736490489428358L;
private static final long serialVersionUID = 1024907024589058151L;
private UUID fileId;
private FileScanStatusType status;
......
......@@ -12,7 +12,7 @@ import java.util.UUID;
@EqualsAndHashCode(callSuper = false)
public class VirusScanUploaded extends AbstractDomain {
private static final long serialVersionUID = 5925736490489428358L;
private static final long serialVersionUID = 219886450567569214L;
private UUID fileId;
private String dataId;
......
package ee.sm.ti.teis.domain.hash;
import ee.sm.ti.teis.domain.AbstractDomain;
import lombok.*;
import java.util.UUID;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode(callSuper = false)
public class CalculateFileHash extends AbstractDomain {
private static final long serialVersionUID = 8168669990648828642L;
private UUID fileId;
private String algorithm;
}
package ee.sm.ti.teis.domain.hash;
import ee.sm.ti.teis.domain.AbstractDomain;
import lombok.*;
import java.util.UUID;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode(callSuper = false)
public class FileHashCalculated extends AbstractDomain {
private static final long serialVersionUID = 2283417907976794013L;
private UUID fileId;
private String hash;
private String algorithm;
}
......@@ -41,6 +41,7 @@ public class Message extends AbstractDomain {
private LocalDateTime readAt;
private String readBy;
private ClassifierItemLight contextType;
private List<MessageDataObjectReference> messageDataObjectReferences;
@Builder.Default
private List<FileReference> files = new ArrayList<>();
......
package ee.sm.ti.teis.domain.thumbnail;
import ee.sm.ti.teis.domain.AbstractDomain;
import lombok.*;
import java.util.UUID;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode(callSuper = false)
public class CreateFileThumbnail extends AbstractDomain {
private static final long serialVersionUID = -5951909806304059286L;
private UUID fileId;
}
package ee.sm.ti.teis.domain.thumbnail;
import ee.sm.ti.teis.domain.AbstractDomain;
import lombok.*;
import java.util.Map;
import java.util.UUID;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode(callSuper = false)
public class FileThumbnailCreated extends AbstractDomain {
private static final long serialVersionUID = 7217981439653605610L;
private UUID fileId;
private Map<String, String> thumbnailIds;
}
# suppress inspection "UnusedProperty"
theGroup=ee.sm.ti.teis
//commonsVersion=forSearch ^commonsVersion=.*?-SNAPSHOT
version=1.15.0
publicVersion=1.10.0
version=1.16.0
publicVersion=1.11.0
pluginVersion=1.2.0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment