mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Matthew Swift
23.11.2015 894d6d032c824086dc7173d220722f46583a8009
Fix minor compiler warnings
3 files modified
28 ■■■■■ changed files
opendj-sdk/opendj-core/clirr-ignored-api-changes.xml 6 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java 4 ●●● patch | view | raw | blame | history
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java 18 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-core/clirr-ignored-api-changes.xml
@@ -542,4 +542,10 @@
    <method>%regex[org\.forgerock\.opendj\.ldap\.ByteString valueOf\([^)]+\)]</method>
    <justification>OPENDJ-1802 ByteString.valueOf() => valueOfInt(), valueOfLong(), valueOfUtf8(), valueOfBytes(), valueOfObject()</justification>
  </difference>
  <difference>
    <className>org/forgerock/opendj/ldap/AttributeParser</className>
    <differenceType>7014</differenceType>
    <method>java.util.Set asSetOf(org.forgerock.opendj.ldap.Function, java.lang.Object[])</method>
    <justification>Method needs to be final in order to use SafeVarArgs annotation</justification>
  </difference>
</differences>
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java
@@ -358,7 +358,9 @@
     *            The default values to return if the attribute is empty.
     * @return The values decoded as a set of {@code T}s.
     */
    public <T> Set<T> asSetOf(final Function<ByteString, ? extends T, NeverThrowsException> f,
    @SafeVarargs
    @SuppressWarnings("varargs")
    public final <T> Set<T> asSetOf(final Function<ByteString, ? extends T, NeverThrowsException> f,
            final T... defaultValues) {
        return asSetOf(f, Arrays.asList(defaultValues));
    }
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java
@@ -20,11 +20,10 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2014 ForgeRock AS
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.forgerock.opendj.ldap;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
@@ -36,41 +35,26 @@
 */
@SuppressWarnings("javadoc")
public class DataProviderIterator implements Iterator<Object[]> {
    private final Iterator<?> iter;
    public DataProviderIterator(Iterator<?> iter) {
        this.iter = iter;
    }
    public DataProviderIterator(Iterable<?> iterable) {
        this.iter = iterable != null
                ? iterable.iterator()
                : Collections.emptySet().iterator();
    }
    public <T> DataProviderIterator(T... objs) {
        this.iter = objs != null
                ? Arrays.asList(objs).iterator()
                : Collections.emptySet().iterator();
    }
    /** {@inheritDoc} */
    @Override
    public boolean hasNext() {
        return iter.hasNext();
    }
    /** {@inheritDoc} */
    @Override
    public Object[] next() {
        return new Object[] { iter.next() };
    }
    /** {@inheritDoc} */
    @Override
    public void remove() {
        iter.remove();
    }
}