You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/03/27 08:19:03 UTC
[19/41] james-project git commit: JAMES-2352 remove last implicit
calls to Domain.toString
JAMES-2352 remove last implicit calls to Domain.toString
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f70b8f2b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f70b8f2b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f70b8f2b
Branch: refs/heads/master
Commit: f70b8f2b3af61b373a605115a3127cad6be8d104
Parents: 8c9289f
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Mar 19 14:44:55 2018 +0100
Committer: benwa <bt...@linagora.com>
Committed: Tue Mar 27 15:14:04 2018 +0700
----------------------------------------------------------------------
.../james/domainlist/cassandra/CassandraDomainList.java | 2 +-
.../org/apache/james/domainlist/hbase/HBaseDomainList.java | 2 +-
.../java/org/apache/james/domainlist/jpa/JPADomainList.java | 8 ++++----
.../org/apache/james/domainlist/lib/AbstractDomainList.java | 2 +-
.../org/apache/james/domainlist/memory/MemoryDomainList.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f70b8f2b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java
index f52d607..bd1d177 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java
@@ -124,7 +124,7 @@ public class CassandraDomainList extends AbstractDomainList {
.setString(DOMAIN, domain.asString()))
.join();
if (!executed) {
- throw new DomainListException(domain + " was not found");
+ throw new DomainListException(domain.name() + " was not found");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f70b8f2b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
index 4e262e2..1d51e40 100644
--- a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
+++ b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
@@ -84,7 +84,7 @@ public class HBaseDomainList extends AbstractDomainList {
@Override
public void addDomain(Domain domain) throws DomainListException {
if (containsDomain(domain)) {
- throw new DomainListException(domain + " already exists.");
+ throw new DomainListException(domain.name() + " already exists.");
}
HTableInterface table = null;
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f70b8f2b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
index 4a4fde6..2d74392 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
@@ -128,7 +128,7 @@ public class JPADomainList extends AbstractDomainList {
transaction.begin();
if (containsDomainInternal(domain, entityManager)) {
transaction.commit();
- throw new DomainListException(domain + " already exists.");
+ throw new DomainListException(domain.name() + " already exists.");
}
JPADomain jpaDomain = new JPADomain(domain);
entityManager.persist(jpaDomain);
@@ -136,7 +136,7 @@ public class JPADomainList extends AbstractDomainList {
} catch (PersistenceException e) {
LOGGER.error("Failed to save domain", e);
rollback(transaction);
- throw new DomainListException("Unable to add domain " + domain, e);
+ throw new DomainListException("Unable to add domain " + domain.name(), e);
} finally {
entityManager.close();
}
@@ -150,14 +150,14 @@ public class JPADomainList extends AbstractDomainList {
transaction.begin();
if (!containsDomainInternal(domain, entityManager)) {
transaction.commit();
- throw new DomainListException(domain + " was not found.");
+ throw new DomainListException(domain.name() + " was not found.");
}
entityManager.createNamedQuery("deleteDomainByName").setParameter("name", domain.asString()).executeUpdate();
transaction.commit();
} catch (PersistenceException e) {
LOGGER.error("Failed to remove domain", e);
rollback(transaction);
- throw new DomainListException("Unable to remove domain " + domain, e);
+ throw new DomainListException("Unable to remove domain " + domain.name(), e);
} finally {
entityManager.close();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f70b8f2b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
index 455ef9d..db53390 100644
--- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
+++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
@@ -167,7 +167,7 @@ public abstract class AbstractDomainList implements DomainList, Configurable {
if (LOGGER.isDebugEnabled()) {
for (Domain domain : allDomains) {
- LOGGER.debug("Handling mail for: " + domain);
+ LOGGER.debug("Handling mail for: " + domain.name());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f70b8f2b/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java b/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
index e7faf84..963fbc6 100644
--- a/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
+++ b/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
@@ -54,7 +54,7 @@ public class MemoryDomainList extends AbstractDomainList {
@Override
public void addDomain(Domain domain) throws DomainListException {
if (containsDomain(domain)) {
- throw new DomainListException(domain + " already exists.");
+ throw new DomainListException(domain.name() + " already exists.");
}
domains.add(domain);
}
@@ -62,7 +62,7 @@ public class MemoryDomainList extends AbstractDomainList {
@Override
public void removeDomain(Domain domain) throws DomainListException {
if (!domains.remove(domain)) {
- throw new DomainListException(domain + " was not found");
+ throw new DomainListException(domain.name() + " was not found");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org