diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutor.java index 8ddbeb3d8e8c3a786e70124c081c8660c2e36752..5addc70a508b6c68162847c0c64eb5bd99388775 100644 --- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutor.java +++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutor.java @@ -20,6 +20,10 @@ import java.util.*; import java.util.Map.Entry; import java.util.stream.Collectors; +import ch.systemsx.cisd.common.logging.LogCategory; +import ch.systemsx.cisd.common.logging.LogFactory; +import ch.systemsx.cisd.openbis.generic.server.batch.BatchOperationExecutor; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -63,6 +67,9 @@ import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper; public class UpdateEntityPropertyExecutor implements IUpdateEntityPropertyExecutor { + private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION, + UpdateEntityPropertyExecutor.class); + @Autowired private IDAOFactory daoFactory; @@ -127,7 +134,7 @@ public class UpdateEntityPropertyExecutor implements IUpdateEntityPropertyExecut entityInformationProvider, managedPropertyEvaluatorFactory); converters.put(entityKind, converter); } - System.out.println("||> UPDATING PROPERTIES OF SAMPLE:" + propertiesHolder.toString()); + operationLog.info(String.format("||> UPDATING PROPERTIES OF SAMPLE:%s", propertiesHolder.toString())); update(context, propertiesHolder, properties, converters.get(entityKind)); } @@ -458,15 +465,15 @@ public class UpdateEntityPropertyExecutor implements IUpdateEntityPropertyExecut Map<String, Serializable> properties, EntityPropertiesConverter converter) { - System.out.println("||> properties:"); - properties.forEach((key, value) -> System.out.println("||> " +key + ":" + value)); + operationLog.info("||> properties:"); + properties.forEach((key, value) -> operationLog.info("||> " +key + ":" + value)); List<IEntityProperty> entityProperties = new LinkedList<IEntityProperty>(); for (Map.Entry<String, Serializable> entry : properties.entrySet()) { entityProperties.add(EntityHelper.createNewProperty(entry.getKey(), entry.getValue())); } - System.out.println("||> entityProperties:"); - entityProperties.forEach(ent -> System.out.println(ent)); + operationLog.info("||> entityProperties:"); + entityProperties.forEach(ent -> operationLog.info(ent)); Set<? extends EntityPropertyPE> existingProperties = propertiesHolder.getProperties(); Map<String, List<Object>> existingPropertyValuesByCode = new HashMap<String, List<Object>>(); @@ -477,16 +484,16 @@ public class UpdateEntityPropertyExecutor implements IUpdateEntityPropertyExecut existingPropertyValuesByCode.computeIfAbsent(propertyCode, s -> new ArrayList<>()); existingPropertyValuesByCode.get(propertyCode).add(getValue(existingProperty)); } - System.out.println("||> existingPropertyValuesByCode:"); - existingPropertyValuesByCode.forEach((key, value) -> System.out.println("||> " +key + ":" + value)); + operationLog.info("||> existingPropertyValuesByCode:"); + existingPropertyValuesByCode.forEach((key, value) -> operationLog.info("||> " +key + ":" + value)); Set<? extends EntityPropertyPE> convertedProperties = convertProperties(context, propertiesHolder.getEntityType(), existingProperties, entityProperties, converter); - System.out.println("||> convertedProperties:"); - convertedProperties.forEach(ent -> System.out.println(ent)); + operationLog.info("||> convertedProperties:"); + convertedProperties.forEach(ent -> operationLog.info(ent)); if (isEqualsMultiple(existingPropertyValuesByCode, convertedProperties) == false) { - System.out.println("||> isEqualsMultiple == false"); + operationLog.info("||> isEqualsMultiple == false"); propertiesHolder.setProperties(convertedProperties); } }