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 2019/01/19 06:20:23 UTC
[directory-server] branch master updated: o Fixed Apache DS build
following the removal of Mutable classes
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-server.git
The following commit(s) were added to refs/heads/master by this push:
new 2a7dc89 o Fixed Apache DS build following the removal of Mutable classes
2a7dc89 is described below
commit 2a7dc89e3e905fd7ea3ace9a04fac561af594f56
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Sat Jan 19 07:20:21 2019 +0100
o Fixed Apache DS build following the removal of Mutable classes
---
.../server/core/operations/search/SearchWithIndicesIT.java | 4 ++--
.../test/java/org/apache/directory/server/xdbm/StoreUtils.java | 10 +++++-----
.../server/xdbm/search/impl/GreaterEqNotIndexedTest.java | 9 ++++-----
.../directory/server/xdbm/search/impl/GreaterEqTest.java | 9 ++++-----
.../apache/directory/server/xdbm/search/impl/LessEqTest.java | 9 ++++-----
5 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java
index 7d5aa9f..ce149f5 100644
--- a/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java
@@ -34,7 +34,7 @@ import org.apache.directory.api.ldap.model.entry.DefaultModification;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.ModificationOperation;
import org.apache.directory.api.ldap.model.message.SearchScope;
-import org.apache.directory.api.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.partition.Partition;
@@ -95,7 +95,7 @@ public class SearchWithIndicesIT extends AbstractLdapTestUnit
getService().startup();
// Add an AttributeType with an ORDERING MatchingRule
- MutableAttributeType attributeType = new MutableAttributeType( TEST_INT_OID );
+ AttributeType attributeType = new AttributeType( TEST_INT_OID );
attributeType.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
attributeType.setNames( "testInt" );
attributeType.setEqualityOid( "2.5.13.14" );
diff --git a/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java b/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
index 551cf1a..ccafe79 100644
--- a/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
+++ b/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
@@ -25,7 +25,7 @@ import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.api.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
@@ -76,7 +76,7 @@ public class StoreUtils
private static void createTestInt( SchemaManager schemaManager ) throws LdapException
{
- MutableAttributeType attributeType = new MutableAttributeType( TEST_INT_OID );
+ AttributeType attributeType = new AttributeType( TEST_INT_OID );
attributeType.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
attributeType.setNames( "testInt" );
attributeType.setEqualityOid( "2.5.13.14" );
@@ -91,7 +91,7 @@ public class StoreUtils
private static void createTestIntDescendant( SchemaManager schemaManager ) throws LdapException
{
- MutableAttributeType attributeType = new MutableAttributeType( TEST_INT_DESCENDANT_OID );
+ AttributeType attributeType = new AttributeType( TEST_INT_DESCENDANT_OID );
attributeType.setNames( "testIntDescendant" );
attributeType.setSuperior( schemaManager.getAttributeType( TEST_INT_OID ) );
attributeType.setEnabled( true );
@@ -103,7 +103,7 @@ public class StoreUtils
private static void createTestIntNoIndex( SchemaManager schemaManager ) throws LdapException
{
- MutableAttributeType attributeType = new MutableAttributeType( TEST_INT_NO_INDEX_OID );
+ AttributeType attributeType = new AttributeType( TEST_INT_NO_INDEX_OID );
attributeType.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
attributeType.setNames( "testIntNoIndex" );
attributeType.setEqualityOid( "2.5.13.14" );
@@ -118,7 +118,7 @@ public class StoreUtils
private static void createTestIntDescendantNoIndex( SchemaManager schemaManager ) throws LdapException
{
- MutableAttributeType attributeType = new MutableAttributeType( TEST_INT_DESCENDANT_NO_INDEX_OID );
+ AttributeType attributeType = new AttributeType( TEST_INT_DESCENDANT_NO_INDEX_OID );
attributeType.setNames( "testIntDescendantNoIndex" );
attributeType.setSuperior( schemaManager.getAttributeType( TEST_INT_NO_INDEX_OID ) );
attributeType.setEnabled( true );
diff --git a/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqNotIndexedTest.java b/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqNotIndexedTest.java
index da63f15..de81f9d 100644
--- a/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqNotIndexedTest.java
+++ b/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqNotIndexedTest.java
@@ -45,8 +45,7 @@ import org.apache.directory.api.ldap.model.filter.GreaterEqNode;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.ldap.model.schema.LdapSyntax;
-import org.apache.directory.api.ldap.model.schema.MutableAttributeType;
-import org.apache.directory.api.ldap.model.schema.MutableMatchingRule;
+import org.apache.directory.api.ldap.model.schema.MatchingRule;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.comparators.StringComparator;
import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
@@ -444,7 +443,7 @@ public class GreaterEqNotIndexedTest
public void testEvaluatorAttributeNoMatchingRule() throws Exception
{
LdapSyntax syntax = new BogusSyntax( 1 );
- MutableAttributeType at = new MutableAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
+ AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
@@ -469,12 +468,12 @@ public class GreaterEqNotIndexedTest
public void testEvaluatorAttributeOrderingMatchingRule() throws Exception
{
LdapSyntax syntax = new BogusSyntax( 1 );
- MutableMatchingRule mr = new MutableMatchingRule( "1.1" );
+ MatchingRule mr = new MatchingRule( "1.1" );
mr.setSyntax( syntax );
mr.setLdapComparator( new StringComparator( "1.1" ) );
mr.setNormalizer( new DeepTrimToLowerNormalizer() );
- MutableAttributeType at = new MutableAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000" );
+ AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
diff --git a/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java b/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
index 7cd2317..d2d7bd9 100644
--- a/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
+++ b/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
@@ -45,8 +45,7 @@ import org.apache.directory.api.ldap.model.filter.GreaterEqNode;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.ldap.model.schema.LdapSyntax;
-import org.apache.directory.api.ldap.model.schema.MutableAttributeType;
-import org.apache.directory.api.ldap.model.schema.MutableMatchingRule;
+import org.apache.directory.api.ldap.model.schema.MatchingRule;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.comparators.StringComparator;
import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
@@ -728,7 +727,7 @@ public class GreaterEqTest
public void testEvaluatorAttributeNoMatchingRule() throws Exception
{
LdapSyntax syntax = new BogusSyntax( 1 );
- MutableAttributeType at = new MutableAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
+ AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
@@ -753,12 +752,12 @@ public class GreaterEqTest
public void testEvaluatorAttributeOrderingMatchingRule() throws Exception
{
LdapSyntax syntax = new BogusSyntax( 1 );
- MutableMatchingRule mr = new MutableMatchingRule( "1.1" );
+ MatchingRule mr = new MatchingRule( "1.1" );
mr.setSyntax( syntax );
mr.setLdapComparator( new StringComparator( "1.1" ) );
mr.setNormalizer( new DeepTrimToLowerNormalizer() );
- MutableAttributeType at = new MutableAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000" );
+ AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".5000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
diff --git a/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java b/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
index a5442c1..8e418ff 100644
--- a/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
+++ b/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
@@ -45,8 +45,7 @@ import org.apache.directory.api.ldap.model.filter.LessEqNode;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.ldap.model.schema.LdapSyntax;
-import org.apache.directory.api.ldap.model.schema.MutableAttributeType;
-import org.apache.directory.api.ldap.model.schema.MutableMatchingRule;
+import org.apache.directory.api.ldap.model.schema.MatchingRule;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.comparators.StringComparator;
import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
@@ -755,7 +754,7 @@ public class LessEqTest
public void testEvaluatorAttributeNoMatchingRule() throws Exception
{
LdapSyntax syntax = new BogusSyntax( 10 );
- MutableAttributeType at = new MutableAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
+ AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".2000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );
@@ -782,12 +781,12 @@ public class LessEqTest
{
LdapSyntax syntax = new BogusSyntax( 2 );
- MutableMatchingRule mr = new MutableMatchingRule( "1.1" );
+ MatchingRule mr = new MatchingRule( "1.1" );
mr.setSyntax( syntax );
mr.setLdapComparator( new StringComparator( "1.1" ) );
mr.setNormalizer( new DeepTrimToLowerNormalizer( "1.1" ) );
- MutableAttributeType at = new MutableAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".3000" );
+ AttributeType at = new AttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT_OID + ".3000" );
at.addName( "bogus" );
at.setSchemaName( "other" );
at.setSyntax( syntax );