From e8ce45294d674851cc936c95c2d56b0a30093e8c Mon Sep 17 00:00:00 2001
From: Pawel GUTOWSKI <Pawel.GUTOWSKI@ext.ec.europa.eu>
Date: Thu, 22 Feb 2018 15:59:25 +0100
Subject: [PATCH] EDELIVERY-3164 Improved Domain ID validation and decreased
spring logging level
---
.../europa/ec/edelivery/smp/services/ServiceGroupService.java | 4 +---
smp-webapp/src/main/resources/log4j.properties | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
index 13d2593ab..6979334dd 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
@@ -47,9 +47,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
@Service
public class ServiceGroupService {
- private static final Logger log = LoggerFactory.getLogger(ServiceGroupService.class);
-
- private static final Pattern DOMAIN_ID_PATTERN = Pattern.compile("[a-zA-Z0-9]+");
+ private static final Pattern DOMAIN_ID_PATTERN = Pattern.compile("[a-zA-Z0-9]{1,50}");
@Autowired
private CaseSensitivityNormalizer caseSensitivityNormalizer;
diff --git a/smp-webapp/src/main/resources/log4j.properties b/smp-webapp/src/main/resources/log4j.properties
index aeee963b0..b760424a8 100644
--- a/smp-webapp/src/main/resources/log4j.properties
+++ b/smp-webapp/src/main/resources/log4j.properties
@@ -20,7 +20,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d [%p] %c %x - %m%n
-log4j.logger.org.springframework=DEBUG
+# log4j.logger.org.springframework=DEBUG
# Second appender to write to a logfile
log4j.appender.logfile=org.apache.log4j.RollingFileAppender
--
GitLab