From ffc19ea3d2c9b1a7b1e2e413df52fa8df9c33e89 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 5 Aug 2024 12:12:04 +0200
Subject: [PATCH] OZG-6317 tiny cleanup; remove logging
---
.../eingang/xta/XtaIncomingFilesMapper.java | 3 ---
.../de/ozgcloud/eingang/xta/XtaService.java | 19 +++++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaIncomingFilesMapper.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaIncomingFilesMapper.java
index 34a807f70..1ef661f3e 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaIncomingFilesMapper.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaIncomingFilesMapper.java
@@ -57,9 +57,6 @@ class XtaIncomingFilesMapper {
}
IncomingFile toIncomingFile(XtaFile messageFile) {
- if (!messageFile.contentType().equals(ZIP_CONTENT_TYPE)) {
- LOG.warn("Expected XTA messageFile to be of content type " + ZIP_CONTENT_TYPE + ". Instead was " + messageFile.contentType());
- }
return IncomingFile.builder()
.name(messageFile.name())
.contentType(messageFile.contentType())
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
index ddf3babef..60bef9e34 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
@@ -59,14 +59,9 @@ class XtaService {
}
boolean isSupportedMessageType(XtaMessageMetaData metaData) {
- if (StringUtils.equals(metaData.getMessageType(), XDOMEA_0201_MESSAGE_TYPE)) {
+ if (isXDomeaMessageType(metaData.getMessageType()) || isFimMessageType(metaData.getMessageType())) {
return true;
}
-
- if (StringUtils.startsWith(metaData.getMessageType(), FIM_MESSAGE_TYPE_PREFIX)) {
- return true;
- }
-
LOG.warn("Ignoring XTA-Message of type '{}'.", metaData.getMessageType());
return false;
}
@@ -95,16 +90,24 @@ class XtaService {
}
RepresentationsAttachmentsPair getRepresentationsAttachmentsPair(XtaMessageMetaData metaData, List<IncomingFile> incomingFiles) {
- if (StringUtils.equals(metaData.getMessageType(), XDOMEA_0201_MESSAGE_TYPE)) {
+ if (isXDomeaMessageType(metaData.getMessageType())) {
return xdomeaMessageDataMapper.mapIncomingFilesToRepresentationsAttachmentsPair(incomingFiles);
}
- if (StringUtils.startsWith(metaData.getMessageType(), FIM_MESSAGE_TYPE_PREFIX)) {
+ if (isFimMessageType(metaData.getMessageType())) {
return mapIncomingFilesToRepresentations(incomingFiles);
}
throw new TechnicalException("Unexpected XTA message type: %s".formatted(metaData.getMessageType()));
}
+ private boolean isXDomeaMessageType(String messageType) {
+ return StringUtils.equals(messageType, XDOMEA_0201_MESSAGE_TYPE);
+ }
+
+ private boolean isFimMessageType(String messageType) {
+ return StringUtils.startsWith(messageType, FIM_MESSAGE_TYPE_PREFIX);
+ }
+
RepresentationsAttachmentsPair mapIncomingFilesToRepresentations(List<IncomingFile> incomingFiles) {
return RepresentationsAttachmentsPair.builder()
.representations(incomingFiles)
--
GitLab