Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename of() -> combine() 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2022-08-03 13:06:32 +02:00
parent f2a20436d4
commit cb348c8d15
12 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java
View File

@ -779,7 +779,7 @@ public class HTTPServerDocs
ResourceHandler handler = new ResourceHandler();
// For multiple directories, use ResourceCollection.
Resource resource = Resource.of(
Resource resource = Resource.combine(
ResourceFactory.of(handler).newResource("/path/to/static/resources/"),
ResourceFactory.of(handler).newResource("/another/path/to/static/resources/")
);

4
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
View File

@ -136,7 +136,7 @@ public class ResourceCacheTest
.map(ResourceFactory.root()::newResource)
.toList();
ResourceCollection rc = Resource.of(resourceList);
ResourceCollection rc = Resource.combine(resourceList);
List<Resource> r = rc.getResources();
MimeTypes mime = new MimeTypes();
@ -168,7 +168,7 @@ public class ResourceCacheTest
.map(ResourceFactory.root()::newResource)
.toList();
ResourceCollection rc = Resource.of(resourceList);
ResourceCollection rc = Resource.combine(resourceList);
List<Resource> r = rc.getResources();
MimeTypes mime = new MimeTypes();

6
jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
View File

@ -100,11 +100,10 @@ public abstract class Resource
* @return A Resource of multiple resources.
* @see ResourceCollection
*/
public static ResourceCollection of(List<Resource> resources)
public static ResourceCollection combine(Collection<Resource> resources)
{
if (resources == null || resources.isEmpty())
throw new IllegalArgumentException("No resources");
return new ResourceCollection(resources);
}
@ -114,11 +113,10 @@ public abstract class Resource
* @return A Resource of multiple resources.
* @see ResourceCollection
*/
public static ResourceCollection of(Resource... resources)
public static ResourceCollection combine(Resource... resources)
{
if (resources == null || resources.length == 0)
throw new IllegalArgumentException("No resources");
return new ResourceCollection(List.of(resources));
}

10
jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
View File

@ -70,7 +70,7 @@ public class ResourceCollectionTest
Path two = MavenTestingUtils.getTestResourcePathDir("org/eclipse/jetty/util/resource/two");
Path three = MavenTestingUtils.getTestResourcePathDir("org/eclipse/jetty/util/resource/three");
ResourceCollection rc = Resource.of(
ResourceCollection rc = Resource.combine(
resourceFactory.newResource(one),
resourceFactory.newResource(two),
resourceFactory.newResource(three)
@ -91,7 +91,7 @@ public class ResourceCollectionTest
Path two = MavenTestingUtils.getTestResourcePathDir("org/eclipse/jetty/util/resource/two");
Path three = MavenTestingUtils.getTestResourcePathDir("org/eclipse/jetty/util/resource/three");
ResourceCollection rc = Resource.of(
ResourceCollection rc = Resource.combine(
resourceFactory.newResource(one),
resourceFactory.newResource(two),
resourceFactory.newResource(three)
@ -113,7 +113,7 @@ public class ResourceCollectionTest
Path two = MavenTestingUtils.getTestResourcePathDir("org/eclipse/jetty/util/resource/two");
Path three = MavenTestingUtils.getTestResourcePathDir("org/eclipse/jetty/util/resource/three");
ResourceCollection rc = Resource.of(
ResourceCollection rc = Resource.combine(
resourceFactory.newResource(one),
resourceFactory.newResource(two),
resourceFactory.newResource(three)
@ -139,7 +139,7 @@ public class ResourceCollectionTest
Path three = MavenTestingUtils.getTestResourcePathDir("org/eclipse/jetty/util/resource/three");
Path twoDir = MavenTestingUtils.getTestResourcePathDir("org/eclipse/jetty/util/resource/two/dir");
ResourceCollection rc1 = Resource.of(
ResourceCollection rc1 = Resource.combine(
List.of(
resourceFactory.newResource(one),
resourceFactory.newResource(two),
@ -147,7 +147,7 @@ public class ResourceCollectionTest
)
);
ResourceCollection rc2 = Resource.of(
ResourceCollection rc2 = Resource.combine(
List.of(
// the original ResourceCollection
rc1,

2
jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/OverlayManager.java
View File

@ -64,7 +64,7 @@ public class OverlayManager
resourceBases.add(webApp.getResourceBase());
}
webApp.setBaseResource(Resource.of(resourceBases));
webApp.setBaseResource(Resource.combine(resourceBases));
}
/**

2
jetty-ee10/jetty-ee10-quickstart/src/main/java/org/eclipse/jetty/ee10/quickstart/QuickStartDescriptorProcessor.java
View File

@ -241,6 +241,6 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor
List<Resource> collection = new ArrayList<>();
collection.add(context.getResourceBase());
collection.addAll(metaInfResources);
context.setBaseResource(Resource.of(collection));
context.setBaseResource(Resource.combine(collection));
}
}

2
jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java
View File

@ -332,7 +332,7 @@ public class MetaInfConfiguration extends AbstractConfiguration
List<Resource> collection = new ArrayList<>();
collection.add(context.getResourceBase());
collection.addAll(resources);
context.setBaseResource(Resource.of(collection));
context.setBaseResource(Resource.combine(collection));
}
}

2
jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebInfConfiguration.java
View File

@ -452,7 +452,7 @@ public class WebInfConfiguration extends AbstractConfiguration
webInf = _resourceFactory.newResource(extractedWebInfDir.getCanonicalPath());
Resource rc = Resource.of(webInf, webApp);
Resource rc = Resource.combine(webInf, webApp);
if (LOG.isDebugEnabled())
LOG.debug("context.baseResource={}", rc);

2
jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/OverlayManager.java
View File

@ -64,7 +64,7 @@ public class OverlayManager
resourceBases.add(webApp.getBaseResource());
}
webApp.setBaseResource(Resource.of(resourceBases));
webApp.setBaseResource(Resource.combine(resourceBases));
}
/**

2
jetty-ee9/jetty-ee9-quickstart/src/main/java/org/eclipse/jetty/ee9/quickstart/QuickStartDescriptorProcessor.java
View File

@ -242,6 +242,6 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor
List<Resource> collection = new ArrayList<>();
collection.add(context.getBaseResource());
collection.addAll(metaInfResources);
context.setBaseResource(Resource.of(collection));
context.setBaseResource(Resource.combine(collection));
}
}

2
jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/MetaInfConfiguration.java
View File

@ -325,7 +325,7 @@ public class MetaInfConfiguration extends AbstractConfiguration
List<Resource> collection = new ArrayList<>();
collection.add(context.getBaseResource());
collection.addAll(resources);
context.setBaseResource(Resource.of(collection));
context.setBaseResource(Resource.combine(collection));
}
}

2
jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/WebInfConfiguration.java
View File

@ -450,7 +450,7 @@ public class WebInfConfiguration extends AbstractConfiguration
webInf = _resourceFactory.newResource(extractedWebInfDir.getCanonicalPath());
Resource rc = Resource.of(webInf, webApp);
Resource rc = Resource.combine(webInf, webApp);
if (LOG.isDebugEnabled())
LOG.debug("context.baseResource={}", rc);