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 2024/02/21 07:02:47 UTC

(directory-ldap-api) branch master updated: Made the class final

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git


The following commit(s) were added to refs/heads/master by this push:
     new 261b3f0b6 Made the class final
261b3f0b6 is described below

commit 261b3f0b65844affee44c39a62acb2b7ad668a24
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Wed Feb 21 08:00:37 2024 +0100

    Made the class final
---
 .../directory/api/asn1/util/Asn1Buffer2.java       |  2 +-
 .../dsmlv2/searchRequest/SearchRequestTest.java    | 25 ++++++++++++++++++++++
 .../api/ldap/schema/converter/SchemaParser.java    |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1Buffer2.java b/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1Buffer2.java
index 70be6a3fd..83bf9549d 100644
--- a/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1Buffer2.java
+++ b/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1Buffer2.java
@@ -38,7 +38,7 @@ public class Asn1Buffer2
     private int size = DEFAULT_SIZE;
 
     /** The internal buffer storage */
-    private class InternalBuffer
+    private final class InternalBuffer
     {
         /** A buffer to store the encoded PDU */
         private byte[] buffer = new byte[DEFAULT_SIZE];
diff --git a/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java b/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java
index d7966f768..2b4c0c62e 100644
--- a/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java
+++ b/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java
@@ -33,8 +33,11 @@ import java.util.Map;
 
 import org.apache.directory.api.dsmlv2.AbstractTest;
 import org.apache.directory.api.dsmlv2.DsmlControl;
+import org.apache.directory.api.dsmlv2.DsmlLiterals;
 import org.apache.directory.api.dsmlv2.Dsmlv2Parser;
+import org.apache.directory.api.dsmlv2.ParserUtils;
 import org.apache.directory.api.dsmlv2.request.SearchRequestDsml;
+import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.filter.AndNode;
 import org.apache.directory.api.ldap.model.filter.ApproximateNode;
@@ -50,8 +53,13 @@ import org.apache.directory.api.ldap.model.filter.SubstringNode;
 import org.apache.directory.api.ldap.model.message.AliasDerefMode;
 import org.apache.directory.api.ldap.model.message.Control;
 import org.apache.directory.api.ldap.model.message.SearchRequest;
+import org.apache.directory.api.ldap.model.message.SearchRequestImpl;
 import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.util.Strings;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -2442,4 +2450,21 @@ public class SearchRequestTest extends AbstractTest
         
         //System.out.println( searchRequest.toDsml( new DefaultElement( "root" ) ).asXML() );
     }
+    
+    
+    @Test
+    public void testGenerateWithBase64() throws LdapException
+    {
+        Document document = DocumentHelper.createDocument();
+        Element element = document.addElement( DsmlLiterals.BATCH_RESPONSE );
+
+        element.add( ParserUtils.DSML_NAMESPACE );
+        element.add( ParserUtils.XSD_NAMESPACE );
+        element.add( ParserUtils.XSI_NAMESPACE );
+
+        SearchRequestDsml searchRequest = new SearchRequestDsml( LdapApiServiceFactory.getSingleton() );
+        searchRequest.setFilter( "(memberOf=cn=MercyCenterHospitalGroup,ou=Relationship,dc=HPD,o=IHE-Europe,c=FRA)" );    	
+    	
+        System.out.println( searchRequest.toDsml( element ).asXML() );
+    }
 }
diff --git a/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java b/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java
index fbb03b9de..af259f418 100755
--- a/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java
+++ b/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java
@@ -204,7 +204,7 @@ public class SchemaParser
      * The thread which read the schema files and fill the
      * temporary buffer used by the lexical analyzer.
      */
-    private class DataProducer implements Runnable
+    private final class DataProducer implements Runnable
     {
         /**
          * {@inheritDoc}