Skip to content

Commit 92d7ab4

Browse files
atextoratextor
committed
Fix Maven Plugin tests
1 parent 5903eb2 commit 92d7ab4

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

‎core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/diagram/DiagramGenerationConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public enum Format {
2020
SVG, PNG;
2121

2222
public static String allValues() {
23-
return String.join( ", ", Stream.of( values() ).map( Format::toString ).toList() );
23+
return String.join( ", ", Stream.of( values() ).map( Format::toString ).map( String::toUpperCase ).toList() );
2424
}
2525
}
2626

‎core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/docu/AspectModelDocumentationGenerator.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public Stream<DocumentationArtifact> generate() {
9999
logMissingTranslations( aspect(), language );
100100
templateContext.put( "i18n", new I18nLanguageBundle( language ) );
101101
final TemplateEngine templateEngine = new TemplateEngine( templateContext, engineConfiguration );
102-
final String artifactName = getArtifactName( aspect(), language );
102+
final String artifactName = "%s_%s.html".formatted( aspect().getName(), config.locale().toLanguageTag() );
103103
String source = templateEngine.apply( DOCU_ROOT_DIR + "/templates/html/aspect-model-documentation" );
104104
source = insertAspectModelDiagram( source, language );
105105
source = insertStaticPlaceholders( source );
@@ -149,10 +149,6 @@ public void generate( final Function<String, OutputStream> nameMapper, final Map
149149
new AspectModelDocumentationGenerator( aspect(), config ).generate( nameMapper );
150150
}
151151

152-
private String getArtifactName( final Aspect aspectModel, final Locale locale ) {
153-
return aspectModel.getName() + "_" + locale.toLanguageTag();
154-
}
155-
156152
private String insertAspectModelDiagram( final String html, final Locale language ) {
157153
final DiagramGenerationConfig config = DiagramGenerationConfigBuilder.builder()
158154
.format( DiagramGenerationConfig.Format.SVG )

‎tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/AspectModelMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
public abstract class AspectModelMojo extends AbstractMojo {
4444
@Parameter( defaultValue = "${basedir}/src/main/resources/aspects" )
45-
private final String modelsRootDirectory = System.getProperty( "user.dir" ) + "/src/main/resources/aspects";
45+
private String modelsRootDirectory = System.getProperty( "user.dir" ) + "/src/main/resources/aspects";
4646

4747
@Parameter( required = true, property = "include" )
4848
protected Set<String> includes;

‎tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateDiagram.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public void executeGeneration() throws MojoExecutionException {
5050
for ( final Aspect aspect : aspects ) {
5151
for ( final DiagramGenerationConfig.Format format : formats ) {
5252
final DiagramGenerationConfig config = DiagramGenerationConfigBuilder.builder().format( format ).build();
53-
new AspectModelDiagramGenerator( aspect, config ).generate( name -> getOutputStreamForFile( name, outputDirectory ) );
53+
new AspectModelDiagramGenerator( aspect, config )
54+
.generate( name -> getOutputStreamForFile( name, outputDirectory ) );
5455
}
5556
}
5657
} catch ( final DocumentGenerationException exception ) {
@@ -67,7 +68,7 @@ protected void validateParameters() throws MojoExecutionException {
6768

6869
for ( final String targetFormat : targetFormats ) {
6970
if ( Arrays.stream( DiagramGenerationConfig.Format.values() )
70-
.noneMatch( x -> x.toString().equals( targetFormat.toLowerCase() ) ) ) {
71+
.noneMatch( x -> x.toString().equals( targetFormat.toUpperCase() ) ) ) {
7172
throw new MojoExecutionException( "Invalid target format: " + targetFormat + ". Valid formats are "
7273
+ DiagramGenerationConfig.Format.allValues() + "." );
7374
}

‎tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateDocumentation.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class GenerateDocumentation extends AspectModelMojo {
3434
private static final Logger LOG = LoggerFactory.getLogger( GenerateDocumentation.class );
3535

3636
@Parameter
37-
private final String htmlCustomCssFilePath = "";
37+
private String htmlCustomCssFilePath = "";
3838

3939
@Override
4040
public void executeGeneration() throws MojoExecutionException {
@@ -48,7 +48,8 @@ public void executeGeneration() throws MojoExecutionException {
4848
final String css = FileUtils.readFileToString( new File( htmlCustomCssFilePath ), "UTF-8" );
4949
configBuilder.stylesheet( css );
5050
}
51-
new AspectModelDocumentationGenerator( model, configBuilder.build() ).generate();
51+
new AspectModelDocumentationGenerator( model, configBuilder.build() )
52+
.generate( artifact -> getOutputStreamForFile( artifact, outputDirectory ) );
5253
}
5354
} catch ( final IOException exception ) {
5455
throw new MojoExecutionException( "Could not load custom CSS file.", exception );

‎tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateJavaClasses.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import java.io.File;
1717
import java.nio.file.Path;
18+
import java.util.Optional;
1819
import java.util.Set;
1920

2021
import org.eclipse.esmf.aspectmodel.java.JavaCodeGenerationConfig;
@@ -41,24 +42,25 @@ public class GenerateJavaClasses extends CodeGenerationMojo {
4142

4243
@Override
4344
public void executeGeneration() throws MojoExecutionException {
44-
try {
45-
final Set<Aspect> aspects = loadAspects();
46-
for ( final Aspect aspect : aspects ) {
47-
final File templateLibFile = Path.of( templateFile ).toFile();
48-
validateParameters( templateLibFile );
45+
final Set<Aspect> aspects = loadAspects();
46+
for ( final Aspect aspect : aspects ) {
47+
final File templateLibFile = Path.of( templateFile ).toFile();
48+
validateParameters( templateLibFile );
49+
try {
4950
final JavaCodeGenerationConfig config = JavaCodeGenerationConfigBuilder.builder()
5051
.enableJacksonAnnotations( !disableJacksonAnnotations )
51-
.jsonTypeInfo( JavaCodeGenerationConfig.JsonTypeInfoType.valueOf( jsonTypeInfo.toUpperCase() ) )
52+
.jsonTypeInfo( JavaCodeGenerationConfig.JsonTypeInfoType.valueOf(
53+
Optional.ofNullable( jsonTypeInfo ).map( String::toUpperCase ).orElse( "DEDUCTION" ) ) )
5254
.packageName( determinePackageName( aspect ) )
5355
.executeLibraryMacros( executeLibraryMacros )
5456
.templateLibFile( templateLibFile )
5557
.namePrefix( namePrefix )
5658
.namePostfix( namePostfix )
5759
.build();
5860
new AspectModelJavaGenerator( aspect, config ).generate( nameMapper );
61+
} catch ( final Exception exception ) {
62+
throw new MojoExecutionException( "Could not generate Java classes for Aspect Models", exception );
5963
}
60-
} catch ( final Exception exception ) {
61-
throw new MojoExecutionException( "Could not generate Java classes for Aspect Models", exception );
6264
}
6365
LOG.info( "Successfully generated Java classes for Aspect Models." );
6466
}

‎tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateSql.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,22 @@ public class GenerateSql extends AspectModelMojo {
4646
private boolean includeColumnComments;
4747

4848
@Parameter( defaultValue = DatabricksSqlGenerationConfig.DEFAULT_TABLE_COMMAND_PREFIX )
49-
private final String tableCommandPrefix = DatabricksSqlGenerationConfig.DEFAULT_TABLE_COMMAND_PREFIX;
49+
private String tableCommandPrefix = DatabricksSqlGenerationConfig.DEFAULT_TABLE_COMMAND_PREFIX;
5050

5151
@Parameter( defaultValue = "" + DatabricksSqlGenerationConfig.DECIMAL_DEFAULT_PRECISION )
52-
private final int decimalPrecision = DatabricksSqlGenerationConfig.DECIMAL_DEFAULT_PRECISION;
52+
private int decimalPrecision = DatabricksSqlGenerationConfig.DECIMAL_DEFAULT_PRECISION;
5353

5454
@Parameter( defaultValue = "en" )
55-
private final String language = DatabricksSqlGenerationConfig.DEFAULT_COMMENT_LANGUAGE.getLanguage();
55+
private String language = DatabricksSqlGenerationConfig.DEFAULT_COMMENT_LANGUAGE.getLanguage();
5656

5757
@Parameter( defaultValue = "databricks" )
58-
private final String dialect = SqlGenerationConfig.Dialect.DATABRICKS.toString().toLowerCase();
58+
private String dialect = SqlGenerationConfig.Dialect.DATABRICKS.toString().toLowerCase();
5959

6060
@Parameter( defaultValue = "denormalized" )
61-
private final String strategy = SqlGenerationConfig.MappingStrategy.DENORMALIZED.toString().toLowerCase();
61+
private String strategy = SqlGenerationConfig.MappingStrategy.DENORMALIZED.toString().toLowerCase();
6262

6363
@Parameter( property = "column" )
64-
private final List<String> customColumns = List.of();
64+
private List<String> customColumns = List.of();
6565

6666
@Override
6767
public void executeGeneration() throws MojoExecutionException {

‎tools/esmf-aspect-model-maven-plugin/src/test/java/org/eclipse/esmf/aspectmodel/GenerateDiagramTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ public void testGenerateDiagramsInvalidTargetFormat() throws Exception {
3838
final Mojo generateDiagram = lookupMojo( "generateDiagram", testPom );
3939
assertThatCode( generateDiagram::execute )
4040
.isInstanceOf( MojoExecutionException.class )
41-
.hasMessage( "Invalid target format: jpg. Valid formats are png, svg." );
41+
.hasMessage( "Invalid target format: jpg. Valid formats are SVG, PNG." );
4242
}
4343
}

‎tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -754,17 +754,17 @@ void testAspectToJsonLdToFile() {
754754
.exists()
755755
.content()
756756
.contains( "\"@context\"" )
757-
.contains( "\"@graph\": [" )
758-
.contains( "\"xsd\": \"http://www.w3.org/2001/XMLSchema#\"," );
757+
.contains( "\"@graph\" : [" )
758+
.contains( "\"xsd\" : \"http://www.w3.org/2001/XMLSchema#\"," );
759759
}
760760

761761
@Test
762762
void testAspectToJsonLdStdout() {
763763
final ExecutionResult result = sammCli.runAndExpectSuccess( "--disable-color", "aspect", defaultInputFile, "to", "jsonld" );
764764
assertThat( result.stdout() )
765765
.contains( "\"@context\"" )
766-
.contains( "\"@graph\": [" )
767-
.contains( "\"xsd\": \"http://www.w3.org/2001/XMLSchema#\"," );
766+
.contains( "\"@graph\" : [" )
767+
.contains( "\"xsd\" : \"http://www.w3.org/2001/XMLSchema#\"," );
768768
assertThat( result.stderr() ).isEmpty();
769769
}
770770

@@ -774,8 +774,8 @@ void testAspectToJsonLdWithCustomResolver() {
774774
"--custom-resolver", resolverCommand() );
775775
assertThat( result.stdout() )
776776
.contains( "\"@context\"" )
777-
.contains( "\"@graph\": [" )
778-
.contains( "\"xsd\": \"http://www.w3.org/2001/XMLSchema#\"," );
777+
.contains( "\"@graph\" : [" )
778+
.contains( "\"xsd\" : \"http://www.w3.org/2001/XMLSchema#\"," );
779779
assertThat( result.stderr() ).isEmpty();
780780
}
781781

0 commit comments

Comments
 (0)