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

[MEJB-129] Refactor - extract method #3

Closed
wants to merge 2 commits into from
Closed

[MEJB-129] Refactor - extract method #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da7bd28
[MEJB-129] UT for missing cases
pzygielo Apr 12, 2020
1d63d1e
[MEJB-129] Refactor - extract method
pzygielo Apr 12, 2020
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
24 changes: 9 additions & 15 deletions src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java
View file
Open in desktop
Expand Up @@ -46,33 +46,27 @@ public IncludesExcludes( List<String> includes, List<String> excludes, List<Stri

public String[] resultingIncludes()
{
String[] result = new String[0];
if ( includes.isEmpty() )
{
result = defaultIncludes.toArray( new String[defaultIncludes.size()] );
}
else
{
result = includes.toArray( new String[includes.size()] );
}

return result;
return resultingXcludes( includes, defaultIncludes );
}

public String[] resultingExcludes()
{
return resultingXcludes( excludes, defaultExcludes );
}

private static String[] resultingXcludes( List<String> currentXcludes, List<String> defaultXcludes )
michael-o marked this conversation as resolved.
Show resolved Hide resolved
{
String[] result = new String[0];
if ( excludes.isEmpty() )
if ( currentXcludes.isEmpty() )
{
result = defaultExcludes.toArray( new String[defaultExcludes.size()] );
result = defaultXcludes.toArray( new String[defaultXcludes.size()] );
}
else
{
result = excludes.toArray( new String[excludes.size()] );
result = currentXcludes.toArray( new String[currentXcludes.size()] );
}

return result;

}

private List<String> makeNonNullList( List<String> in )
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
View file
Open in desktop
Expand Up @@ -79,4 +79,21 @@ public void nonNullForDefaultIncludesShouldResultInIncludesWithDefaultIncludes()
assertThat( ie.resultingExcludes() ).isEqualTo( new String[0] );
}

@Test
public void nonNullIncludesShouldResultInTheSameIncludes()
{
IncludesExcludes ie = new IncludesExcludes( Arrays.asList( "**/package.html" ), null,
Arrays.asList( "**/site.html" ), null );

assertThat( ie.resultingIncludes() ).isEqualTo( new String[] { "**/package.html" } );
}

@Test
public void nonNullExcludesShouldResultInTheSameExcludes()
{
IncludesExcludes ie = new IncludesExcludes( null, Arrays.asList( "**/package.html" ),
null, Arrays.asList( "**/site.html" ) );

assertThat( ie.resultingExcludes() ).isEqualTo( new String[] { "**/package.html" } );
}
}