From 408a711cd4251ad3c56cc6a4d70a64c684778779 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 10 Feb 2014 11:38:10 +0000
Subject: [PATCH] StaticUtils.java: Made stackTraceToSingleLineString() delegate calls to com.forgerock.opendj.util.StaticUtils.stackTraceToSingleLineString().
---
/dev/null | 91 ------------------------------
opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java | 77 +------------------------
2 files changed, 5 insertions(+), 163 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java b/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
index f3109b4..fc0ba7d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
@@ -54,6 +54,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.*;
+
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
@@ -1623,9 +1624,8 @@
*/
public static String stackTraceToSingleLineString(Throwable t)
{
- StringBuilder buffer = new StringBuilder();
- stackTraceToSingleLineString(buffer, t);
- return buffer.toString();
+ return com.forgerock.opendj.util.StaticUtils.stackTraceToSingleLineString(
+ t, DynamicConstants.DEBUG_BUILD);
}
@@ -1640,75 +1640,8 @@
public static void stackTraceToSingleLineString(StringBuilder buffer,
Throwable t)
{
- if (t == null)
- {
- return;
- }
-
- if (DynamicConstants.DEBUG_BUILD)
- {
- buffer.append(t);
-
- for (StackTraceElement e : t.getStackTrace())
- {
- buffer.append(" / ");
- buffer.append(e.getFileName());
- buffer.append(":");
- buffer.append(e.getLineNumber());
- }
-
- while (t.getCause() != null)
- {
- t = t.getCause();
-
- buffer.append("; caused by ");
- buffer.append(t);
-
- for (StackTraceElement e : t.getStackTrace())
- {
- buffer.append(" / ");
- buffer.append(e.getFileName());
- buffer.append(":");
- buffer.append(e.getLineNumber());
- }
- }
- }
- else
- {
- if ((t instanceof InvocationTargetException) && (t.getCause() != null))
- {
- t = t.getCause();
- }
-
- buffer.append(t.getClass().getSimpleName());
- final String message = t.getMessage();
- if (message != null && message.length() != 0)
- {
- buffer.append(": ").append(message);
- }
-
- int i=0;
- buffer.append(" (");
- for (StackTraceElement e : t.getStackTrace())
- {
- if (i > 20)
- {
- buffer.append(" ...");
- break;
- }
- else if (i > 0)
- {
- buffer.append(" ");
- }
-
- buffer.append(e.getFileName());
- buffer.append(":");
- buffer.append(e.getLineNumber());
- i++;
- }
-
- buffer.append(")");
- }
+ com.forgerock.opendj.util.StaticUtils.stackTraceToSingleLineString(
+ buffer, t, DynamicConstants.DEBUG_BUILD);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/StaticUtilsTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/StaticUtilsTest.java
deleted file mode 100644
index a681a83..0000000
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/StaticUtilsTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * Copyright 2014 ForgeRock AS
- */
-package org.opends.server.util;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.assertj.core.api.Assertions.*;
-
-@SuppressWarnings("javadoc")
-public class StaticUtilsTest extends UtilTestCase
-{
-
- @DataProvider
- public Object[][] stackTraceToSingleLineString()
- {
- final String message = "This is a tremendous error message";
- final String noMessageStackTrace = "Exception (" + getClass().getSimpleName() + ".java:";
- final String messageStackTrace = "Exception: " + message + " (" + getClass().getSimpleName() + ".java:";
- return new Object[][] {
- { null, "" },
- { new Exception(), noMessageStackTrace },
- { new Exception(message), messageStackTrace },
- { new Exception(new Exception()), "Exception: java.lang.Exception (" + getClass().getSimpleName() + ".java:" },
- { new Exception(message, new Exception()), messageStackTrace },
- { new InvocationTargetException(null), "InvocationTargetException (" + getClass().getSimpleName() + ".java:" },
- { new InvocationTargetException(new Exception()), noMessageStackTrace },
- { new InvocationTargetException(new Exception(message)), messageStackTrace },
- };
- }
-
- @Test(dataProvider = "stackTraceToSingleLineString")
- public void stackTraceToSingleLineString(Throwable t, String startOfOutput)
- {
- assertThat(StaticUtils.stackTraceToSingleLineString(t)).startsWith(startOfOutput);
- }
-
- @DataProvider
- public Object[][] stackTraceToSingleLineStringInDebugBuild()
- {
- final String message = "This is a tremendous error message";
- final String messageStackTrace = "java.lang.Exception: " + message + " / " + getClass().getSimpleName() + ".java:";
- return new Object[][] {
- { null, "" },
- { new Exception(), "java.lang.Exception / " + getClass().getSimpleName() + ".java:" },
- { new Exception(message), messageStackTrace },
- { new Exception(new Exception()), "java.lang.Exception: java.lang.Exception / " + getClass().getSimpleName() + ".java:" },
- { new Exception(message, new Exception()), messageStackTrace },
- };
- }
-
- @Test(dataProvider = "stackTraceToSingleLineStringInDebugBuild")
- public void stackTraceToSingleLineStringInDebugBuild(Throwable t, String startOfOutput)
- {
- final boolean orig = DynamicConstants.DEBUG_BUILD;
- DynamicConstants.DEBUG_BUILD = true;
- try
- {
- assertThat(StaticUtils.stackTraceToSingleLineString(t)).startsWith(startOfOutput);
- }
- finally
- {
- DynamicConstants.DEBUG_BUILD = orig;
- }
- }
-
-}
--
Gitblit v1.10.0