Test for windows, import fix
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/PathUtil.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/PathUtil.java
index 8c9a437..b8d14bb 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/PathUtil.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/PathUtil.java
@@ -26,8 +26,6 @@
import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
import java.util.StringTokenizer;
import java.util.Vector;
import java.util.stream.StreamSupport;
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventHandler.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventHandler.java
index 5217f11..f98adcd 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventHandler.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventHandler.java
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.archiva.event.Event;
import java.util.EventListener;
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventManager.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventManager.java
index 189f950..00a2400 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventManager.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventManager.java
@@ -28,7 +28,7 @@
public class EventManager implements EventSource
{
- private static final Logger log = LoggerFactory.getLogger(EventManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EventManager.class);
private final ConcurrentHashMap<EventType<? extends Event>, Set<EventHandler>> handlerMap = new ConcurrentHashMap<>();
@@ -71,7 +71,7 @@
handler.handle(event);
} catch (Exception e) {
// We catch all errors from handlers
- log.error("An error occured during event handling: {}", e.getMessage(), e);
+ LOG.error("An error occured during event handling: {}", e.getMessage(), e);
}
}
}
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventType.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventType.java
index 58a9213..50d4267 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventType.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventType.java
@@ -119,7 +119,7 @@
private Object writeReplace() throws ObjectStreamException {
- Deque<String> path = new LinkedList<String>();
+ Deque<String> path = new LinkedList<>();
EventType<?> t = this;
while (t != ROOT) {
path.addFirst(t.name);
diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/PathUtilTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/PathUtilTest.java
index dfd5b90..af2c423 100644
--- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/PathUtilTest.java
+++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/PathUtilTest.java
@@ -24,6 +24,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
+import org.apache.commons.io.FilenameUtils;
/**
* PathUtilTest
@@ -33,15 +34,16 @@
public class PathUtilTest
extends TestCase
{
+
public void testToRelativeWithoutSlash()
{
- assertEquals( "path/to/resource.xml", PathUtil.getRelative( "/home/user/foo/repository",
+ assertEquals( FilenameUtils.separatorsToSystem( "path/to/resource.xml" ), PathUtil.getRelative( "/home/user/foo/repository",
"/home/user/foo/repository/path/to/resource.xml" ) );
}
public void testToRelativeWithSlash()
{
- assertEquals( "path/to/resource.xml", PathUtil.getRelative( "/home/user/foo/repository/",
+ assertEquals( FilenameUtils.separatorsToSystem( "path/to/resource.xml" ), PathUtil.getRelative( "/home/user/foo/repository/",
"/home/user/foo/repository/path/to/resource.xml" ) );
}
@@ -87,7 +89,7 @@
String path = "path/to/resource.xml";
String expectedPath = "file:" + workingDirname + "/" + path;
-
+
assertEquals( expectedPath, PathUtil.toUrl( expectedPath ) );
}
}
