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/05/31 09:32:13 UTC
svn commit: r1746258 [6/9] - 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/ber/gr...
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public ImmutableDitContentRuleRegistry copy()
{
return ( ImmutableDitContentRuleRegistry ) immutableDITContentRuleRegistry.copy();
@@ -64,6 +65,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableDITContentRuleRegistry.size();
@@ -73,6 +75,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableDITContentRuleRegistry.contains( oid );
@@ -82,6 +85,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableDITContentRuleRegistry.getOidByName( name );
@@ -91,6 +95,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableDITContentRuleRegistry.getSchemaName( oid );
@@ -100,6 +105,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableDITContentRuleRegistry.getType();
@@ -109,6 +115,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<DitContentRule> iterator()
{
return immutableDITContentRuleRegistry.iterator();
@@ -118,6 +125,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public DitContentRule lookup( String oid ) throws LdapException
{
return immutableDITContentRuleRegistry.lookup( oid );
@@ -127,6 +135,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableDITContentRuleRegistry.oidsIterator();
@@ -136,6 +145,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public void register( DitContentRule schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04277 ) );
@@ -145,6 +155,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04277 ) );
@@ -154,6 +165,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public DitContentRule unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04277 ) );
@@ -163,6 +175,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04277 ) );
@@ -172,6 +185,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public DitContentRule get( String oid )
{
return immutableDITContentRuleRegistry.get( oid );
@@ -181,6 +195,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04277 ) );
@@ -190,6 +205,7 @@ public class ImmutableDitContentRuleRegi
/**
* {@inheritDoc}
*/
+ @Override
public DitContentRule unregister( DitContentRule schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04277 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( int ruleId )
{
return immutableDITStructureRuleRegistry.contains( ruleId );
@@ -64,6 +65,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<DitStructureRule> iterator()
{
return immutableDITStructureRuleRegistry.iterator();
@@ -73,6 +75,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<Integer> ruleIdIterator()
{
return immutableDITStructureRuleRegistry.ruleIdIterator();
@@ -82,7 +85,8 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
- public String getSchemaName( int ruleId ) throws LdapException
+ @Override
+public String getSchemaName( int ruleId ) throws LdapException
{
return immutableDITStructureRuleRegistry.getSchemaName( ruleId );
}
@@ -91,6 +95,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public void register( DitStructureRule ditStructureRule ) throws LdapException
{
}
@@ -99,6 +104,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public DitStructureRule lookup( int ruleId ) throws LdapException
{
return immutableDITStructureRuleRegistry.lookup( ruleId );
@@ -108,6 +114,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public void unregister( int ruleId ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04278 ) );
@@ -117,6 +124,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04278 ) );
@@ -126,6 +134,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04278 ) );
@@ -135,6 +144,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public ImmutableDitStructureRuleRegistry copy()
{
return ( ImmutableDitStructureRuleRegistry ) immutableDITStructureRuleRegistry.copy();
@@ -144,6 +154,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableDITStructureRuleRegistry.size();
@@ -153,6 +164,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableDITStructureRuleRegistry.contains( oid );
@@ -162,6 +174,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableDITStructureRuleRegistry.getOidByName( name );
@@ -171,6 +184,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableDITStructureRuleRegistry.getSchemaName( oid );
@@ -180,6 +194,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableDITStructureRuleRegistry.getType();
@@ -189,6 +204,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public DitStructureRule lookup( String oid ) throws LdapException
{
return immutableDITStructureRuleRegistry.lookup( oid );
@@ -198,6 +214,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableDITStructureRuleRegistry.oidsIterator();
@@ -207,6 +224,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public DitStructureRule unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04278 ) );
@@ -216,6 +234,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public DitStructureRule get( String oid )
{
return immutableDITStructureRuleRegistry.get( oid );
@@ -225,6 +244,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04278 ) );
@@ -234,6 +254,7 @@ public class ImmutableDitStructureRuleRe
/**
* {@inheritDoc}
*/
+ @Override
public DitStructureRule unregister( DitStructureRule schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04278 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public ImmutableLdapSyntaxRegistry copy()
{
return ( ImmutableLdapSyntaxRegistry ) immutableLdapSyntaxRegistry.copy();
@@ -64,6 +65,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableLdapSyntaxRegistry.size();
@@ -73,6 +75,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableLdapSyntaxRegistry.contains( oid );
@@ -82,6 +85,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableLdapSyntaxRegistry.getOidByName( name );
@@ -91,6 +95,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableLdapSyntaxRegistry.getSchemaName( oid );
@@ -100,6 +105,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableLdapSyntaxRegistry.getType();
@@ -109,6 +115,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<LdapSyntax> iterator()
{
return immutableLdapSyntaxRegistry.iterator();
@@ -118,6 +125,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public LdapSyntax lookup( String oid ) throws LdapException
{
return immutableLdapSyntaxRegistry.lookup( oid );
@@ -127,6 +135,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableLdapSyntaxRegistry.oidsIterator();
@@ -136,6 +145,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public void register( LdapSyntax schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04279 ) );
@@ -145,6 +155,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04279 ) );
@@ -154,6 +165,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public LdapSyntax unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04279 ) );
@@ -163,6 +175,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04279 ) );
@@ -172,6 +185,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public LdapSyntax get( String oid )
{
return immutableLdapSyntaxRegistry.get( oid );
@@ -181,6 +195,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04279 ) );
@@ -190,6 +205,7 @@ public class ImmutableLdapSyntaxRegistry
/**
* {@inheritDoc}
*/
+ @Override
public LdapSyntax unregister( LdapSyntax schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04279 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public ImmutableMatchingRuleRegistry copy()
{
return ( ImmutableMatchingRuleRegistry ) immutableMatchingRuleRegistry.copy();
@@ -64,6 +65,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableMatchingRuleRegistry.size();
@@ -73,6 +75,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableMatchingRuleRegistry.contains( oid );
@@ -82,6 +85,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableMatchingRuleRegistry.getOidByName( name );
@@ -91,6 +95,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableMatchingRuleRegistry.getSchemaName( oid );
@@ -100,6 +105,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableMatchingRuleRegistry.getType();
@@ -109,6 +115,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<MatchingRule> iterator()
{
return immutableMatchingRuleRegistry.iterator();
@@ -118,6 +125,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public MatchingRule lookup( String oid ) throws LdapException
{
return immutableMatchingRuleRegistry.lookup( oid );
@@ -127,6 +135,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableMatchingRuleRegistry.oidsIterator();
@@ -136,6 +145,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public void register( MatchingRule schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
@@ -145,6 +155,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
@@ -154,6 +165,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public MatchingRule unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
@@ -163,6 +175,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
@@ -172,6 +185,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public MatchingRule get( String oid )
{
return immutableMatchingRuleRegistry.get( oid );
@@ -181,6 +195,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
@@ -190,6 +205,7 @@ public class ImmutableMatchingRuleRegist
/**
* {@inheritDoc}
*/
+ @Override
public MatchingRule unregister( MatchingRule schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public ImmutableMatchingRuleUseRegistry copy()
{
return ( ImmutableMatchingRuleUseRegistry ) immutableMatchingRuleUseRegistry.copy();
@@ -64,6 +65,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableMatchingRuleUseRegistry.size();
@@ -73,6 +75,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableMatchingRuleUseRegistry.contains( oid );
@@ -82,6 +85,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableMatchingRuleUseRegistry.getOidByName( name );
@@ -91,6 +95,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableMatchingRuleUseRegistry.getSchemaName( oid );
@@ -100,6 +105,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableMatchingRuleUseRegistry.getType();
@@ -109,6 +115,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<MatchingRuleUse> iterator()
{
return immutableMatchingRuleUseRegistry.iterator();
@@ -118,6 +125,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public MatchingRuleUse lookup( String oid ) throws LdapException
{
return immutableMatchingRuleUseRegistry.lookup( oid );
@@ -127,6 +135,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableMatchingRuleUseRegistry.oidsIterator();
@@ -136,6 +145,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public void register( MatchingRuleUse schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04281 ) );
@@ -145,6 +155,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04281 ) );
@@ -154,6 +165,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public MatchingRuleUse unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04281 ) );
@@ -163,6 +175,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04281 ) );
@@ -172,6 +185,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public MatchingRuleUse get( String oid )
{
return immutableMatchingRuleUseRegistry.get( oid );
@@ -181,6 +195,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04281 ) );
@@ -190,6 +205,7 @@ public class ImmutableMatchingRuleUseReg
/**
* {@inheritDoc}
*/
+ @Override
public MatchingRuleUse unregister( MatchingRuleUse schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04281 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableNameFormRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableNameFormRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableNameFormRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableNameFormRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public ImmutableNameFormRegistry copy()
{
return ( ImmutableNameFormRegistry ) immutableNameFormRegistry.copy();
@@ -64,6 +65,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableNameFormRegistry.size();
@@ -73,6 +75,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableNameFormRegistry.contains( oid );
@@ -82,6 +85,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableNameFormRegistry.getOidByName( name );
@@ -91,6 +95,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableNameFormRegistry.getSchemaName( oid );
@@ -100,6 +105,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableNameFormRegistry.getType();
@@ -109,6 +115,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<NameForm> iterator()
{
return immutableNameFormRegistry.iterator();
@@ -118,6 +125,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public NameForm lookup( String oid ) throws LdapException
{
return immutableNameFormRegistry.lookup( oid );
@@ -127,6 +135,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableNameFormRegistry.oidsIterator();
@@ -136,6 +145,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public void register( NameForm schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04282 ) );
@@ -145,6 +155,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04282 ) );
@@ -154,6 +165,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public NameForm unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04282 ) );
@@ -163,6 +175,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04282 ) );
@@ -172,6 +185,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public NameForm get( String oid )
{
return immutableNameFormRegistry.get( oid );
@@ -181,6 +195,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04282 ) );
@@ -190,6 +205,7 @@ public class ImmutableNameFormRegistry i
/**
* {@inheritDoc}
*/
+ @Override
public NameForm unregister( NameForm schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04282 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableNormalizerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableNormalizerRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableNormalizerRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableNormalizerRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public void register( Normalizer normalizer ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04283 ) );
@@ -64,6 +65,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public Normalizer unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04283 ) );
@@ -73,6 +75,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04283 ) );
@@ -82,6 +85,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public ImmutableNormalizerRegistry copy()
{
return ( ImmutableNormalizerRegistry ) immutableNormalizerRegistry.copy();
@@ -91,6 +95,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableNormalizerRegistry.size();
@@ -100,6 +105,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableNormalizerRegistry.contains( oid );
@@ -109,6 +115,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableNormalizerRegistry.getOidByName( name );
@@ -118,6 +125,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableNormalizerRegistry.getSchemaName( oid );
@@ -127,6 +135,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableNormalizerRegistry.getType();
@@ -136,6 +145,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<Normalizer> iterator()
{
return immutableNormalizerRegistry.iterator();
@@ -145,6 +155,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public Normalizer lookup( String oid ) throws LdapException
{
return immutableNormalizerRegistry.lookup( oid );
@@ -154,6 +165,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableNormalizerRegistry.oidsIterator();
@@ -163,6 +175,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04283 ) );
@@ -172,6 +185,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public Normalizer get( String oid )
{
return immutableNormalizerRegistry.get( oid );
@@ -181,6 +195,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04283 ) );
@@ -190,6 +205,7 @@ public class ImmutableNormalizerRegistry
/**
* {@inheritDoc}
*/
+ @Override
public Normalizer unregister( Normalizer schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04283 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableObjectClassRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableObjectClassRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableObjectClassRegistry.java Tue May 31 09:32:09 2016
@@ -56,6 +56,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasDescendants( String ancestorId ) throws LdapException
{
return immutableObjectClassRegistry.hasDescendants( ancestorId );
@@ -65,6 +66,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<ObjectClass> descendants( String ancestorId ) throws LdapException
{
return immutableObjectClassRegistry.descendants( ancestorId );
@@ -74,6 +76,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public void registerDescendants( ObjectClass objectClass, List<ObjectClass> ancestors ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04284 ) );
@@ -83,6 +86,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterDescendants( ObjectClass attributeType, List<ObjectClass> ancestors ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04284 ) );
@@ -92,6 +96,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public void register( ObjectClass objectClass ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04284 ) );
@@ -101,6 +106,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public ObjectClass unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04284 ) );
@@ -110,6 +116,7 @@ public class ImmutableObjectClassRegistr
/**
* Clone the ObjectClassRegistry
*/
+ @Override
public ImmutableObjectClassRegistry copy()
{
return ( ImmutableObjectClassRegistry ) immutableObjectClassRegistry.copy();
@@ -119,6 +126,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableObjectClassRegistry.size();
@@ -128,6 +136,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableObjectClassRegistry.contains( oid );
@@ -137,6 +146,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableObjectClassRegistry.getOidByName( name );
@@ -146,6 +156,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableObjectClassRegistry.getSchemaName( oid );
@@ -155,6 +166,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableObjectClassRegistry.getType();
@@ -164,6 +176,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<ObjectClass> iterator()
{
return immutableObjectClassRegistry.iterator();
@@ -173,6 +186,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public ObjectClass lookup( String oid ) throws LdapException
{
return immutableObjectClassRegistry.lookup( oid );
@@ -182,6 +196,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableObjectClassRegistry.oidsIterator();
@@ -191,6 +206,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04284 ) );
@@ -200,6 +216,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04284 ) );
@@ -209,6 +226,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public ObjectClass get( String oid )
{
return immutableObjectClassRegistry.get( oid );
@@ -218,6 +236,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04284 ) );
@@ -227,6 +246,7 @@ public class ImmutableObjectClassRegistr
/**
* {@inheritDoc}
*/
+ @Override
public ObjectClass unregister( ObjectClass schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04284 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java Tue May 31 09:32:09 2016
@@ -55,6 +55,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public void register( SyntaxChecker syntaxChecker ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04285 ) );
@@ -64,6 +65,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public SyntaxChecker unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04285 ) );
@@ -73,6 +75,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public void unregisterSchemaElements( String schemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04285 ) );
@@ -82,6 +85,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public ImmutableSyntaxCheckerRegistry copy()
{
return ( ImmutableSyntaxCheckerRegistry ) immutableSyntaxCheckerRegistry.copy();
@@ -91,6 +95,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public int size()
{
return immutableSyntaxCheckerRegistry.size();
@@ -100,6 +105,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public boolean contains( String oid )
{
return immutableSyntaxCheckerRegistry.contains( oid );
@@ -109,6 +115,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public String getOidByName( String name ) throws LdapException
{
return immutableSyntaxCheckerRegistry.getOidByName( name );
@@ -118,6 +125,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public String getSchemaName( String oid ) throws LdapException
{
return immutableSyntaxCheckerRegistry.getSchemaName( oid );
@@ -127,6 +135,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public SchemaObjectType getType()
{
return immutableSyntaxCheckerRegistry.getType();
@@ -136,6 +145,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<SyntaxChecker> iterator()
{
return immutableSyntaxCheckerRegistry.iterator();
@@ -145,6 +155,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public SyntaxChecker lookup( String oid ) throws LdapException
{
return immutableSyntaxCheckerRegistry.lookup( oid );
@@ -154,6 +165,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<String> oidsIterator()
{
return immutableSyntaxCheckerRegistry.oidsIterator();
@@ -163,6 +175,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04285 ) );
@@ -172,6 +185,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public SyntaxChecker get( String oid )
{
return immutableSyntaxCheckerRegistry.get( oid );
@@ -181,6 +195,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public void clear() throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04285 ) );
@@ -190,6 +205,7 @@ public class ImmutableSyntaxCheckerRegis
/**
* {@inheritDoc}
*/
+ @Override
public SyntaxChecker unregister( SyntaxChecker schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04285 ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/LdapSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/LdapSyntaxRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/LdapSyntaxRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/LdapSyntaxRegistry.java Tue May 31 09:32:09 2016
@@ -34,5 +34,6 @@ public interface LdapSyntaxRegistry exte
/**
* Copy the LdapSyntaxRegistry
*/
+ @Override
LdapSyntaxRegistry copy();
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/MatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/MatchingRuleRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/MatchingRuleRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/MatchingRuleRegistry.java Tue May 31 09:32:09 2016
@@ -34,5 +34,6 @@ public interface MatchingRuleRegistry ex
/**
* Copy the MatchingRuleRegistry
*/
+ @Override
MatchingRuleRegistry copy();
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/MatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/MatchingRuleUseRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/MatchingRuleUseRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/MatchingRuleUseRegistry.java Tue May 31 09:32:09 2016
@@ -36,5 +36,6 @@ public interface MatchingRuleUseRegistry
/**
* Copy the MatchingRuleUseRegistry
*/
+ @Override
MatchingRuleUseRegistry copy();
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/NameFormRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/NameFormRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/NameFormRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/NameFormRegistry.java Tue May 31 09:32:09 2016
@@ -34,5 +34,6 @@ public interface NameFormRegistry extend
/**
* Copy the NameFormRegistry
*/
+ @Override
NameFormRegistry copy();
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/NormalizerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/NormalizerRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/NormalizerRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/NormalizerRegistry.java Tue May 31 09:32:09 2016
@@ -39,6 +39,7 @@ public interface NormalizerRegistry exte
* @throws LdapException if the Normalizer is already registered or
* the registration operation is not supported
*/
+ @Override
void register( Normalizer normalizer ) throws LdapException;
@@ -49,6 +50,7 @@ public interface NormalizerRegistry exte
* @param numericOid the numeric identifier
* @throws LdapException if the numeric identifier is invalid
*/
+ @Override
Normalizer unregister( String numericOid ) throws LdapException;
@@ -58,11 +60,13 @@ public interface NormalizerRegistry exte
*
* @param schemaName the name of the schema whose Normalizers will be removed from
*/
+ @Override
void unregisterSchemaElements( String schemaName ) throws LdapException;
/**
* Copy the NormalizerRegistry
*/
+ @Override
NormalizerRegistry copy();
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ObjectClassRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ObjectClassRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/ObjectClassRegistry.java Tue May 31 09:32:09 2016
@@ -91,6 +91,7 @@ public interface ObjectClassRegistry ext
* @throws LdapException if the ObjectClass is already registered or
* the registration operation is not supported
*/
+ @Override
void register( ObjectClass objectClass ) throws LdapException;
@@ -100,11 +101,13 @@ public interface ObjectClassRegistry ext
* @param numericOid the numeric identifier
* @throws LdapException if the numeric identifier is invalid
*/
+ @Override
ObjectClass unregister( String numericOid ) throws LdapException;
/**
* Copy the ObjectClassRegistry
*/
+ @Override
ObjectClassRegistry copy();
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/OidRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/OidRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/OidRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/OidRegistry.java Tue May 31 09:32:09 2016
@@ -50,7 +50,7 @@ public class OidRegistry<T extends Schem
private static final boolean IS_DEBUG = LOG.isDebugEnabled();
/** Maps OID to a type of SchemaObject */
- private Map<String, T> byOid = new HashMap<String, T>();
+ private Map<String, T> byOid = new HashMap<>();
/** A flag indicating that the Registry is relaxed or not */
private boolean isRelaxed = Registries.STRICT;;
@@ -167,6 +167,7 @@ public class OidRegistry<T extends Schem
*
* @return all the SchemaObject registered
*/
+ @Override
public Iterator<T> iterator()
{
return byOid.values().iterator();
@@ -309,10 +310,10 @@ public class OidRegistry<T extends Schem
*/
public OidRegistry<T> copy()
{
- OidRegistry<T> copy = new OidRegistry<T>();
+ OidRegistry<T> copy = new OidRegistry<>();
// Clone the map
- copy.byOid = new HashMap<String, T>();
+ copy.byOid = new HashMap<>();
return copy;
}
@@ -337,6 +338,7 @@ public class OidRegistry<T extends Schem
/**
* @see Object#toString()
*/
+ @Override
public String toString()
{
StringBuilder sb = new StringBuilder();
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java Tue May 31 09:32:09 2016
@@ -80,7 +80,7 @@ public class Registries implements Schem
* A String name to Schema object map for the schemas loaded into this
* registry. The loaded schemas may be disabled.
*/
- protected Map<String, Schema> loadedSchemas = new HashMap<String, Schema>();
+ protected Map<String, Schema> loadedSchemas = new HashMap<>();
/** The AttributeType registry */
protected DefaultAttributeTypeRegistry attributeTypeRegistry;
@@ -149,7 +149,7 @@ public class Registries implements Schem
*/
public Registries()
{
- globalOidRegistry = new OidRegistry<SchemaObject>();
+ globalOidRegistry = new OidRegistry<>();
attributeTypeRegistry = new DefaultAttributeTypeRegistry();
comparatorRegistry = new DefaultComparatorRegistry();
ditContentRuleRegistry = new DefaultDitContentRuleRegistry();
@@ -161,9 +161,9 @@ public class Registries implements Schem
normalizerRegistry = new DefaultNormalizerRegistry();
objectClassRegistry = new DefaultObjectClassRegistry();
syntaxCheckerRegistry = new DefaultSyntaxCheckerRegistry();
- schemaObjects = new HashMap<String, Set<SchemaObjectWrapper>>();
- usedBy = new HashMap<SchemaObjectWrapper, Set<SchemaObjectWrapper>>();
- using = new HashMap<SchemaObjectWrapper, Set<SchemaObjectWrapper>>();
+ schemaObjects = new HashMap<>();
+ usedBy = new HashMap<>();
+ using = new HashMap<>();
isRelaxed = STRICT;
disabledAccepted = false;
@@ -460,7 +460,7 @@ public class Registries implements Schem
*/
public List<Throwable> checkRefInteg()
{
- ArrayList<Throwable> errors = new ArrayList<Throwable>();
+ ArrayList<Throwable> errors = new ArrayList<>();
// Step 1 :
// We start with Normalizers, Comparators and SyntaxCheckers
@@ -816,7 +816,7 @@ public class Registries implements Schem
private void buildObjectClassReferences( List<Throwable> errors )
{
// Remember the OC we have already processed
- Set<String> done = new HashSet<String>();
+ Set<String> done = new HashSet<>();
// The ObjectClass
for ( ObjectClass objectClass : objectClassRegistry )
@@ -866,7 +866,7 @@ public class Registries implements Schem
*/
public List<Throwable> buildReferences()
{
- List<Throwable> errors = new ArrayList<Throwable>();
+ List<Throwable> errors = new ArrayList<>();
// The Comparator references
buildComparatorReferences( errors );
@@ -1162,7 +1162,7 @@ public class Registries implements Schem
// This set is used to avoid having more than one error
// for an AttributeType. It's mandatory when processing
// a Superior, as it may be broken and referenced more than once.
- Set<String> processed = new HashSet<String>();
+ Set<String> processed = new HashSet<>();
// Store the AttributeType itself in the processed, to avoid cycle
processed.add( attributeType.getOid() );
@@ -1206,7 +1206,7 @@ public class Registries implements Schem
// This set is used to avoid having more than one error
// for an ObjectClass. It's mandatory when processing
// the Superiors, as they may be broken and referenced more than once.
- Set<String> processed = new HashSet<String>();
+ Set<String> processed = new HashSet<>();
// Store the ObjectClass itself in the processed, to avoid cycle
processed.add( objectClass.getOid() );
@@ -1414,6 +1414,7 @@ public class Registries implements Schem
*
* {@inheritDoc}
*/
+ @Override
public void schemaLoaded( Schema schema )
{
this.loadedSchemas.put( Strings.toLowerCaseAscii( schema.getSchemaName() ), schema );
@@ -1426,6 +1427,7 @@ public class Registries implements Schem
*
* {@inheritDoc}
*/
+ @Override
public void schemaUnloaded( Schema schema )
{
this.loadedSchemas.remove( Strings.toLowerCaseAscii( schema.getSchemaName() ) );
@@ -1502,7 +1504,7 @@ public class Registries implements Schem
*/
public Set<SchemaObjectWrapper> addSchema( String schemaName )
{
- Set<SchemaObjectWrapper> content = new HashSet<SchemaObjectWrapper>();
+ Set<SchemaObjectWrapper> content = new HashSet<>();
schemaObjects.put( schemaName, content );
return content;
@@ -1522,7 +1524,6 @@ public class Registries implements Schem
{
if ( globalOidRegistry.contains( schemaObject.getOid() ) )
{
- // TODO : throw an exception here
String msg = I18n.err( I18n.ERR_04301, schemaObject.getObjectType(), schemaObject.getOid() );
LOG.error( msg );
Throwable error = new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
@@ -1605,7 +1606,6 @@ public class Registries implements Schem
// Check that the SchemaObject is not already registered
if ( !( schemaObject instanceof LoadableSchemaObject ) && globalOidRegistry.contains( schemaObject.getOid() ) )
{
- // TODO : throw an exception here
String msg = I18n.err( I18n.ERR_04301, schemaObject.getObjectType(), schemaObject.getOid() );
LOG.error( msg );
Throwable error = new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
@@ -1621,7 +1621,7 @@ public class Registries implements Schem
if ( content == null )
{
- content = new HashSet<SchemaObjectWrapper>();
+ content = new HashSet<>();
schemaObjects.put( Strings.toLowerCaseAscii( schemaName ), content );
}
@@ -1674,7 +1674,6 @@ public class Registries implements Schem
// Check that the SchemaObject is already registered
if ( !( schemaObject instanceof LoadableSchemaObject ) && !globalOidRegistry.contains( schemaObject.getOid() ) )
{
- // TODO : throw an exception here
String msg = I18n.err( I18n.ERR_04302, schemaObject.getObjectType(), schemaObject.getOid() );
LOG.error( msg );
Throwable error = new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
@@ -1739,7 +1738,6 @@ public class Registries implements Schem
{
if ( !globalOidRegistry.contains( schemaObject.getOid() ) )
{
- // TODO : throw an exception here
String msg = I18n.err( I18n.ERR_04302, schemaObject.getObjectType(), schemaObject.getOid() );
LOG.error( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
@@ -1856,7 +1854,7 @@ public class Registries implements Schem
Set<SchemaObjectWrapper> set = usedBy.get( wrapper );
- boolean referenced = ( set != null ) && ( set.size() != 0 );
+ boolean referenced = ( set != null ) && !set.isEmpty();
if ( LOG.isDebugEnabled() )
{
@@ -2013,7 +2011,7 @@ public class Registries implements Schem
if ( uses == null )
{
- uses = new HashSet<SchemaObjectWrapper>();
+ uses = new HashSet<>();
}
uses.add( new SchemaObjectWrapper( referee ) );
@@ -2068,7 +2066,7 @@ public class Registries implements Schem
if ( uses == null )
{
- uses = new HashSet<SchemaObjectWrapper>();
+ uses = new HashSet<>();
}
uses.add( new SchemaObjectWrapper( reference ) );
@@ -2102,7 +2100,7 @@ public class Registries implements Schem
SchemaObjectWrapper wrapper = new SchemaObjectWrapper( reference );
- if ( uses.size() == 0 )
+ if ( uses.isEmpty() )
{
using.remove( wrapper );
}
@@ -2137,7 +2135,7 @@ public class Registries implements Schem
SchemaObjectWrapper wrapper = new SchemaObjectWrapper( referee );
- if ( uses.size() == 0 )
+ if ( uses.isEmpty() )
{
usedBy.remove( wrapper );
}
@@ -2513,6 +2511,7 @@ public class Registries implements Schem
* - second restore the relation between them
*/
// False positive
+ @Override
public Registries clone() throws CloneNotSupportedException
{
// First clone the structure
@@ -2576,7 +2575,7 @@ public class Registries implements Schem
}
// Clone the schema list
- clone.loadedSchemas = new HashMap<String, Schema>();
+ clone.loadedSchemas = new HashMap<>();
for ( Map.Entry<String, Set<SchemaObjectWrapper>> entry : schemaObjects.entrySet() )
{
@@ -2586,8 +2585,8 @@ public class Registries implements Schem
// Clone the Using and usedBy structures
// They will be empty
- clone.using = new HashMap<SchemaObjectWrapper, Set<SchemaObjectWrapper>>();
- clone.usedBy = new HashMap<SchemaObjectWrapper, Set<SchemaObjectWrapper>>();
+ clone.using = new HashMap<>();
+ clone.usedBy = new HashMap<>();
// Last, rebuild the using and usedBy references
clone.buildReferences();
@@ -2595,13 +2594,13 @@ public class Registries implements Schem
// Now, check the registries. We don't care about errors
clone.checkRefInteg();
- clone.schemaObjects = new HashMap<String, Set<SchemaObjectWrapper>>();
+ clone.schemaObjects = new HashMap<>();
// Last, not least, clone the SchemaObjects Map, and reference all the copied
// SchemaObjects
for ( Map.Entry<String, Set<SchemaObjectWrapper>> entry : schemaObjects.entrySet() )
{
- Set<SchemaObjectWrapper> objects = new HashSet<SchemaObjectWrapper>();
+ Set<SchemaObjectWrapper> objects = new HashSet<>();
for ( SchemaObjectWrapper schemaObjectWrapper : entry.getValue() )
{
@@ -2847,6 +2846,7 @@ public class Registries implements Schem
/**
* @see Object#toString()
*/
+ @Override
public String toString()
{
StringBuilder sb = new StringBuilder();
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/SchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/SchemaLoader.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/SchemaLoader.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/SchemaLoader.java Tue May 31 09:32:09 2016
@@ -266,14 +266,12 @@ public interface SchemaLoader
/**
* @return the list of enabled schemas
- * @throws LdapException TODO
*/
Collection<Schema> getAllEnabled();
/**
* @return the list of all schemas
- * @throws LdapException TODO
*/
Collection<Schema> getAllSchemas();
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/SyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/SyntaxCheckerRegistry.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/SyntaxCheckerRegistry.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/SyntaxCheckerRegistry.java Tue May 31 09:32:09 2016
@@ -39,6 +39,7 @@ public interface SyntaxCheckerRegistry e
* @throws LdapException if the SyntaxChecker is already registered or
* the registration operation is not supported
*/
+ @Override
void register( SyntaxChecker syntaxChecker ) throws LdapException;
@@ -49,6 +50,7 @@ public interface SyntaxCheckerRegistry e
* @param numericOid the numeric identifier
* @throws LdapException if the numeric identifier is invalid
*/
+ @Override
SyntaxChecker unregister( String numericOid ) throws LdapException;
@@ -58,11 +60,13 @@ public interface SyntaxCheckerRegistry e
*
* @param schemaName the name of the schema whose SyntaxCheckers will be removed from
*/
+ @Override
void unregisterSchemaElements( String schemaName ) throws LdapException;
/**
* Copy the SyntaxCheckerRegistry
*/
+ @Override
SyntaxCheckerRegistry copy();
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/AttributeTypeHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/AttributeTypeHelper.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/AttributeTypeHelper.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/AttributeTypeHelper.java Tue May 31 09:32:09 2016
@@ -45,13 +45,14 @@ import org.slf4j.LoggerFactory;
*/
public final class AttributeTypeHelper
{
+ /** A logger for this class */
+ private static final Logger LOG = LoggerFactory.getLogger( AttributeTypeHelper.class );
+
private AttributeTypeHelper()
{
}
- /** A logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( AttributeTypeHelper.class );
-
+
/**
* Inject the AttributeType into the Registries, updating the references to
* other SchemaObject
@@ -148,7 +149,7 @@ public final class AttributeTypeHelper
*/
private static boolean buildSuperior( MutableAttributeType attributeType, List<Throwable> errors, Registries registries )
{
- MutableAttributeType currentSuperior = null;
+ MutableAttributeType currentSuperior;
AttributeTypeRegistry attributeTypeRegistry = registries.getAttributeTypeRegistry();
String superiorOid = attributeType.getSuperiorOid();
@@ -217,7 +218,7 @@ public final class AttributeTypeHelper
}
// Check for cycles now
- Set<String> superiors = new HashSet<String>();
+ Set<String> superiors = new HashSet<>();
superiors.add( attributeType.getOid() );
AttributeType tmp = currentSuperior;
boolean isOk = true;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/ObjectClassHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/ObjectClassHelper.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/ObjectClassHelper.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/helper/ObjectClassHelper.java Tue May 31 09:32:09 2016
@@ -42,12 +42,13 @@ import org.slf4j.LoggerFactory;
*/
public final class ObjectClassHelper
{
+ /** A logger for this class */
+ private static final Logger LOG = LoggerFactory.getLogger( ObjectClassHelper.class );
+
private ObjectClassHelper()
{
}
- /** A logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( ObjectClassHelper.class );
/**
* Inject the ObjectClass into the registries, updating the references to
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -50,6 +50,7 @@ public class AccessPointSyntaxChecker ex
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -78,7 +78,7 @@ public class AttributeTypeDescriptionSyn
private static final Logger LOG = LoggerFactory.getLogger( AttributeTypeDescriptionSyntaxChecker.class );
/** The schema parser used to parse the AttributeTypeDescription Syntax */
- private AttributeTypeDescriptionSchemaParser schemaParser = new AttributeTypeDescriptionSchemaParser();
+ private transient AttributeTypeDescriptionSchemaParser schemaParser = new AttributeTypeDescriptionSchemaParser();
/**
@@ -95,9 +95,10 @@ public class AttributeTypeDescriptionSyn
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -126,7 +127,7 @@ public class AttributeTypeDescriptionSyn
}
catch ( ParseException pe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -58,9 +58,10 @@ public class AttributeTypeUsageSyntaxChe
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -84,7 +85,7 @@ public class AttributeTypeUsageSyntaxChe
if ( ( strValue.length() < "userApplications".length() )
|| ( strValue.length() > "userApplications".length() ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -92,7 +93,7 @@ public class AttributeTypeUsageSyntaxChe
switch ( ch )
{
- case ( 'd' ):
+ case 'd':
if ( "dSAOperation".equals( strValue )
|| "directoryOperation".equals( strValue )
|| "distributedOperation".equals( strValue ) )
@@ -101,10 +102,10 @@ public class AttributeTypeUsageSyntaxChe
return true;
}
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
- case ( 'u' ):
+ case 'u':
boolean comp = "userApplications".equals( strValue );
if ( comp )
@@ -113,14 +114,14 @@ public class AttributeTypeUsageSyntaxChe
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return comp;
default:
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -56,6 +56,7 @@ public class AudioSyntaxChecker extends
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java Tue May 31 09:32:09 2016
@@ -50,6 +50,7 @@ public class BinarySyntaxChecker extends
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -71,7 +71,7 @@ public class BitStringSyntaxChecker exte
{
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", strValue );
+ LOG.debug( INVALID_SYNTAX_FOR, strValue );
return false;
}
@@ -80,14 +80,14 @@ public class BitStringSyntaxChecker exte
// Check that the String respect the syntax : ' ([01]+) ' B
if ( !Strings.isCharASCII( strValue, pos++, '\'' ) )
{
- LOG.debug( "Syntax invalid for '{}'", strValue );
+ LOG.debug( INVALID_SYNTAX_FOR, strValue );
return false;
}
// We must have at least one bit
if ( !Chars.isBit( strValue, pos++ ) )
{
- LOG.debug( "Syntax invalid for '{}'", strValue );
+ LOG.debug( INVALID_SYNTAX_FOR, strValue );
return false;
}
@@ -100,14 +100,14 @@ public class BitStringSyntaxChecker exte
// Now, we must have a simple quote
if ( !Strings.isCharASCII( strValue, pos++, '\'' ) )
{
- LOG.debug( "Syntax invalid for '{}'", strValue );
+ LOG.debug( INVALID_SYNTAX_FOR, strValue );
return false;
}
// followed by a 'B'
if ( !Strings.isCharASCII( strValue, pos, 'B' ) )
{
- LOG.debug( "Syntax invalid for '{}'", strValue );
+ LOG.debug( INVALID_SYNTAX_FOR, strValue );
return false;
}
@@ -119,9 +119,10 @@ public class BitStringSyntaxChecker exte
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -56,9 +56,10 @@ public class BooleanSyntaxChecker extend
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -81,11 +82,11 @@ public class BooleanSyntaxChecker extend
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", strValue );
+ LOG.debug( INVALID_SYNTAX_FOR, strValue );
return false;
}
- boolean valid = ( ( "TRUE".equalsIgnoreCase( strValue ) ) || ( "FALSE".equalsIgnoreCase( strValue ) ) );
+ boolean valid = "TRUE".equalsIgnoreCase( strValue ) || "FALSE".equalsIgnoreCase( strValue );
if ( valid )
{
@@ -93,7 +94,7 @@ public class BooleanSyntaxChecker extend
}
else
{
- LOG.debug( "Syntax invalid for '{}'", strValue );
+ LOG.debug( INVALID_SYNTAX_FOR, strValue );
}
return valid;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -58,6 +58,7 @@ public class CertificateListSyntaxChecke
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -58,6 +58,7 @@ public class CertificatePairSyntaxChecke
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -58,6 +58,7 @@ public class CertificateSyntaxChecker ex
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );