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-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
index a9b9b5e..a6bc688 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
@@ -1123,7 +1123,7 @@
extractIntermediateListener(ConfigAddListener configListener) {
// @Checkstyle:on
if (configListener instanceof ConfigAddListenerAdaptor) {
- ConfigAddListenerAdaptor<T> adaptor = ((ConfigAddListenerAdaptor<T>) configListener);
+ ConfigAddListenerAdaptor<T> adaptor = (ConfigAddListenerAdaptor<T>) configListener;
return Pair.of(adaptor, adaptor.getServerManagedObjectAddListener());
}
return Pair.empty();
@@ -1239,7 +1239,7 @@
int i = delayWrappers;
for (; i > 0; i--) {
wrappedListener = delayListener.getDelayedAddListener();
- if (wrappedListener != null && wrappedListener instanceof DelayedConfigAddListener) {
+ if (wrappedListener instanceof DelayedConfigAddListener) {
delayListener = (DelayedConfigAddListener) configListener;
} else {
break;
@@ -1254,7 +1254,7 @@
ConfigAddListener delayedListener = delayListener.getDelayedAddListener();
- if (delayedListener != null && delayedListener instanceof ConfigAddListenerAdaptor) {
+ if (delayedListener instanceof ConfigAddListenerAdaptor) {
ConfigAddListenerAdaptor<?> adaptor = (ConfigAddListenerAdaptor<?>) delayedListener;
ServerManagedObjectAddListener<?> l2 = adaptor.getServerManagedObjectAddListener();
if (l2 instanceof ServerManagedObjectAddListenerAdaptor<?>) {
@@ -1293,7 +1293,7 @@
int i = delayWrappers;
for (; i > 0; i--) {
wrappedListener = delayListener.getDelayedAddListener();
- if (wrappedListener != null && wrappedListener instanceof DelayedConfigAddListener) {
+ if (wrappedListener instanceof DelayedConfigAddListener) {
delayListener = (DelayedConfigAddListener) l;
} else {
break;
@@ -1308,7 +1308,7 @@
ConfigDeleteListener delayedListener = delayListener.getDelayedDeleteListener();
- if (delayedListener != null && delayedListener instanceof ConfigDeleteListenerAdaptor) {
+ if (delayedListener instanceof ConfigDeleteListenerAdaptor) {
ConfigDeleteListenerAdaptor<?> adaptor = (ConfigDeleteListenerAdaptor<?>) delayedListener;
ServerManagedObjectDeleteListener<?> l2 = adaptor.getServerManagedObjectDeleteListener();
if (l2 instanceof ServerManagedObjectDeleteListenerAdaptor<?>) {
@@ -1347,7 +1347,7 @@
int i = delayWrappers;
for (; i > 0; i--) {
wrappedListener = delayListener.getDelayedAddListener();
- if (wrappedListener != null && wrappedListener instanceof DelayedConfigAddListener) {
+ if (wrappedListener instanceof DelayedConfigAddListener) {
delayListener = (DelayedConfigAddListener) configListener;
} else {
break;
@@ -1362,7 +1362,7 @@
ConfigAddListener delayedListener = delayListener.getDelayedAddListener();
- if (delayedListener != null && delayedListener instanceof ConfigAddListenerAdaptor) {
+ if (delayedListener instanceof ConfigAddListenerAdaptor) {
ConfigAddListenerAdaptor<?> adaptor = (ConfigAddListenerAdaptor<?>) delayedListener;
if (adaptor.getServerManagedObjectAddListener() == listener) {
configRepository.deregisterAddListener(parentDN, configListener);
@@ -1396,7 +1396,7 @@
int i = delayWrappers;
for (; i > 0; i--) {
wrappedListener = delayListener.getDelayedAddListener();
- if (wrappedListener != null && wrappedListener instanceof DelayedConfigAddListener) {
+ if (wrappedListener instanceof DelayedConfigAddListener) {
delayListener = (DelayedConfigAddListener) configListener;
} else {
break;
@@ -1411,7 +1411,7 @@
ConfigDeleteListener delayedListener = delayListener.getDelayedDeleteListener();
- if (delayedListener != null && delayedListener instanceof ConfigDeleteListenerAdaptor) {
+ if (delayedListener instanceof ConfigDeleteListenerAdaptor) {
ConfigDeleteListenerAdaptor<?> adaptor = (ConfigDeleteListenerAdaptor<?>) delayedListener;
if (adaptor.getServerManagedObjectDeleteListener() == listener) {
configRepository.deregisterAddListener(parentDN, configListener);
--
Gitblit v1.10.0