before reverting UI changes

Author: Pa-Touche

sormas-backend/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -196,7 +196,7 @@ private Object backendAuditing(InvocationContext context, Method calledMethod) t
 
 		Date end = Calendar.getInstance(TimeZone.getDefault()).getTime();
 
-		auditLogger.logBackendCall(calledMethod, parameters, result, start, end);
+		de.symeda.sormas.api.FacadeProvider.auditLogger.logBackendCall(calledMethod, parameters, result, start, end);
 		return result;
 	}
 

sormas-backend/src/main/java/de/symeda/sormas/backend/audit/AuditLoggerInterceptor.java

@@ -35,7 +35,6 @@
 import javax.transaction.Transactional;
 import javax.validation.Valid;
 
-import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
 import de.symeda.sormas.api.contact.ContactCriteria;
@@ -122,8 +121,6 @@ public void share(List<String> entityUuids, @Valid SormasToSormasOptionsDto opti
 			throw new AccessDeniedException(I18nProperties.getString(Strings.errorForbidden));
 		}
 
-
-
 		super.share(entityUuids, options);
 	}
 
@@ -156,10 +153,11 @@ protected void validateEntitiesBeforeShareInner(
 			Set<Sample> samples = caze.getSamples();
 			if (samples != null && samples.stream().anyMatch(s -> s.getAssociatedContact() != null)) {
 				validationErrors.add(
-						new ValidationErrors(
-								buildCaseValidationGroupName(caze),
-								ValidationErrors
-										.create(new ValidationErrorGroup(Captions.CaseData), new ValidationErrorMessage(Validations.sormasToSormasCaseSampleHasAssociatedContact))));
+					new ValidationErrors(
+						buildCaseValidationGroupName(caze),
+						ValidationErrors.create(
+							new ValidationErrorGroup(Captions.CaseData),
+							new ValidationErrorMessage(Validations.sormasToSormasCaseSampleHasAssociatedContact))));
 			}
 		}
 

sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/entities/caze/SormasToSormasCaseFacadeEjb.java

@@ -124,13 +124,9 @@ public void setService(final SystemConfigurationValueService service) {
 	@Override
 	public Optional<String> getValue(final Config key) {
 		System.out.println("SystemConfigurationValueEjb.getValue " + key);
-		LOGGER.error("SystemConfigurationValueEjb.getValue " + key);
 
 		loadDataIfEmpty();
 
-		System.out.println(configurationValuesByKey);
-		LOGGER.error("{}", configurationValuesByKey);
-
 		return Optional.ofNullable(configurationValuesByKey.get(key)).flatMap(SystemConfigurationValueProjection::getActualValue);
 	}
 

sormas-backend/src/main/java/de/symeda/sormas/backend/systemconfiguration/SystemConfigurationValueEjb.java

@@ -18,6 +18,7 @@ public SystemConfigurationValueProjection() {
 	}
 
 	public SystemConfigurationValueProjection(Config key, String value, String defaultValue) {
+		this.key = key;
 		this.value = value;
 		this.defaultValue = defaultValue;
 	}

sormas-backend/src/main/java/de/symeda/sormas/backend/systemconfiguration/SystemConfigurationValueProjection.java

@@ -53,7 +53,6 @@
 import com.vaadin.ui.themes.ValoTheme;
 
 import de.symeda.sormas.api.ConfigFacade;
-import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.caze.classification.ClassificationHtmlRenderer;
 import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Captions;

sormas-ui/src/main/java/de/symeda/sormas/ui/AboutView.java

@@ -31,7 +31,6 @@
 import com.vaadin.v7.ui.Label;
 import com.vaadin.v7.ui.Table;
 
-import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.activityascase.ActivityAsCaseDto;
 import de.symeda.sormas.api.activityascase.ActivityAsCaseType;
 import de.symeda.sormas.api.event.TypeOfPlace;

sormas-ui/src/main/java/de/symeda/sormas/ui/ActivityAsCase/ActivityAsCaseField.java

@@ -44,7 +44,6 @@
 import com.vaadin.v7.ui.TextField;
 
 import de.symeda.sormas.api.CountryHelper;
-import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.activityascase.ActivityAsCaseDto;
 import de.symeda.sormas.api.activityascase.ActivityAsCaseType;
 import de.symeda.sormas.api.event.MeansOfTransport;

sormas-ui/src/main/java/de/symeda/sormas/ui/ActivityAsCase/ActivityAsCaseForm.java

@@ -42,7 +42,6 @@
 import com.vaadin.ui.themes.ValoTheme;
 
 import de.symeda.sormas.api.CountryHelper;
-import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.feature.FeatureTypeProperty;
 import de.symeda.sormas.api.i18n.Captions;

sormas-ui/src/main/java/de/symeda/sormas/ui/MainScreen.java

@@ -49,7 +49,6 @@
 import com.vaadin.ui.Window;
 import com.vaadin.ui.themes.ValoTheme;
 
-import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
@@ -163,9 +162,10 @@ public Menu(Navigator navigator) {
 	}
 
 	private void defineCustomColorBackgroundIfSystemConfigured() {
-		Optional<String> backgroundColor = FacadeProvider.getConfigFacade().getAsString(Config.MENU_BACKGROUND_COLOR)
-				.filter(StringUtils::isNotBlank)
-				.filter(Predicate.not(DEFAULT_BACKGROUND_COLOR_NAME::equals));
+		Optional<String> backgroundColor = FacadeProvider.getConfigFacade()
+			.getAsString(Config.MENU_BACKGROUND_COLOR)
+			.filter(StringUtils::isNotBlank)
+			.filter(Predicate.not(DEFAULT_BACKGROUND_COLOR_NAME::equals));
 
 		if (backgroundColor.isEmpty()) {
 			// no need to configure anything as we can keep the default color.