Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MEAR-285] clean up exception handling #13

Merged
merged 1 commit into from
Sep 24, 2020
Merged

[MEAR-285] clean up exception handling #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
105 changes: 37 additions & 68 deletions src/main/java/org/apache/maven/plugins/ear/EarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.zip.ZipException;

import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
Expand Down Expand Up @@ -288,26 +287,15 @@ public void execute()
// Initializes ear modules
super.execute();

final File earFile;
final MavenArchiver archiver;
final Date reproducibleLastModifiedDate;
try
{
earFile = getEarFile( outputDirectory, finalName, classifier );
archiver = new EarMavenArchiver( getModules() );
getLog().debug( "Jar archiver implementation [" + jarArchiver.getClass().getName() + "]" );
archiver.setArchiver( jarArchiver );
archiver.setOutputFile( earFile );
File earFile = getEarFile( outputDirectory, finalName, classifier );
MavenArchiver archiver = new EarMavenArchiver( getModules() );
getLog().debug( "Jar archiver implementation [" + jarArchiver.getClass().getName() + "]" );
archiver.setArchiver( jarArchiver );
archiver.setOutputFile( earFile );
archiver.setCreatedBy( "Maven EAR Plugin", "org.apache.maven.plugins", "maven-ear-plugin" );

archiver.setCreatedBy( "Maven EAR Plugin", "org.apache.maven.plugins", "maven-ear-plugin" );

// configure for Reproducible Builds based on outputTimestamp value
reproducibleLastModifiedDate = archiver.configureReproducible( outputTimestamp );
}
catch ( Exception e )
{
throw new MojoExecutionException( "Error assembling EAR", e );
}
// configure for Reproducible Builds based on outputTimestamp value
Date reproducibleLastModifiedDate = archiver.configureReproducible( outputTimestamp );

zipArchiver.setUseJvmChmod( useJvmChmod );
if ( reproducibleLastModifiedDate != null )
Expand All @@ -318,15 +306,10 @@ public void execute()

final JavaEEVersion javaEEVersion = JavaEEVersion.getJavaEEVersion( version );

final Collection<String> outdatedResources;
final Collection<String> outdatedResources = new ArrayList<>();

if ( !getWorkDirectory().exists() )
{
outdatedResources = Collections.emptyList();
}
else
if ( getWorkDirectory().exists() )
{
outdatedResources = new ArrayList<>();
try
{
Files.walkFileTree( getWorkDirectory().toPath(), new SimpleFileVisitor<Path>()
Expand Down Expand Up @@ -390,10 +373,8 @@ public FileVisitResult visitFile( Path file, BasicFileAttributes attrs )
File ddFile = new File( getWorkDirectory(), APPLICATION_XML_URI );
if ( !ddFile.exists() && ( javaEEVersion.lt( JavaEEVersion.FIVE ) ) )
{
// CHECKSTYLE_OFF: LineLength
throw new MojoExecutionException( "Deployment descriptor: " + ddFile.getAbsolutePath()
+ " does not exist." );
// CHECKSTYLE_ON: LineLength
}
// no need to check timestamp for descriptors: removing if outdated does not really make sense
outdatedResources.remove( Paths.get( APPLICATION_XML_URI ).toString() );
Expand All @@ -413,27 +394,28 @@ public FileVisitResult visitFile( Path file, BasicFileAttributes attrs )
}
}

getLog().debug( "Excluding " + Arrays.asList( getPackagingExcludes() ) + " from the generated EAR." );
getLog().debug( "Including " + Arrays.asList( getPackagingIncludes() ) + " in the generated EAR." );

archiver.getArchiver().addDirectory( getWorkDirectory(), getPackagingIncludes(), getPackagingExcludes() );
try
{
getLog().debug( "Excluding " + Arrays.asList( getPackagingExcludes() ) + " from the generated EAR." );
getLog().debug( "Including " + Arrays.asList( getPackagingIncludes() ) + " in the generated EAR." );

archiver.getArchiver().addDirectory( getWorkDirectory(), getPackagingIncludes(), getPackagingExcludes() );
archiver.createArchive( session, getProject(), archive );

if ( classifier != null )
{
projectHelper.attachArtifact( getProject(), "ear", classifier, earFile );
}
else
{
getProject().getArtifact().setFile( earFile );
}
}
catch ( Exception e )
catch ( ManifestException | IOException | DependencyResolutionRequiredException e )
{
throw new MojoExecutionException( "Error assembling EAR", e );
}


if ( classifier != null )
{
projectHelper.attachArtifact( getProject(), "ear", classifier, earFile );
}
else
{
getProject().getArtifact().setFile( earFile );
}
}

private void copyModules( final JavaEEVersion javaEEVersion,
Expand Down Expand Up @@ -465,11 +447,9 @@ private void copyModules( final JavaEEVersion javaEEVersion,

// If the module is within the unpack list, make sure that no unpack wasn't forced (null or true)
// If the module is not in the unpack list, it should be true
// CHECKSTYLE_OFF: LineLength
if ( ( unpackTypesList.contains( module.getType() )
&& ( module.shouldUnpack() == null || module.shouldUnpack() ) )
|| ( module.shouldUnpack() != null && module.shouldUnpack() ) )
// CHECKSTYLE_ON: LineLength
{
getLog().info( "Copying artifact [" + module + "] to [" + module.getUri() + "] (unpacked)" );
// Make sure that the destination is a directory to avoid plexus nasty stuff :)
Expand Down Expand Up @@ -608,7 +588,7 @@ public void setPackagingExcludes( String packagingExcludes )
}

/**
* @return The arrays with the includes.
* @return the arrays with the includes
*/
public String[] getPackagingIncludes()
{
Expand Down Expand Up @@ -680,13 +660,14 @@ private String[] getEarFiles( File sourceDir )
/**
* Unpacks the module into the EAR structure.
*
* @param source File to be unpacked.
* @param destDir Location where to put the unpacked files.
* @throws NoSuchArchiverException In case of we don't have an appropriate archiver.
* @throws IOException In case of a general IOException.
* @param source file to be unpacked
* @param destDir where to put the unpacked files
* @throws ArchiverException a corrupt archive
* @throws NoSuchArchiverException if we don't have an appropriate archiver
* @throws IOException in case of a general IOException
*/
public void unpack( File source, final File destDir, final Collection<String> outdatedResources )
throws NoSuchArchiverException, IOException
throws ArchiverException, NoSuchArchiverException, IOException
{
UnArchiver unArchiver = archiverManager.getUnArchiver( "zip" );
unArchiver.setSourceFile( source );
Expand Down Expand Up @@ -728,8 +709,8 @@ private void copyFile( File source, File target )
}

/**
* @param fileName The name of the file which should be checked.
* @return {@code true} if the name is part of the non filtered extensions {@code false} otherwise.
* @param fileName the name of the file which should be checked
* @return {@code true} if the name is part of the non filtered extensions; {@code false} otherwise
*/
public boolean isNonFilteredExtension( String fileName )
{
Expand Down Expand Up @@ -912,21 +893,9 @@ private void changeManifestClasspath( EarModule module, File original, JavaEEVer
zipArchiver.createArchive();
}
}
catch ( ManifestException e )
{
throw new MojoFailureException( e.getMessage() );
}
catch ( ZipException e )
{
throw new MojoFailureException( e.getMessage() );
}
catch ( IOException e )
{
throw new MojoFailureException( e.getMessage() );
}
catch ( ArchiverException e )
catch ( ManifestException | IOException | ArchiverException e )
{
throw new MojoFailureException( e.getMessage() );
throw new MojoFailureException( e.getMessage(), e );
}
}
}