From 26e802d6fa4cb1dddd4764a931169f0be0effd61 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Feb 2015 09:42:15 +0000
Subject: [PATCH] Fix violations reported by SonarQube: preserve stacktrace, final class.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java | 15 +++----
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java | 6 +--
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 15 +++----
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java | 6 +--
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2Entry.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java | 7 ++-
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java | 6 +--
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java | 6 +--
10 files changed, 29 insertions(+), 42 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java
index 69ae91f..7d24004 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java
@@ -1123,10 +1123,8 @@
return false;
}
- /**
- * This class extends the IndexConfig for JE Backend.
- */
- private class JEIndexConfig implements IndexingOptions
+ /** This class extends the IndexConfig for JE Backend. */
+ private final class JEIndexConfig implements IndexingOptions
{
/** The length of the substring index. */
private int substringLength;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
index 594917d..c50527c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
@@ -27,6 +27,7 @@
package org.opends.server.backends.jeb;
import static com.sleepycat.je.EnvironmentConfig.*;
+
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.backends.jeb.ConfigurableEnvironment.*;
@@ -656,7 +657,7 @@
catch (IOException ioe)
{
logger.traceException(ioe);
- throw new DirectoryException(errorRC, ERR_JEB_EXPORT_IO_ERROR.get(ioe.getMessage()));
+ throw new DirectoryException(errorRC, ERR_JEB_EXPORT_IO_ERROR.get(ioe.getMessage()), ioe);
}
catch (DatabaseException de)
{
@@ -665,7 +666,7 @@
}
catch (ConfigException ce)
{
- throw new DirectoryException(errorRC, ce.getMessageObject());
+ throw new DirectoryException(errorRC, ce.getMessageObject(), ce);
}
catch (IdentifiedException e)
{
@@ -674,7 +675,7 @@
throw (DirectoryException) e;
}
logger.traceException(e);
- throw new DirectoryException(errorRC, e.getMessageObject());
+ throw new DirectoryException(errorRC, e.getMessageObject(), e);
}
finally
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
index 91c5834..c6509d9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
@@ -2335,16 +2335,13 @@
}
}
- /**
- * Represents an renamed entry that was deleted from JE but yet to be added
- * back.
- */
- private static class MovedEntry
+ /** Represents an renamed entry that was deleted from JE but yet to be added back. */
+ private static final class MovedEntry
{
- EntryID entryID;
- Entry entry;
- MovedEntry next;
- boolean renumbered;
+ private EntryID entryID;
+ private Entry entry;
+ private MovedEntry next;
+ private boolean renumbered;
private MovedEntry(EntryID entryID, Entry entry, boolean renumbered)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2Entry.java
index 0bdc6b7..d7c1948 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2Entry.java
@@ -90,7 +90,7 @@
* A cached set of ByteStringBuilder buffers and ASN1Writer used to encode
* entries.
*/
- private static class EntryCodec
+ private static final class EntryCodec
{
private static final int BUFFER_INIT_SIZE = 512;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java
index 22679ce..506941c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java
@@ -1591,10 +1591,8 @@
return dn.getParentDNInSuffix();
}
- /**
- * This class reports progress of the verify job at fixed intervals.
- */
- private class ProgressTask extends TimerTask
+ /** This class reports progress of the verify job at fixed intervals. */
+ private final class ProgressTask extends TimerTask
{
/** The total number of records to process. */
private long totalCount;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
index d3bb424..80ada13 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
@@ -1116,10 +1116,8 @@
return false;
}
- /**
- * This class extends the IndexConfig for JE Backend.
- */
- private class JEIndexConfig implements IndexingOptions
+ /** This class extends the IndexConfig for JE Backend. */
+ private final class JEIndexConfig implements IndexingOptions
{
/** The length of the substring index. */
private int substringLength;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 33aae6a..131cf24 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -639,7 +639,7 @@
catch (IOException ioe)
{
logger.traceException(ioe);
- throw new DirectoryException(errorRC, ERR_JEB_EXPORT_IO_ERROR.get(ioe.getMessage()));
+ throw new DirectoryException(errorRC, ERR_JEB_EXPORT_IO_ERROR.get(ioe.getMessage()), ioe);
}
catch (StorageRuntimeException de)
{
@@ -648,7 +648,7 @@
}
catch (ConfigException ce)
{
- throw new DirectoryException(errorRC, ce.getMessageObject());
+ throw new DirectoryException(errorRC, ce.getMessageObject(), ce);
}
catch (IdentifiedException e)
{
@@ -657,7 +657,7 @@
throw (DirectoryException) e;
}
logger.traceException(e);
- throw new DirectoryException(errorRC, e.getMessageObject());
+ throw new DirectoryException(errorRC, e.getMessageObject(), e);
}
finally
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index 567129a..5021edb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -2394,16 +2394,13 @@
}
}
- /**
- * Represents an renamed entry that was deleted from JE but yet to be added
- * back.
- */
- private static class MovedEntry
+ /** Represents an renamed entry that was deleted from JE but yet to be added back. */
+ private static final class MovedEntry
{
- EntryID entryID;
- Entry entry;
- MovedEntry next;
- boolean renumbered;
+ private EntryID entryID;
+ private Entry entry;
+ private MovedEntry next;
+ private boolean renumbered;
private MovedEntry(EntryID entryID, Entry entry, boolean renumbered)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
index 90b83a0..3396e9b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
@@ -91,7 +91,7 @@
* A cached set of ByteStringBuilder buffers and ASN1Writer used to encode
* entries.
*/
- private static class EntryCodec
+ private static final class EntryCodec
{
private static final int BUFFER_INIT_SIZE = 512;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
index ead972c..d9a7b21 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
@@ -1569,10 +1569,8 @@
return dn.getParentDNInSuffix();
}
- /**
- * This class reports progress of the verify job at fixed intervals.
- */
- private class ProgressTask extends TimerTask
+ /** This class reports progress of the verify job at fixed intervals. */
+ private final class ProgressTask extends TimerTask
{
/** The total number of records to process. */
private long totalCount;
--
Gitblit v1.10.0