From f89ecd5265f178c0b22a89d81ac49921d0987365 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 22 Jul 2022 14:06:41 +0200 Subject: [PATCH] ref #10072 some adaptations for setLevel in vaadin --- .../RegistrationRequiredDataInserter.java | 15 +++++------ .../vaadin/mvp/AbstractPopupEditor.java | 27 +++++++------------ 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java b/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java index b95d4686..82a735f6 100644 --- a/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java +++ b/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java @@ -17,7 +17,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Session; @@ -233,13 +232,13 @@ public class RegistrationRequiredDataInserter extends AbstractDataInserter { return repo.getSession(); } }; - LogUtils.setLevel(logger, Level.DEBUG); + int chunksize = 1000; int pageIndex = 0; TransactionStatus tx; Pager taxonPage; List taxa = new ArrayList<>(); - logger.debug("======= fixing sec refrences ========="); + LogUtils.logAsDebug(logger, "======= fixing sec refrences ========="); while(true){ tx = repo.startTransaction(false); taxonPage = repo.getTaxonService().page(Taxon.class, chunksize, pageIndex++, null, null); @@ -254,7 +253,7 @@ public class RegistrationRequiredDataInserter extends AbstractDataInserter { repo.commitTransaction(tx); } - logger.debug("======= creating taxon graph ========="); + LogUtils.logAsDebug(logger, "======= creating taxon graph ========="); pageIndex = 0; Pager page; while(true){ @@ -264,7 +263,7 @@ public class RegistrationRequiredDataInserter extends AbstractDataInserter { repo.commitTransaction(tx); break; } - logger.debug(TAXON_GRAPH_CREATE + ": chunk " + pageIndex + "/" + Math.ceil(page.getCount() / chunksize)); + LogUtils.logAsDebug(logger, TAXON_GRAPH_CREATE + ": chunk " + pageIndex + "/" + Math.ceil(page.getCount() / chunksize)); taxa = new ArrayList<>(); for(TaxonName name : page.getRecords()){ @@ -273,7 +272,7 @@ public class RegistrationRequiredDataInserter extends AbstractDataInserter { if(illegitimType == null){ Taxon taxon; try { - logger.debug("Processing name: " + name.getTitleCache() + " [" + name.getRank().getLabel() + "]"); + LogUtils.logAsDebug(logger, "Processing name: " + name.getTitleCache() + " [" + name.getRank().getLabel() + "]"); taxon = processor.assureSingleTaxon(name); processor.updateEdges(taxon); taxa.add(taxon); @@ -281,10 +280,10 @@ public class RegistrationRequiredDataInserter extends AbstractDataInserter { logger.error(e.getMessage()); } } else { - logger.debug("Skipping illegitimate name: " + name.getTitleCache() + " " + illegitimType.getLabel() + " [" + name.getRank().getLabel() + "]"); + LogUtils.logAsDebug(logger, "Skipping illegitimate name: " + name.getTitleCache() + " " + illegitimType.getLabel() + " [" + name.getRank().getLabel() + "]"); } } else { - logger.debug("Skipping name: " + name.getTitleCache() + " [" + (name.getRank() != null ? name.getRank().getLabel() : "NULL") + "]"); + LogUtils.logAsDebug(logger, "Skipping name: " + name.getTitleCache() + " [" + (name.getRank() != null ? name.getRank().getLabel() : "NULL") + "]"); } } repo.getTaxonService().saveOrUpdate(taxa); diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java index 05d1f853..3454b608 100644 --- a/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java +++ b/src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java @@ -17,7 +17,6 @@ import java.util.Optional; import java.util.Set; import java.util.Stack; -import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.vaadin.spring.events.EventScope; @@ -429,9 +428,6 @@ public abstract class AbstractPopupEditor(this, fieldGroup.getItemDataSource().getBean())); viewEventBus.publish(EventScope.UI, this, new DoneWithPopupEvent(this, Reason.DELETE)); @@ -478,17 +474,13 @@ public abstract class AbstractPopupEditor, InvalidValueException> invalidFields) { for(Field f : invalidFields.keySet()){ if(f instanceof AbstractField){ String message = invalidFields.get(f).getHtmlMessage(); - ((AbstractField)f).setComponentError(new UserError(message, ContentMode.HTML, ErrorLevel.ERROR)); + ((AbstractField)f).setComponentError(new UserError(message, ContentMode.HTML, ErrorLevel.ERROR)); } } - } // ------------------------ field adding methods ------------------------ // @@ -613,31 +605,30 @@ public abstract class AbstractPopupEditor parentField = field; HasComponents parentComponent = parentField.getParent(); - logger.debug("field: " + parentField.getClass().getSimpleName()); + LogUtils.logAsDebug(logger, "field: " + parentField.getClass().getSimpleName()); while(parentComponent != null){ - logger.debug("parentComponent: " + parentComponent.getClass().getSimpleName()); + LogUtils.logAsDebug(logger, "parentComponent: " + parentComponent.getClass().getSimpleName()); if(NestedFieldGroup.class.isAssignableFrom(parentComponent.getClass()) && AbstractField.class.isAssignableFrom(parentComponent.getClass())){ Optional parentFieldGroup = ((NestedFieldGroup)parentComponent).getFieldGroup(); if(parentFieldGroup.isPresent()){ Object propId = parentFieldGroup.get().getPropertyId(parentField); if(propId != null){ - logger.debug("propId: " + propId.toString()); + LogUtils.logAsDebug(logger, "propId: " + propId.toString()); nestedPropertyIds.addParent(propId); } - logger.debug("parentField: " + parentField.getClass().getSimpleName()); - parentField = (Field)parentComponent; + LogUtils.logAsDebug(logger, "parentField: " + parentField.getClass().getSimpleName()); + parentField = (Field)parentComponent; } else { - logger.debug("parentFieldGroup is null, continuing ..."); + LogUtils.logAsDebug(logger, "parentFieldGroup is null, continuing ..."); } } else if(parentComponent == this) { // we reached the editor itself Object propId = fieldGroup.getPropertyId(parentField); if(propId != null){ - logger.debug("propId: " + propId.toString()); + LogUtils.logAsDebug(logger, "propId: " + propId.toString()); nestedPropertyIds.addParent(propId); } propertyIdPath = nestedPropertyIds; -- 2.34.1