Skip to content

Commit adc67e1

Browse files
elharomichael-o
authored andcommitted
Use try with resources to avoid deprecated class (#200)
1 parent 2e867c6 commit adc67e1

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@
1919
package org.apache.maven.plugins.site.stubs;
2020

2121
import java.io.File;
22+
import java.io.FileInputStream;
23+
import java.io.IOException;
24+
import java.io.InputStream;
2225
import java.util.Properties;
2326

2427
import org.apache.maven.model.DistributionManagement;
2528
import org.apache.maven.model.Site;
2629
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
2730
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
28-
import org.codehaus.plexus.util.IOUtil;
29-
import org.codehaus.plexus.util.ReaderFactory;
30-
import org.codehaus.plexus.util.xml.XmlStreamReader;
31+
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
3132

3233
/**
3334
* @author <a href="mailto:[email protected]">Vincent Siveton</a>
@@ -41,31 +42,29 @@ public class SiteMavenProjectStub extends MavenProjectStub {
4142
public SiteMavenProjectStub(String projectName) {
4243
basedir = new File(super.getBasedir() + "/src/test/resources/unit/" + projectName);
4344

44-
XmlStreamReader reader = null;
45-
try {
46-
reader = ReaderFactory.newXmlReader(new File(getBasedir(), "pom.xml"));
47-
setModel(new MavenXpp3Reader().read(reader));
48-
reader.close();
49-
} catch (Exception e) {
45+
File pom = new File(getBasedir(), "pom.xml");
46+
try (InputStream in = new FileInputStream(pom)) {
47+
setModel(new MavenXpp3Reader().read(in));
48+
Site site = new Site();
49+
site.setId("localhost");
50+
distributionManagement.setSite(site);
51+
} catch (IOException | XmlPullParserException e) {
5052
throw new RuntimeException(e);
51-
} finally {
52-
IOUtil.close(reader);
5353
}
54-
Site site = new Site();
55-
site.setId("localhost");
56-
distributionManagement.setSite(site);
5754
}
5855

5956
/**
6057
* @see org.apache.maven.project.MavenProject#getName()
6158
*/
59+
@Override
6260
public String getName() {
6361
return getModel().getName();
6462
}
6563

6664
/**
6765
* @see org.apache.maven.project.MavenProject#getProperties()
6866
*/
67+
@Override
6968
public Properties getProperties() {
7069
return new Properties();
7170
}
@@ -76,6 +75,7 @@ public DistributionManagement getDistributionManagement() {
7675
}
7776

7877
/** {@inheritDoc} */
78+
@Override
7979
public File getBasedir() {
8080
return basedir;
8181
}

0 commit comments

Comments
 (0)