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 2013/05/21 01:43:36 UTC
svn commit: r1484624 [1/2] - in /directory/shared/trunk:
dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/reponse/ dsm...
Author: elecharny
Date: Mon May 20 23:43:35 2013
New Revision: 1484624
URL: http://svn.apache.org/r1484624
Log:
Fixed many warnings
Modified:
directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/Dsmlv2Parser.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/reponse/ExtendedResponseDsml.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/BatchRequestDsml.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java
directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponseImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecificationParser.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/AbstractValue.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/FilterParser.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReader.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractMessage.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/extended/NoticeOfDisconnect.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/AttributeType.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitContentRule.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/DitStructureRule.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LdapSyntax.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/LoadableSchemaObject.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRule.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/Normalizer.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SyntaxChecker.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitContentRuleHelper.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/DitStructureRuleHelper.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/LdapSyntaxHelper.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleHelper.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/MatchingRuleUseHelper.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/NameFormHelper.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/StringValueAttributeTypeTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractMessageTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/AbstractResultResponseTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImplTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/ExtendedResponseImplTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/api/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java
Modified: directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java Mon May 20 23:43:35 2013
@@ -41,6 +41,7 @@ import org.apache.directory.api.dsmlv2.r
import org.apache.directory.api.dsmlv2.reponse.CompareResponseDsml;
import org.apache.directory.api.dsmlv2.reponse.DelResponseDsml;
import org.apache.directory.api.dsmlv2.reponse.ErrorResponse;
+import org.apache.directory.api.dsmlv2.reponse.ErrorResponse.ErrorResponseType;
import org.apache.directory.api.dsmlv2.reponse.ExtendedResponseDsml;
import org.apache.directory.api.dsmlv2.reponse.ModDNResponseDsml;
import org.apache.directory.api.dsmlv2.reponse.ModifyResponseDsml;
@@ -48,12 +49,11 @@ import org.apache.directory.api.dsmlv2.r
import org.apache.directory.api.dsmlv2.reponse.SearchResultDoneDsml;
import org.apache.directory.api.dsmlv2.reponse.SearchResultEntryDsml;
import org.apache.directory.api.dsmlv2.reponse.SearchResultReferenceDsml;
-import org.apache.directory.api.dsmlv2.reponse.ErrorResponse.ErrorResponseType;
import org.apache.directory.api.dsmlv2.request.BatchRequestDsml;
-import org.apache.directory.api.dsmlv2.request.Dsmlv2Grammar;
import org.apache.directory.api.dsmlv2.request.BatchRequestDsml.OnError;
import org.apache.directory.api.dsmlv2.request.BatchRequestDsml.Processing;
import org.apache.directory.api.dsmlv2.request.BatchRequestDsml.ResponseOrder;
+import org.apache.directory.api.dsmlv2.request.Dsmlv2Grammar;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -318,7 +318,7 @@ public class Dsmlv2Engine
// We create a new ErrorResponse and return the XML response.
ErrorResponse errorResponse = new ErrorResponse( 0, ErrorResponseType.COULD_NOT_CONNECT, e
.getLocalizedMessage() );
-
+
if ( respWriter != null )
{
writeResponse( respWriter, errorResponse );
@@ -381,7 +381,7 @@ public class Dsmlv2Engine
// We create a new ErrorResponse and return the XML response.
ErrorResponse errorResponse = new ErrorResponse( reqId, ErrorResponseType.MALFORMED_REQUEST, I18n.err(
I18n.ERR_03001, e.getLocalizedMessage(), e.getLineNumber(), e.getColumnNumber() ) );
-
+
if ( respWriter != null )
{
writeResponse( respWriter, errorResponse );
@@ -431,7 +431,7 @@ public class Dsmlv2Engine
ErrorResponse errorResponse = new ErrorResponse( request.getDecorated().getMessageId(),
ErrorResponseType.GATEWAY_INTERNAL_ERROR, I18n.err(
I18n.ERR_03003, e.getMessage() ) );
-
+
if ( respWriter != null )
{
writeResponse( respWriter, errorResponse );
@@ -460,7 +460,7 @@ public class Dsmlv2Engine
// We create a new ErrorResponse and return the XML response.
ErrorResponse errorResponse = new ErrorResponse( 0, ErrorResponseType.MALFORMED_REQUEST, I18n.err(
I18n.ERR_03001, e.getLocalizedMessage(), e.getLineNumber(), e.getColumnNumber() ) );
-
+
if ( respWriter != null )
{
writeResponse( respWriter, errorResponse );
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/Dsmlv2Parser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/Dsmlv2Parser.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/Dsmlv2Parser.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/Dsmlv2Parser.java Mon May 20 23:43:35 2013
@@ -172,28 +172,28 @@ public class Dsmlv2Parser
XmlPullParser xpp = container.getParser();
int eventType = xpp.getEventType();
-
+
do
{
switch ( eventType )
{
- case XmlPullParser.START_DOCUMENT :
+ case XmlPullParser.START_DOCUMENT:
container.setState( Dsmlv2StatesEnum.INIT_GRAMMAR_STATE );
break;
- case XmlPullParser.END_DOCUMENT :
+ case XmlPullParser.END_DOCUMENT:
container.setState( Dsmlv2StatesEnum.GRAMMAR_END );
break;
- case XmlPullParser.START_TAG :
+ case XmlPullParser.START_TAG:
processTag( container, Tag.START );
break;
- case XmlPullParser.END_TAG :
+ case XmlPullParser.END_TAG:
processTag( container, Tag.END );
break;
}
-
+
try
{
eventType = xpp.next();
@@ -288,23 +288,23 @@ public class Dsmlv2Parser
switch ( eventType )
{
- case XmlPullParser.START_DOCUMENT :
+ case XmlPullParser.START_DOCUMENT:
container.setState( Dsmlv2StatesEnum.INIT_GRAMMAR_STATE );
break;
- case XmlPullParser.END_DOCUMENT :
+ case XmlPullParser.END_DOCUMENT:
container.setState( Dsmlv2StatesEnum.GRAMMAR_END );
return null;
- case XmlPullParser.START_TAG :
+ case XmlPullParser.START_TAG:
processTag( container, Tag.START );
break;
- case XmlPullParser.END_TAG :
+ case XmlPullParser.END_TAG:
processTag( container, Tag.END );
break;
}
-
+
try
{
eventType = xpp.next();
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/reponse/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/reponse/ExtendedResponseDsml.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/reponse/ExtendedResponseDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/reponse/ExtendedResponseDsml.java Mon May 20 23:43:35 2013
@@ -42,7 +42,6 @@ public class ExtendedResponseDsml extend
implements ExtendedResponse
{
private static final String EXTENDED_RESPONSE_TAG = "extendedResponse";
- private static final long serialVersionUID = -3989420095112650346L;
private byte[] response;
@@ -92,7 +91,7 @@ public class ExtendedResponseDsml extend
element = new DefaultElement( EXTENDED_RESPONSE_TAG );
}
- ExtendedResponse extendedResponse = ( ExtendedResponse ) getDecorated();
+ ExtendedResponse extendedResponse = getDecorated();
// LDAP Result
LdapResultDsml ldapResultDsml = new LdapResultDsml( getCodecService(),
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/BatchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/BatchRequestDsml.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/BatchRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/BatchRequestDsml.java Mon May 20 23:43:35 2013
@@ -98,7 +98,7 @@ public class BatchRequestDsml
*/
private boolean storeReq = true;
- private DsmlDecorator currentReq;
+ private DsmlDecorator<? extends Request> currentReq;
/**
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtendedRequestDsml.java Mon May 20 23:43:35 2013
@@ -173,6 +173,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<P> addControl( Control control ) throws MessageException
{
return ( ExtendedRequest<P> ) super.addControl( control );
@@ -182,6 +183,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<P> addAllControls( Control[] controls ) throws MessageException
{
return ( ExtendedRequest<P> ) super.addAllControls( controls );
@@ -191,6 +193,7 @@ public class ExtendedRequestDsml<Q exten
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<P> removeControl( Control control ) throws MessageException
{
return ( ExtendedRequest<P> ) super.removeControl( control );
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java Mon May 20 23:43:35 2013
@@ -144,7 +144,7 @@ public class SearchRequestDsml
/**
* set the currentFilter to its parent
*/
- public void endCurrentConnectorFilter( )
+ public void endCurrentConnectorFilter()
{
currentFilter = currentFilter.getParent();
}
@@ -340,7 +340,7 @@ public class SearchRequestDsml
{
Element element = super.toDsml( root );
- SearchRequest request = ( SearchRequest ) getDecorated();
+ SearchRequest request = getDecorated();
// Dn
if ( request.getBase() != null )
@@ -510,6 +510,7 @@ public class SearchRequestDsml
else if ( filter instanceof SimpleNode )
{
Element newElement = null;
+
if ( filter instanceof ApproximateNode )
{
newElement = element.addElement( "approxMatch" );
@@ -527,10 +528,10 @@ public class SearchRequestDsml
newElement = element.addElement( "lessOrEqual" );
}
- String attributeName = ( ( SimpleNode ) filter ).getAttribute();
+ String attributeName = ( ( SimpleNode<?> ) filter ).getAttribute();
newElement.addAttribute( "name", attributeName );
-
- Value<?> value = ( ( SimpleNode ) filter ).getValue();
+
+ Value<?> value = ( ( SimpleNode<?> ) filter ).getValue();
if ( value != null )
{
if ( ParserUtils.needsBase64Encoding( value ) )
@@ -539,11 +540,11 @@ public class SearchRequestDsml
Namespace xsiNamespace = new Namespace( "xsi", ParserUtils.XML_SCHEMA_INSTANCE_URI );
element.getDocument().getRootElement().add( xsdNamespace );
element.getDocument().getRootElement().add( xsiNamespace );
-
+
Element valueElement = newElement.addElement( "value" ).addText(
ParserUtils.base64Encode( value ) );
valueElement
- .addAttribute( new QName( "type", xsiNamespace ), "xsd:" + ParserUtils.BASE64BINARY );
+ .addAttribute( new QName( "type", xsiNamespace ), "xsd:" + ParserUtils.BASE64BINARY );
}
else
{
@@ -575,7 +576,8 @@ public class SearchRequestDsml
element.getDocument().getRootElement().add( xsdNamespace );
element.getDocument().getRootElement().add( xsiNamespace );
- Element valueElement = newElement.addElement( "value" ).addText( ParserUtils.base64Encode( value.getValue() ) );
+ Element valueElement = newElement.addElement( "value" ).addText(
+ ParserUtils.base64Encode( value.getValue() ) );
valueElement.addAttribute( new QName( "type", xsiNamespace ), "xsd:" + ParserUtils.BASE64BINARY );
}
else
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java Mon May 20 23:43:35 2013
@@ -71,6 +71,10 @@ public class TestEntryUtils
*/
static class MR extends MatchingRule
{
+ /** The mandatory serialVersionUID field */
+ public static final long serialVersionUID = 1L;
+
+
protected MR( String oid )
{
super( oid );
@@ -103,8 +107,6 @@ public class TestEntryUtils
/* no protection*/
- //This will suppress PMD.AvoidUsingHardCodedIP warnings in this class
- @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
static AttributeType getCaseIgnoringAttributeNoNumbersType()
{
MutableAttributeType attributeType = new MutableAttributeType( "1.1.3.1" );
@@ -112,6 +114,10 @@ public class TestEntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2.1" )
{
+ /** The mandatory serialVersionUID field */
+ public static final long serialVersionUID = 1L;
+
+
public boolean isValidSyntax( Object value )
{
if ( !( value instanceof String ) )
@@ -137,6 +143,10 @@ public class TestEntryUtils
matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
{
+ /** The mandatory serialVersionUID field */
+ public static final long serialVersionUID = 1L;
+
+
public int compare( String o1, String o2 )
{
return ( o1 == null ?
@@ -147,6 +157,10 @@ public class TestEntryUtils
Normalizer normalizer = new Normalizer( "1.1.1" )
{
+ /** The mandatory serialVersionUID field */
+ public static final long serialVersionUID = 1L;
+
+
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( value.isHumanReadable() )
@@ -181,6 +195,10 @@ public class TestEntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2" )
{
+ /** The mandatory serialVersionUID field */
+ public static final long serialVersionUID = 1L;
+
+
public boolean isValidSyntax( Object value )
{
return ( ( String ) value == null ) || ( ( ( String ) value ).length() < 7 );
@@ -192,6 +210,10 @@ public class TestEntryUtils
matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
{
+ /** The mandatory serialVersionUID field */
+ public static final long serialVersionUID = 1L;
+
+
public int compare( String o1, String o2 )
{
return ( ( o1 == null ) ?
@@ -216,6 +238,10 @@ public class TestEntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.2.1" )
{
+ /** The mandatory serialVersionUID field */
+ public static final long serialVersionUID = 1L;
+
+
public boolean isValidSyntax( Object value )
{
return ( value == null ) || ( ( ( byte[] ) value ).length < 5 );
@@ -229,6 +255,10 @@ public class TestEntryUtils
matchingRule.setNormalizer( new Normalizer( "1.1.1" )
{
+ /** The mandatory serialVersionUID field */
+ public static final long serialVersionUID = 1L;
+
+
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( !value.isHumanReadable() )
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java Mon May 20 23:43:35 2013
@@ -244,7 +244,7 @@ public interface LdapAsyncConnection ext
* @return extended operation's Future
* @throws LdapException if some error occurred
*/
- ExtendedFuture extendedAsync( ExtendedRequest extendedRequest ) throws LdapException;
+ ExtendedFuture extendedAsync( ExtendedRequest<?> extendedRequest ) throws LdapException;
/**
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Mon May 20 23:43:35 2013
@@ -672,7 +672,7 @@ public interface LdapConnection
* @return Extended operation's response
* @throws {@link LdapException} If the Dn is not valid or if the extended operation failed
*/
- ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException;
+ ExtendedResponse extended( ExtendedRequest<?> extendedRequest ) throws LdapException;
/**
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Mon May 20 23:43:35 2013
@@ -486,7 +486,6 @@ public class LdapNetworkConnection exten
/**
* {@inheritDoc}
*/
- @SuppressWarnings("PMD.EmptyCatchBlock")
public boolean connect() throws LdapException, IOException
{
if ( ( ldapSession != null ) && connected.get() )
@@ -641,6 +640,7 @@ public class LdapNetworkConnection exten
connected.set( true );
// Store the container into the session if we don't have one
+ @SuppressWarnings("unchecked")
LdapMessageContainer<MessageDecorator<? extends Message>> container =
( LdapMessageContainer<MessageDecorator<? extends Message>> ) ldapSession
.getAttribute( LdapDecoder.MESSAGE_CONTAINER_ATTR );
@@ -3065,7 +3065,7 @@ public class LdapNetworkConnection exten
/**
* {@inheritDoc}
*/
- public ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException
+ public ExtendedResponse extended( ExtendedRequest<?> extendedRequest ) throws LdapException
{
if ( extendedRequest == null )
{
@@ -3108,7 +3108,8 @@ public class LdapNetworkConnection exten
// Decode the payload now
resultResponse.getMessageId();
- ExtendedResponseDecorator decoratedResponse = ldapApiService.decorate( ( ExtendedResponse ) resultResponse );
+ ExtendedResponseDecorator<?> decoratedResponse = ldapApiService
+ .decorate( ( ExtendedResponse ) resultResponse );
return decoratedResponse;
}
@@ -3143,7 +3144,7 @@ public class LdapNetworkConnection exten
/**
* {@inheritDoc}
*/
- public ExtendedFuture extendedAsync( ExtendedRequest extendedRequest ) throws LdapException
+ public ExtendedFuture extendedAsync( ExtendedRequest<?> extendedRequest ) throws LdapException
{
if ( extendedRequest == null )
{
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java Mon May 20 23:43:35 2013
@@ -41,8 +41,6 @@ public class AddFuture extends ResponseF
* @param connection the LDAP connection
* @param messageId The associated messageId
*/
- // Implicit super constructor ResponseFuture<BindResponse>() is undefined for default constructor.
- @SuppressWarnings("PMD.UselessOverridingMethod")
public AddFuture( LdapConnection connection, int messageId )
{
super( connection, messageId );
@@ -50,20 +48,6 @@ public class AddFuture extends ResponseF
/**
- * Get the AddResponse, blocking until one is received.
- *
- * @return the add response
- * @throws InterruptedException {@inheritDoc}
- * @throws ExecutionException {@inheritDoc}
- */
- @SuppressWarnings("PMD.UselessOverridingMethod")
- public AddResponse get() throws InterruptedException, ExecutionException
- {
- return super.get();
- }
-
-
- /**
* Get the AddResponse, blocking until one is received, or until the
* given timeout is reached.
*
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java Mon May 20 23:43:35 2013
@@ -41,8 +41,6 @@ public class BindFuture extends Response
* @param connection the LDAP connection
* @param messageId the associated messageId
*/
- // Implicit super constructor ResponseFuture<BindResponse>() is undefined for default constructor.
- @SuppressWarnings("PMD.UselessOverridingMethod")
public BindFuture( LdapConnection connection, int messageId )
{
super( connection, messageId );
@@ -50,20 +48,6 @@ public class BindFuture extends Response
/**
- * Get the BindResponse, blocking until one is received.
- *
- * @return the bind response
- * @throws InterruptedException {@inheritDoc}
- * @throws ExecutionException {@inheritDoc}
- */
- @SuppressWarnings("PMD.UselessOverridingMethod")
- public BindResponse get() throws InterruptedException, ExecutionException
- {
- return super.get();
- }
-
-
- /**
* Get the BindResponse, blocking until one is received, or until the
* given timeout is reached.
*
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java Mon May 20 23:43:35 2013
@@ -41,8 +41,6 @@ public class CompareFuture extends Respo
* @param connection the LDAP connection
* @param messageId the associated messageId
*/
- // Implicit super constructor ResponseFuture<BindResponse>() is undefined for default constructor.
- @SuppressWarnings("PMD.UselessOverridingMethod")
public CompareFuture( LdapConnection connection, int messageId )
{
super( connection, messageId );
@@ -50,20 +48,6 @@ public class CompareFuture extends Respo
/**
- * Get the CompareResponse, blocking until one is received.
- *
- * @return the compare response
- * @throws InterruptedException {@inheritDoc}
- * @throws ExecutionException {@inheritDoc}
- */
- @SuppressWarnings("PMD.UselessOverridingMethod")
- public CompareResponse get() throws InterruptedException, ExecutionException
- {
- return super.get();
- }
-
-
- /**
* Get the CompareResponse, blocking until one is received, or until the
* given timeout is reached.
*
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java Mon May 20 23:43:35 2013
@@ -41,8 +41,6 @@ public class DeleteFuture extends Respon
* @param connection the LDAP connection
* @param messageId The associated messageId
*/
- // Implicit super constructor ResponseFuture<BindResponse>() is undefined for default constructor.
- @SuppressWarnings("PMD.UselessOverridingMethod")
public DeleteFuture( LdapConnection connection, int messageId )
{
super( connection, messageId );
@@ -50,20 +48,6 @@ public class DeleteFuture extends Respon
/**
- * Get the DeleteResponse, blocking until one is received.
- *
- * @return the delete response
- * @throws InterruptedException {@inheritDoc}
- * @throws ExecutionException {@inheritDoc}
- */
- @SuppressWarnings("PMD.UselessOverridingMethod")
- public DeleteResponse get() throws InterruptedException, ExecutionException
- {
- return super.get();
- }
-
-
- /**
* Get the DeleteResponse, blocking until one is received, or until the
* given timeout is reached.
*
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java Mon May 20 23:43:35 2013
@@ -41,8 +41,6 @@ public class ExtendedFuture extends Resp
* @param connection the LDAP connection
* @param messageId The associated messageId
*/
- // Implicit super constructor ResponseFuture<BindResponse>() is undefined for default constructor.
- @SuppressWarnings("PMD.UselessOverridingMethod")
public ExtendedFuture( LdapConnection connection, int messageId )
{
super( connection, messageId );
@@ -50,20 +48,6 @@ public class ExtendedFuture extends Resp
/**
- * Get the ExtendedResponse, blocking until one is received.
- *
- * @return the extended response
- * @throws InterruptedException {@inheritDoc}
- * @throws ExecutionException {@inheritDoc}
- */
- @SuppressWarnings("PMD.UselessOverridingMethod")
- public Response get() throws InterruptedException, ExecutionException
- {
- return super.get();
- }
-
-
- /**
* Get the ExtendedResponse, blocking until one is received, or until the
* given timeout is reached.
*
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java Mon May 20 23:43:35 2013
@@ -41,8 +41,6 @@ public class ModifyDnFuture extends Resp
* @param connection the LDAP connection
* @param messageId The associated messageId
*/
- // Implicit super constructor ResponseFuture<BindResponse>() is undefined for default constructor.
- @SuppressWarnings("PMD.UselessOverridingMethod")
public ModifyDnFuture( LdapConnection connection, int messageId )
{
super( connection, messageId );
@@ -50,20 +48,6 @@ public class ModifyDnFuture extends Resp
/**
- * Get the ModifyDnResponse, blocking until one is received.
- *
- * @return the modify Dn response
- * @throws InterruptedException {@inheritDoc}
- * @throws ExecutionException {@inheritDoc}
- */
- @SuppressWarnings("PMD.UselessOverridingMethod")
- public ModifyDnResponse get() throws InterruptedException, ExecutionException
- {
- return super.get();
- }
-
-
- /**
* Get the ModifyDnResponse, blocking until one is received, or until the
* given timeout is reached.
*
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java Mon May 20 23:43:35 2013
@@ -41,8 +41,6 @@ public class ModifyFuture extends Respon
* @param connection the LDAP connection
* @param messageId The associated messageId
*/
- // Implicit super constructor ResponseFuture<BindResponse>() is undefined for default constructor.
- @SuppressWarnings("PMD.UselessOverridingMethod")
public ModifyFuture( LdapConnection connection, int messageId )
{
super( connection, messageId );
@@ -50,20 +48,6 @@ public class ModifyFuture extends Respon
/**
- * Get the ModifyResponse, blocking until one is received.
- *
- * @return the modify response
- * @throws InterruptedException {@inheritDoc}
- * @throws ExecutionException {@inheritDoc}
- */
- @SuppressWarnings("PMD.UselessOverridingMethod")
- public ModifyResponse get() throws InterruptedException, ExecutionException
- {
- return super.get();
- }
-
-
- /**
* Get the ModifyResponse, blocking until one is received, or until the
* given timeout is reached.
*
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java Mon May 20 23:43:35 2013
@@ -41,8 +41,6 @@ public class SearchFuture extends Respon
* @param connection the LDAP connection
* @param messageId The associated messageId
*/
- // Implicit super constructor ResponseFuture<BindResponse>() is undefined for default constructor.
- @SuppressWarnings("PMD.UselessOverridingMethod")
public SearchFuture( LdapConnection connection, int messageId )
{
super( connection, messageId );
@@ -50,22 +48,6 @@ public class SearchFuture extends Respon
/**
- * Get the SearchResponse, blocking until one is received.
- * It can be either a SearchResultEntry, a SearchResultReference
- * or a SearchResultDone, the last of all the search responses.
- *
- * @return the response, either a SearchResultEntry, a SearchResultReference, or a SearchResultDone
- * @throws InterruptedException {@inheritDoc}
- * @throws ExecutionException {@inheritDoc}
- */
- @SuppressWarnings("PMD.UselessOverridingMethod")
- public Response get() throws InterruptedException, ExecutionException
- {
- return super.get();
- }
-
-
- /**
* Get the SearchResponse, blocking until one is received, or until the
* given timeout is reached. It can be either a SearchResultEntry,
* a SearchResultReference or a SearchResultDone, the last of all
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapMessageGrammar.java Mon May 20 23:43:35 2013
@@ -67,8 +67,8 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.actions.extendedRequest.StoreExtendedRequestName;
import org.apache.directory.api.ldap.codec.actions.extendedRequest.StoreExtendedRequestValue;
import org.apache.directory.api.ldap.codec.actions.extendedResponse.InitExtendedResponse;
-import org.apache.directory.api.ldap.codec.actions.extendedResponse.StoreExtendedResponseValue;
import org.apache.directory.api.ldap.codec.actions.extendedResponse.StoreExtendedResponseName;
+import org.apache.directory.api.ldap.codec.actions.extendedResponse.StoreExtendedResponseValue;
import org.apache.directory.api.ldap.codec.actions.intermediateResponse.InitIntermediateResponse;
import org.apache.directory.api.ldap.codec.actions.intermediateResponse.StoreIntermediateResponseName;
import org.apache.directory.api.ldap.codec.actions.intermediateResponse.StoreIntermediateResponseValue;
@@ -156,16 +156,13 @@ public final class LdapMessageGrammar<E>
static final boolean IS_DEBUG = LOG.isDebugEnabled();
/** The instance of grammar. LdapMessageGrammar is a singleton */
- @SuppressWarnings(
- { "unchecked", "rawtypes" })
- private static Grammar<LdapMessageContainer<MessageDecorator<? extends Message>>> instance = new LdapMessageGrammar();
+ private static Grammar<LdapMessageContainer<MessageDecorator<? extends Message>>> instance =
+ new LdapMessageGrammar<LdapMessageContainer<MessageDecorator<? extends Message>>>();
/**
* Creates a new LdapMessageGrammar object.
*/
- @SuppressWarnings(
- { "unchecked", "rawtypes" })
private LdapMessageGrammar()
{
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestDecorator.java Mon May 20 23:43:35 2013
@@ -160,6 +160,7 @@ public class ExtendedRequestDecorator<Q
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<P> addControl( Control control ) throws MessageException
{
return ( ExtendedRequest<P> ) super.addControl( control );
@@ -169,6 +170,7 @@ public class ExtendedRequestDecorator<Q
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<P> addAllControls( Control[] controls ) throws MessageException
{
return ( ExtendedRequest<P> ) super.addAllControls( controls );
@@ -178,6 +180,7 @@ public class ExtendedRequestDecorator<Q
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<P> removeControl( Control control ) throws MessageException
{
return ( ExtendedRequest<P> ) super.removeControl( control );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedResponseDecorator.java Mon May 20 23:43:35 2013
@@ -40,8 +40,6 @@ import org.apache.directory.api.util.Str
public class ExtendedResponseDecorator<R extends ExtendedResponse> extends ResponseDecorator<R>
implements ExtendedResponse
{
- private static final long serialVersionUID = -9029282485890195506L;
-
/** The response name as a byte[] */
private byte[] responseNameBytes;
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultActivator.java Mon May 20 23:43:35 2013
@@ -32,16 +32,12 @@ import org.osgi.framework.ServiceRegistr
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@SuppressWarnings(
- { "UnusedDeclaration" })
public class DefaultActivator implements BundleActivator
{
private DefaultLdapCodecService codec;
private ServiceRegistration registration;
- @SuppressWarnings(
- { "UnusedDeclaration" })
public DefaultActivator()
{
this.codec = new DefaultLdapCodecService();
Modified: directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java Mon May 20 23:43:35 2013
@@ -72,7 +72,8 @@ public class StandaloneLdapApiService im
private Map<String, ControlFactory<?, ?>> controlFactories = new HashMap<String, ControlFactory<?, ?>>();
/** The map of registered {@link org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory}'s by request OID */
- private Map<String, ExtendedRequestFactory<?, ?>> extReqFactories = new HashMap<String, ExtendedRequestFactory<?, ?>>();
+ private Map<String, ExtendedRequestFactory<?, ?>> extReqFactories =
+ new HashMap<String, ExtendedRequestFactory<?, ?>>();
/** The map of registered {@link UnsolicitedResponseFactory}'s by request OID */
private Map<String, UnsolicitedResponseFactory<?>> unsolicitedFactories = new HashMap<String, UnsolicitedResponseFactory<?>>();
@@ -222,6 +223,7 @@ public class StandaloneLdapApiService im
{
Class<?>[] types = new Class<?>[]
{ LdapApiService.class };
+ @SuppressWarnings("unchecked")
Class<? extends ControlFactory<?, ?>> clazz = ( Class<? extends ControlFactory<?, ?>> ) Class
.forName( control );
Constructor<?> constructor = clazz.getConstructor( types );
@@ -251,6 +253,7 @@ public class StandaloneLdapApiService im
{
Class<?>[] types = new Class<?>[]
{ LdapApiService.class };
+ @SuppressWarnings("unchecked")
Class<? extends ControlFactory<?, ?>> clazz = ( Class<? extends ControlFactory<?, ?>> ) Class
.forName( control );
Constructor<?> constructor = clazz.getConstructor( types );
@@ -293,11 +296,13 @@ public class StandaloneLdapApiService im
{
Class<?>[] types = new Class<?>[]
{ LdapApiService.class };
+ @SuppressWarnings("unchecked")
Class<? extends ExtendedRequestFactory<?, ?>> clazz = ( Class<? extends ExtendedRequestFactory<?, ?>> ) Class
.forName( extendedOperation );
Constructor<?> constructor = clazz.getConstructor( types );
- ExtendedRequestFactory<?, ?> factory = ( ExtendedRequestFactory<?, ?> ) constructor
+ @SuppressWarnings("unchecked")
+ ExtendedRequestFactory<ExtendedRequest<ExtendedResponse>, ExtendedResponse> factory = ( ExtendedRequestFactory<ExtendedRequest<ExtendedResponse>, ExtendedResponse> ) constructor
.newInstance( new Object[]
{ this } );
extReqFactories.put( factory.getOid(), factory );
@@ -323,6 +328,7 @@ public class StandaloneLdapApiService im
{
Class<?>[] types = new Class<?>[]
{ LdapApiService.class };
+ @SuppressWarnings("unchecked")
Class<? extends UnsolicitedResponseFactory<?>> clazz = ( Class<? extends UnsolicitedResponseFactory<?>> ) Class
.forName( extendedOperation );
Constructor<?> constructor = clazz.getConstructor( types );
@@ -396,7 +402,8 @@ public class StandaloneLdapApiService im
/**
* {@inheritDoc}
*/
- public ExtendedRequestFactory<?, ?> registerExtendedRequest( ExtendedRequestFactory<?, ?> factory )
+ public ExtendedRequestFactory<?, ?>
+ registerExtendedRequest( ExtendedRequestFactory<?, ?> factory )
{
return extReqFactories.put( factory.getOid(), factory );
}
@@ -558,7 +565,8 @@ public class StandaloneLdapApiService im
/**
* {@inheritDoc}
*/
- public ExtendedRequestFactory<?, ?> unregisterExtendedRequest( String oid )
+ public ExtendedRequestFactory<?, ?> unregisterExtendedRequest(
+ String oid )
{
return extReqFactories.remove( oid );
}
@@ -703,7 +711,8 @@ public class StandaloneLdapApiService im
{
ExtendedRequest<?> req = null;
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( oid );
+ ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories
+ .get( oid );
if ( extendedRequestFactory != null )
{
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java Mon May 20 23:43:35 2013
@@ -37,9 +37,6 @@ import org.apache.directory.api.ldap.mod
*/
public class CancelRequestImpl extends AbstractExtendedRequest<CancelResponse> implements CancelRequest
{
- /** The serial version UUID */
- private static final long serialVersionUID = 1L;
-
/** The cancelId of the request to be canceled */
private int cancelId;
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java Mon May 20 23:43:35 2013
@@ -33,10 +33,6 @@ import org.apache.directory.api.ldap.mod
*/
public class CancelResponseImpl extends ExtendedResponseImpl implements CancelResponse
{
- /** The serial version UUID */
- private static final long serialVersionUID = 1L;
-
-
/**
* Create a new CancelResponse object
* @param messageId The messageId
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequestImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationRequestImpl.java Mon May 20 23:43:35 2013
@@ -33,9 +33,6 @@ import org.apache.directory.api.ldap.mod
public class CertGenerationRequestImpl extends AbstractExtendedRequest<CertGenerationResponse> implements
CertGenerationRequest
{
- /** The serial version UUID */
- private static final long serialVersionUID = 1L;
-
/** the Dn of the server entry which will be updated*/
private String targetDN;
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponseImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CertGenerationResponseImpl.java Mon May 20 23:43:35 2013
@@ -33,10 +33,6 @@ import org.apache.directory.api.ldap.mod
*/
public class CertGenerationResponseImpl extends ExtendedResponseImpl implements CertGenerationResponse
{
- /** The serial version UUID */
- private static final long serialVersionUID = 1L;
-
-
public CertGenerationResponseImpl( int messageId, ResultCodeEnum rcode )
{
super( messageId, EXTENSION_OID );
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java Mon May 20 23:43:35 2013
@@ -38,9 +38,6 @@ import org.apache.directory.api.ldap.mod
*/
public class GracefulDisconnectResponseImpl extends ExtendedResponseImpl implements GracefulDisconnectResponse
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = -4682291068700593492L;
-
/** Offline time after disconnection */
private int timeOffline;
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java Mon May 20 23:43:35 2013
@@ -35,9 +35,6 @@ import org.apache.directory.api.ldap.mod
public class GracefulShutdownRequestImpl extends AbstractExtendedRequest<GracefulShutdownResponse> implements
GracefulShutdownRequest
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = -4682291068700593492L;
-
private GracefulShutdownResponse response;
/** Offline time after disconnection */
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java Mon May 20 23:43:35 2013
@@ -34,10 +34,6 @@ import org.apache.directory.api.ldap.mod
*/
public class GracefulShutdownResponseImpl extends ExtendedResponseImpl implements GracefulShutdownResponse
{
- /** The Constant serialVersionUID. */
- private static final long serialVersionUID = -3824715470944544189L;
-
-
/**
* Instantiates a new graceful shutdown response.
*
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/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/StoredProcedureRequestImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java Mon May 20 23:43:35 2013
@@ -41,9 +41,6 @@ import org.apache.directory.api.util.exc
public class StoredProcedureRequestImpl extends AbstractExtendedRequest<StoredProcedureResponse> implements
StoredProcedureRequest
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = -4682291068700593492L;
-
private String language = "Java";
private byte[] procedure = StringConstants.EMPTY_BYTES;
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java Mon May 20 23:43:35 2013
@@ -31,10 +31,6 @@ import org.apache.directory.api.ldap.mod
*/
public class StoredProcedureResponseImpl extends ExtendedResponseImpl implements StoredProcedureResponse
{
- /** The Constant serialVersionUID. */
- private static final long serialVersionUID = 7689434378578829994L;
-
-
/**
* Instantiates a new stored procedure response.
*
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java Mon May 20 23:43:35 2013
@@ -58,7 +58,7 @@ import org.osgi.framework.ServiceReferen
*/
public class ExtrasBundleActivator implements BundleActivator
{
- private ServiceReference codecServiceRef;
+ private ServiceReference<?> codecServiceRef;
/**
Modified: directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecificationParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecificationParser.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecificationParser.java (original)
+++ directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecificationParser.java Mon May 20 23:43:35 2013
@@ -25,6 +25,7 @@ import java.io.StringReader;
import java.text.ParseException;
import org.apache.directory.api.i18n.I18n;
+import org.apache.directory.api.ldap.model.schema.Normalizer;
import org.apache.directory.api.ldap.model.schema.NormalizerMappingResolver;
import antlr.RecognitionException;
@@ -68,7 +69,7 @@ public class TriggerSpecificationParser
*
* @param resolver the resolver
*/
- public TriggerSpecificationParser( NormalizerMappingResolver resolver )
+ public TriggerSpecificationParser( NormalizerMappingResolver<Normalizer> resolver )
{
this.lexer = new ReusableAntlrTriggerSpecificationLexer( new StringReader( "" ) );
this.parser = new ReusableAntlrTriggerSpecificationParser( lexer );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/constants/SchemaConstants.java Mon May 20 23:43:35 2013
@@ -27,7 +27,6 @@ package org.apache.directory.api.ldap.mo
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
public final class SchemaConstants
{
/**
@@ -518,8 +517,7 @@ public final class SchemaConstants
//-------------------------------------------------------------------------
// ObjectClasses
//-------------------------------------------------------------------------
-
-
+
//=========================================================================
// DirectoryService AT and OC
//-------------------------------------------------------------------------
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/SetCursor.java Mon May 20 23:43:35 2013
@@ -66,6 +66,7 @@ public class SetCursor<E> extends Abstra
* @param comparator an optional comparator to use for ordering
* @param set the Set this StCursor operates on
*/
+ @SuppressWarnings("unchecked")
public SetCursor( Comparator<E> comparator, Set<E> set )
{
if ( set == null )
@@ -101,6 +102,7 @@ public class SetCursor<E> extends Abstra
/**
* Creates a new SetCursor without any elements.
*/
+ @SuppressWarnings("unchecked")
public SetCursor()
{
this( null, Collections.EMPTY_SET );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/AbstractValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/AbstractValue.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/AbstractValue.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/AbstractValue.java Mon May 20 23:43:35 2013
@@ -122,6 +122,7 @@ public abstract class AbstractValue<T> i
* @throws LdapInvalidAttributeValueException If the value is not valid accordingly
* to the schema
*/
+ @SuppressWarnings("unchecked")
protected void apply( AttributeType attributeType ) throws LdapInvalidAttributeValueException
{
if ( attributeType == null )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/FilterParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/FilterParser.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/FilterParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/FilterParser.java Mon May 20 23:43:35 2013
@@ -101,7 +101,6 @@ public class FilterParser
if ( Strings.byteAt( filter, pos.start ) == ':' )
{
pos.start++;
- int start = pos.start;
if ( Strings.byteAt( filter, pos.start ) == '=' )
{
@@ -158,7 +157,6 @@ public class FilterParser
if ( Strings.byteAt( filter, pos.start ) == ':' )
{
pos.start++;
- int start = pos.start;
if ( Strings.byteAt( filter, pos.start ) == '=' )
{
@@ -235,7 +233,8 @@ public class FilterParser
* HEX = '0'-'9' / 'A'-'F' / 'a'-'f'
* unicodeSubset = %x01-27 / %x2B-5B / %x5D-FFFF
*/
- private static Value<?> parseAssertionValue( SchemaManager schemaManager, String attribute, byte[] filter, Position pos ) throws ParseException
+ private static Value<?> parseAssertionValue( SchemaManager schemaManager, String attribute, byte[] filter,
+ Position pos ) throws ParseException
{
byte b = Strings.byteAt( filter, pos.start );
@@ -292,12 +291,12 @@ public class FilterParser
if ( schemaManager != null )
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType == null )
{
return new BinaryValue( result );
}
-
+
if ( attributeType.getSyntax().isHumanReadable() )
{
return new StringValue( Strings.utf8ToString( result ) );
@@ -317,7 +316,7 @@ public class FilterParser
if ( schemaManager != null )
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType.getEquality().getSyntax().isHumanReadable() )
{
return new StringValue( null );
@@ -600,7 +599,8 @@ public class FilterParser
// Parse the value and create the node
if ( schemaManager == null )
{
- return new ApproximateNode( attribute, parseAssertionValue( schemaManager, attribute, filter, pos ) );
+ return new ApproximateNode( attribute, parseAssertionValue( schemaManager, attribute, filter,
+ pos ) );
}
else
{
@@ -608,7 +608,8 @@ public class FilterParser
if ( attributeType != null )
{
- return new ApproximateNode( attributeType, parseAssertionValue( schemaManager, attribute, filter, pos ) );
+ return new ApproximateNode( attributeType, parseAssertionValue( schemaManager, attribute,
+ filter, pos ) );
}
else
{
@@ -631,7 +632,8 @@ public class FilterParser
// Parse the value and create the node
if ( schemaManager == null )
{
- return new GreaterEqNode( attribute, parseAssertionValue( schemaManager, attribute, filter, pos ) );
+ return new GreaterEqNode( attribute,
+ parseAssertionValue( schemaManager, attribute, filter, pos ) );
}
else
{
@@ -639,7 +641,8 @@ public class FilterParser
if ( attributeType != null )
{
- return new GreaterEqNode( attributeType, parseAssertionValue( schemaManager, attribute, filter, pos ) );
+ return new GreaterEqNode( attributeType, parseAssertionValue( schemaManager, attribute,
+ filter, pos ) );
}
else
{
@@ -670,7 +673,8 @@ public class FilterParser
if ( attributeType != null )
{
- return new LessEqNode( attributeType, parseAssertionValue( schemaManager, attribute, filter, pos ) );
+ return new LessEqNode( attributeType, parseAssertionValue( schemaManager, attribute,
+ filter, pos ) );
}
else
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReader.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReader.java Mon May 20 23:43:35 2013
@@ -435,8 +435,6 @@ public class LdifAttributesReader extend
* @return A list of Attributes, or an empty List
* @throws LdapLdifException If something went wrong
*/
- // This will suppress PMD.EmptyCatchBlock warnings in this method
- @SuppressWarnings("PMD.EmptyCatchBlock")
public Attributes parseAttributes( String ldif ) throws LdapLdifException
{
lines = new ArrayList<String>();
@@ -498,8 +496,6 @@ public class LdifAttributesReader extend
* @return An entry
* @throws LdapLdifException If something went wrong
*/
- // This will suppress PMD.EmptyCatchBlock warnings in this method
- @SuppressWarnings("PMD.EmptyCatchBlock")
public Entry parseEntry( String ldif ) throws LdapLdifException
{
lines = new ArrayList<String>();
@@ -563,8 +559,6 @@ public class LdifAttributesReader extend
* @return An entry
* @throws LdapLdifException If something went wrong
*/
- // This will suppress PMD.EmptyCatchBlock warnings in this method
- @SuppressWarnings("PMD.EmptyCatchBlock")
public Entry parseEntry( SchemaManager schemaManager, String ldif ) throws LdapLdifException
{
lines = new ArrayList<String>();
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java Mon May 20 23:43:35 2013
@@ -1624,8 +1624,6 @@ public class LdifReader implements Itera
* @return A list of entries
* @throws LdapLdifException If the parsing fails
*/
- // This will suppress PMD.EmptyCatchBlock warnings in this method
- @SuppressWarnings("PMD.EmptyCatchBlock")
public List<LdifEntry> parseLdifFile( String fileName, String encoding ) throws LdapLdifException
{
if ( Strings.isEmpty( fileName ) )
@@ -1686,8 +1684,6 @@ public class LdifReader implements Itera
* @return A list of entries, or an empty List
* @throws LdapLdifException If something went wrong
*/
- // This will suppress PMD.EmptyCatchBlock warnings in this method
- @SuppressWarnings("PMD.EmptyCatchBlock")
public List<LdifEntry> parseLdif( String ldif ) throws LdapLdifException
{
LOG.debug( "Starts parsing ldif buffer" );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractExtendedRequest.java Mon May 20 23:43:35 2013
@@ -105,6 +105,7 @@ public abstract class AbstractExtendedRe
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<R> addControl( Control control ) throws MessageException
{
return ( ExtendedRequest<R> ) super.addControl( control );
@@ -114,6 +115,7 @@ public abstract class AbstractExtendedRe
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<R> addAllControls( Control[] controls ) throws MessageException
{
return ( ExtendedRequest<R> ) super.addAllControls( controls );
@@ -123,6 +125,7 @@ public abstract class AbstractExtendedRe
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<R> removeControl( Control control ) throws MessageException
{
return ( ExtendedRequest<R> ) super.removeControl( control );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractMessage.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractMessage.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractMessage.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AbstractMessage.java Mon May 20 23:43:35 2013
@@ -34,8 +34,6 @@ import org.apache.directory.api.ldap.mod
*/
public abstract class AbstractMessage implements Message
{
- private static final long serialVersionUID = 7601738291101182094L;
-
/** Map of message controls using OID Strings for keys and Control values */
protected final Map<String, Control> controls;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/ExtendedRequestImpl.java Mon May 20 23:43:35 2013
@@ -92,6 +92,7 @@ public class ExtendedRequestImpl extends
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<ExtendedResponse> addControl( Control control ) throws MessageException
{
return ( ExtendedRequest<ExtendedResponse> ) super.addControl( control );
@@ -101,6 +102,7 @@ public class ExtendedRequestImpl extends
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<ExtendedResponse> addAllControls( Control[] controls ) throws MessageException
{
return ( ExtendedRequest<ExtendedResponse> ) super.addAllControls( controls );
@@ -110,6 +112,7 @@ public class ExtendedRequestImpl extends
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public ExtendedRequest<ExtendedResponse> removeControl( Control control ) throws MessageException
{
return ( ExtendedRequest<ExtendedResponse> ) super.removeControl( control );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/extended/NoticeOfDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/extended/NoticeOfDisconnect.java?rev=1484624&r1=1484623&r2=1484624&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/extended/NoticeOfDisconnect.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/extended/NoticeOfDisconnect.java Mon May 20 23:43:35 2013
@@ -103,9 +103,6 @@ import org.apache.directory.api.ldap.mod
*/
public final class NoticeOfDisconnect extends ExtendedResponseImpl
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = -4682291068700593492L;
-
/** The OID of the NotiveOfDisconnect extended operation. */
public static final String EXTENSION_OID = "1.3.6.1.4.1.1466.20036";