Skip to content

Commit

Permalink
Added FSInfo to handle file system differences
Browse files Browse the repository at this point in the history
  • Loading branch information
Claudenw committed Jan 12, 2025
1 parent e886682 commit 4c38626
Show file tree
Hide file tree
Showing 14 changed files with 798 additions and 290 deletions.
5 changes: 5 additions & 0 deletions apache-rat-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -281,5 +281,10 @@
<artifactId>groovy-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion apache-rat-core/src/it/java/org/apache/rat/ReportTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public static Stream<Arguments> args() throws RatException {
@Override
public void report(Document document) {
if (!document.isIgnored()) {
String[] tokens = document.getName().tokenize(document.getName().localized());
String[] tokens = DocumentName.FSInfo.getDefault().tokenize(document.getName().localized());
results.add(Arguments.of(tokens[1], document));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,18 @@ private static void verifyFile(final File file) {
throw new ConfigurationException(format("%s is not a valid file.", file));
}
}

/**
* Tokenizes the string based on the directory separator.
* @param source the source to tokenize
* @param from the directory separator for the source.
* @param to the directory separator for the result.
* @return the source string with the separators converted.
*/
public static String convertSeparator(final String source, final String from, final String to) {
if (StringUtils.isEmpty(source) || from.equals(to)) {
return source;
}
return String.join(to, source.split("\\Q" + from + "\\E"));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/*
* 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.rat.document;

import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;

public class ArchiveEntryName extends DocumentName {
/** Then name of the document that contains this entry */
private final DocumentName archiveFileName;

private static DocumentName.Builder prepareBuilder(final DocumentName archiveFileName, final String archiveEntryName) {
String root = archiveFileName.getName() + "#";
FSInfo fsInfo = new FSInfo("archiveEntry", "/", true, Collections.singletonList(root));
return DocumentName.builder(fsInfo)
.setRoot(root)
.setBaseName(root + "/")
.setName(archiveEntryName);
}
public ArchiveEntryName(final DocumentName archiveFileName, final String archiveEntryName) {
super(prepareBuilder(archiveFileName, archiveEntryName));
this.archiveFileName = archiveFileName;
}

@Override
public File asFile() {
return archiveFileName.asFile();
}

@Override
public Path asPath() {
return Paths.get(archiveFileName.asPath().toString(), "#", super.asPath().toString());
}

@Override
public DocumentName resolve(final String child) {
return new ArchiveEntryName(this.archiveFileName, super.resolve(child).localized());
}

@Override
public String getBaseName() {
return archiveFileName.getName() + "#";
}

@Override
boolean startsWithRootOrSeparator(final String candidate, final String root, final String separator) {
return super.startsWithRootOrSeparator(candidate, root, separator);
}

@Override
public String localized(final String dirSeparator) {
String superLocal = super.localized(dirSeparator);
superLocal = superLocal.substring(superLocal.lastIndexOf("#") + 1);
return archiveFileName.localized(dirSeparator) + "#" + superLocal;
}
}
Loading

0 comments on commit 4c38626

Please sign in to comment.