Removed class LoggingMarker. (#405)

Author: mofterdinger

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/CreateAttachmentsHandler.java

@@ -9,7 +9,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
 
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor;
@@ -18,7 +17,6 @@
 import com.sap.cds.feature.attachments.handler.applicationservice.helper.ThreadDataStorageReader;
 import com.sap.cds.feature.attachments.handler.applicationservice.processor.modifyevents.ModifyAttachmentEventFactory;
 import com.sap.cds.feature.attachments.handler.common.ApplicationHandlerHelper;
-import com.sap.cds.feature.attachments.utilities.LoggingMarker;
 import com.sap.cds.reflect.CdsBaseType;
 import com.sap.cds.reflect.CdsEntity;
 import com.sap.cds.services.cds.ApplicationService;
@@ -38,7 +36,6 @@
 public class CreateAttachmentsHandler implements EventHandler {
 
 	private static final Logger logger = LoggerFactory.getLogger(CreateAttachmentsHandler.class);
-	private static final Marker marker = LoggingMarker.APPLICATION_HANDLER.getMarker();
 
 	private final ModifyAttachmentEventFactory eventFactory;
 	private final ThreadDataStorageReader storageReader;
@@ -66,7 +63,7 @@ private void doCreate(CdsCreateEventContext context, List<CdsData> data) {
 			return;
 		}
 
-		logger.debug(marker, "Processing before create event for entity {}", context.getTarget().getName());
+		logger.debug("Processing before create event for entity {}", context.getTarget().getName());
 		setKeysInData(context.getTarget(), data);
 		ModifyApplicationHandlerHelper.handleAttachmentForEntities(context.getTarget(), data, new ArrayList<>(), eventFactory,
 				context);

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/DeleteAttachmentsHandler.java

@@ -7,14 +7,12 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
 
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor.Converter;
 import com.sap.cds.feature.attachments.handler.applicationservice.processor.modifyevents.ModifyAttachmentEvent;
 import com.sap.cds.feature.attachments.handler.common.ApplicationHandlerHelper;
 import com.sap.cds.feature.attachments.handler.common.AttachmentsReader;
-import com.sap.cds.feature.attachments.utilities.LoggingMarker;
 import com.sap.cds.services.cds.ApplicationService;
 import com.sap.cds.services.cds.CdsDeleteEventContext;
 import com.sap.cds.services.handler.EventHandler;
@@ -30,7 +28,6 @@
 public class DeleteAttachmentsHandler implements EventHandler {
 
 	private static final Logger logger = LoggerFactory.getLogger(DeleteAttachmentsHandler.class);
-	private static final Marker marker = LoggingMarker.APPLICATION_HANDLER.getMarker();
 
 	private final AttachmentsReader attachmentsReader;
 	private final ModifyAttachmentEvent deleteContentAttachmentEvent;
@@ -44,7 +41,7 @@ public DeleteAttachmentsHandler(AttachmentsReader attachmentsReader,
 	@Before
 	@HandlerOrder(HandlerOrder.LATE)
 	public void processBefore(CdsDeleteEventContext context) {
-		logger.debug(marker, "Processing before delete event for entity {}", context.getTarget().getName());
+		logger.debug("Processing before delete event for entity {}", context.getTarget().getName());
 
 		var attachments = attachmentsReader.readAttachments(context.getModel(), context.getTarget(), context.getCqn());
 

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/ReadAttachmentsHandler.java

@@ -13,7 +13,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
 
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor.Converter;
@@ -26,7 +25,6 @@
 import com.sap.cds.feature.attachments.handler.draftservice.constants.DraftConstants;
 import com.sap.cds.feature.attachments.service.AttachmentService;
 import com.sap.cds.feature.attachments.service.malware.AsyncMalwareScanExecutor;
-import com.sap.cds.feature.attachments.utilities.LoggingMarker;
 import com.sap.cds.ql.CQL;
 import com.sap.cds.ql.cqn.Path;
 import com.sap.cds.reflect.CdsAssociationType;
@@ -54,7 +52,6 @@
 public class ReadAttachmentsHandler implements EventHandler {
 
 	private static final Logger logger = LoggerFactory.getLogger(ReadAttachmentsHandler.class);
-	private static final Marker marker = LoggingMarker.APPLICATION_HANDLER.getMarker();
 
 	private final AttachmentService attachmentService;
 	private final AttachmentStatusValidator attachmentStatusValidator;
@@ -70,7 +67,7 @@ public ReadAttachmentsHandler(AttachmentService attachmentService,
 	@Before
 	@HandlerOrder(HandlerOrder.EARLY)
 	public void processBefore(CdsReadEventContext context) {
-		logger.debug(marker, "Processing before read event for entity {}", context.getTarget().getName());
+		logger.debug("Processing before read event for entity {}", context.getTarget().getName());
 
 		var cdsModel = context.getModel();
 		var fieldNames = getAttachmentAssociations(cdsModel, context.getTarget(), "", new ArrayList<>());
@@ -86,10 +83,10 @@ public void processAfter(CdsReadEventContext context, List<CdsData> data) {
 		if (ApplicationHandlerHelper.noContentFieldInData(context.getTarget(), data)) {
 			return;
 		}
-		logger.debug(marker, "Processing after read event for entity {}", context.getTarget().getName());
+		logger.debug("Processing after read event for entity {}", context.getTarget().getName());
 
 		Converter converter = (path, element, value) -> {
-			logger.info(marker, "Processing after read event for entity {}", element.getName());
+			logger.info("Processing after read event for entity {}", element.getName());
 			var contentId = (String) path.target().values().get(Attachments.CONTENT_ID);
 			var status = (String) path.target().values().get(Attachments.STATUS);
 			var content = (InputStream) path.target().values().get(Attachments.CONTENT);
@@ -136,9 +133,9 @@ private List<String> getAttachmentAssociations(CdsModel model, CdsEntity entity,
 
 	private void verifyStatus(Path path, String status, String contentId, boolean contentExists) {
 		if (areKeysEmpty(path.target().keys())) {
-			logger.info(marker, "In verify status for content id {} and status {}", contentId, status);
+			logger.info("In verify status for content id {} and status {}", contentId, status);
 			if ((StatusCode.UNSCANNED.equals(status) || StatusCode.SCANNING.equals(status)) && contentExists) {
-				logger.info(marker, "Scanning content with ID {} for malware, has current status {}", contentId, status);
+				logger.info("Scanning content with ID {} for malware, has current status {}", contentId, status);
 				asyncMalwareScanExecutor.scanAsync(path.target().entity(), contentId);
 			}
 			attachmentStatusValidator.verifyStatus(status);

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/UpdateAttachmentsHandler.java

@@ -7,7 +7,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
 
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor.Validator;
@@ -20,7 +19,6 @@
 import com.sap.cds.feature.attachments.handler.common.AttachmentsReader;
 import com.sap.cds.feature.attachments.service.AttachmentService;
 import com.sap.cds.feature.attachments.service.model.service.MarkAsDeletedInput;
-import com.sap.cds.feature.attachments.utilities.LoggingMarker;
 import com.sap.cds.ql.cqn.CqnFilterableStatement;
 import com.sap.cds.ql.cqn.CqnUpdate;
 import com.sap.cds.reflect.CdsEntity;
@@ -45,7 +43,6 @@
 public class UpdateAttachmentsHandler implements EventHandler {
 
 	private static final Logger logger = LoggerFactory.getLogger(UpdateAttachmentsHandler.class);
-	private static final Marker marker = LoggingMarker.APPLICATION_HANDLER.getMarker();
 
 	private final ModifyAttachmentEventFactory eventFactory;
 	private final AttachmentsReader attachmentsReader;
@@ -80,7 +77,7 @@ private void doUpdate(CdsUpdateEventContext context, List<CdsData> data) {
 			return;
 		}
 
-		logger.debug(marker, "Processing before update event for entity {}", target.getName());
+		logger.debug("Processing before update event for entity {}", target.getName());
 
 		var select = getSelect(context.getCqn(), context.getTarget());
 		var attachments = attachmentsReader.readAttachments(context.getModel(), target, select);

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java

@@ -7,7 +7,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
 
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor.Filter;
@@ -18,7 +17,6 @@
 import com.sap.cds.feature.attachments.handler.common.AttachmentsReader;
 import com.sap.cds.feature.attachments.handler.draftservice.constants.DraftConstants;
 import com.sap.cds.feature.attachments.handler.draftservice.modifier.ActiveEntityModifierProvider;
-import com.sap.cds.feature.attachments.utilities.LoggingMarker;
 import com.sap.cds.ql.CQL;
 import com.sap.cds.reflect.CdsEntity;
 import com.sap.cds.reflect.CdsStructuredType;
@@ -40,7 +38,6 @@
 public class DraftCancelAttachmentsHandler implements EventHandler {
 
 	private static final Logger logger = LoggerFactory.getLogger(DraftCancelAttachmentsHandler.class);
-	private static final Marker marker = LoggingMarker.DRAFT_HANDLER.getMarker();
 
 	private final AttachmentsReader attachmentsReader;
 	private final ModifyAttachmentEvent deleteContentAttachmentEvent;
@@ -57,7 +54,7 @@ public DraftCancelAttachmentsHandler(AttachmentsReader attachmentsReader,
 	@HandlerOrder(HandlerOrder.LATE)
 	public void processBeforeDraftCancel(DraftCancelEventContext context) {
 		if (isWhereEmpty(context)) {
-			logger.debug(marker, "Processing before draft cancel event for entity {}", context.getTarget().getName());
+			logger.debug("Processing before draft cancel event for entity {}", context.getTarget().getName());
 
 			var activeEntity = getActiveEntity(context);
 			var draftEntity = getDraftEntity(context);

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftPatchAttachmentsHandler.java

@@ -8,15 +8,13 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
 
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor.Converter;
 import com.sap.cds.feature.attachments.handler.applicationservice.helper.ModifyApplicationHandlerHelper;
 import com.sap.cds.feature.attachments.handler.applicationservice.processor.modifyevents.ModifyAttachmentEventFactory;
 import com.sap.cds.feature.attachments.handler.common.ApplicationHandlerHelper;
 import com.sap.cds.feature.attachments.handler.draftservice.constants.DraftConstants;
-import com.sap.cds.feature.attachments.utilities.LoggingMarker;
 import com.sap.cds.ql.Select;
 import com.sap.cds.services.draft.DraftPatchEventContext;
 import com.sap.cds.services.draft.DraftService;
@@ -35,7 +33,6 @@
 public class DraftPatchAttachmentsHandler implements EventHandler {
 
 	private static final Logger logger = LoggerFactory.getLogger(DraftPatchAttachmentsHandler.class);
-	private static final Marker marker = LoggingMarker.DRAFT_HANDLER.getMarker();
 
 	private final PersistenceService persistence;
 	private final ModifyAttachmentEventFactory eventFactory;
@@ -48,7 +45,7 @@ public DraftPatchAttachmentsHandler(PersistenceService persistence, ModifyAttach
 	@Before
 	@HandlerOrder(HandlerOrder.LATE)
 	public void processBeforeDraftPatch(DraftPatchEventContext context, List<CdsData> data) {
-		logger.debug(marker, "Processing before draft patch event for entity {}", context.getTarget().getName());
+		logger.debug("Processing before draft patch event for entity {}", context.getTarget().getName());
 
 		Converter converter = (path, element, value) -> {
 			var draftElement = path.target().entity().getQualifiedName().endsWith(DraftConstants.DRAFT_TABLE_POSTFIX)

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/handler/DefaultAttachmentsServiceHandler.java

@@ -5,7 +5,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
 
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.StatusCode;
@@ -15,7 +14,6 @@
 import com.sap.cds.feature.attachments.service.model.servicehandler.AttachmentMarkAsDeletedEventContext;
 import com.sap.cds.feature.attachments.service.model.servicehandler.AttachmentReadEventContext;
 import com.sap.cds.feature.attachments.service.model.servicehandler.AttachmentRestoreEventContext;
-import com.sap.cds.feature.attachments.utilities.LoggingMarker;
 import com.sap.cds.services.handler.EventHandler;
 import com.sap.cds.services.handler.annotations.HandlerOrder;
 import com.sap.cds.services.handler.annotations.On;
@@ -35,7 +33,6 @@ public class DefaultAttachmentsServiceHandler implements EventHandler {
 	private static final int DEFAULT_ON = 10 * HandlerOrder.AFTER + HandlerOrder.LATE;
 
 	private static final Logger logger = LoggerFactory.getLogger(DefaultAttachmentsServiceHandler.class);
-	private static final Marker marker = LoggingMarker.ATTACHMENT_SERVICE.getMarker();
 
 	private final EndTransactionMalwareScanProvider endTransactionMalwareScanProvider;
 
@@ -46,7 +43,7 @@ public DefaultAttachmentsServiceHandler(EndTransactionMalwareScanProvider endTra
 	@On
 	@HandlerOrder(DEFAULT_ON)
 	public void createAttachment(AttachmentCreateEventContext context) {
-		logger.debug(marker, "Default Attachment Service handler called for creating attachment for entity '{}'",
+		logger.debug("Default Attachment Service handler called for creating attachment for entity '{}'",
 				context.getAttachmentEntity().getQualifiedName());
 		var contentId = (String) context.getAttachmentIds().get(Attachments.ID);
 		context.getData().setStatus(StatusCode.SCANNING);
@@ -60,7 +57,7 @@ public void createAttachment(AttachmentCreateEventContext context) {
 	@On
 	@HandlerOrder(DEFAULT_ON)
 	public void markAttachmentAsDeleted(AttachmentMarkAsDeletedEventContext context) {
-		logger.debug(marker, "Default Attachment Service handler called for marking attachment as deleted with document id {}", context.getContentId());
+		logger.debug("Default Attachment Service handler called for marking attachment as deleted with document id {}", context.getContentId());
 
 		//nothing to do as data are stored in the database and handled by the database
 		context.setCompleted();
@@ -69,7 +66,7 @@ public void markAttachmentAsDeleted(AttachmentMarkAsDeletedEventContext context)
 	@On
 	@HandlerOrder(DEFAULT_ON)
 	public void restoreAttachment(AttachmentRestoreEventContext context) {
-		logger.debug(marker, "Default Attachment Service handler called for restoring attachment for timestamp {}",
+		logger.debug("Default Attachment Service handler called for restoring attachment for timestamp {}",
 				context.getRestoreTimestamp());
 
 		//nothing to do as data are stored in the database and handled by the database
@@ -79,7 +76,7 @@ public void restoreAttachment(AttachmentRestoreEventContext context) {
 	@On
 	@HandlerOrder(DEFAULT_ON)
 	public void readAttachment(AttachmentReadEventContext context) {
-		logger.debug(marker, "Default Attachment Service handler called for reading attachment with document id {}",
+		logger.debug("Default Attachment Service handler called for reading attachment with document id {}",
 				context.getContentId());
 
 		//nothing to do as data are stored in the database and handled by the database

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/service/malware/client/DefaultMalwareScanClient.java

@@ -14,14 +14,12 @@
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.cds.feature.attachments.service.malware.client.httpclient.HttpClientProviderFactory;
 import com.sap.cds.feature.attachments.service.malware.client.model.MalwareScanResult;
 import com.sap.cds.feature.attachments.service.malware.client.model.MalwareScanResultStatus;
-import com.sap.cds.feature.attachments.utilities.LoggingMarker;
 import com.sap.cds.services.ServiceException;
 
 /**
@@ -34,7 +32,6 @@ public class DefaultMalwareScanClient implements MalwareScanClient {
 	private static final String JSON_CONTENT = "application/json";
 
 	private static final Logger logger = LoggerFactory.getLogger(DefaultMalwareScanClient.class);
-	private static final Marker marker = LoggingMarker.MALWARE_SCANNER.getMarker();
 
 	private final ObjectMapper mapper = buildObjectMapper();
 	private final HttpClientProviderFactory clientProviderFactory;
@@ -52,10 +49,10 @@ private static ObjectMapper buildObjectMapper() {
 	@Override
 	public MalwareScanResultStatus scanContent(InputStream content) {
 		if (!clientProviderFactory.isServiceBound()) {
-			logger.warn(marker, "No malware scanner service bound, never use this in productive environment!");
+			logger.warn("No malware scanner service bound, never use this in productive environment!");
 			return MalwareScanResultStatus.NO_SCANNER;
 		} else {
-			logger.info(marker, "Start scanning document");
+			logger.info("Start scanning document");
 			return scanContentWithClient(content);
 		}
 	}