Skip to content

Commit

Permalink
[fix][broker] normalize path (apache#23438)
Browse files Browse the repository at this point in the history 
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
  • Loading branch information
@nodece
nodece authored Oct 11, 2024
1 parent 2dace76 commit 50dc521
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static OffloaderDefinition getOffloaderDefinition(String narPath, String

public static Offloaders searchForOffloaders(String offloadersPath, String narExtractionDirectory)
throws IOException {
Path path = Paths.get(offloadersPath).toAbsolutePath();
Path path = Paths.get(offloadersPath).toAbsolutePath().normalize();
log.info("Searching for offloaders in {}", path);

Offloaders offloaders = new Offloaders();
Expand Down
4 changes: 2 additions & 2 deletions ...mon/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private AdditionalServletDefinition getAdditionalServletDefinition(NarClassLoade
*/
public AdditionalServletDefinitions searchForServlets(String additionalServletDirectory,
String narExtractionDirectory) throws IOException {
Path path = Paths.get(additionalServletDirectory).toAbsolutePath();
Path path = Paths.get(additionalServletDirectory).toAbsolutePath().normalize();
log.info("Searching for additional servlets in {}", path);

AdditionalServletDefinitions servletDefinitions = new AdditionalServletDefinitions();
Expand Down Expand Up @@ -119,7 +119,7 @@ public AdditionalServletDefinitions searchForServlets(String additionalServletDi
public AdditionalServletWithClassLoader load(
AdditionalServletMetadata metadata, String narExtractionDirectory) throws IOException {

final File narFile = metadata.getArchivePath().toAbsolutePath().toFile();
final File narFile = metadata.getArchivePath().toAbsolutePath().normalize().toFile();
NarClassLoader ncl = NarClassLoaderBuilder.builder()
.narFile(narFile)
.parentClassLoader(AdditionalServlet.class.getClassLoader())
Expand Down
4 changes: 2 additions & 2 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private BrokerInterceptorDefinition getBrokerInterceptorDefinition(NarClassLoade
*/
public BrokerInterceptorDefinitions searchForInterceptors(String interceptorsDirectory,
String narExtractionDirectory) throws IOException {
Path path = Paths.get(interceptorsDirectory).toAbsolutePath();
Path path = Paths.get(interceptorsDirectory).toAbsolutePath().normalize();
log.info("Searching for broker interceptors in {}", path);

BrokerInterceptorDefinitions interceptors = new BrokerInterceptorDefinitions();
Expand Down Expand Up @@ -119,7 +119,7 @@ public BrokerInterceptorDefinitions searchForInterceptors(String interceptorsDir
*/
BrokerInterceptorWithClassLoader load(BrokerInterceptorMetadata metadata, String narExtractionDirectory)
throws IOException {
final File narFile = metadata.getArchivePath().toAbsolutePath().toFile();
final File narFile = metadata.getArchivePath().toAbsolutePath().normalize().toFile();
NarClassLoader ncl = NarClassLoaderBuilder.builder()
.narFile(narFile)
.parentClassLoader(BrokerInterceptorUtils.class.getClassLoader())
Expand Down
4 changes: 2 additions & 2 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private static ProtocolHandlerDefinition getProtocolHandlerDefinition(NarClassLo
*/
public static ProtocolHandlerDefinitions searchForHandlers(String handlersDirectory,
String narExtractionDirectory) throws IOException {
Path path = Paths.get(handlersDirectory).toAbsolutePath();
Path path = Paths.get(handlersDirectory).toAbsolutePath().normalize();
log.info("Searching for protocol handlers in {}", path);

ProtocolHandlerDefinitions handlers = new ProtocolHandlerDefinitions();
Expand Down Expand Up @@ -119,7 +119,7 @@ public static ProtocolHandlerDefinitions searchForHandlers(String handlersDirect
*/
static ProtocolHandlerWithClassLoader load(ProtocolHandlerMetadata metadata,
String narExtractionDirectory) throws IOException {
final File narFile = metadata.getArchivePath().toAbsolutePath().toFile();
final File narFile = metadata.getArchivePath().toAbsolutePath().normalize().toFile();
NarClassLoader ncl = NarClassLoaderBuilder.builder()
.narFile(narFile)
.parentClassLoader(ProtocolHandler.class.getClassLoader())
Expand Down
4 changes: 2 additions & 2 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public List<EntryFilter> getBrokerEntryFilters() {

private void initialize() throws IOException {
final String entryFiltersDirectory = serviceConfiguration.getEntryFiltersDirectory();
Path path = Paths.get(entryFiltersDirectory).toAbsolutePath();
Path path = Paths.get(entryFiltersDirectory).toAbsolutePath().normalize();
log.info("Searching for entry filters in {}", path);


Expand Down Expand Up @@ -217,7 +217,7 @@ private NarClassLoader loadNarClassLoader(Path archivePath) {
return cachedClassLoaders
.computeIfAbsent(absolutePath, narFilePath -> {
try {
final File narFile = archivePath.toAbsolutePath().toFile();
final File narFile = archivePath.toAbsolutePath().normalize().toFile();
return NarClassLoaderBuilder.builder()
.narFile(narFile)
.parentClassLoader(EntryFilter.class.getClassLoader())
Expand Down
4 changes: 2 additions & 2 deletions ...t-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static List<CustomCommandFactory> createCustomCommandFactories(
private static CustomCommandFactoryDefinitions searchForCustomCommandFactories(String directory,
String narExtractionDirectory)
throws IOException {
Path path = Paths.get(directory).toAbsolutePath();
Path path = Paths.get(directory).toAbsolutePath().normalize();
log.debug("Searching for command factories in {}", path);

CustomCommandFactoryDefinitions customCommandFactoryDefinitions = new CustomCommandFactoryDefinitions();
Expand Down Expand Up @@ -142,7 +142,7 @@ static CustomCommandFactoryDefinition getCustomCommandFactoryDefinition(NarClass
private static CustomCommandFactory load(CustomCommandFactoryMetaData metadata,
String narExtractionDirectory)
throws IOException {
final File narFile = metadata.getArchivePath().toAbsolutePath().toFile();
final File narFile = metadata.getArchivePath().toAbsolutePath().normalize().toFile();
NarClassLoader ncl = NarClassLoaderBuilder.builder()
.narFile(narFile)
.parentClassLoader(CustomCommandFactory.class.getClassLoader())
Expand Down
2 changes: 1 addition & 1 deletion pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/LocalRunner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private static String getPulsarDirectory(String directory) {
} else {
directoryPath = Path.of(directory);
}
return directoryPath.toAbsolutePath().toString();
return directoryPath.toAbsolutePath().normalize().toString();
}

private static File createNarExtractionTempDirectory() {
Expand Down
2 changes: 1 addition & 1 deletion ...ctions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static <T> T getPulsarIOServiceConfig(NarClassLoader narClassLoader, Clas
public static TreeMap<String, FunctionArchive> searchForFunctions(String functionsDirectory,
String narExtractionDirectory,
boolean enableClassloading) throws IOException {
Path path = Paths.get(functionsDirectory).toAbsolutePath();
Path path = Paths.get(functionsDirectory).toAbsolutePath().normalize();
log.info("Searching for functions in {}", path);

TreeMap<String, FunctionArchive> functions = new TreeMap<>();
Expand Down
2 changes: 1 addition & 1 deletion ...ar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/ConnectorUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private static List<FieldDescription> getAllFields(TypeDefinition type) {
public static TreeMap<String, Connector> searchForConnectors(String connectorsDirectory,
String narExtractionDirectory,
boolean enableClassloading) throws IOException {
Path path = Paths.get(connectorsDirectory).toAbsolutePath();
Path path = Paths.get(connectorsDirectory).toAbsolutePath().normalize();
log.info("Searching for connectors in {}", path);

TreeMap<String, Connector> connectors = new TreeMap<>();
Expand Down
2 changes: 1 addition & 1 deletion .../worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static WorkerServiceDefinition getWorkerServiceDefinition(NarClassLoader
*/
static WorkerServiceWithClassLoader load(WorkerServiceMetadata metadata,
String narExtractionDirectory) throws IOException {
final File narFile = metadata.getArchivePath().toAbsolutePath().toFile();
final File narFile = metadata.getArchivePath().toAbsolutePath().normalize().toFile();
NarClassLoader ncl = NarClassLoaderBuilder.builder()
.narFile(narFile)
.parentClassLoader(WorkerService.class.getClassLoader())
Expand Down
4 changes: 2 additions & 2 deletions pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private static ProxyExtensionDefinition getProxyExtensionDefinition(NarClassLoad
*/
public static ExtensionsDefinitions searchForExtensions(String extensionsDirectory,
String narExtractionDirectory) throws IOException {
Path path = Paths.get(extensionsDirectory).toAbsolutePath();
Path path = Paths.get(extensionsDirectory).toAbsolutePath().normalize();
log.info("Searching for extensions in {}", path);

ExtensionsDefinitions extensions = new ExtensionsDefinitions();
Expand Down Expand Up @@ -119,7 +119,7 @@ public static ExtensionsDefinitions searchForExtensions(String extensionsDirecto
*/
static ProxyExtensionWithClassLoader load(ProxyExtensionMetadata metadata,
String narExtractionDirectory) throws IOException {
final File narFile = metadata.getArchivePath().toAbsolutePath().toFile();
final File narFile = metadata.getArchivePath().toAbsolutePath().normalize().toFile();
NarClassLoader ncl = NarClassLoaderBuilder.builder()
.narFile(narFile)
.parentClassLoader(ProxyExtension.class.getClassLoader())
Expand Down

0 comments on commit 50dc521

Please sign in to comment.