From 0f58a0569d631d364482310b9bcfa781e324d367 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Feb 2016 16:35:58 +0000
Subject: [PATCH] OPENDJ-2006 Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java | 11 +----
opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java | 10 +----
opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java | 50 ++++++++----------------
3 files changed, 22 insertions(+), 49 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
index adc0177..af4a40d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
@@ -58,9 +58,8 @@
* the server is starting, and then will manage any additions, removals, or
* modifications of any loggers while the server is running.
*/
-public class LoggerConfigManager implements
- ConfigurationAddListener<LogPublisherCfg>,
- ConfigurationDeleteListener<LogPublisherCfg>
+public class LoggerConfigManager implements ConfigurationAddListener<LogPublisherCfg>,
+ ConfigurationDeleteListener<LogPublisherCfg>
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -90,8 +89,7 @@
* If a problem occurs during initialization that is not
* related to the server configuration.
*/
- public void initializeLoggerConfig()
- throws ConfigException, InitializationException
+ public void initializeLoggerConfig() throws ConfigException, InitializationException
{
// Create an internal server management context and retrieve
// the root configuration which has the log publisher relation.
@@ -164,8 +162,7 @@
* @return the logger corresponding to the provided config, null if no logger
* corresponds.
*/
- private AbstractLogger getLoggerInstance(LogPublisherCfg config,
- List<LocalizableMessage> messages)
+ private AbstractLogger getLoggerInstance(LogPublisherCfg config, List<LocalizableMessage> messages)
{
if (config instanceof DebugLogPublisherCfg)
{
@@ -183,64 +180,51 @@
{
return ErrorLogger.getInstance();
}
- else
- {
- messages.add(ERR_CONFIG_LOGGER_INVALID_OBJECTCLASS.get(config.dn()));
- return null;
- }
+
+ messages.add(ERR_CONFIG_LOGGER_INVALID_OBJECTCLASS.get(config.dn()));
+ return null;
}
- /** {@inheritDoc} */
@Override
- public boolean isConfigurationAddAcceptable(LogPublisherCfg config,
- List<LocalizableMessage> unacceptableReasons)
+ public boolean isConfigurationAddAcceptable(LogPublisherCfg config, List<LocalizableMessage> unacceptableReasons)
{
AbstractLogger instance = getLoggerInstance(config, unacceptableReasons);
return instance != null
&& instance.isConfigurationAddAcceptable(config, unacceptableReasons);
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(LogPublisherCfg config)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
- AbstractLogger instance = getLoggerInstance(config, ccr.getMessages());
+ final AbstractLogger instance = getLoggerInstance(config, ccr.getMessages());
if (instance != null)
{
return instance.applyConfigurationAdd(config);
}
- else
- {
- ccr.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
- return ccr;
- }
+
+ ccr.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
+ return ccr;
}
- /** {@inheritDoc} */
@Override
- public boolean isConfigurationDeleteAcceptable(LogPublisherCfg config,
- List<LocalizableMessage> unacceptableReasons)
+ public boolean isConfigurationDeleteAcceptable(LogPublisherCfg config, List<LocalizableMessage> unacceptableReasons)
{
- AbstractLogger instance = getLoggerInstance(config, unacceptableReasons);
+ final AbstractLogger instance = getLoggerInstance(config, unacceptableReasons);
return instance != null
&& instance.isConfigurationDeleteAcceptable(config, unacceptableReasons);
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(LogPublisherCfg config)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
- AbstractLogger instance = getLoggerInstance(config, ccr.getMessages());
+ final AbstractLogger instance = getLoggerInstance(config, ccr.getMessages());
if (instance != null)
{
return instance.applyConfigurationDelete(config);
}
- else
- {
- ccr.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
- return ccr;
- }
+ ccr.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
+ return ccr;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
index 661c7c8..fd0adc7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
@@ -62,7 +62,7 @@
* Trace methods will use this static boolean to determine if debug is enabled
* so to not incur the cost of calling debugPublishers.isEmpty().
*/
- static boolean enabled;
+ private static boolean enabled;
private static final LoggerStorage
<DebugLogPublisher<DebugLogPublisherCfg>, DebugLogPublisherCfg>
@@ -191,20 +191,16 @@
return targets;
}
- /** {@inheritDoc} */
@Override
- public final synchronized void addLogPublisher(
- DebugLogPublisher<DebugLogPublisherCfg> publisher)
+ public final synchronized void addLogPublisher(final DebugLogPublisher<DebugLogPublisherCfg> publisher)
{
loggerStorage.addLogPublisher(publisher);
updateTracerSettings();
enabled = true;
}
- /** {@inheritDoc} */
@Override
- public final synchronized boolean removeLogPublisher(
- DebugLogPublisher<DebugLogPublisherCfg> publisher)
+ public final synchronized boolean removeLogPublisher(final DebugLogPublisher<DebugLogPublisherCfg> publisher)
{
boolean removed = loggerStorage.removeLogPublisher(publisher);
updateTracerSettings();
@@ -212,7 +208,6 @@
return removed;
}
- /** {@inheritDoc} */
@Override
public final synchronized void removeAllLogPublishers()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
index 2f54509..7f2a9df 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
@@ -157,27 +157,21 @@
return false;
}
- /** {@inheritDoc} */
@Override
- public final synchronized void addLogPublisher(
- ErrorLogPublisher<ErrorLogPublisherCfg> publisher)
+ public final synchronized void addLogPublisher(final ErrorLogPublisher<ErrorLogPublisherCfg> publisher)
{
loggerStorage.addLogPublisher(publisher);
}
- /** {@inheritDoc} */
@Override
- public final synchronized boolean removeLogPublisher(
- ErrorLogPublisher<ErrorLogPublisherCfg> publisher)
+ public final synchronized boolean removeLogPublisher(final ErrorLogPublisher<ErrorLogPublisherCfg> publisher)
{
return loggerStorage.removeLogPublisher(publisher);
}
- /** {@inheritDoc} */
@Override
public final synchronized void removeAllLogPublishers()
{
loggerStorage.removeAllLogPublishers();
}
-
}
--
Gitblit v1.10.0