You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/11/28 23:31:04 UTC

[directory-ldap-api] branch master updated: Moved some constants from decorator to factory

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 d41e19a  Moved some constants from decorator to factory
d41e19a is described below

commit d41e19a931c5a0d4117c9043adc5188ad6e79782
Author: Emmanuel Lecharny <el...@apache.org>
AuthorDate: Thu Nov 29 00:31:03 2018 +0100

    Moved some constants from decorator to factory
---
 .../api/ldap/codec/controls/sort/SortRequestDecorator.java       | 9 +++------
 .../api/ldap/codec/controls/sort/SortRequestGrammar.java         | 8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestDecorator.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestDecorator.java
index 0b0d769..55ca0dd 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestDecorator.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestDecorator.java
@@ -20,6 +20,9 @@
 package org.apache.directory.api.ldap.codec.controls.sort;
 
 
+import static org.apache.directory.api.ldap.codec.controls.sort.SortRequestFactory.ORDERING_RULE_TAG;
+import static org.apache.directory.api.ldap.codec.controls.sort.SortRequestFactory.REVERSE_ORDER_TAG;
+
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
@@ -54,12 +57,6 @@ public class SortRequestDecorator extends ControlDecorator<SortRequest> implemen
 
     private List<Integer> sortKeyLenList = new ArrayList<>();
 
-    /** ASN.1 BER tag for the forward ordering rule */
-    public static final int ORDERING_RULE_TAG = 0x80;
-
-    /** ASN.1 BER tag for the backward ordering rule */
-    public static final int REVERSE_ORDER_TAG = 0x81;
-
 
     /**
      * Creates a new instance of SortRequestDecorator.
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestGrammar.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestGrammar.java
index 5a770ca..140d8ad 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestGrammar.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestGrammar.java
@@ -20,8 +20,8 @@
 package org.apache.directory.api.ldap.codec.controls.sort;
 
 
-import static org.apache.directory.api.ldap.codec.controls.sort.SortRequestDecorator.ORDERING_RULE_TAG;
-import static org.apache.directory.api.ldap.codec.controls.sort.SortRequestDecorator.REVERSE_ORDER_TAG;
+import static org.apache.directory.api.ldap.codec.controls.sort.SortRequestFactory.ORDERING_RULE_TAG;
+import static org.apache.directory.api.ldap.codec.controls.sort.SortRequestFactory.REVERSE_ORDER_TAG;
 
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.ber.grammar.AbstractGrammar;
@@ -67,7 +67,7 @@ public final class SortRequestGrammar extends AbstractGrammar<SortRequestContain
                 BerValue value = container.getCurrentTLV().getValue();
 
                 String atDesc = Strings.utf8ToString( value.getData() );
-                
+
                 if ( LOG.isDebugEnabled() )
                 {
                     LOG.debug( I18n.msg( I18n.MSG_05307_ATTRIBUTE_TYPE_DESC, atDesc ) );
@@ -177,7 +177,7 @@ public final class SortRequestGrammar extends AbstractGrammar<SortRequestContain
 
     /**
      * This class is a singleton.
-     * 
+     *
      * @return An instance on this grammar
      */
     public static Grammar<?> getInstance()