Skip to content
Snippets Groups Projects
Commit ffc19ea3 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6317 tiny cleanup; remove logging

parent 9ec41c73
Branches
Tags
No related merge requests found
...@@ -57,9 +57,6 @@ class XtaIncomingFilesMapper { ...@@ -57,9 +57,6 @@ class XtaIncomingFilesMapper {
} }
IncomingFile toIncomingFile(XtaFile messageFile) { 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() return IncomingFile.builder()
.name(messageFile.name()) .name(messageFile.name())
.contentType(messageFile.contentType()) .contentType(messageFile.contentType())
......
...@@ -59,14 +59,9 @@ class XtaService { ...@@ -59,14 +59,9 @@ class XtaService {
} }
boolean isSupportedMessageType(XtaMessageMetaData metaData) { boolean isSupportedMessageType(XtaMessageMetaData metaData) {
if (StringUtils.equals(metaData.getMessageType(), XDOMEA_0201_MESSAGE_TYPE)) { if (isXDomeaMessageType(metaData.getMessageType()) || isFimMessageType(metaData.getMessageType())) {
return true; return true;
} }
if (StringUtils.startsWith(metaData.getMessageType(), FIM_MESSAGE_TYPE_PREFIX)) {
return true;
}
LOG.warn("Ignoring XTA-Message of type '{}'.", metaData.getMessageType()); LOG.warn("Ignoring XTA-Message of type '{}'.", metaData.getMessageType());
return false; return false;
} }
...@@ -95,16 +90,24 @@ class XtaService { ...@@ -95,16 +90,24 @@ class XtaService {
} }
RepresentationsAttachmentsPair getRepresentationsAttachmentsPair(XtaMessageMetaData metaData, List<IncomingFile> incomingFiles) { RepresentationsAttachmentsPair getRepresentationsAttachmentsPair(XtaMessageMetaData metaData, List<IncomingFile> incomingFiles) {
if (StringUtils.equals(metaData.getMessageType(), XDOMEA_0201_MESSAGE_TYPE)) { if (isXDomeaMessageType(metaData.getMessageType())) {
return xdomeaMessageDataMapper.mapIncomingFilesToRepresentationsAttachmentsPair(incomingFiles); return xdomeaMessageDataMapper.mapIncomingFilesToRepresentationsAttachmentsPair(incomingFiles);
} }
if (StringUtils.startsWith(metaData.getMessageType(), FIM_MESSAGE_TYPE_PREFIX)) { if (isFimMessageType(metaData.getMessageType())) {
return mapIncomingFilesToRepresentations(incomingFiles); return mapIncomingFilesToRepresentations(incomingFiles);
} }
throw new TechnicalException("Unexpected XTA message type: %s".formatted(metaData.getMessageType())); 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) { RepresentationsAttachmentsPair mapIncomingFilesToRepresentations(List<IncomingFile> incomingFiles) {
return RepresentationsAttachmentsPair.builder() return RepresentationsAttachmentsPair.builder()
.representations(incomingFiles) .representations(incomingFiles)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment