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 2018/07/14 06:17:49 UTC
[directory-ldap-api] branch master updated: Many little SONAR fixes
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
The following commit(s) were added to refs/heads/master by this push:
new 09e13f8 Many little SONAR fixes
09e13f8 is described below
commit 09e13f846c06dee7f17448834af4b2c240154fcb
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Sat Jul 14 08:17:44 2018 +0200
Many little SONAR fixes
---
.../ldap/client/api/LdapNetworkConnection.java | 4 +-
.../search/filter/InitAssertionValueFilter.java | 3 +-
.../response/bind/StoreServerSASLCreds.java | 3 +-
.../extended/StoreExtendedResponseValue.java | 3 +-
.../reference/InitSearchResultReference.java | 3 +-
.../search/pagedSearch/PagedResultsGrammar.java | 2 +-
.../codec/standalone/StandaloneLdapApiService.java | 9 ++--
.../endTransaction/EndTransactionResponseImpl.java | 13 +++--
.../extras/controls/ad_impl/AdDirSyncGrammar.java | 2 +-
.../extras/controls/ppolicy_impl/PPolicyInit.java | 3 +-
.../syncrepl_impl/SyncDoneValueGrammar.java | 4 +-
.../syncrepl_impl/SyncRequestValueGrammar.java | 2 +-
.../syncrepl_impl/SyncStateValueGrammar.java | 4 +-
.../controls/vlv_impl/InitByOffsetSequence.java | 3 +-
.../vlv_impl/InitVirtualListViewRequest.java | 3 +-
.../certGeneration/CertGenerationGrammar.java | 2 +-
.../pwdModify/PasswordModifyRequestGrammar.java | 13 +++--
.../pwdModify/PasswordModifyResponseGrammar.java | 3 +-
.../storedProcedure/StoredProcedureGrammar.java | 2 +-
.../syncrepl_impl/SyncInfoValueGrammar.java | 6 +--
.../api/ldap/model/entry/DefaultAttribute.java | 2 +-
.../api/ldap/model/entry/DefaultEntry.java | 2 -
.../directory/api/ldap/model/entry/Value.java | 39 ++++++---------
.../api/ldap/model/filter/AssertionNode.java | 2 +-
.../api/ldap/model/filter/ExtensibleNode.java | 2 +-
.../directory/api/ldap/model/filter/ScopeNode.java | 2 +-
.../api/ldap/model/filter/SubstringNode.java | 3 +-
.../directory/api/ldap/model/ldif/LdifUtils.java | 8 +--
.../api/ldap/model/message/AbandonRequestImpl.java | 2 +-
.../api/ldap/model/message/BindRequestImpl.java | 2 +-
.../api/ldap/model/message/BindResponseImpl.java | 2 +-
.../apache/directory/api/ldap/model/name/Ava.java | 1 -
.../api/ldap/model/schema/PrepareString.java | 4 --
.../schema/registries/AbstractSchemaLoader.java | 2 +-
.../ldap/model/schema/registries/Registries.java | 10 +---
.../registries/helper/AttributeTypeHelper.java | 12 -----
.../registries/helper/DitStructureRuleHelper.java | 1 -
.../schema/registries/helper/LdapSyntaxHelper.java | 1 -
.../registries/helper/MatchingRuleHelper.java | 1 -
.../registries/helper/ObjectClassHelper.java | 2 +-
.../directory/api/ldap/model/url/LdapUrl.java | 2 +-
.../ldap/schema/loader/SchemaEntityFactory.java | 3 +-
.../ldap/schema/loader/SingleLdifSchemaLoader.java | 5 +-
.../java/org/apache/directory/api/util/Chars.java | 58 +++++-----------------
44 files changed, 86 insertions(+), 169 deletions(-)
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
index 167e93a..16f1456 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
@@ -1478,7 +1478,7 @@ public class LdapNetworkConnection extends AbstractLdapConnection implements Lda
/**
* Create a Simple BindRequest ready to be sent.
*/
- private BindRequest createBindRequest( String name, byte[] credentials ) throws LdapException
+ private BindRequest createBindRequest( String name, byte[] credentials )
{
return createBindRequest( name, credentials, null, ( Control[] ) null );
}
@@ -1487,7 +1487,7 @@ public class LdapNetworkConnection extends AbstractLdapConnection implements Lda
/**
* Create a Simple BindRequest ready to be sent.
*/
- private BindRequest createBindRequest( Dn name, byte[] credentials ) throws LdapException
+ private BindRequest createBindRequest( Dn name, byte[] credentials )
{
return createBindRequest( name.getName(), credentials, null, ( Control[] ) null );
}
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/request/search/filter/InitAssertionValueFilter.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/request/search/filter/InitAssertionValueFilter.java
index 141cbc9..60a2a12 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/request/search/filter/InitAssertionValueFilter.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/request/search/filter/InitAssertionValueFilter.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.actions.request.search.filter;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
@@ -55,7 +54,7 @@ public class InitAssertionValueFilter extends GrammarAction<LdapMessageContainer
/**
* {@inheritDoc}
*/
- public void action( LdapMessageContainer<SearchRequestDecorator> container ) throws DecoderException
+ public void action( LdapMessageContainer<SearchRequestDecorator> container )
{
SearchRequestDecorator searchRequestDecorator = container.getMessage();
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/bind/StoreServerSASLCreds.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/bind/StoreServerSASLCreds.java
index 31c3c45..4a4e080 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/bind/StoreServerSASLCreds.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/bind/StoreServerSASLCreds.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.actions.response.bind;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
@@ -58,7 +57,7 @@ public class StoreServerSASLCreds extends GrammarAction<LdapMessageContainer<Bin
/**
* {@inheritDoc}
*/
- public void action( LdapMessageContainer<BindResponseDecorator> container ) throws DecoderException
+ public void action( LdapMessageContainer<BindResponseDecorator> container )
{
// Get the Value and store it in the BindRequest
TLV tlv = container.getCurrentTLV();
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/extended/StoreExtendedResponseValue.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/extended/StoreExtendedResponseValue.java
index 2e34a26..b01a104 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/extended/StoreExtendedResponseValue.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/extended/StoreExtendedResponseValue.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.actions.response.extended;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
@@ -57,7 +56,7 @@ public class StoreExtendedResponseValue extends GrammarAction<LdapMessageContain
/**
* {@inheritDoc}
*/
- public void action( LdapMessageContainer<ExtendedResponseDecorator<?>> container ) throws DecoderException
+ public void action( LdapMessageContainer<ExtendedResponseDecorator<?>> container )
{
// We can allocate the ExtendedResponse Object
ExtendedResponseDecorator<?> extendedResponse = container.getMessage();
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/search/reference/InitSearchResultReference.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/search/reference/InitSearchResultReference.java
index f61bc78..72b03fc 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/search/reference/InitSearchResultReference.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/response/search/reference/InitSearchResultReference.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.actions.response.search.reference;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
@@ -56,7 +55,7 @@ public class InitSearchResultReference extends GrammarAction<LdapMessageContaine
/**
* {@inheritDoc}
*/
- public void action( LdapMessageContainer<SearchResultReferenceDecorator> container ) throws DecoderException
+ public void action( LdapMessageContainer<SearchResultReferenceDecorator> container )
{
// Now, we can allocate the SearchResultReference Object
SearchResultReferenceDecorator searchResultReference = new SearchResultReferenceDecorator(
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java
index a818cef..cea0a70 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java
@@ -141,7 +141,7 @@ public final class PagedResultsGrammar extends AbstractGrammar<PagedResultsConta
PagedResultsStates.COOKIE_STATE, UniversalTag.OCTET_STRING.getValue(),
new GrammarAction<PagedResultsContainer>( "Set PagedSearchControl cookie" )
{
- public void action( PagedResultsContainer container ) throws DecoderException
+ public void action( PagedResultsContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
diff --git a/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java b/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
index 24fa0e3..fcb78ec 100644
--- a/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
+++ b/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
@@ -211,7 +211,7 @@ public class StandaloneLdapApiService extends DefaultLdapCodecService
*
* @throws Exception
*/
- private static List<String> getControlsFromSystemProperties() throws Exception
+ private static List<String> getControlsFromSystemProperties()
{
List<String> controlsList = new ArrayList<>();
@@ -248,7 +248,7 @@ public class StandaloneLdapApiService extends DefaultLdapCodecService
* Such extended operations are stored in the <b>apacheds.extendedOperations</b>
* and <b>default.extendedOperation.requests</b> system properties.
*/
- private static List<String> getExtendedOperationsFromSystemProperties() throws Exception
+ private static List<String> getExtendedOperationsFromSystemProperties()
{
List<String> extendedOperationsList = new ArrayList<>();
@@ -285,7 +285,7 @@ public class StandaloneLdapApiService extends DefaultLdapCodecService
* Such intermediate responses are stored in the <b>apacheds.intermediateResponses</b>
* and <b>default.intermediateResponses.requests</b> system properties.
*/
- private static List<String> getIntermediateResponsesFromSystemProperties() throws Exception
+ private static List<String> getIntermediateResponsesFromSystemProperties()
{
List<String> intermediateResponsesList = new ArrayList<>();
@@ -396,8 +396,7 @@ public class StandaloneLdapApiService extends DefaultLdapCodecService
Constructor<?> constructor = clazz.getConstructor( types );
ExtendedOperationFactory factory = ( ExtendedOperationFactory ) constructor
- .newInstance( new Object[]
- { this } );
+ .newInstance( this );
getExtendedOperationFactories().put( factory.getOid(), factory );
if ( LOG.isInfoEnabled() )
diff --git a/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/endTransaction/EndTransactionResponseImpl.java b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/endTransaction/EndTransactionResponseImpl.java
index e3a5fa1..7797b24 100644
--- a/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/endTransaction/EndTransactionResponseImpl.java
+++ b/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/endTransaction/EndTransactionResponseImpl.java
@@ -72,14 +72,13 @@ public class EndTransactionResponseImpl extends ExtendedResponseImpl implements
{
super( failedMessageId );
- switch ( resultCode )
+ if ( resultCode == ResultCodeEnum.SUCCESS )
{
- case SUCCESS:
- this.failedMessageId = -1;
- break;
-
- default:
- this.failedMessageId = failedMessageId;
+ this.failedMessageId = -1;
+ }
+ else
+ {
+ this.failedMessageId = failedMessageId;
}
super.getLdapResult().setMatchedDn( null );
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncGrammar.java
index 1c8bcd8..7de8401 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ad_impl/AdDirSyncGrammar.java
@@ -194,7 +194,7 @@ public final class AdDirSyncGrammar extends AbstractGrammar<AdDirSyncContainer>
AdDirSyncStatesEnum.COOKIE_STATE, UniversalTag.OCTET_STRING.getValue(),
new GrammarAction<AdDirSyncContainer>( "Set AdDirSyncControl cookie" )
{
- public void action( AdDirSyncContainer container ) throws DecoderException
+ public void action( AdDirSyncContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PPolicyInit.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PPolicyInit.java
index e258263..bfc336f 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PPolicyInit.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PPolicyInit.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.controls.ppolicy_impl;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.i18n.I18n;
import org.slf4j.Logger;
@@ -49,7 +48,7 @@ public class PPolicyInit extends GrammarAction<PasswordPolicyContainer>
/**
* {@inheritDoc}
*/
- public void action( PasswordPolicyContainer container ) throws DecoderException
+ public void action( PasswordPolicyContainer container )
{
// As all the values are optional or defaulted, we can end here
container.setGrammarEndAllowed( true );
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java
index 5985532..bcabec2 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java
@@ -84,7 +84,7 @@ public final class SyncDoneValueGrammar extends AbstractGrammar<SyncDoneValueCon
UniversalTag.SEQUENCE.getValue(),
new GrammarAction<SyncDoneValueContainer>( "Initialization" )
{
- public void action( SyncDoneValueContainer container ) throws DecoderException
+ public void action( SyncDoneValueContainer container )
{
// As all the values are optional or defaulted, we can end here
container.setGrammarEndAllowed( true );
@@ -104,7 +104,7 @@ public final class SyncDoneValueGrammar extends AbstractGrammar<SyncDoneValueCon
SyncDoneValueStatesEnum.COOKIE_STATE, UniversalTag.OCTET_STRING.getValue(),
new GrammarAction<SyncDoneValueContainer>( "Set SyncDoneValueControl cookie" )
{
- public void action( SyncDoneValueContainer container ) throws DecoderException
+ public void action( SyncDoneValueContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java
index 1c3b5a2..2d711f4 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncRequestValueGrammar.java
@@ -157,7 +157,7 @@ public final class SyncRequestValueGrammar extends AbstractGrammar<SyncRequestVa
SyncRequestValueStatesEnum.COOKIE_STATE, UniversalTag.OCTET_STRING.getValue(),
new GrammarAction<SyncRequestValueContainer>( "Set SyncRequestValueControl cookie" )
{
- public void action( SyncRequestValueContainer container ) throws DecoderException
+ public void action( SyncRequestValueContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java
index d0613d8..b09c54c 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncStateValueGrammar.java
@@ -150,7 +150,7 @@ public final class SyncStateValueGrammar extends AbstractGrammar<SyncStateValueC
UniversalTag.OCTET_STRING.getValue(),
new GrammarAction<SyncStateValueContainer>( "Set SyncStateValueControl entryUUID" )
{
- public void action( SyncStateValueContainer container ) throws DecoderException
+ public void action( SyncStateValueContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
@@ -182,7 +182,7 @@ public final class SyncStateValueGrammar extends AbstractGrammar<SyncStateValueC
UniversalTag.OCTET_STRING.getValue(),
new GrammarAction<SyncStateValueContainer>( "Set SyncStateValueControl cookie value" )
{
- public void action( SyncStateValueContainer container ) throws DecoderException
+ public void action( SyncStateValueContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/InitByOffsetSequence.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/InitByOffsetSequence.java
index 9aaf96b..66f2a8b 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/InitByOffsetSequence.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/InitByOffsetSequence.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.controls.vlv_impl;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.i18n.I18n;
import org.slf4j.Logger;
@@ -49,7 +48,7 @@ public class InitByOffsetSequence extends GrammarAction<VirtualListViewRequestCo
/**
* {@inheritDoc}
*/
- public void action( VirtualListViewRequestContainer container ) throws DecoderException
+ public void action( VirtualListViewRequestContainer container )
{
if ( LOG.isDebugEnabled() )
{
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/InitVirtualListViewRequest.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/InitVirtualListViewRequest.java
index 8b23a11..008a711 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/InitVirtualListViewRequest.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/vlv_impl/InitVirtualListViewRequest.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.controls.vlv_impl;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.i18n.I18n;
import org.slf4j.Logger;
@@ -49,7 +48,7 @@ public class InitVirtualListViewRequest extends GrammarAction<VirtualListViewReq
/**
* {@inheritDoc}
*/
- public void action( VirtualListViewRequestContainer container ) throws DecoderException
+ public void action( VirtualListViewRequestContainer container )
{
if ( LOG.isDebugEnabled() )
{
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
index 750f549..9828bad 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
@@ -245,7 +245,7 @@ public class CertGenerationGrammar extends AbstractGrammar<CertGenerationContain
UniversalTag.OCTET_STRING.getValue(),
new GrammarAction<CertGenerationContainer>( "Set Cert Generation key algorithm value" )
{
- public void action( CertGenerationContainer container ) throws DecoderException
+ public void action( CertGenerationContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java
index fa472fe..9acdd85 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.AbstractGrammar;
import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
@@ -114,7 +113,7 @@ public class PasswordModifyRequestGrammar extends AbstractGrammar<PasswordModify
PasswordModifyRequestConstants.USER_IDENTITY_TAG,
new GrammarAction<PasswordModifyRequestContainer>( "Set PasswordModifyRequest user identity" )
{
- public void action( PasswordModifyRequestContainer container ) throws DecoderException
+ public void action( PasswordModifyRequestContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
@@ -154,7 +153,7 @@ public class PasswordModifyRequestGrammar extends AbstractGrammar<PasswordModify
PasswordModifyRequestConstants.OLD_PASSWORD_TAG,
new GrammarAction<PasswordModifyRequestContainer>( "Set PasswordModifyRequest oldPassword" )
{
- public void action( PasswordModifyRequestContainer container ) throws DecoderException
+ public void action( PasswordModifyRequestContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
@@ -195,7 +194,7 @@ public class PasswordModifyRequestGrammar extends AbstractGrammar<PasswordModify
PasswordModifyRequestConstants.NEW_PASSWORD_TAG,
new GrammarAction<PasswordModifyRequestContainer>( "Set PasswordModifyRequest newPassword" )
{
- public void action( PasswordModifyRequestContainer container ) throws DecoderException
+ public void action( PasswordModifyRequestContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
@@ -235,7 +234,7 @@ public class PasswordModifyRequestGrammar extends AbstractGrammar<PasswordModify
PasswordModifyRequestConstants.OLD_PASSWORD_TAG,
new GrammarAction<PasswordModifyRequestContainer>( "Set PasswordModifyRequest oldPassword" )
{
- public void action( PasswordModifyRequestContainer container ) throws DecoderException
+ public void action( PasswordModifyRequestContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
@@ -275,7 +274,7 @@ public class PasswordModifyRequestGrammar extends AbstractGrammar<PasswordModify
PasswordModifyRequestConstants.NEW_PASSWORD_TAG,
new GrammarAction<PasswordModifyRequestContainer>( "Set PasswordModifyRequest newPassword" )
{
- public void action( PasswordModifyRequestContainer container ) throws DecoderException
+ public void action( PasswordModifyRequestContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
@@ -315,7 +314,7 @@ public class PasswordModifyRequestGrammar extends AbstractGrammar<PasswordModify
PasswordModifyRequestConstants.NEW_PASSWORD_TAG,
new GrammarAction<PasswordModifyRequestContainer>( "Set PasswordModifyRequest newPassword" )
{
- public void action( PasswordModifyRequestContainer container ) throws DecoderException
+ public void action( PasswordModifyRequestContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java
index ddc3991..fbc0bb2 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify;
-import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.grammar.AbstractGrammar;
import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
@@ -112,7 +111,7 @@ public class PasswordModifyResponseGrammar extends AbstractGrammar<PasswordModif
PasswordModifyResponseConstants.GEN_PASSWORD_TAG,
new GrammarAction<PasswordModifyResponseContainer>( "Set PasswordModifyResponse user identity" )
{
- public void action( PasswordModifyResponseContainer container ) throws DecoderException
+ public void action( PasswordModifyResponseContainer container )
{
BerValue value = container.getCurrentTLV().getValue();
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
index 2955ad4..794076e 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
@@ -166,7 +166,7 @@ public final class StoredProcedureGrammar extends AbstractGrammar<StoredProcedur
UniversalTag.SEQUENCE.getValue(),
new GrammarAction<StoredProcedureContainer>( "Stores the parameters" )
{
- public void action( StoredProcedureContainer container ) throws DecoderException
+ public void action( StoredProcedureContainer container )
{
container.setGrammarEndAllowed( true );
}
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/intermediate/syncrepl_impl/SyncInfoValueGrammar.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/intermediate/syncrepl_impl/SyncInfoValueGrammar.java
index a740075..c3b7e54 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/intermediate/syncrepl_impl/SyncInfoValueGrammar.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/intermediate/syncrepl_impl/SyncInfoValueGrammar.java
@@ -602,7 +602,7 @@ public final class SyncInfoValueGrammar extends AbstractGrammar<SyncInfoValueCon
UniversalTag.SET.getValue(),
new GrammarAction<SyncInfoValueContainer>( "SyncIdSet syncUUIDs" )
{
- public void action( SyncInfoValueContainer container ) throws DecoderException
+ public void action( SyncInfoValueContainer container )
{
// We can have an END transition
container.setGrammarEndAllowed( true );
@@ -624,7 +624,7 @@ public final class SyncInfoValueGrammar extends AbstractGrammar<SyncInfoValueCon
UniversalTag.SET.getValue(),
new GrammarAction<SyncInfoValueContainer>( "SyncIdSet syncUUIDs" )
{
- public void action( SyncInfoValueContainer container ) throws DecoderException
+ public void action( SyncInfoValueContainer container )
{
// We can have an END transition
container.setGrammarEndAllowed( true );
@@ -647,7 +647,7 @@ public final class SyncInfoValueGrammar extends AbstractGrammar<SyncInfoValueCon
UniversalTag.SET.getValue(),
new GrammarAction<SyncInfoValueContainer>( "SyncIdSet syncUUIDs" )
{
- public void action( SyncInfoValueContainer container ) throws DecoderException
+ public void action( SyncInfoValueContainer container )
{
// We can have an END transition
container.setGrammarEndAllowed( true );
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java
index cc20e74..7404acb 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java
@@ -694,7 +694,7 @@ public class DefaultAttribute implements Attribute, Cloneable
@Override
public boolean isHumanReadable()
{
- return isHR != null ? isHR : false;
+ return isHR != null && isHR;
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
index c9d978d..8a8862c 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
@@ -2016,8 +2016,6 @@ public final class DefaultEntry implements Entry
{
LOG.warn( I18n.err( I18n.ERR_13218_AT_DOES_NOT_EXIST, attribute ) );
}
-
- continue;
}
}
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java
index ee5b32d..0850545 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java
@@ -681,7 +681,7 @@ public class Value implements Cloneable, Externalizable, Comparable<Value>
* @return a comparator associated with the attributeType or null if one cannot be found
* @throws LdapException if resolution of schema entities fail
*/
- private LdapComparator<?> getLdapComparator() throws LdapException
+ private LdapComparator<?> getLdapComparator()
{
if ( attributeType != null )
{
@@ -797,7 +797,7 @@ public class Value implements Cloneable, Externalizable, Comparable<Value>
* @throws ClassNotFoundException If we can't instanciate a Value
* @throws LdapInvalidAttributeValueException If the value is invalid
*/
- public static Value deserialize( ObjectInput in ) throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
+ public static Value deserialize( ObjectInput in ) throws IOException, ClassNotFoundException
{
Value value = new Value( ( AttributeType ) null );
value.readExternal( in );
@@ -1374,30 +1374,23 @@ public class Value implements Cloneable, Externalizable, Comparable<Value>
// Use the comparator
// We have an AttributeType, we use the associated comparator
- try
+ LdapComparator<String> comparator = ( LdapComparator<String> ) getLdapComparator();
+
+ if ( other.attributeType.getEquality() == null )
{
- LdapComparator<String> comparator = ( LdapComparator<String> ) getLdapComparator();
-
- if ( other.attributeType.getEquality() == null )
- {
- // No equality ? Default to comparing using a String comparator
- return stringComparator.compare( normValue, other.normValue ) == 0;
- }
-
-
- // Compare normalized values
- if ( comparator == null )
- {
- return normValue.equals( other.normValue );
- }
- else
- {
- return comparator.compare( normValue, other.normValue ) == 0;
- }
+ // No equality ? Default to comparing using a String comparator
+ return stringComparator.compare( normValue, other.normValue ) == 0;
}
- catch ( LdapException ne )
+
+
+ // Compare normalized values
+ if ( comparator == null )
{
- return false;
+ return normValue.equals( other.normValue );
+ }
+ else
+ {
+ return comparator.compare( normValue, other.normValue ) == 0;
}
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AssertionNode.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AssertionNode.java
index a19f9f2..d672e19 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AssertionNode.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AssertionNode.java
@@ -139,7 +139,7 @@ public abstract class AssertionNode extends AbstractExprNode
return true;
}
- if ( ( obj == null ) || !( obj instanceof AssertionNode ) )
+ if ( !( obj instanceof AssertionNode ) )
{
return false;
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExtensibleNode.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExtensibleNode.java
index 8cfbfcc..442a0c1 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExtensibleNode.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExtensibleNode.java
@@ -219,7 +219,7 @@ public class ExtensibleNode extends LeafNode
return true;
}
- if ( ( obj == null ) || !( obj instanceof ExtensibleNode ) )
+ if ( !( obj instanceof ExtensibleNode ) )
{
return false;
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ScopeNode.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ScopeNode.java
index b3a6d83..3b1bcbc 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ScopeNode.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ScopeNode.java
@@ -165,7 +165,7 @@ public class ScopeNode extends AbstractExprNode
return true;
}
- if ( ( obj == null ) || !( obj instanceof ScopeNode ) )
+ if ( !( obj instanceof ScopeNode ) )
{
return false;
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SubstringNode.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SubstringNode.java
index b65a1e2..625a12e 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SubstringNode.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SubstringNode.java
@@ -361,10 +361,11 @@ public class SubstringNode extends LeafNode
return true;
}
- if ( ( obj == null ) || !( obj instanceof SubstringNode ) )
+ if ( !( obj instanceof SubstringNode ) )
{
return false;
}
+
SubstringNode that = ( SubstringNode ) obj;
if ( initialPattern == null )
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifUtils.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifUtils.java
index b85591c..02be973 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifUtils.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifUtils.java
@@ -295,7 +295,7 @@ public final class LdifUtils
* @return the corresponding LDIF code as a String
* @throws LdapException If a naming exception is encountered.
*/
- public static String convertToLdif( Entry entry, int length ) throws LdapException
+ public static String convertToLdif( Entry entry, int length )
{
StringBuilder sb = new StringBuilder();
@@ -332,7 +332,7 @@ public final class LdifUtils
* @return the corresponding LDIF code as a String
* @throws LdapException If a naming exception is encountered.
*/
- public static String convertAttributesToLdif( Entry entry, int length ) throws LdapException
+ public static String convertAttributesToLdif( Entry entry, int length )
{
StringBuilder sb = new StringBuilder();
@@ -550,7 +550,7 @@ public final class LdifUtils
* @return the corresponding LDIF code as a String
* @throws LdapException If a naming exception is encountered.
*/
- public static String convertToLdif( Attribute attr ) throws LdapException
+ public static String convertToLdif( Attribute attr )
{
return convertToLdif( attr, DEFAULT_LINE_LENGTH );
}
@@ -564,7 +564,7 @@ public final class LdifUtils
* @return the corresponding LDIF code as a String
* @throws LdapException If a naming exception is encountered.
*/
- public static String convertToLdif( Attribute attr, int length ) throws LdapException
+ public static String convertToLdif( Attribute attr, int length )
{
StringBuilder sb = new StringBuilder();
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbandonRequestImpl.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbandonRequestImpl.java
index b12de59..6476b08 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbandonRequestImpl.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbandonRequestImpl.java
@@ -150,7 +150,7 @@ public AbandonRequest addControl( Control control )
return true;
}
- if ( ( obj == null ) || !( obj instanceof AbandonRequest ) )
+ if ( !( obj instanceof AbandonRequest ) )
{
return false;
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java
index a738950..ae9fc0b 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindRequestImpl.java
@@ -367,7 +367,7 @@ public BindRequest setName( String name )
return true;
}
- if ( ( obj == null ) || !( obj instanceof BindRequest ) )
+ if ( !( obj instanceof BindRequest ) )
{
return false;
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java
index aa75100..7243852 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/BindResponseImpl.java
@@ -143,7 +143,7 @@ public class BindResponseImpl extends AbstractResultResponse implements BindResp
return true;
}
- if ( ( obj == null ) || !( obj instanceof BindResponse ) )
+ if ( !( obj instanceof BindResponse ) )
{
return false;
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java
index 62b7b21..c3c52e1 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java
@@ -558,7 +558,6 @@ public class Ava implements Externalizable, Cloneable, Comparable<Ava>
* @throws LdapInvalidDnException If the given type or value are invalid
*/
private void createAva( SchemaManager schemaManager, String upType, Value value )
- throws LdapInvalidDnException
{
StringBuilder sb = new StringBuilder();
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java
index cf6503f..e317a6f 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java
@@ -3354,7 +3354,6 @@ public final class PrepareString
* @throws InvalidCharacterException If an invalid character is met
*/
public static String insignificantSpacesStringValue( char[] origin )
- throws InvalidCharacterException
{
if ( origin == null )
{
@@ -3622,7 +3621,6 @@ public final class PrepareString
* @throws InvalidCharacterException If an invalid character is met
*/
public static String insignificantSpacesStringInitial( char[] origin )
- throws InvalidCharacterException
{
if ( origin == null )
{
@@ -3847,7 +3845,6 @@ public final class PrepareString
* @throws InvalidCharacterException If an invalid character is met
*/
public static String insignificantSpacesStringAny( char[] origin )
- throws InvalidCharacterException
{
if ( origin == null )
{
@@ -4062,7 +4059,6 @@ public final class PrepareString
* @throws InvalidCharacterException If an invalid character is found in the String
*/
public static String insignificantSpacesStringFinal( char[] origin )
- throws InvalidCharacterException
{
if ( origin == null )
{
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java
index 368dd60..ac5122a 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java
@@ -195,7 +195,7 @@ public abstract class AbstractSchemaLoader implements SchemaLoader
}
- private Schema[] buildSchemaArray( String... schemaNames ) throws LdapException
+ private Schema[] buildSchemaArray( String... schemaNames )
{
Schema[] schemas = new Schema[schemaNames.length];
int pos = 0;
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
index cc0ab12..f6ddb4c 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
@@ -1329,15 +1329,7 @@ public class Registries implements SchemaLoaderListener, Cloneable
}
// All is done for this ObjectClass, let's apply the registries
- try
- {
- ObjectClassHelper.addToRegistries( objectClass, errorHandler, this );
- }
- catch ( LdapException ne )
- {
- // Do nothing. We may have a broken OC,
- // but at this point, it doesn't matter.
- }
+ ObjectClassHelper.addToRegistries( objectClass, errorHandler, this );
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/AttributeTypeHelper.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/AttributeTypeHelper.java
index 55b1e14..d24b283 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/AttributeTypeHelper.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/AttributeTypeHelper.java
@@ -314,8 +314,6 @@ public final class AttributeTypeHelper
ldapSchemaException.setSourceObject( attributeType );
ldapSchemaException.setRelatedId( syntaxOid );
errorHandler.handle( LOG, msg, ldapSchemaException );
-
- return;
}
}
else
@@ -336,8 +334,6 @@ public final class AttributeTypeHelper
ldapSchemaException.setSourceObject( attributeType );
ldapSchemaException.setRelatedId( syntaxOid );
errorHandler.handle( LOG, msg, ldapSchemaException );
-
- return;
}
}
else
@@ -349,8 +345,6 @@ public final class AttributeTypeHelper
LdapSchemaExceptionCodes.AT_SYNTAX_OR_SUPERIOR_REQUIRED, msg );
ldapSchemaException.setSourceObject( attributeType );
errorHandler.handle( LOG, msg, ldapSchemaException );
-
- return;
}
}
}
@@ -462,8 +456,6 @@ public final class AttributeTypeHelper
ldapSchemaException.setSourceObject( attributeType );
ldapSchemaException.setRelatedId( substringOid );
errorHandler.handle( LOG, msg, ldapSchemaException );
-
- return;
}
}
else
@@ -479,10 +471,6 @@ public final class AttributeTypeHelper
}
-
-
-
-
/**
* Build the ORDERING MR reference for an AttributeType
*/
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java
index c79f64e..db2eaa4 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java
@@ -49,7 +49,6 @@ public final class DitStructureRuleHelper
* @throws LdapException If the addition failed
*/
public static void addToRegistries( DitStructureRule ditStructureRule, SchemaErrorHandler errorHandler, Registries registries )
- throws LdapException
{
if ( registries != null )
{
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java
index dd71837..ef5dcd4 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java
@@ -101,7 +101,6 @@ public final class LdapSyntaxHelper
* @throws LdapException If the LdapSyntax is not valid
*/
public static void removeFromRegistries( LdapSyntax ldapSyntax, SchemaErrorHandler errorHandler, Registries registries )
- throws LdapException
{
if ( ( registries != null ) && ( ldapSyntax.getSyntaxChecker() != null ) )
{
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java
index be45bf1..d38085a 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java
@@ -161,7 +161,6 @@ public final class MatchingRuleHelper
* @throws LdapException If the MatchingRule is not valid
*/
public static void removeFromRegistries( MatchingRule matchingRule, SchemaErrorHandler errorHandler, Registries registries )
- throws LdapException
{
if ( registries != null )
{
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/ObjectClassHelper.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/ObjectClassHelper.java
index c4f3cd9..4f8e92b 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/ObjectClassHelper.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/ObjectClassHelper.java
@@ -60,7 +60,7 @@ public final class ObjectClassHelper
* @param registries The Registries
* @throws LdapException on failure
*/
- public static void addToRegistries( ObjectClass objectClass, SchemaErrorHandler errorHandler, Registries registries ) throws LdapException
+ public static void addToRegistries( ObjectClass objectClass, SchemaErrorHandler errorHandler, Registries registries )
{
if ( registries != null )
{
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java
index 9c5ce5a..85e6539 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java
@@ -1027,7 +1027,7 @@ public class LdapUrl
* @return The string as a byte array.
* @throws org.apache.directory.api.ldap.model.exception.UrlDecoderException if encoding is not supported
*/
- private static byte[] getAsciiBytes( final String data ) throws UrlDecoderException
+ private static byte[] getAsciiBytes( final String data )
{
if ( data == null )
{
diff --git a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
index 643356b..6236e47 100644
--- a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
+++ b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
@@ -525,8 +525,7 @@ public class SchemaEntityFactory implements EntityFactory
try
{
- comparator = ( LdapComparator<?> ) constructor.newInstance( new Object[]
- { oid } );
+ comparator = ( LdapComparator<?> ) constructor.newInstance( oid );
}
catch ( InvocationTargetException ite )
{
diff --git a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java
index 251fe32..c5fda70 100644
--- a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java
+++ b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java
@@ -188,7 +188,7 @@ public class SingleLdifSchemaLoader extends AbstractSchemaLoader
/**
* Load all the schemaObjects
*/
- private void loadSchemaObject( String schemaName, LdifEntry ldifEntry ) throws LdapException
+ private void loadSchemaObject( String schemaName, LdifEntry ldifEntry )
{
for ( String scObjTypeRdn : schemaObjectTypeRdns )
{
@@ -220,8 +220,7 @@ public class SingleLdifSchemaLoader extends AbstractSchemaLoader
}
- private List<Entry> loadSchemaObjects( String schemaObjectType, Schema... schemas ) throws LdapException,
- IOException
+ private List<Entry> loadSchemaObjects( String schemaObjectType, Schema... schemas )
{
Map<String, List<Entry>> m = scObjEntryMap.get( schemaObjectType );
List<Entry> atList = new ArrayList<>();
diff --git a/util/src/main/java/org/apache/directory/api/util/Chars.java b/util/src/main/java/org/apache/directory/api/util/Chars.java
index 217ba94..3fc3c69 100644
--- a/util/src/main/java/org/apache/directory/api/util/Chars.java
+++ b/util/src/main/java/org/apache/directory/api/util/Chars.java
@@ -197,7 +197,7 @@ public final class Chars
}
else
{
- return ( chars[index] == car ) ? true : false;
+ return chars[index] == car;
}
}
@@ -458,14 +458,7 @@ public final class Chars
{
char c = string.charAt( index );
- if ( ( c > 127 ) || !ALPHA_UPPER_CASE[c] )
- {
- return false;
- }
- else
- {
- return true;
- }
+ return ( c <= 127 ) && ALPHA_UPPER_CASE[c];
}
}
@@ -496,14 +489,7 @@ public final class Chars
{
char c = string.charAt( index );
- if ( ( c > 127 ) || !ALPHA_DIGIT[c] )
- {
- return false;
- }
- else
- {
- return true;
- }
+ return ( c <= 127 ) && ALPHA_DIGIT[c];
}
}
@@ -526,14 +512,7 @@ public final class Chars
{
byte c = bytes[index];
- if ( ( ( c | 0x7F ) != 0x7F ) || !CHAR[c] )
- {
- return false;
- }
- else
- {
- return true;
- }
+ return ( ( c | 0x7F ) == 0x7F ) && CHAR[c];
}
}
@@ -556,14 +535,7 @@ public final class Chars
{
char c = chars[index];
- if ( ( c > 127 ) || !CHAR[c] )
- {
- return false;
- }
- else
- {
- return true;
- }
+ return ( c <= 127 ) && CHAR[c];
}
}
@@ -593,14 +565,7 @@ public final class Chars
{
char c = string.charAt( index );
- if ( ( c > 127 ) || !CHAR[c] )
- {
- return false;
- }
- else
- {
- return true;
- }
+ return ( c <= 127 ) && CHAR[c];
}
}
@@ -663,7 +628,7 @@ public final class Chars
}
else
{
- return ( ( ( bytes[0] | 0x7F ) != 0x7F ) || !DIGIT[bytes[0]] ) ? false : true;
+ return ( ( bytes[0] | 0x7F ) == 0x7F ) && DIGIT[bytes[0]];
}
}
@@ -712,7 +677,7 @@ public final class Chars
}
else
{
- return ( ( ( bytes[index] | 0x7F ) != 0x7F ) || !DIGIT[bytes[index]] ) ? false : true;
+ return ( ( bytes[index] | 0x7F ) == 0x7F ) && DIGIT[bytes[index]];
}
}
@@ -733,7 +698,7 @@ public final class Chars
}
else
{
- return ( ( chars[index] > 127 ) || !DIGIT[chars[index]] ) ? false : true;
+ return ( chars[index] <= 127 ) && DIGIT[chars[index]];
}
}
@@ -762,7 +727,8 @@ public final class Chars
else
{
char c = string.charAt( index );
- return ( ( c > 127 ) || !DIGIT[c] ) ? false : true;
+
+ return ( c <= 127 ) && DIGIT[c];
}
}
@@ -782,7 +748,7 @@ public final class Chars
}
else
{
- return ( ( chars[0] > 127 ) || !DIGIT[chars[0]] ) ? false : true;
+ return ( chars[0] <= 127 ) && DIGIT[chars[0]];
}
}