From 501a65b6537d217cb22eb61967ed619c2376ddac Mon Sep 17 00:00:00 2001
From: Pawel GUTOWSKI <Pawel.GUTOWSKI@ext.ec.europa.eu>
Date: Fri, 26 Jan 2018 13:59:39 +0100
Subject: [PATCH] EDELIVERY-1893 Minor refactorings after code review
---
.../europa/ec/edelivery/smp/data/model/DBUser.java | 14 ++++++--------
.../smp/services/ServiceMetadataSigner.java | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUser.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUser.java
index ab8250469..d561605b6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUser.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUser.java
@@ -33,7 +33,7 @@ public class DBUser implements BaseEntity {
@Id
@Column(name = "username", unique = true, nullable = false, length = MAX_USERNAME_LENGTH)
- public String getUsername() {
+ public String getId() {
return username;
}
@@ -42,7 +42,6 @@ public class DBUser implements BaseEntity {
return password;
}
-
@Column(name = "isadmin", nullable = false)
public boolean isAdmin() {
return isAdmin;
@@ -53,7 +52,7 @@ public class DBUser implements BaseEntity {
return ownerships;
}
- public void setUsername(String username) {
+ public void setId(String username) {
this.username = username;
}
@@ -69,13 +68,12 @@ public class DBUser implements BaseEntity {
this.ownerships = ownerships;
}
- @Override
@Transient
- public String getId() {
- return getUsername();
+ public String getUsername() {
+ return getId();
}
- public void setId(String username){
- setUsername(username);
+ public void setUsername(String username){
+ setId(username);
}
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSigner.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSigner.java
index 2d0a7ede4..0aeeaeb6d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSigner.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSigner.java
@@ -96,7 +96,7 @@ public final class ServiceMetadataSigner {
}
signingKeys.put(alias, key);
signingCertificates.put(alias, (X509Certificate) certificate);
- log.info("Successfully loaded signing key and certificate: " + ((X509Certificate) certificate).getSubjectDN().getName());
+ log.info("Successfully loaded [" + alias + "] signing key and certificate: " + ((X509Certificate) certificate).getSubjectDN().getName());
}
public void sign(Document serviceMetadataDoc, String keyAlias) {
--
GitLab