Merge pull request #531 from sonatype/nexus-5241-simple-fix

NEXUS-5241: Simple fix
sonatype · Sep 14, 2012 · 3350061 · 3350061
2 parents 6900dd3 + 3ce3342
commit 3350061
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 17 deletions.
diff --git a/...e-plugin/src/main/java/org/sonatype/nexus/feeds/record/ItemChangesFeedEventInspector.java b/...e-plugin/src/main/java/org/sonatype/nexus/feeds/record/ItemChangesFeedEventInspector.java
@@ -25,10 +25,13 @@
 import org.sonatype.nexus.proxy.events.RepositoryItemEventStore;
 import org.sonatype.nexus.proxy.item.StorageFileItem;
 import org.sonatype.nexus.proxy.item.uid.IsHiddenAttribute;
+import org.sonatype.nexus.proxy.maven.uid.IsMavenArtifactSignatureAttribute;
+import org.sonatype.nexus.proxy.maven.uid.IsMavenChecksumAttribute;
+import org.sonatype.nexus.proxy.maven.uid.IsMavenRepositoryMetadataAttribute;
 import org.sonatype.plexus.appevents.Event;
 
 /**
- * Event inspector that creates feeds about item changes.
+ * Event inspector that persists item events into Timeline.
  *
  * @author Juven Xu
  * @author cstamas
@@ -68,6 +71,9 @@ private void inspectForNexus( Event<?> evt )
         // filter out links and dirs/collections and hidden files
         if ( StorageFileItem.class.isAssignableFrom( ievt.getItem().getClass() )
             && !ievt.getItemUid().getBooleanAttributeValue( IsHiddenAttribute.class )
+            && !ievt.getItemUid().getBooleanAttributeValue( IsMavenRepositoryMetadataAttribute.class ) // "maven-metadata.xml"
+            && !ievt.getItemUid().getBooleanAttributeValue( IsMavenArtifactSignatureAttribute.class ) // "*.asc"
+            && !ievt.getItemUid().getBooleanAttributeValue( IsMavenChecksumAttribute.class ) // "*.sha1" or "*.md5" 
             && !( (StorageFileItem) ievt.getItem() ).isContentGenerated() )
         {
             StorageFileItem pomItem = (StorageFileItem) ievt.getItem();

diff --git a/...ugin/src/test/java/org/sonatype/nexus/feeds/record/ItemChangesFeedEventInspectorTest.java b/...ugin/src/test/java/org/sonatype/nexus/feeds/record/ItemChangesFeedEventInspectorTest.java
@@ -12,27 +12,27 @@
  */
 package org.sonatype.nexus.feeds.record;
 
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.sonatype.nexus.ApplicationStatusSource;
 import org.sonatype.nexus.feeds.FeedRecorder;
-import org.sonatype.nexus.proxy.NoSuchRepositoryException;
+import org.sonatype.nexus.feeds.NexusArtifactEvent;
 import org.sonatype.nexus.proxy.RequestContext;
-import org.sonatype.nexus.proxy.ResourceStoreRequest;
+import org.sonatype.nexus.proxy.attributes.internal.DefaultAttributes;
 import org.sonatype.nexus.proxy.events.RepositoryItemEventStoreCreate;
-import org.sonatype.nexus.proxy.item.AbstractRepositoryItemUidFactory;
-import org.sonatype.nexus.proxy.item.DefaultRepositoryItemUid;
-import org.sonatype.nexus.proxy.item.DefaultStorageFileItem;
 import org.sonatype.nexus.proxy.item.RepositoryItemUid;
 import org.sonatype.nexus.proxy.item.StorageFileItem;
 import org.sonatype.nexus.proxy.item.uid.IsHiddenAttribute;
+import org.sonatype.nexus.proxy.maven.uid.IsMavenArtifactSignatureAttribute;
+import org.sonatype.nexus.proxy.maven.uid.IsMavenChecksumAttribute;
+import org.sonatype.nexus.proxy.maven.uid.IsMavenRepositoryMetadataAttribute;
 import org.sonatype.nexus.proxy.repository.Repository;
 import org.sonatype.sisu.litmus.testsupport.TestSupport;
 
@@ -51,32 +51,65 @@ public class ItemChangesFeedEventInspectorTest
 
     @Mock
     private StorageFileItem storageFileItem;
-    
+
     @Mock
     private RepositoryItemUid repositoryItemUid;
 
     @Before
     public void setup()
     {
         when( repository.getId() ).thenReturn( "test" );
-        when( storageFileItem.getItemContext() ).thenReturn( new RequestContext(  ) );
+        when( storageFileItem.getItemContext() ).thenReturn( new RequestContext() );
         when( storageFileItem.getRepositoryItemUid() ).thenReturn( repositoryItemUid );
+        when( storageFileItem.getRepositoryItemAttributes() ).thenReturn( new DefaultAttributes() );
     }
 
     @Test
     public void eventsOnHiddenFilesAreNotRecorded()
     {
-        final ItemChangesFeedEventInspector underTest = new ItemChangesFeedEventInspector(
-            feedRecorder, applicationStatusSource
-        );
-
+        final ItemChangesFeedEventInspector underTest =
+            new ItemChangesFeedEventInspector( feedRecorder, applicationStatusSource );
         final RepositoryItemEventStoreCreate evt = new RepositoryItemEventStoreCreate( repository, storageFileItem );
-
         when( repositoryItemUid.getBooleanAttributeValue( IsHiddenAttribute.class ) ).thenReturn( true );
-
         underTest.inspect( evt );
 
         verifyNoMoreInteractions( feedRecorder );
     }
 
+    @Test
+    public void eventsOnMavenMetadataSignatureAndHashFilesAreNotRecorded()
+    {
+        final ItemChangesFeedEventInspector underTest =
+            new ItemChangesFeedEventInspector( feedRecorder, applicationStatusSource );
+        {
+            final RepositoryItemEventStoreCreate evt = new RepositoryItemEventStoreCreate( repository, storageFileItem );
+            when( repositoryItemUid.getBooleanAttributeValue( IsMavenRepositoryMetadataAttribute.class ) ).thenReturn(
+                true );
+            underTest.inspect( evt );
+        }
+        {
+            final RepositoryItemEventStoreCreate evt = new RepositoryItemEventStoreCreate( repository, storageFileItem );
+            when( repositoryItemUid.getBooleanAttributeValue( IsMavenArtifactSignatureAttribute.class ) ).thenReturn(
+                true );
+            underTest.inspect( evt );
+        }
+        {
+            final RepositoryItemEventStoreCreate evt = new RepositoryItemEventStoreCreate( repository, storageFileItem );
+            when( repositoryItemUid.getBooleanAttributeValue( IsMavenChecksumAttribute.class ) ).thenReturn( true );
+            underTest.inspect( evt );
+        }
+
+        // these events above should be filtered out by ItemChangesFeedEventInspector, feedRecordes shall be untouched
+        verifyNoMoreInteractions( feedRecorder );
+
+        // now do touch it (with event that has all the flags we added false)
+        final RepositoryItemEventStoreCreate evt = new RepositoryItemEventStoreCreate( repository, storageFileItem );
+        when( repositoryItemUid.getBooleanAttributeValue( IsMavenRepositoryMetadataAttribute.class ) ).thenReturn(
+            false );
+        when( repositoryItemUid.getBooleanAttributeValue( IsMavenArtifactSignatureAttribute.class ) ).thenReturn( false );
+        when( repositoryItemUid.getBooleanAttributeValue( IsMavenChecksumAttribute.class ) ).thenReturn( false );
+        underTest.inspect( evt );
+        // method touched only once
+        verify( feedRecorder, times( 1 ) ).addNexusArtifactEvent( any( NexusArtifactEvent.class ) );
+    }
 }