Fix unclosed opened stream

slawekjaranowski · slawekjaranowski · commit ce8e541f6c19 · 2022-06-17T18:55:05.000+02:00
Method ArtifactStore#get was used for checking only if artifact exist
but return was not consumed and opened stream was never closed
diff --git a/mrm-servlet/src/main/java/org/codehaus/mojo/mrm/impl/maven/ArtifactStoreFileSystem.java b/mrm-servlet/src/main/java/org/codehaus/mojo/mrm/impl/maven/ArtifactStoreFileSystem.java
@@ -126,9 +126,7 @@ public ArtifactStoreFileSystem( ArtifactStore store )
         this.store = store;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public Entry[] listEntries( DirectoryEntry directory )
     {
         if ( getRoot().equals( directory ) )
@@ -164,7 +162,6 @@ public Entry[] listEntries( DirectoryEntry directory )
         String groupId = path.replace( '/', '.' );
 
         // get all the groupId's that start with this groupId
-        String groupIdPrefix = groupId + ".";
         Set<String> groupIds = new TreeSet<>( store.getGroupIds( groupId ) );
         for ( String name : groupIds )
         {
@@ -223,9 +220,7 @@ public Entry[] listEntries( DirectoryEntry directory )
         return result.toArray(new Entry[0]);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     protected Entry get( DirectoryEntry parent, String name )
     {
         String path = "/";
@@ -299,7 +294,8 @@ else if ( ARCHETYPE_CATALOG.matcher( path ).matches() )
                                                       matcher.group( 10 ) );
                     try
                     {
-                        store.get( artifact );
+                        // check if artifact exist
+                        store.getSize( artifact );
                         return new ArtifactFileEntry( this, parent, artifact, store );
                     }
                     catch ( IOException | ArtifactNotFoundException e )
@@ -325,7 +321,8 @@ else if ( ARCHETYPE_CATALOG.matcher( path ).matches() )
                                                       matcher.group( 10 ), timestamp, buildNumber );
                     try
                     {
-                        store.get( artifact );
+                        // check if artifact exist
+                        store.getSize( artifact );
                         return new ArtifactFileEntry( this, parent, artifact, store );
                     }
                     catch ( IOException | ArtifactNotFoundException e )
@@ -360,7 +357,8 @@ else if ( ARCHETYPE_CATALOG.matcher( path ).matches() )
                     Artifact artifact = new Artifact( groupId, artifactId, version, classifier, type );
                     try
                     {
-                        store.get( artifact );
+                        // check if artifact exist
+                        store.getSize( artifact );
                         return new ArtifactFileEntry( this, parent, artifact, store );
                     }
                     catch ( ArtifactNotFoundException | IOException e )
@@ -376,9 +374,7 @@ else if ( ARCHETYPE_CATALOG.matcher( path ).matches() )
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public long getLastModified( DirectoryEntry entry )
         throws IOException
     {
diff --git a/mrm-servlet/src/test/java/org/codehaus/mojo/mrm/impl/maven/ArtifactStoreFileSystemTest.java b/mrm-servlet/src/test/java/org/codehaus/mojo/mrm/impl/maven/ArtifactStoreFileSystemTest.java
@@ -40,7 +40,6 @@ public class ArtifactStoreFileSystemTest
 
     @Test
     public void testGroupMetadataRegex()
-        throws Exception
     {
         Matcher matcher = ArtifactStoreFileSystem.METADATA.matcher( "/commons/maven-metadata.xml" );
         assertTrue( matcher.matches() );
@@ -56,7 +55,6 @@ public void testGroupMetadataRegex()
 
     @Test
     public void testArtifactRegex()
-        throws Exception
     {
         Matcher matcher = ArtifactStoreFileSystem.ARTIFACT.matcher( "/commons/maven-metadata.xml" );
         assertFalse( matcher.matches() );
@@ -109,7 +107,6 @@ public void testArtifactRegex()
 
     @Test
     public void testSnapshotArtifactRegex()
-        throws Exception
     {
         Matcher matcher = ArtifactStoreFileSystem.SNAPSHOT_ARTIFACT.matcher( "/commons/maven-metadata.xml" );
         assertFalse( matcher.matches() );
@@ -159,7 +156,7 @@ public void testSnapshotArtifactRegex()
     public void testSiteXmlReleaseVersion() throws Exception
     {
         ArtifactStore store = mock( ArtifactStore.class );
-        when( store.get( isA( Artifact.class ) ) ).thenThrow( ArtifactNotFoundException.class );
+        when( store.getSize( isA( Artifact.class ) ) ).thenThrow( ArtifactNotFoundException.class );
         ArtifactStoreFileSystem system = new ArtifactStoreFileSystem( store );
         FileEntry entry = (FileEntry) system.get( "/localhost/mmockrm-5/1/mmockrm-5-1-site_en.xml" );
         assertNull( entry );
@@ -169,7 +166,7 @@ public void testSiteXmlReleaseVersion() throws Exception
     public void testSiteXmlSnapshotVersion() throws Exception
     {
         ArtifactStore store = mock( ArtifactStore.class );
-        when( store.get( isA( Artifact.class ) ) ).thenThrow( ArtifactNotFoundException.class );
+        when( store.getSize( isA( Artifact.class ) ) ).thenThrow( ArtifactNotFoundException.class );
         ArtifactStoreFileSystem system = new ArtifactStoreFileSystem( store );
         FileEntry entry = (FileEntry) system.get( "/localhost/mmockrm-5/1.0-SNAPSHOT/mmockrm-5-1.0-SNAPSHOT-site_en.xml" );
         assertNull( entry );

Original file line number	Diff line number	Diff line change
`@@ -126,9 +126,7 @@ public ArtifactStoreFileSystem( ArtifactStore store )`
`126`	`126`	`this.store = store;`
`127`	`127`	`}`
`128`	`128`
`129`		`- /**`
`130`		`- * {@inheritDoc}`
`131`		`- */`
	`129`	`+ @Override`
`132`	`130`	`public Entry[] listEntries( DirectoryEntry directory )`
`133`	`131`	`{`
`134`	`132`	`if ( getRoot().equals( directory ) )`
`@@ -164,7 +162,6 @@ public Entry[] listEntries( DirectoryEntry directory )`
`164`	`162`	`String groupId = path.replace( '/', '.' );`
`165`	`163`
`166`	`164`	`// get all the groupId's that start with this groupId`
`167`		`- String groupIdPrefix = groupId + ".";`
`168`	`165`	`Set<String> groupIds = new TreeSet<>( store.getGroupIds( groupId ) );`
`169`	`166`	`for ( String name : groupIds )`
`170`	`167`	`{`
`@@ -223,9 +220,7 @@ public Entry[] listEntries( DirectoryEntry directory )`
`223`	`220`	`return result.toArray(new Entry[0]);`
`224`	`221`	`}`
`225`	`222`
`226`		`- /**`
`227`		`- * {@inheritDoc}`
`228`		`- */`
	`223`	`+ @Override`
`229`	`224`	`protected Entry get( DirectoryEntry parent, String name )`
`230`	`225`	`{`
`231`	`226`	`String path = "/";`
`@@ -299,7 +294,8 @@ else if ( ARCHETYPE_CATALOG.matcher( path ).matches() )`
`299`	`294`	`matcher.group( 10 ) );`
`300`	`295`	`try`
`301`	`296`	`{`
`302`		`- store.get( artifact );`
	`297`	`+ // check if artifact exist`
	`298`	`+ store.getSize( artifact );`
`303`	`299`	`return new ArtifactFileEntry( this, parent, artifact, store );`
`304`	`300`	`}`
`305`	`301`	`catch ( IOException \| ArtifactNotFoundException e )`
`@@ -325,7 +321,8 @@ else if ( ARCHETYPE_CATALOG.matcher( path ).matches() )`
`325`	`321`	`matcher.group( 10 ), timestamp, buildNumber );`
`326`	`322`	`try`
`327`	`323`	`{`
`328`		`- store.get( artifact );`
	`324`	`+ // check if artifact exist`
	`325`	`+ store.getSize( artifact );`
`329`	`326`	`return new ArtifactFileEntry( this, parent, artifact, store );`
`330`	`327`	`}`
`331`	`328`	`catch ( IOException \| ArtifactNotFoundException e )`
`@@ -360,7 +357,8 @@ else if ( ARCHETYPE_CATALOG.matcher( path ).matches() )`
`360`	`357`	`Artifact artifact = new Artifact( groupId, artifactId, version, classifier, type );`
`361`	`358`	`try`
`362`	`359`	`{`
`363`		`- store.get( artifact );`
	`360`	`+ // check if artifact exist`
	`361`	`+ store.getSize( artifact );`
`364`	`362`	`return new ArtifactFileEntry( this, parent, artifact, store );`
`365`	`363`	`}`
`366`	`364`	`catch ( ArtifactNotFoundException \| IOException e )`
`@@ -376,9 +374,7 @@ else if ( ARCHETYPE_CATALOG.matcher( path ).matches() )`
`376`	`374`	`}`
`377`	`375`	`}`
`378`	`376`
`379`		`- /**`
`380`		`- * {@inheritDoc}`
`381`		`- */`
	`377`	`+ @Override`
`382`	`378`	`public long getLastModified( DirectoryEntry entry )`
`383`	`379`	`throws IOException`
`384`	`380`	`{`