Skip to content

Commit

Permalink
honor @Vetoed on a bean
Browse files Browse the repository at this point in the history
Signed-off-by: jansupol <jan.supol@oracle.com>
  • Loading branch information
jansupol authored and senivam committed Mar 21, 2022
1 parent db2f8a2 commit c5e71d0
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -39,6 +39,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.enterprise.inject.Vetoed;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.inject.Singleton;
Expand Down Expand Up @@ -189,6 +190,10 @@ private boolean bind(final Class<?> clazz, final Set<Class<?>> providerContracts
return false;
}

if (clazz.isAnnotationPresent(Vetoed.class)) {
return false;
}

if (isJerseyOrDependencyType(clazz)) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/*
* Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception, which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package org.glassfish.jersey.tests.cdi.resources;

import org.glassfish.jersey.ext.cdi1x.internal.CdiComponentProvider;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.jboss.weld.environment.se.Weld;
import org.junit.Test;

import javax.enterprise.inject.Vetoed;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.CDI;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
import java.util.Collections;

import static org.junit.Assert.assertFalse;

public class CdiComponentProviderTest extends JerseyTest {
Weld weld;

@Override
public void setUp() throws Exception {
weld = new Weld();
weld.initialize();
super.setUp();
}

@Override
public void tearDown() throws Exception {
weld.shutdown();
super.tearDown();
}

@Override
protected Application configure() {
return new ResourceConfig();
}

@Test
public void testVetoedClassIsNotBound() {
BeanManager beanManager = CDI.current().getBeanManager();
CdiComponentProvider provider = beanManager.getExtension(CdiComponentProvider.class);
assertFalse(provider.bind(VetoedResourceClass.class, Collections.singleton(Path.class)));
}

@Test
public void testInterfaceIsNotBound() {
BeanManager beanManager = CDI.current().getBeanManager();
CdiComponentProvider provider = beanManager.getExtension(CdiComponentProvider.class);
assertFalse(provider.bind(InterfaceResource.class, Collections.singleton(Path.class)));
}

@Path("/vetoed")
@Vetoed
public static class VetoedResourceClass {
@GET
public String get() {
return null;
}
}

@Path("/iface")
public static interface InterfaceResource {
@GET
public String get();
}
}

0 comments on commit c5e71d0

Please sign in to comment.