Skip to content

Improve error message for Guice injection errors in Modello tool #166

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

Merged
mizdebsk merged 1 commit into from
Feb 3, 2025
Merged

Improve error message for Guice injection errors in Modello tool #166

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions mbi/modello/src/org/fedoraproject/mbi/tool/modello/ModelloTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,13 @@
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.fedoraproject.mbi.tool.Instruction;
import org.fedoraproject.mbi.tool.Tool;

import com.google.inject.CreationException;

/**
* @author Mikolaj Izdebski
*/
Expand Down Expand Up @@ -102,21 +106,37 @@ public void param( String s )
velocityParams.put( s.substring( 0, s.indexOf( '=' ) ), s.substring( s.indexOf( '=' ) + 1 ) );
}

private ModelloCore instantiateModello()
throws ComponentLookupException, PlexusContainerException
{
try
{
ContainerConfiguration conf = new DefaultContainerConfiguration();
conf.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
conf.setAutoWiring( true );
PlexusContainer container = new DefaultPlexusContainer( conf );
ModelloCore modello = container.lookup( ModelloCore.class );
return modello;
}
catch ( CreationException e )
{
throw new RuntimeException( "Unable to instantiane Modello: " + e.getMessage() );
}

}

@Override
public void execute()
throws Exception
{
ModelloCore modello = instantiateModello();

Files.createDirectories( getGeneratedSourcesDir() );
Path modelPath = getSourceRootDir().resolve( model );
params.put( "modello.output.directory", getGeneratedSourcesDir().toString() );
params.put( VelocityGenerator.VELOCITY_TEMPLATES, templates.stream().collect( Collectors.joining( "," ) ) );
params.put( VelocityGenerator.VELOCITY_PARAMETERS, velocityParams );

ContainerConfiguration conf = new DefaultContainerConfiguration();
conf.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
conf.setAutoWiring( true );
PlexusContainer container = new DefaultPlexusContainer( conf );
ModelloCore modello = container.lookup( ModelloCore.class );
try ( Reader modelReader = Files.newBufferedReader( modelPath ) )
{
Model model = modello.loadModel( modelReader );
Expand Down