api: Rename Servlets/Filters value() to mappings()

Author: kohlschuetter

dumbo-api/src/main/java/com/kohlschutter/dumbo/annotations/Filters.java

@@ -27,5 +27,5 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Filters {
-  FilterMapping[] value() default {};
+  FilterMapping[] mappings() default {};
 }

dumbo-api/src/main/java/com/kohlschutter/dumbo/annotations/Servlets.java

@@ -27,7 +27,7 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Servlets {
-  ServletMapping[] value() default {};
+  ServletMapping[] mappings() default {};
 
   ServletContextAttribute[] contextAttributes() default {};
 }

dumbo-core/src/main/java/com/kohlschutter/dumbo/BaseSupport.java

@@ -30,14 +30,14 @@
 /**
  * Base resources, such as jQuery and json-rpc.
  */
-@Servlets({ //
+@Servlets(mappings = { //
     @ServletMapping(map = "*.jsp.js", to = JspCachingServlet.class, initOrder = 0, initParameters = {
         @ServletInitParameter(key = "scratchdir", value = "getJspWorkDir", valueProvider = ServerApp.class)}),
     @ServletMapping(map = "*.jsp", to = JspCachingServlet.class, initOrder = 0, initParameters = {
         @ServletInitParameter(key = "scratchdir", value = "getJspWorkDir", valueProvider = ServerApp.class)}),
     //
 })
-@Filters({@FilterMapping(map = "*.js", to = JsFilter.class, initOrder = 0, //
+@Filters(mappings = {@FilterMapping(map = "*.js", to = JsFilter.class, initOrder = 0, //
     dispatcherTypes = {DispatcherType.REQUEST}),
 //
 })

dumbo-core/src/main/java/com/kohlschutter/dumbo/DumboServerImpl.java

@@ -765,7 +765,7 @@ private void mapServlets(ServletContext servletContext, ComponentImpl comp, Serv
       Set<String> pathFilters) {
     Map<String, ServletMapping> mappings = new HashMap<>();
     for (Servlets s : comp.getAnnotatedMappingsFromAllReachableComponents(Servlets.class)) {
-      for (ServletMapping mapping : s.value()) {
+      for (ServletMapping mapping : s.mappings()) {
         String[] mapPaths = mapping.map();
         for (String mapPath : mapPaths) {
           pathFilters.add(mapPath); // NOPMD.UseArraysAsList false positive
@@ -882,7 +882,7 @@ private void mapServlets(ServletContext servletContext, ComponentImpl comp, Serv
   private void mapFilters(ComponentImpl comp, ServletHandler sh, Set<String> pathFilters) {
     Map<String, List<FilterMapping>> mappings = new HashMap<>();
     for (Filters f : comp.getAnnotatedMappingsFromAllReachableComponents(Filters.class)) {
-      for (FilterMapping mapping : f.value()) {
+      for (FilterMapping mapping : f.mappings()) {
         String[] mapPaths = mapping.map();
         for (String mapPath : mapPaths) {
           pathFilters.add(mapPath); // NOPMD.UseArraysAsList false positive