You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/11/28 06:08:21 UTC
svn commit: r1771684 - in /directory/shared/branches/shared-value:
integ-osgi/src/test/java/org/apache/directory/api/osgi/
util/src/main/java/org/apache/directory/api/util/
Author: elecharny
Date: Mon Nov 28 06:08:21 2016
New Revision: 1771684
URL: http://svn.apache.org/viewvc?rev=1771684&view=rev
Log:
o Fixed Sonarlint warnings
Modified:
directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapCodecCoreOsgiTest.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/AbstractSimpleComponentsMonitor.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/ComponentsMonitor.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/DateUtils.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Hex.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/MandatoryAndOptionalComponentsMonitor.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/NoDuplicateKeysMap.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/StringConstants.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Unicode.java
Modified: directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapCodecCoreOsgiTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapCodecCoreOsgiTest.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapCodecCoreOsgiTest.java (original)
+++ directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapCodecCoreOsgiTest.java Mon Nov 28 06:08:21 2016
@@ -27,12 +27,12 @@ import static org.junit.Assert.assertTru
import javax.inject.Inject;
import org.apache.directory.api.ldap.codec.LdapStatesEnum;
-import org.apache.directory.api.ldap.codec.actions.addRequest.InitAddRequest;
-import org.apache.directory.api.ldap.codec.actions.addResponse.InitAddResponse;
-import org.apache.directory.api.ldap.codec.actions.bindRequest.InitBindRequest;
-import org.apache.directory.api.ldap.codec.actions.bindResponse.InitBindResponse;
-import org.apache.directory.api.ldap.codec.actions.searchRequest.InitSearchRequest;
-import org.apache.directory.api.ldap.codec.actions.searchResultDone.InitSearchResultDone;
+import org.apache.directory.api.ldap.codec.actions.request.add.InitAddRequest;
+import org.apache.directory.api.ldap.codec.actions.request.bind.InitBindRequest;
+import org.apache.directory.api.ldap.codec.actions.request.search.InitSearchRequest;
+import org.apache.directory.api.ldap.codec.actions.response.add.InitAddResponse;
+import org.apache.directory.api.ldap.codec.actions.response.bind.InitBindResponse;
+import org.apache.directory.api.ldap.codec.actions.response.search.done.InitSearchResultDone;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.api.ldap.codec.decorators.SearchRequestDecorator;
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/AbstractSimpleComponentsMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/AbstractSimpleComponentsMonitor.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/AbstractSimpleComponentsMonitor.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/AbstractSimpleComponentsMonitor.java Mon Nov 28 06:08:21 2016
@@ -57,7 +57,7 @@ public abstract class AbstractSimpleComp
* {@inheritDoc}
*/
@Override
- public ComponentsMonitor useComponent( String component ) throws IllegalArgumentException
+ public ComponentsMonitor useComponent( String component )
{
if ( !components.remove( component ) )
{
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/ComponentsMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/ComponentsMonitor.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/ComponentsMonitor.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/ComponentsMonitor.java Mon Nov 28 06:08:21 2016
@@ -38,7 +38,7 @@ public interface ComponentsMonitor
* @return this components monitor
* @throws IllegalArgumentException if the component is already used
*/
- ComponentsMonitor useComponent( String component ) throws IllegalArgumentException;
+ ComponentsMonitor useComponent( String component );
/**
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/DateUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/DateUtils.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/DateUtils.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/DateUtils.java Mon Nov 28 06:08:21 2016
@@ -118,7 +118,7 @@ public final class DateUtils
long offset = 11644473600000L; // offset milliseconds from Jan 1, 1601 to Jan 1, 1970
// convert 100-nanosecond intervals to milliseconds (10000 = 1 000 000ns / 100)
- long javaTime = ( Long.parseLong( intervalDate ) / 10000L - offset );
+ long javaTime = Long.parseLong( intervalDate ) / 10000L - offset;
return new Date( javaTime );
}
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/GeneralizedTime.java Mon Nov 28 06:08:21 2016
@@ -206,22 +206,6 @@ public class GeneralizedTime implements
}
- private void setUp( Calendar newCalendar )
- {
- if ( newCalendar == null )
- {
- throw new IllegalArgumentException( I18n.err( I18n.ERR_04358 ) );
- }
-
- this.calendar = newCalendar;
- upGeneralizedTime = null;
- upFormat = Format.YEAR_MONTH_DAY_HOUR_MIN_SEC_FRACTION;
- upTimeZoneFormat = TimeZoneFormat.Z;
- upFractionDelimiter = FractionDelimiter.DOT;
- upFractionLength = 3;
- }
-
-
/**
* Creates a new instance of GeneralizedTime, based on the
* given generalized time string.
@@ -369,6 +353,22 @@ public class GeneralizedTime implements
}
+ private void setUp( Calendar newCalendar )
+ {
+ if ( newCalendar == null )
+ {
+ throw new IllegalArgumentException( I18n.err( I18n.ERR_04358 ) );
+ }
+
+ this.calendar = newCalendar;
+ upGeneralizedTime = null;
+ upFormat = Format.YEAR_MONTH_DAY_HOUR_MIN_SEC_FRACTION;
+ upTimeZoneFormat = TimeZoneFormat.Z;
+ upFractionDelimiter = FractionDelimiter.DOT;
+ upFractionLength = 3;
+ }
+
+
private void parseTimezone( int pos ) throws ParseException
{
if ( upGeneralizedTime.length() < pos + 1 )
@@ -973,6 +973,7 @@ public class GeneralizedTime implements
*
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo( GeneralizedTime other )
{
return calendar.compareTo( other.calendar );
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Hex.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Hex.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Hex.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Hex.java Mon Nov 28 06:08:21 2016
@@ -80,7 +80,7 @@ public final class Hex
return -1;
}
- return ( byte ) ( ( HEX_VALUE[high] << 4 ) | HEX_VALUE[low] );
+ return ( byte ) ( ( HEX_VALUE[high] << 4 ) | HEX_VALUE[low] & 0xff );
}
@@ -99,7 +99,7 @@ public final class Hex
return -1;
}
- return ( byte ) ( ( HEX_VALUE[high] << 4 ) | HEX_VALUE[low] );
+ return ( byte ) ( ( HEX_VALUE[high] << 4 ) | HEX_VALUE[low] & 0xff );
}
@@ -152,7 +152,7 @@ public final class Hex
for ( int ii = 1, jj = 0; ii < chars.length; ii += 2, jj++ )
{
int ch = ( HEX_VALUE[chars[ii]] << 4 )
- + HEX_VALUE[chars[ii + 1]];
+ + ( HEX_VALUE[chars[ii + 1]] & 0xff );
decoded[jj] = ( byte ) ch;
}
@@ -196,7 +196,7 @@ public final class Hex
if ( Chars.isHex( str, i + 1 ) && Chars.isHex( str, i + 2 ) )
{
byte value = ( byte ) ( ( HEX_VALUE[str.charAt( i + 1 )] << 4 )
- + HEX_VALUE[str.charAt( i + 2 )] );
+ + ( HEX_VALUE[str.charAt( i + 2 )] & 0xff ) );
i += 2;
buf[pos++] = value;
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/MandatoryAndOptionalComponentsMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/MandatoryAndOptionalComponentsMonitor.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/MandatoryAndOptionalComponentsMonitor.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/MandatoryAndOptionalComponentsMonitor.java Mon Nov 28 06:08:21 2016
@@ -52,7 +52,6 @@ public class MandatoryAndOptionalCompone
* @throws IllegalArgumentException if the same component is defined as mandatory and optional
*/
public MandatoryAndOptionalComponentsMonitor( String[] mandatoryComponents, String[] optionalComponents )
- throws IllegalArgumentException
{
// check for common elements
for ( int i = 0; i < mandatoryComponents.length; i++ )
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/NoDuplicateKeysMap.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/NoDuplicateKeysMap.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/NoDuplicateKeysMap.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/NoDuplicateKeysMap.java Mon Nov 28 06:08:21 2016
@@ -47,7 +47,7 @@ public class NoDuplicateKeysMap extends
*/
@SuppressWarnings("unchecked")
@Override
- public Object put( Object key, Object value ) throws IllegalArgumentException
+ public Object put( Object key, Object value )
{
if ( containsKey( key ) )
{
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/OsgiUtils.java Mon Nov 28 06:08:21 2016
@@ -194,10 +194,8 @@ public final class OsgiUtils
*/
public static String getBundleExports( File bundle )
{
- JarFile jar = null;
- try
+ try ( JarFile jar = new JarFile( bundle ) )
{
- jar = new JarFile( bundle );
Manifest manifest = jar.getManifest();
if ( manifest == null )
@@ -207,7 +205,7 @@ public final class OsgiUtils
for ( Map.Entry<Object, Object> attr : manifest.getMainAttributes().entrySet() )
{
- if ( attr.getKey().toString().equals( "Export-Package" ) )
+ if ( "Export-Package".equals( attr.getKey().toString() ) )
{
return attr.getValue().toString();
}
@@ -220,19 +218,5 @@ public final class OsgiUtils
LOG.error( "Failed to open jar file or manifest.", e );
throw new RuntimeException( "Failed to open jar file or manifest.", e );
}
- finally
- {
- if ( jar != null )
- {
- try
- {
- jar.close();
- }
- catch ( IOException e )
- {
- e.printStackTrace();
- }
- }
- }
}
}
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/StringConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/StringConstants.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/StringConstants.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/StringConstants.java Mon Nov 28 06:08:21 2016
@@ -33,11 +33,7 @@ public final class StringConstants
* @since 2.0
*/
public static final String EMPTY = "";
- /**
- * The empty byte[]
- */
- public static final byte[] EMPTY_BYTES = new byte[]
- {};
+
/**
* The empty String[]
*/
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java Mon Nov 28 06:08:21 2016
@@ -350,15 +350,15 @@ public final class Strings
}
char ch;
- char[] buf = str.toCharArray();
- char[] newbuf = new char[buf.length];
+ int length = str.length();
+ char[] newbuf = new char[length];
boolean wsSeen = false;
boolean isStart = true;
int pos = 0;
- for ( int i = 0; i < str.length(); i++ )
+ for ( int i = 0; i < length; i++ )
{
- ch = buf[i];
+ ch = str.charAt( i );
// filter out all uppercase characters
if ( toLowerCase && Character.isUpperCase( ch ) )
@@ -577,9 +577,9 @@ public final class Strings
StringBuilder buf = new StringBuilder();
int len = source.length();
- for ( int ii = 0; ii < len; ii++ )
+ for ( int i = 0; i < len; i++ )
{
- char ch = source.charAt( ii );
+ char ch = source.charAt( i );
switch ( ch )
{
@@ -1059,7 +1059,7 @@ public final class Strings
{
if ( isEmpty( bytes ) )
{
- return StringConstants.EMPTY_BYTES;
+ return EMPTY_BYTES;
}
int start = trimLeft( bytes, 0 );
@@ -1077,7 +1077,7 @@ public final class Strings
}
else
{
- return StringConstants.EMPTY_BYTES;
+ return EMPTY_BYTES;
}
}
@@ -1878,6 +1878,7 @@ public final class Strings
*
* @param value The String to lowercase
* @return The lowercase string
+ * @deprecated Use {@link #toLowerCaseAscii(String)}
*/
@Deprecated
public static String toLowerCase( String value )
@@ -1956,6 +1957,7 @@ public final class Strings
* Deprecated Use {@link #toUpperCaseAscii(String)}
* @param value The String to uppercase
* @return The uppercase string
+ * @deprecated Use {@link #toUpperCaseAscii(String)}
*/
@Deprecated
public static String toUpperCase( String value )
@@ -2281,7 +2283,7 @@ public final class Strings
{
if ( isEmpty( value ) )
{
- return StringConstants.EMPTY_BYTES;
+ return EMPTY_BYTES;
}
byte[] copy = new byte[value.length];
@@ -2359,7 +2361,6 @@ public final class Strings
*
* @param value The string to parse
* @return the parsed value.
- * @throws NumberFormatException If we don't have a number
*/
public static int parseInt( String value )
{
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Unicode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Unicode.java?rev=1771684&r1=1771683&r2=1771684&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Unicode.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Unicode.java Mon Nov 28 06:08:21 2016
@@ -487,7 +487,7 @@ public final class Unicode
// Start reading the string
StringBuilder strBuf = new StringBuilder( objectInput.readUTF() );
- if ( strLength == 0 && strBuf.toString().equals( "null" ) )
+ if ( ( strLength == 0 ) && ( "null".equals( strBuf.toString() ) ) )
{
// The special case of a 'null' string
return null;