Skip to content

Add Config Resource filter to lookup introspection endpoint #6928

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

Closed
a2l007 wants to merge 4 commits into from
Closed

Add Config Resource filter to lookup introspection endpoint #6928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ada54f
Add config filter to lookup introspection
Jan 28, 2019
130dbd1
Fix tests
Feb 5, 2019
822b42d
Merge branch 'master' of https://github.com/druid-io/druid into fix_i…
Feb 5, 2019
7292a06
Unused import
Feb 5, 2019
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
3 changes: 3 additions & 0 deletions server/src/main/java/org/apache/druid/query/lookup/LookupIntrospectionResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@
package org.apache.druid.query.lookup;

import com.google.inject.Inject;
import com.sun.jersey.spi.container.ResourceFilters;
Copy link
Copy Markdown
Contributor

@gianm gianm Jan 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This import is unused, and is probably related to the CI failure.

Copy link
Copy Markdown
Contributor Author

@a2l007 a2l007 Feb 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually being used for the ResourceFilters annotation below.

import org.apache.druid.java.util.common.logger.Logger;
import org.apache.druid.server.http.security.ConfigResourceFilter;

import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;

@Path("/druid/v1/lookups/introspect")
@ResourceFilters(ConfigResourceFilter.class)
public class LookupIntrospectionResource
{
private static final Logger LOGGER = new Logger(LookupIntrospectionResource.class);
Expand Down
79 changes: 18 additions & 61 deletions server/src/test/java/org/apache/druid/query/lookup/LookupIntrospectionResourceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,20 @@
package org.apache.druid.query.lookup;

import com.google.common.collect.ImmutableMap;
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.core.ClassNamesResourceConfig;
import com.sun.jersey.spi.container.servlet.WebComponent;
import com.sun.jersey.spi.inject.SingletonTypeInjectableProvider;
import com.sun.jersey.test.framework.JerseyTest;
import com.sun.jersey.test.framework.WebAppDescriptor;
import com.sun.jersey.test.framework.spi.container.TestContainerFactory;
import com.sun.jersey.test.framework.spi.container.grizzly2.GrizzlyTestContainerFactory;
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

import javax.ws.rs.core.Context;
import javax.ws.rs.ext.Provider;

public class LookupIntrospectionResourceImplTest extends JerseyTest
public class LookupIntrospectionResourceImplTest
{

static LookupReferencesManager lookupReferencesManager = EasyMock.createMock(LookupReferencesManager.class);

LookupReferencesManager lookupReferencesManager = EasyMock.createMock(LookupReferencesManager.class);
LookupIntrospectionResource lookupIntrospectionResource = new LookupIntrospectionResource(lookupReferencesManager);

@Override
@Before
public void setUp() throws Exception
{
super.setUp();
EasyMock.reset(lookupReferencesManager);
LookupExtractorFactory lookupExtractorFactory1 = new MapLookupExtractorFactory(ImmutableMap.of(
"key",
Expand All @@ -63,63 +50,33 @@ public void setUp() throws Exception
EasyMock.replay(lookupReferencesManager);
}

@Provider
public static class MockTodoServiceProvider extends
SingletonTypeInjectableProvider<Context, LookupReferencesManager>
{
public MockTodoServiceProvider()
{
super(LookupReferencesManager.class, lookupReferencesManager);
}
}


public LookupIntrospectionResourceImplTest()
{
super(new WebAppDescriptor.Builder().initParam(
WebComponent.RESOURCE_CONFIG_CLASS,
ClassNamesResourceConfig.class.getName()
)
.initParam(
ClassNamesResourceConfig.PROPERTY_CLASSNAMES,
LookupIntrospectionResource.class.getName()
+ ';'
+ MockTodoServiceProvider.class.getName()
+ ';'
+ LookupIntrospectHandler.class.getName()
)
.build());
}

@Override
protected TestContainerFactory getTestContainerFactory()
{
return new GrizzlyTestContainerFactory();
}


@Test
public void testGetKey()
{

WebResource r = resource().path("/druid/v1/lookups/introspect/lookupId1/keys");
String s = r.get(String.class);
Assert.assertEquals("[key, key2]", s);
MapLookupExtractorFactory.MapLookupIntrospectionHandler mapLookupIntrospectionHandler =
(MapLookupExtractorFactory.MapLookupIntrospectionHandler) lookupIntrospectionResource
.introspectLookup("lookupId1");
Assert.assertEquals("[key, key2]", mapLookupIntrospectionHandler.getKeys().getEntity());
}

@Test
public void testGetValue()
{
WebResource r = resource().path("/druid/v1/lookups/introspect/lookupId1/values");
String s = r.get(String.class);
Assert.assertEquals("[value, value2]", s);
MapLookupExtractorFactory.MapLookupIntrospectionHandler mapLookupIntrospectionHandler =
(MapLookupExtractorFactory.MapLookupIntrospectionHandler) lookupIntrospectionResource
.introspectLookup("lookupId1");
Assert.assertEquals("[value, value2]", mapLookupIntrospectionHandler.getValues().getEntity());
}

@Test
public void testGetMap()
{
WebResource r = resource().path("/druid/v1/lookups/introspect/lookupId1/");
String s = r.get(String.class);
Assert.assertEquals("{\"key\":\"value\",\"key2\":\"value2\"}", s);
MapLookupExtractorFactory.MapLookupIntrospectionHandler mapLookupIntrospectionHandler =
(MapLookupExtractorFactory.MapLookupIntrospectionHandler) lookupIntrospectionResource
.introspectLookup("lookupId1");
Assert.assertEquals(
ImmutableMap.of("key", "value", "key2", "value2"),
mapLookupIntrospectionHandler.getMap().getEntity()
);
}
}