/**
 *
 * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); You may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at:
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package com.speedment.internal.util;

import static com.speedment.util.NullUtil.requireNonNulls;
import static com.speedment.util.StaticClassUtil.instanceNotAllowed;
import java.util.NoSuchElementException;
import java.util.Optional;

/**
 *
 * @author pemi
 */
public final class Cast {

    /**
     * Casts and returns the provided object if it is assignable from the given
     * class, otherwise returns an Optional.empty().
     *
     * @param <T> the type to return
     * @param object to cast
     * @param clazz to cast to
     * @return An Optional of the casted element or Optional.empty()
     */
    public static <T> Optional<T> cast(Object object, Class<T> clazz) {
        requireNonNulls(object, clazz);
        if (clazz.isAssignableFrom(object.getClass())) {
            final T result = clazz.cast(object);
            return Optional.of(result);
        }
        return Optional.empty();
    }

    /**
     * Casts and returns the provided object to the provided class.
     *
     * @param <T> the type to return
     * @param object to cast
     * @param clazz to cast to
     * @return the casted element
     * @throws NoSuchElementException if the object could not be casted to the
     * provided class
     */
    public static <T> T castOrFail(Object object, Class<T> clazz) {
        requireNonNulls(object, clazz);
        return Optional.ofNullable(object)
            .filter(o -> clazz.isAssignableFrom(o.getClass()))
            .map(clazz::cast)
            .get();
    }

    /**
     * Utility classes should not be instantiated.
     */
    private Cast() {
        instanceNotAllowed(getClass());
    }
}

@@ -666,67 +666,8 @@
 l;%0A%0A
-import static com.speedment.util.NullUtil.requireNonNulls;%0A
 impo
@@ -772,16 +772,64 @@
 eption;%0A
+import static java.util.Objects.requireNonNull;%0A
 import j
@@ -1318,33 +1318,101 @@
 eNonNull
-s(object, clazz);
+(clazz);%0A        if (object == null) %7B%0A            return Optional.empty();%0A        %7D
 %0A       
@@ -2017,26 +2017,152 @@
 Null
-s(object, clazz
+(clazz);%0A        if (object == null) %7B%0A            throw new NoSuchElementException(%22null is not an instance of %22 + clazz.getName()
 );%0A
+        %7D%0A
     
@@ -2187,16 +2187,8 @@
 l.of
-Nullable
 (obj

Fix null case in Cast class