/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common Development
 * and Distribution License("CDDL") (collectively, the "License").  You
 * may not use this file except in compliance with the License.  You can
 * obtain a copy of the License at
 * http://glassfish.java.net/public/CDDL+GPL_1_1.html
 * or packager/legal/LICENSE.txt.  See the License for the specific
 * language governing permissions and limitations under the License.
 *
 * When distributing the software, include this License Header Notice in each
 * file and include the License file at packager/legal/LICENSE.txt.
 *
 * GPL Classpath Exception:
 * Oracle designates this particular file as subject to the "Classpath"
 * exception as provided by Oracle in the GPL Version 2 section of the License
 * file that accompanied this code.
 *
 * Modifications:
 * If applicable, add the following below the License Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyright [year] [name of copyright owner]"
 *
 * Contributor(s):
 * If you wish your version of this file to be governed by only the CDDL or
 * only the GPL Version 2, indicate your decision by adding "[Contributor]
 * elects to include this software in this distribution under the [CDDL or GPL
 * Version 2] license."  If you don't indicate a single choice of license, a
 * recipient has the option to distribute your version of this file under
 * either the CDDL, the GPL Version 2 or to extend the choice of license to
 * its licensees as provided above.  However, if you add GPL Version 2 code
 * and therefore, elected the GPL Version 2 license, then the option applies
 * only if the new code is made subject to such option by the copyright
 * holder.
 */
package com.oracle.ozark.cdi;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
import java.util.Iterator;

/**
 * CdiUtil class
 *
 * @author Santiago.PericasGeertsen@oracle.com
 */
@ApplicationScoped
public class CdiUtil {

    @Inject
    private BeanManager bm;

    @SuppressWarnings("unchecked")
    public <T> T newBean(Class<T> clazz) {
        Iterator<Bean<?>> it = bm.getBeans(clazz).iterator();
        if (!it.hasNext()) {
            return null;
        }
        final Bean<T> bean = (Bean<T>) it.next();
        final CreationalContext<T> ctx = bm.createCreationalContext(bean);
        return (T) bm.getReference(bean, clazz, ctx);
    }
}

@@ -2244,24 +2244,19 @@
 va.util.
-Iterator
+Set
 ;%0A%0A/**%0A 
@@ -2499,16 +2499,11 @@
     
-Iterator
+Set
 %3CBea
@@ -2508,18 +2508,21 @@
 ean%3C?%3E%3E 
-it
+beans
  = bm.ge
@@ -2538,84 +2538,9 @@
 azz)
-.iterator();%0A        if (!it.hasNext()) %7B%0A            return null;%0A        %7D
+;
 %0A   
@@ -2579,16 +2579,24 @@
 T%3E) 
-it.next(
+bm.resolve(beans
 );%0A 

Use BeanManager.resolve