Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed HK2 AbstractActiveDescriptor Test #4511

Merged
merged 1 commit into from
Jun 18, 2020
Merged

Fixed HK2 AbstractActiveDescriptor Test #4511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions ...r/src/test/java/org/glassfish/jersey/server/internal/inject/ActiveBindingBindingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 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
Expand Down Expand Up @@ -31,23 +31,21 @@
import javax.inject.Singleton;

import org.glassfish.jersey.internal.inject.InjectionManager;
import org.glassfish.jersey.internal.inject.PerLookup;
import org.glassfish.jersey.internal.util.collection.Ref;
import org.glassfish.jersey.process.internal.RequestScoped;
import org.glassfish.jersey.server.internal.process.RequestProcessingContextReference;
import org.glassfish.jersey.server.ContainerResponse;
import org.glassfish.jersey.server.RequestContextBuilder;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.server.internal.process.RequestProcessingContext;

import org.glassfish.hk2.api.DescriptorType;
import org.glassfish.hk2.api.DescriptorVisibility;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceHandle;
import org.glassfish.hk2.utilities.AbstractActiveDescriptor;
import org.glassfish.hk2.utilities.binding.AbstractBinder;

import org.jvnet.hk2.internal.ServiceHandleImpl;

import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.not;
Expand Down Expand Up @@ -139,7 +137,6 @@ public String getParam(@Context MyRequestData param) {
}

@Test
@Ignore("At the time of ignoring this test, ResourceConfig does not support HK2 Binder registering.")
public void testReq() throws Exception {

// bootstrap the test application
Expand Down Expand Up @@ -250,16 +247,16 @@ public MyRequestData create(ServiceHandle<?> serviceHandle) {

boolean direct = false;

final javax.inject.Provider<Ref<RequestProcessingContext>> ctxRef =
injectionManager.getInstance(new GenericType<Provider<Ref<RequestProcessingContext>>>() {
final Provider<RequestProcessingContextReference> ctxRef =
injectionManager.getInstance(new GenericType<Provider<RequestProcessingContextReference>>() {
}.getType());

if (serviceHandle instanceof ServiceHandleImpl) {
final ServiceHandleImpl serviceHandleImpl = (ServiceHandleImpl) serviceHandle;
final Class<? extends Annotation> scopeAnnotation =
serviceHandleImpl.getOriginalRequest().getInjecteeDescriptor().getScopeAnnotation();
final String scopeAnnotation =
serviceHandleImpl.getOriginalRequest().getInjecteeDescriptor().getScope();

if (scopeAnnotation == RequestScoped.class || scopeAnnotation == null) {
if (RequestScoped.class.getName().equals(scopeAnnotation) || scopeAnnotation == null) {
direct = true;
}
}
Expand Down