This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 2e9a4081ce Remove todos
2e9a4081ce is described below
commit 2e9a4081cec61981169952d5876ca2d490ce3792
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Nov 16 10:52:18 2022 +0100
Remove todos
---
.../base/internal/console/HttpServicePlugin.java | 1 -
.../base/internal/registry/ServletRegistry.java | 1 -
.../http/base/internal/runtime/ResourceInfo.java | 1 -
.../internal/runtime/ServletContextHelperInfo.java | 1 -
.../base/internal/service/ServletContextImpl.java | 2 -
.../whiteboard/RegistrationFailureException.java | 1 -
.../whiteboard/SharedServletContextImpl.java | 2 -
.../internal/context/ServletContextImplTest.java | 7 -
.../internal/registry/HandlerRegistryTest.java | 1 -
.../runtime/dto/RuntimeDTOBuilderTest.java | 734 ---------------------
10 files changed, 751 deletions(-)
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java
index a886141403..7d8342b3b0 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java
@@ -63,7 +63,6 @@ import org.osgi.service.servlet.runtime.dto.ServletDTO;
/**
* This is a web console plugin.
*/
-@SuppressWarnings("serial")
public class HttpServicePlugin extends HttpServlet
{
private static final String ATTR_TEST = "test";
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ServletRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ServletRegistry.java
index ff9bd2a327..78ebd0c316 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ServletRegistry.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ServletRegistry.java
@@ -78,7 +78,6 @@ public final class ServletRegistry
final PathResolution pr = entry.resolve(relativeRequestURI);
if ( pr != null )
{
- // TODO - we should have all patterns under which this servlet
is actively registered
pr.patterns = new String[] {entry.getPattern()};
pr.matchedPattern = entry.getPattern();
return pr;
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java
index ade8589943..2d10da8ad3 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java
@@ -58,7 +58,6 @@ public final class ResourceInfo extends
WhiteboardServiceInfo<Object>
@Override
public boolean isValid()
{
- // TODO - do we need to check the prefix?
boolean valid = super.isValid() && !isEmpty(this.patterns) &&
!isEmpty(this.prefix);
if ( valid ) {
for(final String p : patterns)
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java
index 12d6ac8552..6b75817312 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java
@@ -71,7 +71,6 @@ public class ServletContextHelperInfo extends
AbstractInfo<ServletContextHelper>
{
return true;
}
- // TODO we need more validation
if (path.startsWith("/") && !path.endsWith("/"))
{
return true;
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
index f3549161f3..166b0e8f06 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
@@ -520,7 +520,6 @@ public class ServletContextImpl implements ExtServletContext
final ServletResolution resolution = new ServletResolution();
resolution.handler = servletHandler;
resolution.handlerRegistry = this.handlerRegistry;
- // TODO - what is the path of a named servlet?
final RequestInfo requestInfo = new RequestInfo("", null, null,
null, name,
"", "", MappingMatch.EXACT, true);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
@@ -548,7 +547,6 @@ public class ServletContextImpl implements ExtServletContext
query = path.substring(q + 1);
path = path.substring(0, q);
}
- // TODO remove path parameters...
final String encodedRequestURI = path == null ? "" :
removeDotSegments(path);
final String requestURI = decodePath(encodedRequestURI);
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/RegistrationFailureException.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/RegistrationFailureException.java
index f17a97b95d..040098c5c3 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/RegistrationFailureException.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/RegistrationFailureException.java
@@ -20,7 +20,6 @@ import jakarta.servlet.ServletException;
import org.apache.felix.http.base.internal.runtime.WhiteboardServiceInfo;
-@SuppressWarnings("serial")
public class RegistrationFailureException extends ServletException
{
private final WhiteboardServiceInfo<?> info;
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
index eb6cd35c62..1327b4f1b3 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
@@ -320,7 +320,6 @@ public class SharedServletContextImpl implements
ServletContext
final ServletResolution resolution = new ServletResolution();
resolution.handler = servletHandler;
resolution.handlerRegistry = this.registry;
- // TODO - what is the path of a named servlet?
final RequestInfo requestInfo = new RequestInfo("", null, null,
null, name, "", "", MappingMatch.EXACT, true);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
}
@@ -347,7 +346,6 @@ public class SharedServletContextImpl implements
ServletContext
query = path.substring(q + 1);
path = path.substring(0, q);
}
- // TODO remove path parameters...
final String encodedRequestURI = path == null ? "" :
removeDotSegments(path);
final String requestURI = decodePath(encodedRequestURI);
diff --git
a/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
index 648272881e..58bce9e509 100644
---
a/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
+++
b/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
@@ -459,43 +459,36 @@ public class ServletContextImplTest
@Override
public Dynamic addJspFile(String servletName, String jspFile) {
- // TODO Auto-generated method stub
return null;
}
@Override
public int getSessionTimeout() {
- // TODO Auto-generated method stub
return 0;
}
@Override
public void setSessionTimeout(int sessionTimeout) {
- // TODO Auto-generated method stub
}
@Override
public String getRequestCharacterEncoding() {
- // TODO Auto-generated method stub
return null;
}
@Override
public void setRequestCharacterEncoding(String encoding) {
- // TODO Auto-generated method stub
}
@Override
public String getResponseCharacterEncoding() {
- // TODO Auto-generated method stub
return null;
}
@Override
public void setResponseCharacterEncoding(String encoding) {
- // TODO Auto-generated method stub
}
}
diff --git
a/http/base/src/test/java/org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java
index 9e81493edf..68111b95b7 100644
---
a/http/base/src/test/java/org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java
+++
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java
@@ -128,7 +128,6 @@ public class HandlerRegistryTest
{
hr.addServlet(null, handler);
- // TODO
// fail("Should not have allowed the servlet to be added as it was
already "
// + "added before init was finished");
diff --git
a/http/base/src/test/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilderTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilderTest.java
deleted file mode 100644
index ce77e42397..0000000000
---
a/http/base/src/test/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilderTest.java
+++ /dev/null
@@ -1,734 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.http.base.internal.runtime.dto;
-
-
-//@RunWith(MockitoJUnitRunner.class)
-public class RuntimeDTOBuilderTest
-{
-/*
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
- private static final Long ID_0 = -ID_COUNTER.incrementAndGet();
- private static final Long ID_A = ID_COUNTER.incrementAndGet();
- private static final Long ID_B = ID_COUNTER.incrementAndGet();
- private static final Long ID_C = ID_COUNTER.incrementAndGet();
- private static final Long ID_D = ID_COUNTER.incrementAndGet();
-
- private static final Long ID_LISTENER_1 = ID_COUNTER.incrementAndGet();
- private static final Long ID_LISTENER_2 = ID_COUNTER.incrementAndGet();
-
- private static final List<String> CONTEXT_NAMES = Arrays.asList("0", "A",
"B");
-
- @SuppressWarnings("serial")
- private static final Map<String, List<String>> CONTEXT_ENTITY_NAMES = new
HashMap<String, List<String>>()
- {
- {
- put("0", Arrays.asList("1"));
- put("A", Arrays.asList("A_1"));
- put("B", Arrays.asList("B_1", "B_2"));
- }
- };
-
- @SuppressWarnings("serial")
- private static final Map<String, Object> RUNTIME_ATTRIBUTES = new
HashMap<String, Object>()
- {
- {
- put("attr_1", "val_1");
- put("attr_2", "val_2");
- }
- };
-
- @Mock private Bundle bundle;
-
- @Mock private DTO testDTO;
-
- @Mock private ExtServletContext context_0;
- @Mock private ExtServletContext context_A;
- @Mock private ExtServletContext context_B;
- @Mock private ExtServletContext context_C;
- @Mock private ExtServletContext context_D;
-
- @Mock private ServiceReference<?> listener_1;
- @Mock private ServiceReference<?> listener_2;
-
- @Mock private ServiceReference<Object> resource;
-
- @Mock private ServiceReference<HttpServiceRuntime> runtimeReference;
-
- private RegistryRuntime registry;
- private Map<String, Object> runtimeAttributes;
-
- @Before
- public void setUp()
- {
- registry = null;
- runtimeAttributes = RUNTIME_ATTRIBUTES;
- when(bundle.getBundleId()).thenReturn(47L);
- when(runtimeReference.getBundle()).thenReturn(bundle);
- when(runtimeReference.getUsingBundles()).thenReturn(null);
-
when(runtimeReference.getPropertyKeys()).thenReturn(runtimeAttributes.keySet().toArray(new
String[5]));
- for(final String key : runtimeAttributes.keySet())
- {
-
when(runtimeReference.getProperty(key)).thenReturn(runtimeAttributes.get(key));
- }
-
when(runtimeReference.getProperty(Constants.SERVICE_ID)).thenReturn(39L);
- }
-
- public ServletContextHelperRuntime setupContext(ServletContext context,
String name, long serviceId)
- {
- when(context.getServletContextName()).thenReturn(name);
-
- String path = "/" + name;
- when(context.getContextPath()).thenReturn(path);
-
- List<String> initParameterNames = asList("param_1", "param_2");
-
when(context.getInitParameterNames()).thenReturn(Collections.enumeration(initParameterNames));
- when(context.getInitParameter("param_1")).thenReturn("init_val_1");
- when(context.getInitParameter("param_2")).thenReturn("init_val_2");
-
- Map<String, String> initParameters = createInitParameterMap();
- ServletContextHelperInfo contextInfo = createContextInfo(0, serviceId,
name, path, initParameters);
-
- ContextHandler contextHandler = new ContextHandler(contextInfo,
context, bundle);
- PerContextEventListener eventListener =
contextHandler.getListenerRegistry();
-
- ServletContext sharedContext = contextHandler.getSharedContext();
- sharedContext.setAttribute("intAttr", 1);
- sharedContext.setAttribute("dateAttr", new Date());
- sharedContext.setAttribute("stringAttr", "one");
- sharedContext.setAttribute("dtoAttr", testDTO);
-
- // TODO
- return null;
-// return contextHandler;
- }
-
- private Map<String, String> createInitParameterMap()
- {
- Map<String, String> initParameters = new HashMap<String, String>();
- initParameters.put("param_1", "init_val_1");
- initParameters.put("param_2", "init_val_2");
- return initParameters;
- }
-
- @SuppressWarnings("unchecked")
- public Map<Long, Collection<ServiceReference<?>>> setupListeners()
- {
- Map<Long, Collection<ServiceReference<?>>> listenerRuntimes = new
HashMap<Long, Collection<ServiceReference<?>>>();
-
- listenerRuntimes.put(ID_0, asList(listener_1, listener_2));
- listenerRuntimes.put(ID_A,
Arrays.<ServiceReference<?>>asList(listener_1));
- listenerRuntimes.put(ID_B, asList(listener_1, listener_2));
-
-
when(listener_1.getProperty(Constants.SERVICE_ID)).thenReturn(ID_LISTENER_1);
- when(listener_1.getProperty(Constants.OBJECTCLASS))
- .thenReturn(new String[] { "org.test.interface_1" });
-
-
when(listener_2.getProperty(Constants.SERVICE_ID)).thenReturn(ID_LISTENER_2);
- when(listener_2.getProperty(Constants.OBJECTCLASS))
- .thenReturn(new String[] { "org.test.interface_1",
"org.test.interface_2" });
-
- return listenerRuntimes;
- }
-
- public void setupResource()
- {
-
when(resource.getProperty(HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PATTERN)).thenReturn(new
String[] { "/" });
-
when(resource.getProperty(HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PREFIX)).thenReturn("prefix");
- }
-
- @Test
- public void buildRuntimeDTO()
- {
- ServletContextHelperRuntime contextHelper_0 = setupContext(context_0,
"0", ID_0);
- ServletContextHelperRuntime contextHelper_A = setupContext(context_A,
"A", ID_A);
- ServletContextHelperRuntime contextHelper_B = setupContext(context_B,
"B", ID_B);
-
- List<ServletHandler> servlets = new ArrayList<ServletHandler>();
- List<ServletHandler> resources = new ArrayList<ServletHandler>();
-
- servlets.add(createTestServlet("1", context_0, ID_0));
- resources.add(createTestServlet("1", context_0, ID_0));
- List<FilterHandler> filters_0 = asList(createTestFilter("1",
context_0));
- List<ServletState> errorPages_0 = asList(createErrorPage("E_1",
context_0, ID_0));
- ContextRuntime contextRuntime_0 = new ContextRuntime(null,
errorPages_0, null, null);
-
- servlets.add(createTestServlet("A_1", context_A, ID_A));
- resources.add(createTestServlet("A_1", context_A, ID_A));
- List<FilterHandler> filters_A = asList(createTestFilter("A_1",
context_A));
- List<ServletState> errorPages_A = asList(createErrorPage("E_A_1",
context_A, ID_A));
- ContextRuntime contextRuntime_A = new ContextRuntime(null,
errorPages_A, null, null);
-
- servlets.addAll(asList(createTestServletWithServiceId("B_1",
context_B, ID_B),
- createTestServletWithServiceId("B_2", context_B, ID_B)));
- resources.addAll(asList(createTestServletWithServiceId("B_1",
context_B, ID_B),
- createTestServletWithServiceId("B_2", context_B, ID_B)));
- List<FilterHandler> filters_B =
asList(createTestFilterWithServiceId("B_1", context_B),
- createTestFilterWithServiceId("B_2", context_B));
- List<ServletState> errorPages_B =
asList(createErrorPageWithServiceId("E_B_1", context_B, ID_B),
- createErrorPageWithServiceId("E_B_2", context_B, ID_B));
- ContextRuntime contextRuntime_B = new ContextRuntime(null,
errorPages_B, null, null);
-
- Map<Long, Collection<ServiceReference<?>>> listenerRuntimes =
setupListeners();
-
- setupRegistry(asList(contextHelper_0, contextHelper_A,
contextHelper_B),
- asList(contextRuntime_0, contextRuntime_A, contextRuntime_B),
-// new ServletRegistryRuntime(servlets, resources),
- listenerRuntimes,
- null);
-
- RuntimeDTO runtimeDTO = new RuntimeDTOBuilder(registry,
runtimeReference).build();
-
- assertEquals(0, runtimeDTO.failedErrorPageDTOs.length);
- assertEquals(0, runtimeDTO.failedFilterDTOs.length);
- assertEquals(0, runtimeDTO.failedListenerDTOs.length);
- assertEquals(0, runtimeDTO.failedResourceDTOs.length);
- assertEquals(0, runtimeDTO.failedServletContextDTOs.length);
- assertEquals(0, runtimeDTO.failedServletDTOs.length);
-
- assertServletContextDTOs(runtimeDTO);
- }
-
- private void assertServletContextDTOs(RuntimeDTO runtimeDTO)
- {
- SortedSet<Long> seenServiceIds = new TreeSet<Long>();
-
- assertEquals(3, runtimeDTO.servletContextDTOs.length);
-
- for (ServletContextDTO servletContextDTO :
runtimeDTO.servletContextDTOs)
- {
- String contextName = servletContextDTO.name;
- assertTrue(CONTEXT_NAMES.contains(contextName));
- if (contextName.equals("0"))
- {
- assertTrue(contextName,
- servletContextDTO.serviceId < 0);
- assertEquals(contextName,
- 1, servletContextDTO.servletDTOs.length);
- assertEquals(contextName,
- 1, servletContextDTO.filterDTOs.length);
- assertEquals(contextName,
- 1, servletContextDTO.resourceDTOs.length);
- assertEquals(contextName,
- 1, servletContextDTO.errorPageDTOs.length);
- assertEquals(contextName,
- 2, servletContextDTO.listenerDTOs.length);
- }
- else
- {
- int expectedId = CONTEXT_NAMES.indexOf(contextName) + 1;
- assertEquals(contextName,
- expectedId, servletContextDTO.serviceId);
-
- int expectedChildren = CONTEXT_NAMES.indexOf(contextName);
- assertEquals(contextName,
- expectedChildren,
servletContextDTO.servletDTOs.length);
- assertEquals(contextName,
- expectedChildren, servletContextDTO.filterDTOs.length);
- assertEquals(contextName,
- expectedChildren,
servletContextDTO.resourceDTOs.length);
- assertEquals(contextName,
- expectedChildren,
servletContextDTO.errorPageDTOs.length);
- assertEquals(contextName,
- expectedChildren,
servletContextDTO.listenerDTOs.length);
- }
- seenServiceIds.add(servletContextDTO.serviceId);
-
- assertEquals(contextName,
- 3, servletContextDTO.attributes.size());
- assertEquals(contextName,
- 1, servletContextDTO.attributes.get("intAttr"));
- assertEquals(contextName,
- "one", servletContextDTO.attributes.get("stringAttr"));
- assertEquals(contextName,
- testDTO, servletContextDTO.attributes.get("dtoAttr"));
-
- assertEquals(contextName,
- 2, servletContextDTO.initParams.size());
- assertEquals(contextName,
- "init_val_1", servletContextDTO.initParams.get("param_1"));
- assertEquals(contextName,
- "init_val_2", servletContextDTO.initParams.get("param_2"));
-
- assertEquals(contextName,
- "/" + contextName + "/" + contextName,
servletContextDTO.contextPath);
-
- Collection<Long> serviceIds = assertServletDTOs(contextName,
- servletContextDTO.serviceId,
servletContextDTO.servletDTOs);
- seenServiceIds.addAll(serviceIds);
-
- serviceIds = assertFilterDTOs(contextName,
- servletContextDTO.serviceId, servletContextDTO.filterDTOs);
- seenServiceIds.addAll(serviceIds);
-
- serviceIds = assertResourceDTOs(contextName,
- servletContextDTO.serviceId,
servletContextDTO.resourceDTOs);
- seenServiceIds.addAll(serviceIds);
-
- serviceIds = assertErrorPageDTOs(contextName,
- servletContextDTO.serviceId,
servletContextDTO.errorPageDTOs);
- seenServiceIds.addAll(serviceIds);
-
- serviceIds = assertListenerDTOs(contextName,
- servletContextDTO.serviceId,
servletContextDTO.listenerDTOs);
- seenServiceIds.addAll(serviceIds);
- }
- assertEquals(12, seenServiceIds.tailSet(0L).size());
- assertEquals(9, seenServiceIds.headSet(0L).size());
- }
-
- private Collection<Long> assertServletDTOs(String contextName, long
contextId, ServletDTO[] dtos) {
- List<Long> serviceIds = new ArrayList<Long>();
- for (ServletDTO servletDTO : dtos)
- {
- String name = servletDTO.name;
- assertTrue(CONTEXT_ENTITY_NAMES.get(contextName).contains(name));
-
- if (contextId != ID_B)
- {
- assertTrue(name,
- servletDTO.serviceId < 0);
- }
- else
- {
- assertTrue(name,
- servletDTO.serviceId > 0);
- }
- serviceIds.add(servletDTO.serviceId);
-
- assertEquals(name,
- contextId, servletDTO.servletContextId);
-
- assertTrue(name,
- servletDTO.asyncSupported);
-
- assertEquals(name,
- 2, servletDTO.initParams.size());
- assertEquals(name,
- "valOne_" + name, servletDTO.initParams.get("paramOne_" +
name));
- assertEquals(name,
- "valTwo_" + name, servletDTO.initParams.get("paramTwo_" +
name));
-
- assertEquals(name,
- 1, servletDTO.patterns.length);
- assertEquals(name,
- "/" + name, servletDTO.patterns[0]);
-
- assertEquals(name,
- "info_" + name, servletDTO.servletInfo);
- }
-
- return serviceIds;
- }
-
- private Collection<Long> assertFilterDTOs(String contextName, long
contextId, FilterDTO[] dtos) {
- List<Long> serviceIds = new ArrayList<Long>();
- for (FilterDTO filterDTO : dtos)
- {
- String name = filterDTO.name;
- assertTrue(CONTEXT_ENTITY_NAMES.get(contextName).contains(name));
-
- if (contextId != ID_B)
- {
- assertTrue(name,
- filterDTO.serviceId < 0);
- }
- else
- {
- assertTrue(name,
- filterDTO.serviceId > 0);
- }
- serviceIds.add(filterDTO.serviceId);
-
- assertEquals(name,
- contextId, filterDTO.servletContextId);
-
- assertTrue(name,
- filterDTO.asyncSupported);
-
- assertEquals(name,
- 2, filterDTO.initParams.size());
- assertEquals(name,
- "valOne_" + name, filterDTO.initParams.get("paramOne_" +
name));
- assertEquals(name,
- "valTwo_" + name, filterDTO.initParams.get("paramTwo_" +
name));
-
- assertEquals(name,
- 1, filterDTO.patterns.length);
- assertEquals(name,
- "/" + name, filterDTO.patterns[0]);
-
- assertEquals(name,
- 1, filterDTO.regexs.length);
- assertEquals(name,
- "." + name, filterDTO.regexs[0]);
-
- assertEquals(name,
- 2, filterDTO.dispatcher.length);
- assertEquals(name,
- "ASYNC", filterDTO.dispatcher[0]);
- assertEquals(name,
- "REQUEST", filterDTO.dispatcher[1]);
- }
-
- return serviceIds;
- }
-
- private Collection<Long> assertResourceDTOs(String contextName, long
contextId, ResourceDTO[] dtos) {
- List<Long> serviceIds = new ArrayList<Long>();
- for (ResourceDTO resourceDTO : dtos)
- {
- if (contextId != ID_B)
- {
- assertTrue(contextId + " " + contextName,
- resourceDTO.serviceId < 0);
- }
- else
- {
- assertTrue(contextId + " " + contextName,
- resourceDTO.serviceId > 0);
- }
- serviceIds.add(resourceDTO.serviceId);
-
- assertEquals(contextId + " " + contextName,
- contextId, resourceDTO.servletContextId);
-
- assertEquals(contextId + " " + contextName,
- 1, resourceDTO.patterns.length);
- assertTrue(contextId + " " + contextName,
- resourceDTO.patterns[0].startsWith("/"));
- }
- return serviceIds;
- }
-
- private Collection<Long> assertErrorPageDTOs(String contextName, long
contextId, ErrorPageDTO[] dtos)
- {
- List<Long> serviceIds = new ArrayList<Long>();
- for (ErrorPageDTO errorPageDTO : dtos)
- {
- String name = errorPageDTO.name;
-
assertTrue(CONTEXT_ENTITY_NAMES.get(contextName).contains(name.substring(2)));
-
- if (contextId != ID_B)
- {
- assertTrue(name,
- errorPageDTO.serviceId < 0);
- }
- else
- {
- assertTrue(name,
- errorPageDTO.serviceId > 0);
- }
- serviceIds.add(errorPageDTO.serviceId);
-
- assertEquals(name,
- contextId, errorPageDTO.servletContextId);
-
- assertTrue(name,
- errorPageDTO.asyncSupported);
-
- assertEquals(name,
- 2, errorPageDTO.initParams.size());
- assertEquals(name,
- "valOne_" + name, errorPageDTO.initParams.get("paramOne_"
+ name));
- assertEquals(name,
- "valTwo_" + name, errorPageDTO.initParams.get("paramTwo_"
+ name));
-
- assertEquals(name,
- "info_" + name, errorPageDTO.servletInfo);
-
- assertEquals(name,
- 2, errorPageDTO.errorCodes.length);
- long[] errorCodes = copyOf(errorPageDTO.errorCodes, 2);
- sort(errorCodes);
- assertEquals(name,
- 400, errorCodes[0]);
- assertEquals(name,
- 500, errorCodes[1]);
-
- assertEquals(name,
- 2, errorPageDTO.exceptions.length);
- String[] exceptions = copyOf(errorPageDTO.exceptions, 2);
- sort(exceptions);
- assertEquals(name,
- "Bad request", exceptions[0]);
- assertEquals(name,
- "Error", exceptions[1]);
- }
-
- return serviceIds;
- }
-
- private Collection<Long> assertListenerDTOs(String contextName, long
contextId, ListenerDTO[] dtos)
- {
- Set<Long> serviceIds = new HashSet<Long>();
- for (ListenerDTO listenerDTO : dtos)
- {
- assertEquals(contextId, listenerDTO.servletContextId);
- serviceIds.add(listenerDTO.serviceId);
- }
-
- assertEquals(ID_LISTENER_1.longValue(), dtos[0].serviceId);
- assertArrayEquals(new String[] { "org.test.interface_1" },
- dtos[0].types);
- if (dtos.length > 1)
- {
- assertEquals(ID_LISTENER_2.longValue(), dtos[1].serviceId);
- assertArrayEquals(new String[] { "org.test.interface_1",
"org.test.interface_2" }, dtos[1].types);
- }
-
- return serviceIds;
- }
-
- @Test
- public void nullValuesInEntities() {
- ServletContextHelperRuntime contextHandler = setupContext(context_0,
"0", ID_0);
-
- ServletInfo servletInfo = createServletInfo(0,
- ID_COUNTER.incrementAndGet(),
- "1",
- new String[] { "/*" },
- null,
- true,
- Collections.<String, String>emptyMap());
- Servlet servlet = mock(Servlet.class);
- ServletHandler servletHandler = new HttpServiceServletHandler(0,
context_0, servletInfo, servlet);
- when(servlet.getServletInfo()).thenReturn("info_0");
-
- FilterInfo filterInfo = createFilterInfo(0,
- ID_COUNTER.incrementAndGet(),
- "1",
- null,
- null,
- null,
- true,
- null,
- Collections.<String, String>emptyMap());
- FilterHandler filterHandler = new HttpServiceFilterHandler(0,
context_0, filterInfo, mock(Filter.class));
-
- ServletInfo resourceInfo = createServletInfo(0,
- ID_COUNTER.incrementAndGet(),
- "1",
- new String[] { "/*" },
- null,
- true,
- Collections.<String, String>emptyMap());
- Servlet resource = mock(Servlet.class);
- ServletHandler resourceHandler = new HttpServiceServletHandler(ID_0,
context_0, resourceInfo, resource);
-
- ContextRuntime contextRuntime = new ContextRuntime(null,
- Collections.<ServletState>emptyList(),
- null, null);
- setupRegistry(asList(contextHandler), asList(contextRuntime),
-// new ServletRegistryRuntime(asList(resourceHandler),
asList(servletHandler)),
- Collections.<Long, Collection<ServiceReference<?>>>emptyMap(),
- null);
-
- RuntimeDTO runtimeDTO = new RuntimeDTOBuilder(registry,
runtimeReference).build();
-
- assertEquals(1, runtimeDTO.servletContextDTOs.length);
- assertEquals(1, runtimeDTO.servletContextDTOs[0].servletDTOs.length);
- assertEquals(1, runtimeDTO.servletContextDTOs[0].filterDTOs.length);
-
- assertEquals(emptyMap(),
runtimeDTO.servletContextDTOs[0].servletDTOs[0].initParams);
-
- assertEquals(emptyMap(),
runtimeDTO.servletContextDTOs[0].filterDTOs[0].initParams);
- assertEquals(0,
runtimeDTO.servletContextDTOs[0].filterDTOs[0].patterns.length);
- assertEquals(0,
runtimeDTO.servletContextDTOs[0].filterDTOs[0].regexs.length);
- }
-
- @Test
- public void contextWithNoEntities() {
- ServletContextHelperRuntime contextHandler_0 = setupContext(context_0,
"0", ID_0);
- ServletContextHelperRuntime contextHandler_A = setupContext(context_A,
"A", ID_A);
-
- // TODO
- setupRegistry(asList(contextHandler_0, contextHandler_A),
-null, // asList(ContextRuntime.empty(ID_0),
ContextRuntime.empty(ID_A)),
- Collections.<Long, Collection<ServiceReference<?>>>emptyMap(),
- null);
-
- RuntimeDTO runtimeDTO = new RuntimeDTOBuilder(registry,
runtimeReference).build();
-
- assertEquals(2, runtimeDTO.servletContextDTOs.length);
- assertEquals(0, runtimeDTO.servletContextDTOs[0].servletDTOs.length);
- assertEquals(0, runtimeDTO.servletContextDTOs[0].filterDTOs.length);
- assertEquals(0, runtimeDTO.servletContextDTOs[1].servletDTOs.length);
- assertEquals(0, runtimeDTO.servletContextDTOs[1].filterDTOs.length);
- }
-
- @Test
- public void missingPatternInServletThrowsException()
- {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("patterns");
-
- ServletContextHelperRuntime contextHandler = setupContext(context_0,
"0", ID_0);
-
- ServletInfo servletInfo = createServletInfo(0,
- ID_COUNTER.incrementAndGet(),
- "1",
- null,
- null,
- true,
- Collections.<String, String>emptyMap());
- Servlet servlet = mock(Servlet.class);
- ServletHandler servletHandler = new HttpServiceServletHandler(ID_0,
context_0, servletInfo, servlet);
- when(servlet.getServletInfo()).thenReturn("info_0");
-
- ContextRuntime contextRuntime = new
ContextRuntime(Collections.<FilterState>emptyList(),
- Collections.<ServletState>emptyList(),
- null, null);
- setupRegistry(asList(contextHandler), asList(contextRuntime),
-// new ServletRegistryRuntime(asList(servletHandler),
Collections.<ServletRuntime>emptyList()),
- Collections.<Long, Collection<ServiceReference<?>>>emptyMap(),
- null);
-
- new RuntimeDTOBuilder(registry, runtimeReference).build();
- }
-
- public FailureRuntime setupFailures()
- {
- Map<AbstractInfo<?>, Integer> serviceFailures = new
HashMap<AbstractInfo<?>, Integer>();
-
- ServletContextHelperInfo contextInfo = createContextInfo(0,
- ID_C,
- "context_failure_1",
- "/",
- createInitParameterMap());
- serviceFailures.put(contextInfo, 1);
-
- contextInfo = createContextInfo(0,
- ID_D,
- "context_failure_2",
- "/",
- createInitParameterMap());
- serviceFailures.put(contextInfo, 2);
-
- ServletInfo servletInfo = createServletInfo(0,
ID_COUNTER.incrementAndGet(),
- "servlet_failure_1",
- new String[] {"/"},
- null,
- false,
- createInitParameterMap());
- serviceFailures.put(servletInfo, 3);
-
- servletInfo = createServletInfo(0, ID_COUNTER.incrementAndGet(),
- "servlet_failure_2",
- new String[] {"/"},
- null,
- false,
- createInitParameterMap());
- serviceFailures.put(servletInfo, 4);
-
- FilterInfo filterInfo = createFilterInfo(0,
- ID_COUNTER.incrementAndGet(),
- "filter_failure_1",
- new String[] {"/"},
- null,
- null,
- false,
- null,
- createInitParameterMap());
- serviceFailures.put(filterInfo, 5);
-
- ServletInfo errorPageInfo = createServletInfo(0,
- ID_COUNTER.incrementAndGet(),
- "error_failure_1",
- null,
- new String[] { "405", "TestException" },
- false,
- createInitParameterMap());
- serviceFailures.put(errorPageInfo, 6);
-
- ServletInfo invalidErrorPageInfo = createServletInfo(0,
- ID_COUNTER.incrementAndGet(),
- "error_failure_2",
- new String[] { "/" },
- new String[] { "405", "TestException" },
- false,
- createInitParameterMap());
- serviceFailures.put(invalidErrorPageInfo, 7);
-
- return FailureRuntime.builder().add(serviceFailures).build();
- }
-
- @Test
- public void testFailureDTOs()
- {
- setupRegistry(Collections.<ServletContextHelperRuntime>emptyList(),
- Collections.<ContextRuntime>emptyList(),
- Collections.<Long, Collection<ServiceReference<?>>>emptyMap(),
- setupFailures());
-
- RuntimeDTO runtimeDTO = new RuntimeDTOBuilder(registry,
runtimeReference).build();
-
- assertEquals(0, runtimeDTO.servletContextDTOs.length);
-
- assertEquals(2, runtimeDTO.failedErrorPageDTOs.length);
- assertEquals(1, runtimeDTO.failedFilterDTOs.length);
- // ListenerInfo is hard to setup
- assertEquals(0, runtimeDTO.failedListenerDTOs.length);
- // ResourceInfo is hard to setup
- assertEquals(0, runtimeDTO.failedResourceDTOs.length);
- assertEquals(2, runtimeDTO.failedServletContextDTOs.length);
- assertEquals(2, runtimeDTO.failedServletDTOs.length);
-
- assertEquals(1, runtimeDTO.failedServletContextDTOs[0].failureReason);
- assertEquals(2, runtimeDTO.failedServletContextDTOs[1].failureReason);
- assertEquals(3, runtimeDTO.failedServletDTOs[0].failureReason);
- assertEquals(4, runtimeDTO.failedServletDTOs[1].failureReason);
- assertEquals(5, runtimeDTO.failedFilterDTOs[0].failureReason);
- assertEquals(6, runtimeDTO.failedErrorPageDTOs[0].failureReason);
- assertEquals(7, runtimeDTO.failedErrorPageDTOs[1].failureReason);
-
- assertEquals("context_failure_1",
runtimeDTO.failedServletContextDTOs[0].name);
- assertEquals("context_failure_2",
runtimeDTO.failedServletContextDTOs[1].name);
- assertEquals("servlet_failure_1",
runtimeDTO.failedServletDTOs[0].name);
- assertEquals("servlet_failure_2",
runtimeDTO.failedServletDTOs[1].name);
- assertEquals("filter_failure_1", runtimeDTO.failedFilterDTOs[0].name);
- assertEquals("error_failure_1",
runtimeDTO.failedErrorPageDTOs[0].name);
- assertEquals("error_failure_2",
runtimeDTO.failedErrorPageDTOs[1].name);
-
- assertEquals(ID_C.longValue(),
runtimeDTO.failedServletContextDTOs[0].serviceId);
- assertEquals(ID_D.longValue(),
runtimeDTO.failedServletContextDTOs[1].serviceId);
- assertEquals(0, runtimeDTO.failedServletDTOs[0].servletContextId);
- assertEquals(0, runtimeDTO.failedServletDTOs[1].servletContextId);
- assertEquals(0, runtimeDTO.failedFilterDTOs[0].servletContextId);
- assertEquals(0, runtimeDTO.failedErrorPageDTOs[0].servletContextId);
- assertEquals(0, runtimeDTO.failedErrorPageDTOs[1].servletContextId);
-
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[0].errorPageDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[0].filterDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[0].listenerDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[0].resourceDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[0].servletDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[1].errorPageDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[1].filterDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[1].listenerDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[1].resourceDTOs.length);
- assertEquals(0,
runtimeDTO.failedServletContextDTOs[1].servletDTOs.length);
-
-
assertTrue(runtimeDTO.failedServletContextDTOs[0].attributes.isEmpty());
-
assertTrue(runtimeDTO.failedServletContextDTOs[1].attributes.isEmpty());
- }
-*/
-}
\ No newline at end of file
