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

[directory-ldap-api] branch master updated: Fixed some warnings

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ad1ed72  Fixed some warnings
ad1ed72 is described below

commit ad1ed72d7e036be0888eef47a42372c8081aa0c9
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Thu Jul 12 23:32:27 2018 +0200

    Fixed some warnings
---
 .../java/org/apache/directory/api/osgi/ApiLdapClientApiOsgiTest.java  | 1 +
 .../org/apache/directory/api/osgi/ApiLdapExtrasCodecApiOsgiTest.java  | 1 -
 .../directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java  | 2 +-
 .../test/java/org/apache/directory/api/ldap/model/name/DnTest.java    | 4 ++--
 .../directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java | 4 ----
 .../java/org/apache/directory/api/ldap/model/entry/AttributeTest.java | 2 +-
 .../java/org/apache/directory/api/ldap/model/entry/EntryUtils.java    | 1 -
 .../org/apache/directory/api/ldap/model/filter/FilterParserTest.java  | 4 ++--
 .../java/org/apache/directory/api/ldap/model/name/DnParserTest.java   | 2 +-
 .../org/apache/directory/api/ldap/model/name/FastRdnParserTest.java   | 2 +-
 .../api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java  | 1 -
 .../apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java  | 4 ++--
 12 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapClientApiOsgiTest.java b/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapClientApiOsgiTest.java
index bbcd73b..ab78319 100644
--- a/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapClientApiOsgiTest.java
+++ b/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapClientApiOsgiTest.java
@@ -62,6 +62,7 @@ public class ApiLdapClientApiOsgiTest extends ApiOsgiTestBase
         LdapConnectionPool ldapConnectionPool = new LdapConnectionPool( factory, config );
         ldapConnectionPool.getLdapApiService();
         ldapConnectionPool.getTestOnBorrow();
+        ldapConnectionPool.close();
     }
 
 }
diff --git a/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapExtrasCodecApiOsgiTest.java b/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapExtrasCodecApiOsgiTest.java
index 8a50a6f..e0f7868 100644
--- a/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapExtrasCodecApiOsgiTest.java
+++ b/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapExtrasCodecApiOsgiTest.java
@@ -43,7 +43,6 @@ import org.apache.directory.api.ldap.extras.extended.startTransaction.StartTrans
 import org.apache.directory.api.ldap.extras.extended.startTransaction.StartTransactionResponseImpl;
 import org.apache.directory.api.ldap.extras.extended.whoAmI.WhoAmIRequestImpl;
 import org.apache.directory.api.ldap.extras.extended.whoAmI.WhoAmIResponseImpl;
-import org.apache.directory.api.ldap.extras.intermediate.syncrepl.SyncInfoValueImpl;
 import org.apache.directory.api.ldap.model.name.Dn;
 
 
diff --git a/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java b/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
index 3496561..34198cd 100644
--- a/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
+++ b/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
@@ -140,7 +140,7 @@ public class StandaloneLdapCodecServiceTest
         assertNotNull( syncInfoValue );
         assertNotNull( codec );
 
-        Object o = codec.decorate( syncInfoValue );
+        codec.decorate( syncInfoValue );
         SyncInfoValue decorator = ( SyncInfoValue ) codec.decorate( syncInfoValue );
         assertNotNull( decorator );
     }
diff --git a/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java b/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java
index deb8fee..7a1a6ae 100644
--- a/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java
+++ b/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java
@@ -2584,7 +2584,7 @@ public class DnTest
     @Test
     public void testNumericOid() throws Exception
     {
-        Dn dn = new Dn( "ipHostNumber=X127.0.0.1+cn=loopback,ou=Hosts,dc=mygfs,dc=com" );
+        new Dn( "ipHostNumber=X127.0.0.1+cn=loopback,ou=Hosts,dc=mygfs,dc=com" );
 
         // numeric OID only
         Dn dn1 = new Dn( "cn=loopback+ipHostNumber=127.0.0.1,ou=Hosts,dc=mygfs,dc=com" );
@@ -3007,7 +3007,7 @@ public class DnTest
     @Test
     public void testSameAttributeInDn() throws LdapInvalidDnException
     {
-        Dn dn = new Dn( "l=eu + l=de + l=Berlin + l=Brandenburger Tor,dc=example,dc=org" );
+        new Dn( "l=eu + l=de + l=Berlin + l=Brandenburger Tor,dc=example,dc=org" );
     }
 
     
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java
index 8c082e5..554eb20 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java
@@ -48,9 +48,6 @@ public abstract class AbstractSchemaParser<T extends SchemaObject>
     /** The fast schemaObject parser */
     protected OpenLdapSchemaParser fastParser;
 
-    /** error code used when schema descritpion is null */
-    private I18n errorCodeOnNull;
-
     /**
      * Instantiates a new abstract schema parser.
      * 
@@ -63,7 +60,6 @@ public abstract class AbstractSchemaParser<T extends SchemaObject>
         I18n errorCodeOnParseExceptionWithPosition,
         I18n errorCodeOnParseException )
     {
-        this.errorCodeOnNull = errorCodeOnNull;
         fastParser = new OpenLdapSchemaParser();
     }
 
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java
index 5263347..ad87457 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java
@@ -1539,6 +1539,6 @@ public class AttributeTest
     public void testNullAT() throws LdapInvalidAttributeValueException
     {
         AttributeType attributeType = new AttributeType("mail");
-        Value stringValue = new Value(attributeType, "test@test.com");
+        new Value(attributeType, "test@test.com");
     }
 }
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java
index b509c32..d19070a 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java
@@ -20,7 +20,6 @@
 package org.apache.directory.api.ldap.model.entry;
 
 
-import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.LdapComparator;
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java
index bf0f883..e7dfe6a 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java
@@ -610,7 +610,7 @@ public class FilterParserTest
         assertTrue( node instanceof SubstringNode );
 
         assertEquals( 4, node.getAny().size() );
-        assertFalse( node.getAny().contains( new Value( "" ) ) );
+        assertFalse( node.getAny().contains( new Value( "" ).getValue() ) );
         assertTrue( node.getAny().contains( "e" ) );
         assertTrue( node.getAny().contains( "b" ) );
         assertTrue( node.getAny().contains( "c" ) );
@@ -652,7 +652,7 @@ public class FilterParserTest
         assertTrue( node instanceof SubstringNode );
 
         assertEquals( 4, node.getAny().size() );
-        assertFalse( node.getAny().contains( new Value( "" ) ) );
+        assertFalse( node.getAny().contains( new Value( "" ).getValue() ) );
         assertTrue( node.getAny().contains( "e" ) );
         assertTrue( node.getAny().contains( "b" ) );
         assertTrue( node.getAny().contains( "c" ) );
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java
index 9314fcb..105c172 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java
@@ -678,7 +678,7 @@ public class DnParserTest
     @Test
     public void testEqualInRdn() throws LdapInvalidDnException
     {
-        Dn dn = new Dn( "uid=nghZwwtHgxgyvVbTQCYyeY\\+O4cc=,dc=example,dc=com" );
+        new Dn( "uid=nghZwwtHgxgyvVbTQCYyeY\\+O4cc=,dc=example,dc=com" );
     }
     
     
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastRdnParserTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastRdnParserTest.java
index b84968d..1f18bc0 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastRdnParserTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastRdnParserTest.java
@@ -439,7 +439,7 @@ public class FastRdnParserTest
         
         for ( int i = 0; i < 10000000; i++ )
         {
-            Rdn rdn = new Rdn( "cn=test"+ i );
+            new Rdn( "cn=test"+ i );
         }
         
         long t1 = System.currentTimeMillis();
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
index c9bf6dd..f7b87c2 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
 import java.text.ParseException;
diff --git a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
index 877757b..643356b 100644
--- a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
+++ b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
@@ -343,8 +343,8 @@ public class SchemaEntityFactory implements EntityFactory
         // Create the syntaxChecker instance
         try
         {
-            Method builder = clazz.getMethod( "builder", null );
-            syntaxChecker = ( SyntaxChecker ) ( ( SCBuilder ) builder.invoke( null, null ) ).setOid( oid ).build();
+            Method builder = clazz.getMethod( "builder", ( Class<?>[] ) null );
+            syntaxChecker = ( SyntaxChecker ) ( ( SCBuilder ) builder.invoke( null, ( Object[] ) null ) ).setOid( oid ).build();
         }
         catch ( NoSuchMethodException nsme )
         {