diff options
2 files changed, 7 insertions, 12 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java index d2269ee50..12189f31b 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java @@ -126,9 +126,7 @@ public class AuditEvent { try { - int index = name.lastIndexOf( '/' ); - String ts = index > 0 ? name.substring( 0, index ) : name; - timestamp = createNameFormat().parse( ts ); + timestamp = createNameFormat().parse( name ); } catch ( ParseException e ) { @@ -213,9 +211,7 @@ public class AuditEvent public String getName() { - // we add the resource name to the end to avoid clashes at that timestamp - // TODO: this is still not robust enough and the content model should be revised - return createNameFormat().format( timestamp ) + "/" + resource.substring( resource.lastIndexOf( '/' ) + 1 ); + return createNameFormat().format( timestamp ); } private static SimpleDateFormat createNameFormat() diff --git a/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java b/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java index 28c62456a..2bb3399a8 100644 --- a/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java +++ b/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java @@ -138,16 +138,16 @@ public class AuditManagerTest return createTestEvent( TEST_REPO_ID, name ); } - private static AuditEvent createTestEvent( String repositoryId, String t ) + private static AuditEvent createTestEvent( String repositoryId, String name ) throws ParseException { AuditEvent event = new AuditEvent(); - event.setTimestamp( TIMESTAMP_FORMAT.parse( AUDIT_EVENT_BASE + t ) ); + event.setTimestamp( TIMESTAMP_FORMAT.parse( name ) ); event.setAction( AuditEvent.UPLOAD_FILE ); event.setRemoteIP( TEST_IP_ADDRESS ); event.setRepositoryId( repositoryId ); event.setUserId( TEST_USER ); - event.setResource( TEST_RESOURCE_BASE + "/" + t ); + event.setResource( TEST_RESOURCE_BASE + "/" + name.substring( AUDIT_EVENT_BASE.length() ) ); return event; } @@ -197,11 +197,10 @@ public class AuditManagerTest eventNames.put( TEST_REPO_ID_2, new ArrayList<String>() ); for ( int i = 0; i < numEvents; i++ ) { - String t = MILLIS_FORMAT.format( i ); - String name = AUDIT_EVENT_BASE + t + "/" + t; + String name = AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ); String repositoryId = i % 2 == 0 ? TEST_REPO_ID : TEST_REPO_ID_2; eventNames.get( repositoryId ).add( name ); - events.add( createTestEvent( repositoryId, t ) ); + events.add( createTestEvent( repositoryId, name ) ); } metadataRepositoryControl.expectAndReturn( |