Skip to content

Commit

Permalink
Minor code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajs6f
ajs6f committed Jun 12, 2013
1 parent 0c65d53 commit c7c98a8
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 88 deletions.
100 changes: 51 additions & 49 deletions src/test/java/org/fcrepo/auth/oauth/integration/api/ContainerWrapper.java
View file
Expand Up @@ -28,10 +28,6 @@
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.web.filter.DelegatingFilterProxy;

import com.sun.jersey.spi.spring.container.servlet.SpringServlet;
import com.sun.jersey.test.framework.JerseyTest;

public class ContainerWrapper implements ApplicationContextAware {

Expand All @@ -40,7 +36,7 @@ public class ContainerWrapper implements ApplicationContextAware {
private int port;

private HttpServer server;

private String configLocation;

public void setConfigLocation(final String configLocation) {
Expand All @@ -52,59 +48,65 @@ public void setPort(final int port) {
}

public void start() throws Exception {

JAXBContext context = JAXBContext.newInstance(WebAppConfig.class);
Unmarshaller u = context.createUnmarshaller();
WebAppConfig o = (WebAppConfig) u.unmarshal(getClass().getResource(this.configLocation));


final JAXBContext context = JAXBContext.newInstance(WebAppConfig.class);
final Unmarshaller u = context.createUnmarshaller();
final WebAppConfig o =
(WebAppConfig) u.unmarshal(getClass().getResource(
this.configLocation));

final URI uri = URI.create("http://localhost:" + port + "/");

final Map<String, String> initParams = new HashMap<String, String>();

server = GrizzlyWebContainerFactory.create(uri, initParams);

// create a "root" web application
WebappContext wac = new WebappContext(o.displayName(), "");
for (ContextParam p: o.contextParams()) {
wac.addContextInitParameter(p.name(), p.value());
final WebappContext wac = new WebappContext(o.displayName(), "");

for (final ContextParam p : o.contextParams()) {
wac.addContextInitParameter(p.name(), p.value());
}
for (Listener l: o.listeners) {
wac.addListener(l.className());

for (final Listener l : o.listeners) {
wac.addListener(l.className());
}

for (Servlet s: o.servlets) {
ServletRegistration servlet = wac.addServlet(s.servletName(), s.servletClass());

Collection<ServletMapping> mappings = o.servletMappings(s.servletName());
for (ServletMapping sm: mappings) {
servlet.addMapping(sm.urlPattern());

for (final Servlet s : o.servlets) {
final ServletRegistration servlet =
wac.addServlet(s.servletName(), s.servletClass());

final Collection<ServletMapping> mappings =
o.servletMappings(s.servletName());
for (final ServletMapping sm : mappings) {
servlet.addMapping(sm.urlPattern());
}
for (InitParam p: s.initParams()) {
servlet.setInitParameter(p.name(), p.value());
for (final InitParam p : s.initParams()) {
servlet.setInitParameter(p.name(), p.value());
}
}

for (Filter f: o.filters) {
FilterRegistration filter = wac.addFilter(f.filterName(), f.filterClass());

Collection<FilterMapping> mappings = o.filterMappings(f.filterName());
for (FilterMapping sm: mappings) {
String urlPattern = sm.urlPattern();
String servletName = sm.servletName();
if (urlPattern != null) {
filter.addMappingForUrlPatterns(null, urlPattern);
} else {
filter.addMappingForServletNames(null, servletName);
}

for (final Filter f : o.filters) {
final FilterRegistration filter =
wac.addFilter(f.filterName(), f.filterClass());

final Collection<FilterMapping> mappings =
o.filterMappings(f.filterName());
for (final FilterMapping sm : mappings) {
final String urlPattern = sm.urlPattern();
final String servletName = sm.servletName();
if (urlPattern != null) {
filter.addMappingForUrlPatterns(null, urlPattern);
} else {
filter.addMappingForServletNames(null, servletName);
}

}
for (InitParam p: f.initParams()) {
filter.setInitParameter(p.name(), p.value());
for (final InitParam p : f.initParams()) {
filter.setInitParameter(p.name(), p.value());
}
}

wac.deploy(server);

final URL webXml = this.getClass().getResource("/web.xml");
Expand All @@ -118,11 +120,11 @@ public void stop() throws Exception {
server.stop();
}

@Override
public void setApplicationContext(ApplicationContext applicationContext)
throws BeansException {
//this.applicationContext = applicationContext;
}
@Override
public void setApplicationContext(
final ApplicationContext applicationContext) throws BeansException {
//this.applicationContext = applicationContext;

}

}
77 changes: 38 additions & 39 deletions src/test/java/org/fcrepo/auth/oauth/integration/api/TestBinding.java
View file
@@ -1,3 +1,4 @@

package org.fcrepo.auth.oauth.integration.api;

import static org.junit.Assert.assertEquals;
Expand All @@ -18,43 +19,41 @@

public class TestBinding {

private final Logger LOGGER = LoggerFactory.getLogger(TestBinding.class);

@Test
public void testBinding() throws JAXBException {
JAXBContext context = JAXBContext.newInstance(WebAppConfig.class);
Unmarshaller u = context.createUnmarshaller();
WebAppConfig o = (WebAppConfig) u.unmarshal(getClass().getResourceAsStream("/web.xml"));
assertEquals("Fedora-on-ModeShape", o.displayName());
assertTrue(o.contextParams.contains(
new ContextParam(
"contextConfigLocation",
"classpath:spring-test/rest.xml; " +
"classpath:spring-test/repo.xml; " +
"classpath:spring-test/security.xml")));
assertTrue(o.contextParams.contains(
new ContextParam(
"org.modeshape.jcr.RepositoryName",
"repo")));
assertTrue(o.contextParams.contains(
new ContextParam(
"org.modeshape.jcr.URL",
"/test_repository.json")));
assertTrue(o.listeners.contains(
new Listener(null, "org.springframework.web.context.ContextLoaderListener")));
assertTrue(o.listeners.contains(
new Listener(null, "org.modeshape.web.jcr.ModeShapeJcrDeployer")));
ServletMapping sm = o.servletMappings("jersey-servlet").iterator().next();
assertNotNull(sm);
assertEquals("/*", sm.urlPattern());

FilterMapping fm = o.filterMappings("TokenFilter").iterator().next();
assertNotNull(fm);
assertEquals("/token", fm.urlPattern());

fm = o.filterMappings("OpFilter").iterator().next();
assertNotNull(fm);
assertEquals("/rest/objects/authenticated/*", fm.urlPattern());

}
private final Logger LOGGER = LoggerFactory.getLogger(TestBinding.class);

@Test
public void testBinding() throws JAXBException {
LOGGER.trace("Executing testBinding()");
final JAXBContext context = JAXBContext.newInstance(WebAppConfig.class);
final Unmarshaller u = context.createUnmarshaller();
final WebAppConfig o =
(WebAppConfig) u.unmarshal(getClass().getResourceAsStream(
"/web.xml"));
assertEquals("Fedora-on-ModeShape", o.displayName());
assertTrue(o.contextParams.contains(new ContextParam(
"contextConfigLocation", "classpath:spring-test/rest.xml; "
+ "classpath:spring-test/repo.xml; "
+ "classpath:spring-test/security.xml")));
assertTrue(o.contextParams.contains(new ContextParam(
"org.modeshape.jcr.RepositoryName", "repo")));
assertTrue(o.contextParams.contains(new ContextParam(
"org.modeshape.jcr.URL", "/test_repository.json")));
assertTrue(o.listeners.contains(new Listener(null,
"org.springframework.web.context.ContextLoaderListener")));
assertTrue(o.listeners.contains(new Listener(null,
"org.modeshape.web.jcr.ModeShapeJcrDeployer")));
final ServletMapping sm =
o.servletMappings("jersey-servlet").iterator().next();
assertNotNull(sm);
assertEquals("/*", sm.urlPattern());

FilterMapping fm = o.filterMappings("TokenFilter").iterator().next();
assertNotNull(fm);
assertEquals("/token", fm.urlPattern());

fm = o.filterMappings("OpFilter").iterator().next();
assertNotNull(fm);
assertEquals("/rest/objects/authenticated/*", fm.urlPattern());

}
}

0 comments on commit c7c98a8

Please sign in to comment.