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/06/19 09:53:54 UTC
[8/8] james-project git commit: JAMES-2429 Don't fail on never null
fields
JAMES-2429 Don't fail on never null fields
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/23d22a0e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/23d22a0e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/23d22a0e
Branch: refs/heads/master
Commit: 23d22a0e9cc9b00b25db2c32adb79d287e90cb0e
Parents: f109758
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Mon Jun 18 17:46:09 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Tue Jun 19 16:53:02 2018 +0700
----------------------------------------------------------------------
.../main/java/org/apache/james/dlp/api/DLPConfigurationItem.java | 4 +---
.../java/org/apache/james/dlp/api/DLPConfigurationItemTest.java | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/23d22a0e/server/data/data-api/src/main/java/org/apache/james/dlp/api/DLPConfigurationItem.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/dlp/api/DLPConfigurationItem.java b/server/data/data-api/src/main/java/org/apache/james/dlp/api/DLPConfigurationItem.java
index 79d5e94..9d4dbe6 100644
--- a/server/data/data-api/src/main/java/org/apache/james/dlp/api/DLPConfigurationItem.java
+++ b/server/data/data-api/src/main/java/org/apache/james/dlp/api/DLPConfigurationItem.java
@@ -263,11 +263,9 @@ public class DLPConfigurationItem {
if (o instanceof DLPConfigurationItem) {
DLPConfigurationItem dlpConfigurationItem = (DLPConfigurationItem) o;
- Optional<String> regexp = Optional.ofNullable(this.regexp).map(Pattern::pattern);
- Optional<String> otherRegexp = Optional.ofNullable(dlpConfigurationItem.regexp).map(Pattern::pattern);
return Objects.equals(this.id, dlpConfigurationItem.id)
&& Objects.equals(this.explanation, dlpConfigurationItem.explanation)
- && Objects.equals(regexp, otherRegexp)
+ && Objects.equals(this.regexp.pattern(), dlpConfigurationItem.regexp.pattern())
&& Objects.equals(this.targets, dlpConfigurationItem.targets);
}
return false;
http://git-wip-us.apache.org/repos/asf/james-project/blob/23d22a0e/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java b/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java
index 375b6c4..2cd7296 100644
--- a/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java
+++ b/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java
@@ -38,6 +38,7 @@ public class DLPConfigurationItemTest {
@Test
void shouldMatchBeanContract() {
EqualsVerifier.forClass(DLPConfigurationItem.class)
+ .withNonnullFields("regexp")
.verify();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org