You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/12/17 15:18:17 UTC
svn commit: r1774774 [6/10] - in /directory/shared/branches/shared-value: ./
asn1/ber/src/main/java/org/apache/directory/api/asn1/actions/
asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/
asn1/ber/src/main/java/org/apache/directory/api/asn1/be...
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ErrorResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ErrorResponse.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ErrorResponse.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ErrorResponse.java Sat Dec 17 15:18:15 2016
@@ -122,9 +122,10 @@ public class ErrorResponse extends Abstr
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
@@ -138,7 +139,7 @@ public class ErrorResponse extends Abstr
// RequestID
if ( requestID != 0 )
{
- element.addAttribute( "requestID", "" + requestID );
+ element.addAttribute( "requestID", Integer.toString( requestID ) );
}
// Type
@@ -275,6 +276,9 @@ public class ErrorResponse extends Abstr
}
+ /**
+ * @return The LdapApiService instance
+ */
public LdapApiService getCodecService()
{
throw new IllegalArgumentException( "This should not be a decorator "
@@ -283,6 +287,10 @@ public class ErrorResponse extends Abstr
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public Response getDecorated()
{
return this;
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ExtendedResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ExtendedResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ExtendedResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -71,6 +71,7 @@ public class ExtendedResponseDsml extend
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -80,9 +81,10 @@ public class ExtendedResponseDsml extend
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
@@ -137,6 +139,7 @@ public class ExtendedResponseDsml extend
/**
* {@inheritDoc}
*/
+ @Override
public void setResponseName( String oid )
{
getDecorated().setResponseName( oid );
@@ -148,6 +151,7 @@ public class ExtendedResponseDsml extend
*
* @return Returns the name.
*/
+ @Override
public String getResponseName()
{
return getDecorated().getResponseName();
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/LdapResultDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/LdapResultDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/LdapResultDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/LdapResultDsml.java Sat Dec 17 15:18:15 2016
@@ -70,6 +70,7 @@ public class LdapResultDsml implements D
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
@@ -77,7 +78,7 @@ public class LdapResultDsml implements D
int requestID = message.getMessageId();
if ( requestID > 0 )
{
- root.addAttribute( "requestID", "" + requestID );
+ root.addAttribute( "requestID", Integer.toString( requestID ) );
}
// Matched Dn
@@ -93,12 +94,13 @@ public class LdapResultDsml implements D
// ResultCode
Element resultCodeElement = root.addElement( "resultCode" );
- resultCodeElement.addAttribute( "code", "" + result.getResultCode().getResultCode() );
+ resultCodeElement.addAttribute( "code", Integer.toString( result.getResultCode().getResultCode() ) );
resultCodeElement.addAttribute( "descr", result.getResultCode().getMessage() );
// ErrorMessage
- String errorMessage = ( result.getDiagnosticMessage() );
- if ( ( errorMessage != null ) && ( !errorMessage.equals( "" ) ) )
+ String errorMessage = result.getDiagnosticMessage();
+
+ if ( ( errorMessage != null ) && ( errorMessage.length() != 0 ) )
{
Element errorMessageElement = root.addElement( "errorMessage" );
errorMessageElement.addText( errorMessage );
@@ -126,6 +128,7 @@ public class LdapResultDsml implements D
/**
* {@inheritDoc}
*/
+ @Override
public String getDiagnosticMessage()
{
return result.getDiagnosticMessage();
@@ -135,6 +138,7 @@ public class LdapResultDsml implements D
/**
* {@inheritDoc}
*/
+ @Override
public void setDiagnosticMessage( String diagnosticMessage )
{
result.setDiagnosticMessage( diagnosticMessage );
@@ -146,6 +150,7 @@ public class LdapResultDsml implements D
*
* @return Returns the matchedDN.
*/
+ @Override
public Dn getMatchedDn()
{
return result.getMatchedDn();
@@ -157,6 +162,7 @@ public class LdapResultDsml implements D
*
* @param matchedDn The matchedDn to set.
*/
+ @Override
public void setMatchedDn( Dn matchedDn )
{
result.setMatchedDn( matchedDn );
@@ -190,6 +196,7 @@ public class LdapResultDsml implements D
*
* @return Returns the resultCode.
*/
+ @Override
public ResultCodeEnum getResultCode()
{
return result.getResultCode();
@@ -201,6 +208,7 @@ public class LdapResultDsml implements D
*
* @param resultCode The resultCode to set.
*/
+ @Override
public void setResultCode( ResultCodeEnum resultCode )
{
result.setResultCode( resultCode );
@@ -210,6 +218,7 @@ public class LdapResultDsml implements D
/**
* {@inheritDoc}
*/
+ @Override
public LdapResult getDecorated()
{
return result;
@@ -219,6 +228,7 @@ public class LdapResultDsml implements D
/**
* {@inheritDoc}
*/
+ @Override
public boolean isReferral()
{
return getDecorated().isReferral();
@@ -228,6 +238,7 @@ public class LdapResultDsml implements D
/**
* {@inheritDoc}
*/
+ @Override
public Referral getReferral()
{
return getDecorated().getReferral();
@@ -237,6 +248,7 @@ public class LdapResultDsml implements D
/**
* {@inheritDoc}
*/
+ @Override
public void setReferral( Referral referral )
{
getDecorated().setReferral( referral );
@@ -246,6 +258,7 @@ public class LdapResultDsml implements D
/**
* {@inheritDoc}
*/
+ @Override
public boolean isDefaultSuccess()
{
return false;
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ModDNResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ModDNResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ModDNResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ModDNResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -65,6 +65,7 @@ public class ModDNResponseDsml extends A
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -74,9 +75,10 @@ public class ModDNResponseDsml extends A
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ModifyResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ModifyResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ModifyResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/ModifyResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -65,6 +65,7 @@ public class ModifyResponseDsml extends
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -74,9 +75,10 @@ public class ModifyResponseDsml extends
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResponse.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResponse.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResponse.java Sat Dec 17 15:18:15 2016
@@ -35,10 +35,10 @@ import org.apache.directory.api.ldap.mod
public class SearchResponse extends AbstractResponse
{
/** The List of contained Search Result Entries */
- private List<SearchResultEntryDsml> searchResultEntryList = new ArrayList<SearchResultEntryDsml>();
+ private List<SearchResultEntryDsml> searchResultEntryList = new ArrayList<>();
/** The List of contained Search Result References */
- private List<SearchResultReferenceDsml> searchResultReferenceList = new ArrayList<SearchResultReferenceDsml>();
+ private List<SearchResultReferenceDsml> searchResultReferenceList = new ArrayList<>();
/** The Search Result Done object */
private SearchResultDoneDsml searchResultDone;
@@ -100,7 +100,7 @@ public class SearchResponse extends Abst
*/
public SearchResultEntryDsml getCurrentSearchResultEntry()
{
- if ( searchResultEntryList.size() > 0 )
+ if ( !searchResultEntryList.isEmpty() )
{
return searchResultEntryList.get( searchResultEntryList.size() - 1 );
}
@@ -159,7 +159,7 @@ public class SearchResponse extends Abst
*/
public SearchResultReferenceDsml getCurrentSearchResultReference()
{
- if ( searchResultReferenceList.size() > 0 )
+ if ( !searchResultReferenceList.isEmpty() )
{
return searchResultReferenceList.get( searchResultReferenceList.size() - 1 );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResponseDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResponseDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResponseDsml.java Sat Dec 17 15:18:15 2016
@@ -47,7 +47,7 @@ public class SearchResponseDsml extends
/** The responses */
private List<DsmlDecorator<? extends Response>> responses =
- new ArrayList<DsmlDecorator<? extends Response>>();
+ new ArrayList<>();
/**
@@ -146,9 +146,10 @@ public class SearchResponseDsml extends
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
@@ -165,7 +166,7 @@ public class SearchResponseDsml extends
int requestID = getDecorated().getMessageId();
if ( requestID > 0 )
{
- element.addAttribute( "requestID", "" + requestID );
+ element.addAttribute( "requestID", Integer.toString( requestID ) );
}
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultDoneDsml.java Sat Dec 17 15:18:15 2016
@@ -65,6 +65,7 @@ public class SearchResultDoneDsml extend
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -74,9 +75,10 @@ public class SearchResultDoneDsml extend
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java Sat Dec 17 15:18:15 2016
@@ -121,6 +121,7 @@ public class SearchResultEntryDsml
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -130,9 +131,10 @@ public class SearchResultEntryDsml
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
@@ -143,7 +145,7 @@ public class SearchResultEntryDsml
element = new DefaultElement( SEARCH_RESULT_ENTRY_TAG );
}
- SearchResultEntry searchResultEntry = ( SearchResultEntry ) getDecorated();
+ SearchResultEntry searchResultEntry = getDecorated();
element.addAttribute( "dn", searchResultEntry.getObjectName().getName() );
Entry entry = searchResultEntry.getEntry();
@@ -189,6 +191,7 @@ public class SearchResultEntryDsml
*
* @return Returns the objectName.
*/
+ @Override
public Dn getObjectName()
{
return getDecorated().getObjectName();
@@ -200,6 +203,7 @@ public class SearchResultEntryDsml
*
* @param objectName The objectName to set.
*/
+ @Override
public void setObjectName( Dn objectName )
{
getDecorated().setObjectName( objectName );
@@ -211,6 +215,7 @@ public class SearchResultEntryDsml
*
* @return Returns the entry.
*/
+ @Override
public Entry getEntry()
{
return getDecorated().getEntry();
@@ -222,6 +227,7 @@ public class SearchResultEntryDsml
*
* @param entry the entry
*/
+ @Override
public void setEntry( Entry entry )
{
getDecorated().setEntry( entry );
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultReferenceDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultReferenceDsml.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultReferenceDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultReferenceDsml.java Sat Dec 17 15:18:15 2016
@@ -70,6 +70,7 @@ public class SearchResultReferenceDsml
/**
* {@inheritDoc}
*/
+ @Override
public MessageTypeEnum getType()
{
return getDecorated().getType();
@@ -79,9 +80,10 @@ public class SearchResultReferenceDsml
/**
* {@inheritDoc}
*/
+ @Override
public Element toDsml( Element root )
{
- Element element = null;
+ Element element;
if ( root != null )
{
@@ -127,6 +129,7 @@ public class SearchResultReferenceDsml
/**
* {@inheritDoc}
*/
+ @Override
public Referral getReferral()
{
return getDecorated().getReferral();
@@ -136,6 +139,7 @@ public class SearchResultReferenceDsml
/**
* {@inheritDoc}
*/
+ @Override
public void setReferral( Referral referral )
{
getDecorated().setReferral( referral );
Added: directory/shared/branches/shared-value/first-benchmark/.classpath
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/.classpath?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/.classpath (added)
+++ directory/shared/branches/shared-value/first-benchmark/.classpath Sat Dec 17 15:18:15 2016
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: directory/shared/branches/shared-value/first-benchmark/.project
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/.project?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/.project (added)
+++ directory/shared/branches/shared-value/first-benchmark/.project Sat Dec 17 15:18:15 2016
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>first-benchmark</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.core.resources.prefs
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.core.resources.prefs?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.core.resources.prefs (added)
+++ directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.core.resources.prefs Sat Dec 17 15:18:15 2016
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=ISO-8859-1
+encoding//src/main/resources=UTF-8
+encoding/<project>=UTF-8
Added: directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.jdt.core.prefs?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.jdt.core.prefs (added)
+++ directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.jdt.core.prefs Sat Dec 17 15:18:15 2016
@@ -0,0 +1,13 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
Added: directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.m2e.core.prefs
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.m2e.core.prefs?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.m2e.core.prefs (added)
+++ directory/shared/branches/shared-value/first-benchmark/.settings/org.eclipse.m2e.core.prefs Sat Dec 17 15:18:15 2016
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: directory/shared/branches/shared-value/first-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/pom.xml?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/pom.xml (added)
+++ directory/shared/branches/shared-value/first-benchmark/pom.xml Sat Dec 17 15:18:15 2016
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2014, Oracle America, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the name of Oracle nor the names of its contributors may be used
+ to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>api-parent</artifactId>
+ <groupId>org.apache.directory.api</groupId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.directory</groupId>
+ <artifactId>first-benchmark</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>JMH benchmark sample: Java</name>
+
+ <!--
+ This is the demo/sample template build script for building Java benchmarks with JMH.
+ Edit as needed.
+ -->
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-core</artifactId>
+ <version>${jmh.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-generator-annprocess</artifactId>
+ <version>${jmh.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-util</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-asn1-api</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-asn1-ber</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-i18n</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-model</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-client-api</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-codec-core</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-extras-aci</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-extras-codec</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-extras-codec-api</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-extras-sp</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-extras-trigger</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-extras-util</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-net-mina</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-converter</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <!--dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.1.3</version>
+ </dependency-->
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.16</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.16</version>
+ </dependency>
+
+ <!--dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency-->
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-schema-data</artifactId>
+ <version>2.0.0-M1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.0.13</version>
+ </dependency>
+
+ <!-- The original antlr artifact is needed by the antlr-maven-plugin which
+ checks for its existence within the classpath. Use scope provided to avoid
+ propagation to dependent projects. Choosen artifact is a valid OSGi bundle
+ repackaged by ServiceMix team, kudos to them. -->
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <scope>provided</scope>
+ <version>2.7.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
+ <version>2.7.7_5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jmh.version>1.12</jmh.version>
+ <javac.target>1.6</javac.target>
+ <uberjar.name>benchmarks</uberjar.name>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <compilerVersion>${javac.target}</compilerVersion>
+ <source>${javac.target}</source>
+ <target>${javac.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <finalName>${uberjar.name}</finalName>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.openjdk.jmh.Main</mainClass>
+ </transformer>
+ </transformers>
+ <filters>
+ <filter>
+ <!--
+ Shading signed JARs will fail without this.
+ http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+ -->
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Added: directory/shared/branches/shared-value/first-benchmark/src/main/java/org/apache/directory/MyBenchmark.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/src/main/java/org/apache/directory/MyBenchmark.java?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/src/main/java/org/apache/directory/MyBenchmark.java (added)
+++ directory/shared/branches/shared-value/first-benchmark/src/main/java/org/apache/directory/MyBenchmark.java Sat Dec 17 15:18:15 2016
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2014, Oracle America, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of Oracle nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.apache.directory;
+
+import java.util.Collections;
+import java.util.List;
+
+//import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.openjdk.jmh.annotations.Benchmark;
+
+public class MyBenchmark
+{
+ private static SchemaManager schemaManager;
+ private static StringBuilder sb = new StringBuilder( "AZERTYUIOPQSDFGJKL" );
+ private static Dn dn1;
+ private static Dn dn2;
+
+ static
+ {
+ schemaManager = new DefaultSchemaManager();
+
+ List<Logger> loggers = Collections.<Logger>list( LogManager.getCurrentLoggers() );
+ loggers.add( LogManager.getRootLogger() );
+
+ for ( Logger logger : loggers )
+ {
+ logger.setLevel( Level.OFF );
+ }
+
+ try
+ {
+ dn1 = new Dn( schemaManager, "cn=elecharny,dc=symas,dc=com" );
+ dn2 = new Dn( schemaManager, "cn=elecharnu,dc=symas,dc=com" );
+ }
+ catch ( LdapInvalidDnException e )
+ {
+ e.printStackTrace();
+ }
+ }
+
+ private void exch( int[] indices, int x, int y )
+ {
+ int tmp = indices[x];
+ indices[x] = indices[y];
+ indices[y] = tmp;
+ }
+
+
+ private int getValue( int[] values, int[] indices, int pos )
+ {
+ return values[indices[pos]];
+ }
+
+
+ private int comp( int a, int b )
+ {
+ return a - b;
+ }
+
+ private int slap_sort_vals( int[] values, int small )
+ {
+ int[] istack = new int[16];
+ int i, j, k, left, right, jstack, match, indices[], itmp, rc = 0;
+ int nvals = values.length;
+ int is_norm;
+ int a, cv[];
+
+ /*
+ #define SWAP(a,b,tmp) tmp=(a);(a)=(b);(b)=tmp
+ #define COMP(a,b) match=0; rc = ordered_value_match( &match, \
+ attributeDescription, matchingRule, SLAP_MR_EQUALITY \
+ | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX \
+ | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH \
+ | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH, \
+ &(a), &(b), text );
+ */
+
+ if ( nvals <= 1 )
+ {
+ return 0;
+ }
+
+ /* record indices to preserve input ordering */
+ indices = new int[ nvals ];
+
+ for (i=0; i<nvals; i++)
+ {
+ indices[i] = i;
+ }
+
+ right = nvals-1;
+ left = 0;
+ jstack = 0;
+
+ for(;;)
+ {
+ if (right - left < 8)
+ { /* Insertion sort */
+ match=1;
+
+ for (j=left+1;j<=right;j++)
+ {
+ itmp = indices[j];
+ a = values[itmp];
+
+ for (i=j-1;i>=0;i--)
+ {
+ COMP(cv[indices[i]], a);
+
+ if ( match <= 0 )
+ {
+ break;
+ }
+
+ indices[i+1] = indices[i]
+ }
+
+ indices[i+1] = itmp;
+
+ if ( match == 0 )
+ {
+ goto done;
+ }
+ }
+
+ if ( jstack == 0 )
+ {
+ break;
+ }
+
+ right = istack[jstack--];
+ left = istack[jstack--];
+ }
+ else
+ {
+ k = (left + right) >> 1; /* Choose median of left, center, right */
+ SWAP(indices[k],indices[left+1],itmp);
+ COMP( cv[indices[left]], cv[indices[right]] );
+
+ if ( match > 0 )
+ {
+ SWAP(indices[left],indices[right],itmp);
+ }
+ else if ( match == 0 )
+ {
+ i = right;
+ break;
+ }
+
+ COMP( cv[indices[left+1]], cv[indices[right]] );
+
+ if ( match > 0 )
+ {
+ SWAP(indices[left+1],indices[right],itmp);
+ }
+ else if ( match == 0 )
+ {
+ i = right;
+ break;
+ }
+
+ COMP( cv[indices[left]], cv[indices[left+1]] );
+
+ if ( match > 0 )
+ {
+ SWAP(indices[left],indices[left+1],itmp);
+ }
+ else if ( match == 0 )
+ {
+ i = left;
+ break;
+ }
+
+ i = left+1;
+ j = right;
+ a = cv[indices[i]];
+
+ for(;;)
+ {
+ do
+ {
+ i++;
+ COMP( cv[indices[i]], a );
+ }
+ while( match < 0 );
+
+ while( match > 0 )
+ {
+ j--;
+ COMP( cv[indices[j]], a );
+ }
+
+ if (j < i)
+ {
+ match = 1;
+ break;
+ }
+
+ if ( match == 0 )
+ {
+ i = left+1;
+ break;
+ }
+
+ SWAP(indices[i],indices[j],itmp);
+ }
+
+ if ( match == 0 )
+ {
+ break;
+ }
+
+ SWAP(indices[left+1],indices[j],itmp);
+ jstack += 2;
+
+ if (right-i+1 > j-left)
+ {
+ istack[jstack] = right;
+ istack[jstack-1] = i;
+ right = j;
+ }
+ else
+ {
+ istack[jstack] = j;
+ istack[jstack-1] = left;
+ left = i;
+ }
+ }
+ }
+
+ done:
+ if ( match == 0 && i >= 0 )
+ {
+ *dup = indices[i];
+ }
+
+ /* For sorted attributes, put the values in index order */
+ if ( rc == LDAP_SUCCESS && match &&
+ ( attributeDescription->ad_type->sat_flags & SLAP_AT_SORTED_VAL ))
+ {
+ BerVarray tmpv = slap_sl_malloc( sizeof( struct berval ) * nvals, ctx );
+
+ for ( i = 0; i<nvals; i++ )
+ {
+ tmpv[i] = cv[indices[i]];
+ }
+
+ for ( i = 0; i<nvals; i++ )
+ {
+ cv[i] = tmpv[i];
+ }
+
+ /* Check if the non-normalized array needs to move too */
+ if ( is_norm )
+ {
+ cv = ml->sml_values;
+
+ for ( i = 0; i<nvals; i++ )
+ {
+ tmpv[i] = cv[indices[i]];
+ }
+
+ for ( i = 0; i<nvals; i++ )
+ {
+ cv[i] = tmpv[i];
+ }
+ }
+
+ slap_sl_free( tmpv, ctx );
+ }
+
+ slap_sl_free( indices, ctx );
+
+ if ( rc == LDAP_SUCCESS && match == 0 )
+ {
+ /* value exists already */
+ assert( i >= 0 );
+ assert( i < nvals );
+ rc = LDAP_TYPE_OR_VALUE_EXISTS;
+ }
+
+ ret:
+ return rc;
+ }
+ }
+
+
+ @Benchmark
+ public void testToLowerAscii2Method() throws Exception
+ {
+ // This is a demo/sample template for building your JMH benchmarks. Edit as needed.
+ // Put your benchmark code here.
+ dn1.equals( dn2 );
+ }
+}
Added: directory/shared/branches/shared-value/first-benchmark/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/src/main/resources/log4j.properties?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/src/main/resources/log4j.properties (added)
+++ directory/shared/branches/shared-value/first-benchmark/src/main/resources/log4j.properties Sat Dec 17 15:18:15 2016
@@ -0,0 +1,22 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
+log4j.rootCategory=ERROR, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
+log4j.org.apache.directory.api.ldap.codec.standalone.StandaloneLdapCodecService=DEBUG
Added: directory/shared/branches/shared-value/first-benchmark/target/checkstyle-cachefile
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/target/checkstyle-cachefile?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/target/checkstyle-cachefile (added)
+++ directory/shared/branches/shared-value/first-benchmark/target/checkstyle-cachefile Sat Dec 17 15:18:15 2016
@@ -0,0 +1,2 @@
+#Mon Oct 03 23:50:37 CEST 2016
+configuration*?=B99DD5CE4ED9643CB5685108E6AAFBEAA5DDBAEE
Added: directory/shared/branches/shared-value/first-benchmark/target/checkstyle-checker.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/target/checkstyle-checker.xml?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/target/checkstyle-checker.xml (added)
+++ directory/shared/branches/shared-value/first-benchmark/target/checkstyle-checker.xml Sat Dec 17 15:18:15 2016
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--
+
+ Checkstyle is very configurable. Be sure to read the documentation at
+ http://checkstyle.sf.net (or in your downloaded distribution).
+
+ Most Checks are configurable, be sure to consult the documentation.
+
+ To completely disable a check, just comment it out or delete it from the file.
+
+ Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+ <!--
+ If you set the basedir property below, then all reported file
+ names will be relative to the specified directory. See
+ http://checkstyle.sourceforge.net/5.x/config.html#Checker
+
+ <property name="basedir" value="${basedir}"/>
+ -->
+
+ <!-- Checks that each Java package has a Javadoc file used for commenting. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
+ <!--
+ <module name="JavadocPackage">
+ <property name="allowLegacy" value="true"/>
+ </module>
+ -->
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <!-- module name="NewlineAtEndOfFile"/ -->
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+ <module name="FileLength"/>
+
+ <!-- Following interprets the header file as regular expressions. -->
+ <!-- <module name="RegexpHeader"/> -->
+
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
+ </module>
+
+ <!--
+ <module name="RegexpSingleline">
+ <!- \s matches whitespace character, $ matches end of line. ->
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ -->
+
+ <module name="TreeWalker">
+
+ <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+<!-- <module name="JavadocMethod"> -->
+<!-- No Javadoc required for private methods -->
+<!-- <property name="scope" value="protected"/> -->
+<!-- </module> -->
+<!-- <module name="JavadocType"> -->
+<!-- <property name="scope" value="public"/> -->
+<!-- </module> -->
+<!-- <module name="JavadocVariable"> -->
+<!-- No Javadoc required for private fields -->
+<!-- <property name="scope" value="protected"/> -->
+<!-- </module> -->
+<!-- <module name="JavadocStyle"> -->
+<!-- <property name="checkFirstSentence" value="false"/> -->
+<!-- </module> -->
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <!-- <module name="Header"> -->
+ <!-- The follow property value demonstrates the ability -->
+ <!-- to have access to ANT properties. In this case it uses -->
+ <!-- the ${basedir} property to allow Checkstyle to be run -->
+ <!-- from any directory within a project. See property -->
+ <!-- expansion, -->
+ <!-- http://checkstyle.sf.net/config.html#properties -->
+ <!-- <property -->
+ <!-- name="headerFile" -->
+ <!-- value="${basedir}/java.header"/> -->
+ <!-- </module> -->
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <!-- module name="LineLength"/ -->
+ <!--module name="MethodLength"/ -->
+ <module name="ParameterNumber"/>
+
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
+ </module>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad">
+ <property name="tokens" value="ANNOTATION_FIELD_DEF, CTOR_DEF, CTOR_CALL, EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL, METHOD_DEF, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, QUESTION"/>
+ <property name="option" value="space"/>
+ </module>
+ <module name="TypecastParenPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="WhitespaceAfter">
+ <property name="tokens" value="COMMA, TYPECAST"/>
+ </module>
+ <module name="WhitespaceAround"/>
+ <module name="EmptyLineSeparator">
+ <property name="tokens" value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, METHOD_DEF, STATIC_INIT, INSTANCE_INIT"/>
+ </module>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock"/>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ </module>
+ <module name="NeedBraces"/>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <!-- module name="AvoidInlineConditionals"/ -->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <!-- module name="HiddenField">
+ <property name="ignoreSetter" value="true"/>
+ <property name="ignoreConstructorParameter" value="true"/>
+ <property name="setterCanReturnItsClass" value="true"/>
+ </module -->
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <!-- module name="MagicNumber"/ -->
+ <module name="MissingSwitchDefault"/>
+ <module name="SimplifyBooleanExpression"/>
+ <!-- module name="SimplifyBooleanReturn"/ -->
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!-- module name="DesignForExtension"/ -->
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier">
+ <property name="packageAllowed" value="true"/>
+ <property name="protectedAllowed" value="true"/>
+ </module>
+
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
+ <!-- module name="FinalParameters"/ -->
+ <!-- module name="TodoComment"/ -->
+ <module name="UpperEll"/>
+
+ </module>
+
+</module>
Added: directory/shared/branches/shared-value/first-benchmark/target/checkstyle-result.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/target/checkstyle-result.xml?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/target/checkstyle-result.xml (added)
+++ directory/shared/branches/shared-value/first-benchmark/target/checkstyle-result.xml Sat Dec 17 15:18:15 2016
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="6.8.1">
+<file name="/Users/elecharny/apacheds/value/shared/first-benchmark/src/main/java/org/apache/directory/MyBenchmark.java">
+<error line="0" severity="error" message="Got an exception - expecting EOF, found '}'" source="com.puppycrawl.tools.checkstyle.TreeWalker"/>
+</file>
+<file name="/Users/elecharny/apacheds/value/shared/first-benchmark/src/main/resources/log4j.properties">
+</file>
+</checkstyle>
Added: directory/shared/branches/shared-value/first-benchmark/target/classes/log4j.properties
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/first-benchmark/target/classes/log4j.properties?rev=1774774&view=auto
==============================================================================
--- directory/shared/branches/shared-value/first-benchmark/target/classes/log4j.properties (added)
+++ directory/shared/branches/shared-value/first-benchmark/target/classes/log4j.properties Sat Dec 17 15:18:15 2016
@@ -0,0 +1,22 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
+log4j.rootCategory=ERROR, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
+log4j.org.apache.directory.api.ldap.codec.standalone.StandaloneLdapCodecService=DEBUG
Modified: directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java (original)
+++ directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java Sat Dec 17 15:18:15 2016
@@ -327,9 +327,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadAttributeTypes( Attribute attributeTypes ) throws LdapException
{
if ( attributeTypes == null )
@@ -355,9 +352,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadComparators( Attribute comparators ) throws LdapException
{
if ( comparators == null )
@@ -383,9 +377,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadDitContentRules( Attribute ditContentRules ) throws LdapException
{
if ( ditContentRules == null )
@@ -411,9 +402,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadDitStructureRules( Attribute ditStructureRules ) throws LdapException
{
if ( ditStructureRules == null )
@@ -439,9 +427,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadLdapSyntaxes( Attribute ldapSyntaxes ) throws LdapException
{
if ( ldapSyntaxes == null )
@@ -467,9 +452,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadMatchingRules( Attribute matchingRules ) throws LdapException
{
if ( matchingRules == null )
@@ -495,9 +477,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadMatchingRuleUses( Attribute matchingRuleUses ) throws LdapException
{
if ( matchingRuleUses == null )
@@ -523,9 +502,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadNameForms( Attribute nameForms ) throws LdapException
{
if ( nameForms == null )
@@ -551,9 +527,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadNormalizers( Attribute normalizers ) throws LdapException
{
if ( normalizers == null )
@@ -579,9 +552,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadObjectClasses( Attribute objectClasses ) throws LdapException
{
if ( objectClasses == null )
@@ -607,9 +577,6 @@ public class DefaultSchemaLoader extends
}
- /**
- * {@inheritDoc}
- */
private void loadSyntaxCheckers( Attribute syntaxCheckers ) throws LdapException
{
if ( syntaxCheckers == null )
Modified: directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionPool.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionPool.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionPool.java (original)
+++ directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionPool.java Sat Dec 17 15:18:15 2016
@@ -123,7 +123,7 @@ public class LdapConnectionPool extends
connection = super.borrowObject();
LOG.trace( "borrowed connection {}", connection );
}
- catch ( LdapException e )
+ catch ( LdapException | RuntimeException e )
{
throw e;
}
Modified: directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java (original)
+++ directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java Sat Dec 17 15:18:15 2016
@@ -65,9 +65,15 @@ import org.apache.directory.api.ldap.mod
*/
public class LdapConnectionWrapper implements LdapConnection, Wrapper<LdapConnection>
{
+ /** The wrapped connection */
protected LdapConnection connection;
+ /**
+ * Creates a new LdapConnectionWrapper instance
+ *
+ * @param connection The wrapped connection
+ */
protected LdapConnectionWrapper( LdapConnection connection )
{
this.connection = connection;
@@ -84,6 +90,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isConnected()
{
@@ -91,6 +100,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isAuthenticated()
{
@@ -98,6 +110,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean connect() throws LdapException
{
@@ -105,6 +120,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void close() throws IOException
{
@@ -112,6 +130,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void add( Entry entry ) throws LdapException
{
@@ -119,6 +140,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public AddResponse add( AddRequest addRequest ) throws LdapException
{
@@ -126,6 +150,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void abandon( int messageId )
{
@@ -133,6 +160,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void abandon( AbandonRequest abandonRequest )
{
@@ -140,6 +170,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void bind() throws LdapException
{
@@ -147,6 +180,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void anonymousBind() throws LdapException
{
@@ -154,6 +190,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void bind( String name ) throws LdapException
{
@@ -161,6 +200,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void bind( String name, String credentials ) throws LdapException
{
@@ -168,6 +210,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void bind( Dn name ) throws LdapException
{
@@ -175,6 +220,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void bind( Dn name, String credentials ) throws LdapException
{
@@ -182,6 +230,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public BindResponse bind( BindRequest bindRequest ) throws LdapException
{
@@ -189,6 +240,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public EntryCursor search( Dn baseDn, String filter, SearchScope scope, String... attributes )
throws LdapException
@@ -197,6 +251,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public EntryCursor search( String baseDn, String filter, SearchScope scope, String... attributes )
throws LdapException
@@ -205,6 +262,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public SearchCursor search( SearchRequest searchRequest ) throws LdapException
{
@@ -212,6 +272,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void unBind() throws LdapException
{
@@ -219,6 +282,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setTimeOut( long timeOut )
{
@@ -226,6 +292,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void modify( Dn dn, Modification... modifications ) throws LdapException
{
@@ -233,6 +302,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void modify( String dn, Modification... modifications ) throws LdapException
{
@@ -240,6 +312,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void modify( Entry entry, ModificationOperation modOp ) throws LdapException
{
@@ -247,6 +322,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ModifyResponse modify( ModifyRequest modRequest ) throws LdapException
{
@@ -254,6 +332,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void rename( String entryDn, String newRdn ) throws LdapException
{
@@ -261,6 +342,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void rename( Dn entryDn, Rdn newRdn ) throws LdapException
{
@@ -268,6 +352,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException
{
@@ -275,6 +362,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void rename( Dn entryDn, Rdn newRdn, boolean deleteOldRdn ) throws LdapException
{
@@ -282,6 +372,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void move( String entryDn, String newSuperiorDn ) throws LdapException
{
@@ -289,6 +382,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void move( Dn entryDn, Dn newSuperiorDn ) throws LdapException
{
@@ -296,6 +392,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void moveAndRename( Dn entryDn, Dn newDn ) throws LdapException
{
@@ -303,6 +402,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void moveAndRename( String entryDn, String newDn ) throws LdapException
{
@@ -310,6 +412,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void moveAndRename( Dn entryDn, Dn newDn, boolean deleteOldRdn ) throws LdapException
{
@@ -317,6 +422,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void moveAndRename( String entryDn, String newDn, boolean deleteOldRdn ) throws LdapException
{
@@ -324,6 +432,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException
{
@@ -331,6 +442,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void delete( String dn ) throws LdapException
{
@@ -338,6 +452,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void delete( Dn dn ) throws LdapException
{
@@ -345,6 +462,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public DeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException
{
@@ -352,6 +472,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean compare( String dn, String attributeName, String value ) throws LdapException
{
@@ -359,6 +482,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean compare( String dn, String attributeName, byte[] value ) throws LdapException
{
@@ -366,6 +492,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean compare( String dn, String attributeName, Value value ) throws LdapException
{
@@ -373,6 +502,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean compare( Dn dn, String attributeName, String value ) throws LdapException
{
@@ -380,6 +512,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean compare( Dn dn, String attributeName, byte[] value ) throws LdapException
{
@@ -387,6 +522,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean compare( Dn dn, String attributeName, Value value ) throws LdapException
{
@@ -394,6 +532,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public CompareResponse compare( CompareRequest compareRequest ) throws LdapException
{
@@ -401,6 +542,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ExtendedResponse extended( String oid ) throws LdapException
{
@@ -408,6 +552,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ExtendedResponse extended( String oid, byte[] value ) throws LdapException
{
@@ -415,6 +562,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ExtendedResponse extended( Oid oid ) throws LdapException
{
@@ -422,6 +572,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ExtendedResponse extended( Oid oid, byte[] value ) throws LdapException
{
@@ -429,6 +582,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException
{
@@ -436,6 +592,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean exists( String dn ) throws LdapException
{
@@ -443,6 +602,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean exists( Dn dn ) throws LdapException
{
@@ -450,6 +612,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Entry getRootDse() throws LdapException
{
@@ -457,6 +622,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Entry getRootDse( String... attributes ) throws LdapException
{
@@ -464,6 +632,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Entry lookup( Dn dn ) throws LdapException
{
@@ -471,6 +642,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Entry lookup( String dn ) throws LdapException
{
@@ -478,6 +652,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Entry lookup( Dn dn, String... attributes ) throws LdapException
{
@@ -485,6 +662,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Entry lookup( Dn dn, Control[] controls, String... attributes ) throws LdapException
{
@@ -492,6 +672,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Entry lookup( String dn, String... attributes ) throws LdapException
{
@@ -499,6 +682,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Entry lookup( String dn, Control[] controls, String... attributes ) throws LdapException
{
@@ -506,6 +692,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isControlSupported( String controlOID ) throws LdapException
{
@@ -513,6 +702,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public List<String> getSupportedControls() throws LdapException
{
@@ -520,6 +712,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void loadSchema() throws LdapException
{
@@ -527,6 +722,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public SchemaManager getSchemaManager()
{
@@ -534,6 +732,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public LdapApiService getCodecService()
{
@@ -541,6 +742,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean isRequestCompleted( int messageId )
{
@@ -548,6 +752,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean doesFutureExistFor( int messageId )
{
@@ -555,6 +762,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public BinaryAttributeDetector getBinaryAttributeDetector()
{
@@ -562,6 +772,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setBinaryAttributeDetector( BinaryAttributeDetector binaryAttributeDetecter )
{
@@ -569,6 +782,9 @@ public class LdapConnectionWrapper imple
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setSchemaManager( SchemaManager schemaManager )
{
Modified: directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1774774&r1=1774773&r2=1774774&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sat Dec 17 15:18:15 2016
@@ -236,12 +236,10 @@ public class LdapNetworkConnection exten
private static final String EXCEPTION_KEY = "sessionException";
// ~~~~~~~~~~~~~~~~~ common error messages ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
static final String TIME_OUT_ERROR = "TimeOut occurred";
static final String NO_RESPONSE_ERROR = "The response queue has been emptied, no response was found.";
-
//------------------------- The constructors --------------------------//
/**
* Create a new instance of a LdapConnection on localhost,
@@ -265,6 +263,12 @@ public class LdapNetworkConnection exten
}
+ /**
+ * Creates a new LdapNetworkConnection instance
+ *
+ * @param config The configuration to use
+ * @param ldapApiService The LDAP API Service to use
+ */
public LdapNetworkConnection( LdapConnectionConfig config, LdapApiService ldapApiService )
{
super( ldapApiService );
@@ -289,6 +293,12 @@ public class LdapNetworkConnection exten
}
+ /**
+ * Creates a new LdapNetworkConnection instance
+ *
+ * @param useSsl If we are going to create a secure connection or not
+ * @param ldapApiService The LDAP API Service to use
+ */
public LdapNetworkConnection( boolean useSsl, LdapApiService ldapApiService )
{
this( null, -1, useSsl, ldapApiService );
@@ -308,6 +318,13 @@ public class LdapNetworkConnection exten
}
+ /**
+ * Creates a new LdapNetworkConnection instance
+ *
+ * @param server The server we want to be connected to. If null or empty,
+ * we will default to LocalHost.
+ * @param ldapApiService The LDAP API Service to use
+ */
public LdapNetworkConnection( String server, LdapApiService ldapApiService )
{
this( server, -1, false, ldapApiService );
@@ -329,6 +346,14 @@ public class LdapNetworkConnection exten
}
+ /**
+ * Creates a new LdapNetworkConnection instance
+ *
+ * @param server The server we want to be connected to. If null or empty,
+ * we will default to LocalHost.
+ * @param useSsl A flag to tell if it's a SSL connection or not.
+ * @param ldapApiService The LDAP API Service to use
+ */
public LdapNetworkConnection( String server, boolean useSsl, LdapApiService ldapApiService )
{
this( server, -1, useSsl, ldapApiService );
@@ -348,6 +373,15 @@ public class LdapNetworkConnection exten
}
+ /**
+ * Create a new instance of a LdapConnection on a
+ * given server and a given port. We don't use ssl.
+ *
+ * @param server The server we want to be connected to. If null or empty,
+ * we will default to LocalHost.
+ * @param port The port the server is listening on
+ * @param ldapApiService The LDAP API Service to use
+ */
public LdapNetworkConnection( String server, int port, LdapApiService ldapApiService )
{
this( server, port, false, ldapApiService );
@@ -370,6 +404,16 @@ public class LdapNetworkConnection exten
}
+ /**
+ * Create a new instance of a LdapConnection on a
+ * given server and a given port. We don't use ssl.
+ *
+ * @param server The server we want to be connected to. If null or empty,
+ * we will default to LocalHost.
+ * @param port The port the server is listening on
+ * @param useSsl A flag to tell if it's a SSL connection or not.
+ * @param ldapApiService The LDAP API Service to use
+ */
public LdapNetworkConnection( String server, int port, boolean useSsl, LdapApiService ldapApiService )
{
this( buildConfig( server, port, useSsl ), ldapApiService );
@@ -1805,7 +1849,7 @@ public class LdapNetworkConnection exten
LOG.debug( "Sending Unbind request \n{}", unbindRequest );
// Send the request to the server
- // Use this for logging instead: WriteFuture unbindFuture = ldapSession.write( unbindRequest );
+ // Use this for logging instead: WriteFuture unbindFuture = ldapSession.write( unbindRequest )
WriteFuture unbindFuture = ldapSession.write( unbindRequest );
unbindFuture.awaitUninterruptibly( timeout );