You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/07/05 20:43:53 UTC
svn commit: r1689273 - in /directory/shared/trunk/util/src:
main/java/org/apache/directory/api/util/
test/java/org/apache/directory/api/util/
Author: seelmann
Date: Sun Jul 5 18:43:52 2015
New Revision: 1689273
URL: http://svn.apache.org/r1689273
Log:
Fix checkstyle violations
Modified:
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Chars.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/DateUtils.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Hex.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Serialize.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/StringConstants.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Strings.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Unicode.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/UnicodeConstants.java
directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/GeneralizedTimeTest.java
directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/HexTest.java
directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/MethodUtilsTest.java
directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/OsgiUtilsTest.java
directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/StringsTest.java
directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/UnicodeTest.java
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Chars.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Chars.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Chars.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Chars.java Sun Jul 5 18:43:52 2015
@@ -168,6 +168,11 @@ public final class Chars
false, false, false, false, false, false, false, false };
+ private Chars()
+ {
+ }
+
+
/**
* Test if the current character is equal to a specific character.
*
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/DateUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/DateUtils.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/DateUtils.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/DateUtils.java Sun Jul 5 18:43:52 2015
@@ -46,7 +46,7 @@ public final class DateUtils
{
return GeneralizedTime.getDate( zuluTime );
}
- catch( Exception e )
+ catch ( Exception e )
{
throw new RuntimeException( e );
}
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java Sun Jul 5 18:43:52 2015
@@ -204,14 +204,14 @@ public class GeneralizedTime implements
}
- private void setUp( Calendar calendar )
+ private void setUp( Calendar newCalendar )
{
- if ( calendar == null )
+ if ( newCalendar == null )
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_04358 ) );
}
- this.calendar = calendar;
+ this.calendar = newCalendar;
upGeneralizedTime = null;
upFormat = Format.YEAR_MONTH_DAY_HOUR_MIN_SEC_FRACTION;
upTimeZoneFormat = TimeZoneFormat.Z;
@@ -829,6 +829,10 @@ public class GeneralizedTime implements
break;
+ case YEAR_MONTH_DAY_HOUR:
+ // nothing to add
+ break;
+
case YEAR_MONTH_DAY_HOUR_FRACTION:
// min + sec + millis => fraction of an hour
fraction = 1000 * 60 * clonedCalendar.get( Calendar.MINUTE ) + 1000
@@ -863,6 +867,9 @@ public class GeneralizedTime implements
}
break;
+
+ default:
+ throw new IllegalArgumentException( "Unexpected format " + format );
}
if ( ( timeZoneFormat == TimeZoneFormat.Z ) && clonedCalendar.getTimeZone().hasSameRules( GMT ) )
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Hex.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Hex.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Hex.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Hex.java Sun Jul 5 18:43:52 2015
@@ -32,7 +32,7 @@ import org.apache.directory.api.i18n.I18
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Hex
+public final class Hex
{
/** <hex> ::= [0x30-0x39] | [0x41-0x46] | [0x61-0x66] */
public static final byte[] HEX_VALUE =
@@ -60,6 +60,11 @@ public class Hex
{ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+ private Hex()
+ {
+ }
+
+
/**
* Translate two chars to an hex value. The chars must be
* in [a-fA-F0-9]
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java Sun Jul 5 18:43:52 2015
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OsgiUtils
+public final class OsgiUtils
{
/** A logger */
private static final Logger LOG = LoggerFactory.getLogger( OsgiUtils.class );
@@ -222,4 +222,9 @@ public class OsgiUtils
}
}
}
+
+
+ private OsgiUtils()
+ {
+ }
}
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java Sun Jul 5 18:43:52 2015
@@ -113,10 +113,10 @@ public class SequencedHashMap implements
// per Map.Entry.setValue()
- public Object setValue( Object value )
+ public Object setValue( Object newValue )
{
Object oldValue = this.value;
- this.value = value;
+ this.value = newValue;
return oldValue;
}
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Serialize.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Serialize.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Serialize.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Serialize.java Sun Jul 5 18:43:52 2015
@@ -24,12 +24,17 @@ package org.apache.directory.api.util;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Serialize
+public final class Serialize
{
public static final byte TRUE = 0x01;
public static final byte FALSE = 0x00;
+ private Serialize()
+ {
+ }
+
+
/**
* Write an integer into a buffer at a given position
*
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/StringConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/StringConstants.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/StringConstants.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/StringConstants.java Sun Jul 5 18:43:52 2015
@@ -25,23 +25,28 @@ package org.apache.directory.api.util;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface StringConstants
+public final class StringConstants
{
/**
* The empty String <code>""</code>.
*
* @since 2.0
*/
- String EMPTY = "";
+ public static final String EMPTY = "";
/**
* The empty byte[]
*/
- byte[] EMPTY_BYTES = new byte[]
+ public static final byte[] EMPTY_BYTES = new byte[]
{};
/**
* The empty String[]
*/
- String[] EMPTY_STRINGS = new String[]
+ public static final String[] EMPTY_STRINGS = new String[]
{};
- int NOT_EQUAL = -1;
+ public static final int NOT_EQUAL = -1;
+
+
+ private StringConstants()
+ {
+ }
}
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Strings.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Strings.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Strings.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Strings.java Sun Jul 5 18:43:52 2015
@@ -182,7 +182,7 @@ public final class Strings
( byte ) 0xF0, ( byte ) 0xF1, ( byte ) 0xF2, ( byte ) 0xF3,
( byte ) 0xF4, ( byte ) 0xF5, ( byte ) 0xF6, ( byte ) 0xF7,
( byte ) 0xF8, ( byte ) 0xF9, ( byte ) 0xFA, ( byte ) 0xFB,
- ( byte ) 0xFC, ( byte ) 0xFD, ( byte ) 0xFE,( byte ) 0xFF,
+ ( byte ) 0xFC, ( byte ) 0xFD, ( byte ) 0xFE, ( byte ) 0xFF
};
/** upperCase = 'A' .. 'Z', '0'..'9', '-' */
@@ -2143,18 +2143,18 @@ public final class Strings
return false;
}
- if ( isHex( uuid.charAt(0) ) && isHex( uuid.charAt(1) ) && isHex( uuid.charAt(2) ) && isHex( uuid.charAt(3) )
- && isHex( uuid.charAt(4) ) && isHex( uuid.charAt(5) ) && isHex( uuid.charAt(6) ) && isHex( uuid.charAt(7) )
- && ( uuid.charAt(8) == '-' )
- && isHex( uuid.charAt(9) ) && isHex( uuid.charAt(10) ) && isHex( uuid.charAt(11) ) && isHex( uuid.charAt(12) )
- && ( uuid.charAt(13) == '-' )
- && isHex( uuid.charAt(14) ) && isHex( uuid.charAt(15) ) && isHex( uuid.charAt(16) ) && isHex( uuid.charAt(17) )
- && ( uuid.charAt(18) == '-' )
- && isHex( uuid.charAt(19) ) && isHex( uuid.charAt(20) ) && isHex( uuid.charAt(21) ) && isHex( uuid.charAt(22) )
- && ( uuid.charAt(23) == '-' )
- && isHex( uuid.charAt(24) ) && isHex( uuid.charAt(25) ) && isHex( uuid.charAt(26) ) && isHex( uuid.charAt(27) )
- && isHex( uuid.charAt(28) ) && isHex( uuid.charAt(29) ) && isHex( uuid.charAt(30) ) && isHex( uuid.charAt(31) )
- && isHex( uuid.charAt(32) ) && isHex( uuid.charAt(33) ) && isHex( uuid.charAt(34) ) && isHex( uuid.charAt(35) ) )
+ if ( isHex( uuid.charAt( 0 ) ) && isHex( uuid.charAt( 1 ) ) && isHex( uuid.charAt( 2 ) )
+ && isHex( uuid.charAt( 3 ) ) && isHex( uuid.charAt( 4 ) ) && isHex( uuid.charAt( 5 ) )
+ && isHex( uuid.charAt( 6 ) ) && isHex( uuid.charAt( 7 ) ) && ( uuid.charAt( 8 ) == '-' )
+ && isHex( uuid.charAt( 9 ) ) && isHex( uuid.charAt( 10 ) ) && isHex( uuid.charAt( 11 ) )
+ && isHex( uuid.charAt( 12 ) ) && ( uuid.charAt( 13 ) == '-' ) && isHex( uuid.charAt( 14 ) )
+ && isHex( uuid.charAt( 15 ) ) && isHex( uuid.charAt( 16 ) ) && isHex( uuid.charAt( 17 ) )
+ && ( uuid.charAt( 18 ) == '-' ) && isHex( uuid.charAt( 19 ) ) && isHex( uuid.charAt( 20 ) )
+ && isHex( uuid.charAt( 21 ) ) && isHex( uuid.charAt( 22 ) ) && ( uuid.charAt( 23 ) == '-' )
+ && isHex( uuid.charAt( 24 ) ) && isHex( uuid.charAt( 25 ) ) && isHex( uuid.charAt( 26 ) )
+ && isHex( uuid.charAt( 27 ) ) && isHex( uuid.charAt( 28 ) ) && isHex( uuid.charAt( 29 ) )
+ && isHex( uuid.charAt( 30 ) ) && isHex( uuid.charAt( 31 ) ) && isHex( uuid.charAt( 32 ) )
+ && isHex( uuid.charAt( 33 ) ) && isHex( uuid.charAt( 34 ) ) && isHex( uuid.charAt( 35 ) ) )
{
// There is not that much more we can check.
LOG.debug( "Syntax valid for '{}'", uuid );
@@ -2346,6 +2346,6 @@ public final class Strings
}
}
- return (int)res;
+ return ( int ) res;
}
}
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Unicode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Unicode.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Unicode.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Unicode.java Sun Jul 5 18:43:52 2015
@@ -121,10 +121,7 @@ public final class Unicode
{
// Two bytes char
// 110x-xxyy 10zz-zzzz -> 0000-0xxx yyzz-zzzz
- return ( char ) ( ( ( bytes[pos] & 0x1C ) << 6 ) +
- ( ( bytes[pos] & 0x03 ) << 6 ) +
- ( bytes[pos + 1] & 0x3F )
- );
+ return ( char ) ( ( ( bytes[pos] & 0x1C ) << 6 ) + ( ( bytes[pos] & 0x03 ) << 6 ) + ( bytes[pos + 1] & 0x3F ) );
}
else if ( ( bytes[pos] & UnicodeConstants.UTF8_THREE_BYTES_MASK ) == UnicodeConstants.UTF8_THREE_BYTES )
{
@@ -463,4 +460,9 @@ public final class Unicode
return strBuf.toString();
}
}
+
+
+ private Unicode()
+ {
+ }
}
Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/UnicodeConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/UnicodeConstants.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/UnicodeConstants.java (original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/UnicodeConstants.java Sun Jul 5 18:43:52 2015
@@ -25,22 +25,22 @@ package org.apache.directory.api.util;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface UnicodeConstants
+public final class UnicodeConstants
{
- int UTF8_MULTI_BYTES_MASK = 0x0080;
- int UTF8_TWO_BYTES_MASK = 0x00E0;
- int UTF8_TWO_BYTES = 0x00C0;
- int UTF8_THREE_BYTES_MASK = 0x00F0;
- int UTF8_THREE_BYTES = 0x00E0;
- int UTF8_FOUR_BYTES_MASK = 0x00F8;
- int UTF8_FOUR_BYTES = 0x00F0;
- int UTF8_FIVE_BYTES_MASK = 0x00FC;
- int UTF8_FIVE_BYTES = 0x00F8;
- int UTF8_SIX_BYTES_MASK = 0x00FE;
- int UTF8_SIX_BYTES = 0x00FC;
+ public static final int UTF8_MULTI_BYTES_MASK = 0x0080;
+ public static final int UTF8_TWO_BYTES_MASK = 0x00E0;
+ public static final int UTF8_TWO_BYTES = 0x00C0;
+ public static final int UTF8_THREE_BYTES_MASK = 0x00F0;
+ public static final int UTF8_THREE_BYTES = 0x00E0;
+ public static final int UTF8_FOUR_BYTES_MASK = 0x00F8;
+ public static final int UTF8_FOUR_BYTES = 0x00F0;
+ public static final int UTF8_FIVE_BYTES_MASK = 0x00FC;
+ public static final int UTF8_FIVE_BYTES = 0x00F8;
+ public static final int UTF8_SIX_BYTES_MASK = 0x00FE;
+ public static final int UTF8_SIX_BYTES = 0x00FC;
/** %01-%27 %2B-%5B %5D-%7F */
- boolean[] UNICODE_SUBSET =
+ public static final boolean[] UNICODE_SUBSET =
{
// '\0'
false, true, true, true, true, true, true, true,
@@ -62,10 +62,15 @@ public interface UnicodeConstants
true, true, true, true, true, true, true, true,
true, true, true, true, true, true, true, true,
};
- int CHAR_ONE_BYTE_MASK = 0xFFFFFF80;
- int CHAR_TWO_BYTES_MASK = 0xFFFFF800;
- int CHAR_THREE_BYTES_MASK = 0xFFFF0000;
- int CHAR_FOUR_BYTES_MASK = 0xFFE00000;
- int CHAR_FIVE_BYTES_MASK = 0xFC000000;
- int CHAR_SIX_BYTES_MASK = 0x80000000;
+ public static final int CHAR_ONE_BYTE_MASK = 0xFFFFFF80;
+ public static final int CHAR_TWO_BYTES_MASK = 0xFFFFF800;
+ public static final int CHAR_THREE_BYTES_MASK = 0xFFFF0000;
+ public static final int CHAR_FOUR_BYTES_MASK = 0xFFE00000;
+ public static final int CHAR_FIVE_BYTES_MASK = 0xFC000000;
+ public static final int CHAR_SIX_BYTES_MASK = 0x80000000;
+
+
+ private UnicodeConstants()
+ {
+ }
}
Modified: directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/GeneralizedTimeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/GeneralizedTimeTest.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/GeneralizedTimeTest.java (original)
+++ directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/GeneralizedTimeTest.java Sun Jul 5 18:43:52 2015
@@ -38,7 +38,6 @@ import java.util.TimeZone;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.api.util.GeneralizedTime;
import org.apache.directory.api.util.GeneralizedTime.Format;
import org.apache.directory.api.util.GeneralizedTime.TimeZoneFormat;
import org.junit.Test;
@@ -1215,17 +1214,17 @@ public class GeneralizedTimeTest
originalTime, recalculatedTime );
}
- static DateFormat FORMAT = new SimpleDateFormat( "dd/MM/yyyy HH:mm:ss.SSSS z" );
+ static DateFormat format = new SimpleDateFormat( "dd/MM/yyyy HH:mm:ss.SSSS z" );
@Test
public void fractionCloseToOne() throws ParseException
{
GeneralizedTime close = new GeneralizedTime( "20000101000000.9994Z" );
- assertThat( close.getDate(), is( equalTo( FORMAT.parse( "01/01/2000 00:00:00.999 GMT" ) ) ) );
+ assertThat( close.getDate(), is( equalTo( format.parse( "01/01/2000 00:00:00.999 GMT" ) ) ) );
GeneralizedTime closer = new GeneralizedTime( "20000101000000.9995Z" );
- assertThat( closer.getDate(), is( equalTo( FORMAT.parse( "01/01/2000 00:00:00.999 GMT" ) ) ) );
+ assertThat( closer.getDate(), is( equalTo( format.parse( "01/01/2000 00:00:00.999 GMT" ) ) ) );
}
}
\ No newline at end of file
Modified: directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/HexTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/HexTest.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/HexTest.java (original)
+++ directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/HexTest.java Sun Jul 5 18:43:52 2015
@@ -23,7 +23,6 @@ package org.apache.directory.api.util;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.api.util.Hex;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/MethodUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/MethodUtilsTest.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/MethodUtilsTest.java (original)
+++ directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/MethodUtilsTest.java Sun Jul 5 18:43:52 2015
@@ -32,7 +32,6 @@ import java.util.Collection;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.api.util.MethodUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/OsgiUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/OsgiUtilsTest.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/OsgiUtilsTest.java (original)
+++ directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/OsgiUtilsTest.java Sun Jul 5 18:43:52 2015
@@ -27,7 +27,6 @@ import java.io.File;
import java.io.FileFilter;
import java.util.Set;
-import org.apache.directory.api.util.OsgiUtils;
import org.junit.Test;
@@ -50,8 +49,7 @@ public class OsgiUtilsTest
{
public boolean accept( File pathname )
{
- return pathname.getAbsolutePath().contains( "junit" ) ||
- pathname.getAbsolutePath().contains( "slf4j" );
+ return pathname.getAbsolutePath().contains( "junit" ) || pathname.getAbsolutePath().contains( "slf4j" );
}
};
@@ -77,9 +75,8 @@ public class OsgiUtilsTest
public void testSplitIntoPackageVersions()
{
Set<String> pkgs = OsgiUtils.splitIntoPackages(
- "org.ops4j.store.intern;uses:=\"org.ops4j.store,org.ops4j.io,org.apache.commons.logging\";" +
- "version=\"1.2.2\",org.ops4j.store;uses:=\"org.ops4j.store.intern\";version=\"1.2.2",
- null );
+ "org.ops4j.store.intern;uses:=\"org.ops4j.store,org.ops4j.io,org.apache.commons.logging\";"
+ + "version=\"1.2.2\",org.ops4j.store;uses:=\"org.ops4j.store.intern\";version=\"1.2.2", null );
assertTrue( "org.ops4j.store.intern", pkgs.contains( "org.ops4j.store.intern" ) );
assertTrue( "org.ops4j.store", pkgs.contains( "org.ops4j.store" ) );
@@ -92,29 +89,29 @@ public class OsgiUtilsTest
public void testSplitIntoPackages()
{
Set<String> pkgs = OsgiUtils.splitIntoPackages(
- "org.apache.log4j.net;uses:=\"org.apache.log4j,org.apache.log4j.spi," +
- "javax.naming,org.apache.log4j.helpers,javax.jms,org.apache.log4j.xml," +
- "javax.mail,javax.mail.internet,org.w3c.dom,javax.jmdns\"," +
- "org.apache.log4j.jmx;uses:=\"org.apache.log4j,javax.management," +
- "com.sun.jdmk.comm,org.apache.log4j.helpers,org.apache.log4j.spi\"," +
- "org.apache.log4j.jdbc;uses:=\"org.apache.log4j,org.apache.log4j.spi\"," +
- "org.apache.log4j.config;uses:=\"org.apache.log4j.helpers,org.apache.log4j," +
- "org.apache.log4j.spi\",org.apache.log4j.helpers;uses:=\"org.apache.log4j," +
- "org.apache.log4j.spi,org.apache.log4j.pattern\",org.apache.log4j;uses:=\"" +
- "org.apache.log4j.spi,org.apache.log4j.helpers,org.apache.log4j.pattern," +
- "org.apache.log4j.or,org.apache.log4j.config\",org.apache.log4j.or.jms;" +
- "uses:=\"org.apache.log4j.helpers,javax.jms,org.apache.log4j.or\"," +
- "org.apache.log4j.nt;uses:=\"org.apache.log4j.helpers,org.apache.log4j," +
- "org.apache.log4j.spi\",org.apache.log4j.or.sax;uses:=\"org.apache.log4j.or," +
- "org.xml.sax\",org.apache.log4j.pattern;uses:=\"org.apache.log4j.helpers," +
- "org.apache.log4j.spi,org.apache.log4j,org.apache.log4j.or\"," +
- "org.apache.log4j.spi;uses:=\"org.apache.log4j,org.apache.log4j.helpers," +
- "com.ibm.uvm.tools,org.apache.log4j.or\",org.apache.log4j.or;uses:=\"" +
- "org.apache.log4j.helpers,org.apache.log4j.spi,org.apache.log4j\"," +
- "org.apache.log4j.xml;uses:=\"javax.xml.parsers,org.w3c.dom,org.xml.sax," +
- "org.apache.log4j.config,org.apache.log4j.helpers,org.apache.log4j," +
- "org.apache.log4j.spi,org.apache.log4j.or\",org.apache.log4j.varia;uses:=\"" +
- "org.apache.log4j.spi,org.apache.log4j,org.apache.log4j.helpers\"", null );
+ "org.apache.log4j.net;uses:=\"org.apache.log4j,org.apache.log4j.spi,"
+ + "javax.naming,org.apache.log4j.helpers,javax.jms,org.apache.log4j.xml,"
+ + "javax.mail,javax.mail.internet,org.w3c.dom,javax.jmdns\","
+ + "org.apache.log4j.jmx;uses:=\"org.apache.log4j,javax.management,"
+ + "com.sun.jdmk.comm,org.apache.log4j.helpers,org.apache.log4j.spi\","
+ + "org.apache.log4j.jdbc;uses:=\"org.apache.log4j,org.apache.log4j.spi\","
+ + "org.apache.log4j.config;uses:=\"org.apache.log4j.helpers,org.apache.log4j,"
+ + "org.apache.log4j.spi\",org.apache.log4j.helpers;uses:=\"org.apache.log4j,"
+ + "org.apache.log4j.spi,org.apache.log4j.pattern\",org.apache.log4j;uses:=\""
+ + "org.apache.log4j.spi,org.apache.log4j.helpers,org.apache.log4j.pattern,"
+ + "org.apache.log4j.or,org.apache.log4j.config\",org.apache.log4j.or.jms;"
+ + "uses:=\"org.apache.log4j.helpers,javax.jms,org.apache.log4j.or\","
+ + "org.apache.log4j.nt;uses:=\"org.apache.log4j.helpers,org.apache.log4j,"
+ + "org.apache.log4j.spi\",org.apache.log4j.or.sax;uses:=\"org.apache.log4j.or,"
+ + "org.xml.sax\",org.apache.log4j.pattern;uses:=\"org.apache.log4j.helpers,"
+ + "org.apache.log4j.spi,org.apache.log4j,org.apache.log4j.or\","
+ + "org.apache.log4j.spi;uses:=\"org.apache.log4j,org.apache.log4j.helpers,"
+ + "com.ibm.uvm.tools,org.apache.log4j.or\",org.apache.log4j.or;uses:=\""
+ + "org.apache.log4j.helpers,org.apache.log4j.spi,org.apache.log4j\","
+ + "org.apache.log4j.xml;uses:=\"javax.xml.parsers,org.w3c.dom,org.xml.sax,"
+ + "org.apache.log4j.config,org.apache.log4j.helpers,org.apache.log4j,"
+ + "org.apache.log4j.spi,org.apache.log4j.or\",org.apache.log4j.varia;uses:=\""
+ + "org.apache.log4j.spi,org.apache.log4j,org.apache.log4j.helpers\"", null );
assertTrue( "org.apache.log4j.net", pkgs.contains( "org.apache.log4j.net" ) );
assertTrue( "org.apache.log4j.jmx", pkgs.contains( "org.apache.log4j.jmx" ) );
Modified: directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/StringsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/StringsTest.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/StringsTest.java (original)
+++ directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/StringsTest.java Sun Jul 5 18:43:52 2015
@@ -29,7 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.directory.api.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/UnicodeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/UnicodeTest.java?rev=1689273&r1=1689272&r2=1689273&view=diff
==============================================================================
--- directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/UnicodeTest.java (original)
+++ directory/shared/trunk/util/src/test/java/org/apache/directory/api/util/UnicodeTest.java Sun Jul 5 18:43:52 2015
@@ -33,8 +33,6 @@ import java.util.Arrays;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.api.util.Strings;
-import org.apache.directory.api.util.Unicode;
import org.junit.Test;
import org.junit.runner.RunWith;