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/20 21:56:13 UTC
svn commit: r1692016 - in /directory/shared/trunk/ldap/extras:
codec-api/src/checkstyle/
codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/
codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ad/
codec-api/src/main...
Author: seelmann
Date: Mon Jul 20 19:56:12 2015
New Revision: 1692016
URL: http://svn.apache.org/r1692016
Log:
Fix checkstyle violations
Modified:
directory/shared/trunk/ldap/extras/codec-api/src/checkstyle/suppressions.xml
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncModifyDnType.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewResponseImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseGrammar.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java
directory/shared/trunk/ldap/extras/trigger/src/checkstyle/suppressions.xml
Modified: directory/shared/trunk/ldap/extras/codec-api/src/checkstyle/suppressions.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/checkstyle/suppressions.xml?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/checkstyle/suppressions.xml (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/checkstyle/suppressions.xml Mon Jul 20 19:56:12 2015
@@ -24,4 +24,6 @@
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
+ <!-- Contol inferfaces that don't declare any new method -->
+ <suppress files="org.apache.directory.api.ldap.extras.extended" checks="InterfaceIsType" />
</suppressions>
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncModifyDnType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncModifyDnType.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncModifyDnType.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncModifyDnType.java Mon Jul 20 19:56:12 2015
@@ -71,8 +71,9 @@ public enum SyncModifyDnType
case 2:
return MOVE_AND_RENAME;
- }
- throw new IllegalArgumentException( "unknown modify dn operantion type " + value );
+ default:
+ throw new IllegalArgumentException( "unknown modify dn operantion type " + value );
+ }
}
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncImpl.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/ad/AdDirSyncImpl.java Mon Jul 20 19:56:12 2015
@@ -124,7 +124,7 @@ public class AdDirSyncImpl extends Abstr
if ( cookie != null )
{
this.cookie = new byte[cookie.length];
- System.arraycopy( cookie, 0, this.cookie, 0,cookie.length );
+ System.arraycopy( cookie, 0, this.cookie, 0, cookie.length );
}
else
{
@@ -175,10 +175,10 @@ public class AdDirSyncImpl extends Abstr
AdDirSync otherControl = ( AdDirSync ) o;
- return ( maxReturnLength == otherControl.getMaxReturnLength() ) &&
- ( parentFirst == otherControl.getParentFirst() ) &&
- ( Arrays.equals( cookie, otherControl.getCookie() ) &&
- ( isCritical() == otherControl.isCritical() ) );
+ return ( maxReturnLength == otherControl.getMaxReturnLength() )
+ && ( parentFirst == otherControl.getParentFirst() )
+ && ( Arrays.equals( cookie, otherControl.getCookie() ) )
+ && ( isCritical() == otherControl.isCritical() );
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java Mon Jul 20 19:56:12 2015
@@ -139,9 +139,9 @@ public class SyncDoneValueImpl extends A
SyncDoneValue otherControl = ( SyncDoneValue ) o;
- return ( refreshDeletes == otherControl.isRefreshDeletes() ) &&
- ( Arrays.equals( cookie, otherControl.getCookie() ) &&
- ( isCritical() == otherControl.isCritical() ) );
+ return ( refreshDeletes == otherControl.isRefreshDeletes() )
+ && ( Arrays.equals( cookie, otherControl.getCookie() ) )
+ && ( isCritical() == otherControl.isCritical() );
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java Mon Jul 20 19:56:12 2015
@@ -270,11 +270,11 @@ public class SyncInfoValueImpl extends A
}
}
- return ( refreshDeletes == otherControl.isRefreshDeletes() ) &&
- ( refreshDone == otherControl.isRefreshDone() ) &&
- ( type == otherControl.getType() ) &&
- ( Arrays.equals( cookie, otherControl.getCookie() ) &&
- ( isCritical() == otherControl.isCritical() ) );
+ return ( refreshDeletes == otherControl.isRefreshDeletes() )
+ && ( refreshDone == otherControl.isRefreshDone() )
+ && ( type == otherControl.getType() )
+ && ( Arrays.equals( cookie, otherControl.getCookie() ) )
+ && ( isCritical() == otherControl.isCritical() );
}
@@ -359,6 +359,9 @@ public class SyncInfoValueImpl extends A
}
break;
+
+ default:
+ throw new IllegalArgumentException( "Unexpected SynchronizationInfo: " + getType() );
}
return sb.toString();
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java Mon Jul 20 19:56:12 2015
@@ -184,9 +184,9 @@ public class SyncRequestValueImpl extend
SyncRequestValue otherControl = ( SyncRequestValue ) o;
- return ( mode == otherControl.getMode() ) &&
- ( isReloadHint == otherControl.isReloadHint() ) &&
- ( Arrays.equals( cookie, otherControl.getCookie() ) );
+ return ( mode == otherControl.getMode() )
+ && ( isReloadHint == otherControl.isReloadHint() )
+ && ( Arrays.equals( cookie, otherControl.getCookie() ) );
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java Mon Jul 20 19:56:12 2015
@@ -168,10 +168,10 @@ public class SyncStateValueImpl extends
SyncStateValue otherControl = ( SyncStateValue ) o;
- return ( type == otherControl.getSyncStateType() ) &&
- ( Arrays.equals( entryUuid, otherControl.getEntryUUID() ) ) &&
- ( Arrays.equals( cookie, otherControl.getCookie() ) &&
- ( isCritical() == otherControl.isCritical() ) );
+ return ( type == otherControl.getSyncStateType() )
+ && ( Arrays.equals( entryUuid, otherControl.getEntryUUID() ) )
+ && ( Arrays.equals( cookie, otherControl.getCookie() ) )
+ && ( isCritical() == otherControl.isCritical() );
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewRequestImpl.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewRequestImpl.java Mon Jul 20 19:56:12 2015
@@ -251,11 +251,11 @@ public class VirtualListViewRequestImpl
VirtualListViewRequestImpl otherControl = ( VirtualListViewRequestImpl ) o;
- return ( beforeCount == otherControl.getBeforeCount() ) &&
- ( afterCount == otherControl.getAfterCount() ) &&
- ( offset == otherControl.getOffset() ) &&
- ( contentCount == otherControl.getContentCount() ) &&
- Arrays.equals( contextId, otherControl.getContextId() );
+ return ( beforeCount == otherControl.getBeforeCount() )
+ && ( afterCount == otherControl.getAfterCount() )
+ && ( offset == otherControl.getOffset() )
+ && ( contentCount == otherControl.getContentCount() )
+ && Arrays.equals( contextId, otherControl.getContextId() );
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewResponseImpl.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv/VirtualListViewResponseImpl.java Mon Jul 20 19:56:12 2015
@@ -158,10 +158,10 @@ public class VirtualListViewResponseImpl
VirtualListViewResponseImpl otherControl = ( VirtualListViewResponseImpl ) o;
- return ( targetPosition == otherControl.getTargetPosition() ) &&
- ( contentCount == otherControl.getContentCount() ) &&
- ( virtualListViewResult == otherControl.getVirtualListViewResult() ) &&
- Arrays.equals( contextId, otherControl.getContextId() );
+ return ( targetPosition == otherControl.getTargetPosition() )
+ && ( contentCount == otherControl.getContentCount() )
+ && ( virtualListViewResult == otherControl.getVirtualListViewResult() )
+ && Arrays.equals( contextId, otherControl.getContextId() );
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java Mon Jul 20 19:56:12 2015
@@ -252,8 +252,8 @@ public class StoredProcedureRequestImpl
}
catch ( IntegerDecoderException e )
{
- throw new RuntimeException( "Failed to decode INTEGER: " +
- Strings.dumpBytes( ( byte[] ) obj ), e );
+ throw new RuntimeException( "Failed to decode INTEGER: "
+ + Strings.dumpBytes( ( byte[] ) obj ), e );
}
}
else
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java Mon Jul 20 19:56:12 2015
@@ -49,7 +49,7 @@ import org.apache.directory.api.asn1.ber
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PasswordPolicyGrammar extends AbstractGrammar<PasswordPolicyContainer>
+public final class PasswordPolicyGrammar extends AbstractGrammar<PasswordPolicyContainer>
{
/** PasswordPolicyResponseControlGrammar singleton instance */
private static final PasswordPolicyGrammar INSTANCE = new PasswordPolicyGrammar();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java Mon Jul 20 19:56:12 2015
@@ -414,6 +414,11 @@ public class SyncInfoValueDecorator exte
BerValue.encode( buffer, syncUUID );
}
}
+
+ break;
+
+ default:
+ throw new IllegalArgumentException( "Unexpected SynchronizationInfo: " + getType() );
}
return buffer;
@@ -520,6 +525,11 @@ public class SyncInfoValueDecorator exte
BerValue.encode( buffer, syncUUID );
}
}
+
+ break;
+
+ default:
+ throw new IllegalArgumentException( "Unexpected SynchronizationInfo: " + getType() );
}
value = buffer.array();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewRequestGrammar.java Mon Jul 20 19:56:12 2015
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class VirtualListViewRequestGrammar extends AbstractGrammar<VirtualListViewRequestContainer>
+public final class VirtualListViewRequestGrammar extends AbstractGrammar<VirtualListViewRequestContainer>
{
static final Logger LOG = LoggerFactory.getLogger( VirtualListViewRequestGrammar.class );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseGrammar.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/VirtualListViewResponseGrammar.java Mon Jul 20 19:56:12 2015
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class VirtualListViewResponseGrammar extends AbstractGrammar<VirtualListViewResponseContainer>
+public final class VirtualListViewResponseGrammar extends AbstractGrammar<VirtualListViewResponseContainer>
{
static final Logger LOG = LoggerFactory.getLogger( VirtualListViewResponseGrammar.class );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectResponseDecorator.java Mon Jul 20 19:56:12 2015
@@ -210,8 +210,8 @@ public class GracefulDisconnectResponseD
gracefulDisconnectSequenceLength += 1 + 1 + BerValue.getNbBytes( gracefulDisconnectResponse.getDelay() );
}
- if ( ( gracefulDisconnectResponse.getReplicatedContexts() != null ) &&
- ( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() != 0 ) )
+ if ( ( gracefulDisconnectResponse.getReplicatedContexts() != null )
+ && ( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() != 0 ) )
{
replicatedContextsLength = 0;
@@ -261,8 +261,8 @@ public class GracefulDisconnectResponseD
bb.put( BerValue.getBytes( gracefulDisconnectResponse.getDelay() ) );
}
- if ( ( gracefulDisconnectResponse.getReplicatedContexts() != null ) &&
- ( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() != 0 ) )
+ if ( ( gracefulDisconnectResponse.getReplicatedContexts() != null )
+ && ( gracefulDisconnectResponse.getReplicatedContexts().getLdapUrls().size() != 0 ) )
{
bb.put( UniversalTag.SEQUENCE.getValue() );
bb.put( TLV.getBytes( replicatedContextsLength ) );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/whoAmI/WhoAmIResponseDecorator.java Mon Jul 20 19:56:12 2015
@@ -206,8 +206,8 @@ public class WhoAmIResponseDecorator ext
{
if ( whoAmIResponse.getAuthzId() != null )
{
- return 1 + TLV.getNbBytes( whoAmIResponse.getAuthzId().length ) +
- whoAmIResponse.getAuthzId().length;
+ return 1 + TLV.getNbBytes( whoAmIResponse.getAuthzId().length )
+ + whoAmIResponse.getAuthzId().length;
}
else
{
Modified: directory/shared/trunk/ldap/extras/trigger/src/checkstyle/suppressions.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/src/checkstyle/suppressions.xml?rev=1692016&r1=1692015&r2=1692016&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/src/checkstyle/suppressions.xml (original)
+++ directory/shared/trunk/ldap/extras/trigger/src/checkstyle/suppressions.xml Mon Jul 20 19:56:12 2015
@@ -24,21 +24,5 @@
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
- <!-- UnixCrypt is from external, no formatting is applied -->
- <suppress files="org.apache.directory.api.util.UnixCrypt" checks="[A-Za-z0-9]" />
-
- <!-- hashcode() is final in super class -->
- <suppress files="org.apache.directory.api.ldap.model.schema.SyntaxChecker" checks="EqualsHashCode" />
- <suppress files="org.apache.directory.api.ldap.model.schema.Normalizer" checks="EqualsHashCode" />
- <suppress files="org.apache.directory.api.ldap.model.schema.LoadableSchemaObject" checks="EqualsHashCode" />
- <suppress files="org.apache.directory.api.ldap.model.schema.LdapComparator" checks="EqualsHashCode" />
- <suppress files="org.apache.directory.api.ldap.model.schema.DITStructureRule" checks="EqualsHashCode" />
-
- <!-- No Javadoc for schema constants required -->
- <suppress files="org.apache.directory.api.ldap.model.constants.SchemaConstants" checks="JavadocVariable" />
- <suppress files="org.apache.directory.api.ldap.model.constants.MetaSchemaConstants" checks="JavadocVariable" />
- <suppress files="org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants" checks="JavadocVariable" />
-
- <!-- Classes in org.apache.directory.api.asn1.der are forked from Bouncy Castle -->
- <suppress files="org.apache.directory.api.asn1.der" checks="[A-Za-z0-9]" />
+ <suppress files="org.apache.directory.api.ldap.trigger.StoredProcedureParameter" checks="TypeName" />
</suppressions>