From e0c9943f4d911bad3e4ef3e6ea7b67a210f46e01 Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Wed, 3 Aug 2022 13:01:35 +0200 Subject: [PATCH] rename createResource -> create Signed-off-by: Ludovic Orban --- .../org/eclipse/jetty/util/resource/FileSystemPool.java | 2 +- .../java/org/eclipse/jetty/util/resource/Resource.java | 4 ++-- .../org/eclipse/jetty/util/resource/ResourceFactory.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileSystemPool.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileSystemPool.java index ba3a62dcdbc..86d3891b347 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileSystemPool.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileSystemPool.java @@ -95,7 +95,7 @@ public class FileSystemPool implements Dumpable } // use root FS URI so that pool key/release/sweep is sane URI rootURI = fileSystem.getPath("/").toUri(); - Mount mount = new Mount(rootURI, Resource.createResource(uri)); + Mount mount = new Mount(rootURI, Resource.create(uri)); retain(rootURI, fileSystem, mount); return mount; } diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java index cdb8078765f..20c46ca6b49 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java @@ -161,7 +161,7 @@ public abstract class Resource * @param uri A URI. * @return A Resource object. */ - static Resource createResource(URI uri) + static Resource create(URI uri) { try { @@ -474,7 +474,7 @@ public abstract class Resource uri = URI.create(uri + URIUtil.SLASH); resolvedUri = uri.resolve(subUriPath); } - return createResource(resolvedUri); + return create(resolvedUri); } /** diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java index bad6c6b5984..89b573c7e03 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java @@ -124,7 +124,7 @@ public interface ResourceFactory try { URI uri = url.toURI(); - return Resource.createResource(uri); + return Resource.create(uri); } catch (URISyntaxException e) { @@ -238,7 +238,7 @@ public interface ResourceFactory else LOG.warn("Leaked {} for {}", mount, uri); } - return Resource.createResource(uri); + return Resource.create(uri); } @Override @@ -259,7 +259,7 @@ public interface ResourceFactory Resource.Mount mount = Resource.mountIfNeeded(uri); if (mount != null) _mounts.add(mount); - return Resource.createResource(uri); + return Resource.create(uri); } @Override @@ -282,7 +282,7 @@ public interface ResourceFactory Resource.Mount mount = Resource.mountIfNeeded(uri); if (mount != null) _mounts.add(mount); - return Resource.createResource(uri); + return Resource.create(uri); } @Override