From 7d7913228e6f52273f2fdada6822a380f95e0f8c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 20 Oct 2014 12:11:48 +0000
Subject: [PATCH] Autorefactored simplifying expressions: - removed useless parentheses - added parentheses to disambiguate expressions - removed useless use of "this" keyword in method calls - removed useless null checks in conjunction with use of instanceof operator
---
opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java
index b59bbc4..fb86097 100644
--- a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java
+++ b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java
@@ -143,14 +143,14 @@
* Sets the type of this server as : replication activated and this is the first server in topology.
*/
void setFirstInTopology() {
- this.setType(Type.FIRST_IN_TOPOLOGY);
+ setType(Type.FIRST_IN_TOPOLOGY);
}
/**
* Sets the type of this server as : replication activated and this is a server in an existing topology.
*/
void setInExistingTopology() {
- this.setType(Type.IN_EXISTING_TOPOLOGY);
+ setType(Type.IN_EXISTING_TOPOLOGY);
}
/**
@@ -368,16 +368,16 @@
*/
void validate() throws ConfigException {
if (isFirstInTopology() || isPartOfReplicationTopology()) {
- if (this.getReplicationConfiguration() == null) {
+ if (getReplicationConfiguration() == null) {
throw new ConfigException(LocalizableMessage.raw("No replication configuration found"));
}
if (isPartOfReplicationTopology()) {
- Reject.ifNull(this.getReplicationConfiguration().getAdministrator(),
+ Reject.ifNull(getReplicationConfiguration().getAdministrator(),
"Administrator name should not be null");
- Reject.ifNull(this.getReplicationConfiguration().getPassword(), "Admin password should not be null");
- Reject.ifNull(this.getReplicationConfiguration().getGlobalAdministrator(),
+ Reject.ifNull(getReplicationConfiguration().getPassword(), "Admin password should not be null");
+ Reject.ifNull(getReplicationConfiguration().getGlobalAdministrator(),
"Global administrator should not be null");
- Reject.ifNull(this.getReplicationConfiguration().getGlobalAdministratorPassword(),
+ Reject.ifNull(getReplicationConfiguration().getGlobalAdministratorPassword(),
"Global administrator should not be null");
if (getReplicationConfiguration().getSuffixes() == null
|| getReplicationConfiguration().getSuffixes().size() == 0) {
--
Gitblit v1.10.0