Skip to content

Commit

Permalink
Merge pull request #110 from ppalaga/i104
Browse files Browse the repository at this point in the history
Issue #104 inlineHeader not working
  • Loading branch information
mathieucarbou authored Aug 18, 2016
2 parents b0156f8 + fd347b4 commit a1f4d64
Show file tree
Hide file tree
Showing 11 changed files with 268 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.mycila.maven.plugin.license.header.AdditionalHeaderDefinition;
import com.mycila.maven.plugin.license.header.Header;
import com.mycila.maven.plugin.license.header.HeaderDefinition;
import com.mycila.maven.plugin.license.header.HeaderSource;
import com.mycila.maven.plugin.license.header.HeaderType;
import com.mycila.maven.plugin.license.util.Selection;
import com.mycila.maven.plugin.license.util.resource.ResourceFinder;
Expand All @@ -43,6 +44,7 @@

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
Expand Down Expand Up @@ -307,7 +309,7 @@ public void checkUnknown() throws MojoExecutionException {
@SuppressWarnings({"unchecked"})
public final void execute(final Callback callback) throws MojoExecutionException, MojoFailureException {
if (!skip) {
if (header == null) {
if (header == null && (this.inlineHeader == null || this.inlineHeader.isEmpty())) {
warn("No header file specified to check for license");
return;
}
Expand All @@ -323,16 +325,18 @@ public final void execute(final Callback callback) throws MojoExecutionException
throw new MojoExecutionException(e.getMessage(), e);
}
finder.setPluginClassPath(getClass().getClassLoader());

final Header h = new Header(finder.findResource(this.header), encoding, headerSections, inlineHeader);
debug("Header %s:\n%s", h.isInline() ? "inline" : h.getLocation(), h);


final HeaderSource headerSource = HeaderSource.of(this.inlineHeader, this.header, this.encoding, this.finder);
final Header h = new Header(headerSource, headerSections);
debug("Header: %s", h.getLocation());

if (this.validHeaders == null) {
this.validHeaders = new String[0];
}
final List<Header> validHeaders = new ArrayList<Header>(this.validHeaders.length);
for (String validHeader : this.validHeaders) {
validHeaders.add(new Header(finder.findResource(validHeader), encoding, headerSections, inlineHeader));
final HeaderSource validHeaderSource = HeaderSource.of(null, validHeader, this.encoding, this.finder);
validHeaders.add(new Header(validHeaderSource, headerSections));
}

final List<PropertiesProvider> propertiesProviders = new LinkedList<PropertiesProvider>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void removeHeader() {

public boolean is(Header header) {
try {
return !header.isInline() && header.getLocation().sameFile(this.file.toURI().toURL());
return header.getLocation().isFromUrl(this.file.toURI().toURL());
} catch (Exception e) {
throw new IllegalStateException("Error comparing document " + this.file + " with file " + file + ". Cause: " + e.getMessage(), e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@
*/
package com.mycila.maven.plugin.license.header;

import com.mycila.maven.plugin.license.HeaderSection;
import com.mycila.maven.plugin.license.document.Document;
import com.mycila.maven.plugin.license.util.StringUtils;

import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;

import static com.mycila.maven.plugin.license.util.FileUtils.read;
import com.mycila.maven.plugin.license.HeaderSection;
import com.mycila.maven.plugin.license.document.Document;
import com.mycila.maven.plugin.license.util.StringUtils;

import static com.mycila.maven.plugin.license.util.FileUtils.readFirstLines;
import static com.mycila.maven.plugin.license.util.FileUtils.remove;

Expand All @@ -38,13 +36,12 @@
* @author Mathieu Carbou (mathieu.carbou@gmail.com)
*/
public final class Header {
private final URL location;
private final HeaderSource location;
private final String headerContent;
private final String headerContentOneLine;
private String[] lines;
private final HeaderSection[] sections;
private final int maxLength;
private final boolean inline;

/**
* Constructs a <code>Header</code> object pointing to a license template file. In case of the template contains
Expand All @@ -55,15 +52,11 @@ public final class Header {
* @throws IllegalArgumentException If the header file location is null or if an error occurred while reading the
* file content.
*/
public Header(URL location, String encoding, HeaderSection[] sections, String headerText) {
if (location == null && headerText == null) {
throw new IllegalArgumentException("Cannot read license template header file with a null location");
}
public Header(HeaderSource location, HeaderSection[] sections) {
this.location = location;
this.inline = location == null;
this.sections = sections;
try {
this.headerContent = location == null ? headerText : read(location, encoding);
this.headerContent = location.getContent();
lines = headerContent.replace("\r", "").split("\n");
headerContentOneLine = remove(headerContent, " ", "\t", "\r", "\n");
} catch (Exception e) {
Expand Down Expand Up @@ -101,15 +94,11 @@ public int getMaxLineLength() {
*
* @return The URL location.
*/
public URL getLocation() {
public HeaderSource getLocation() {
return location;
}

public boolean isInline() {
return inline;
}

public String eol(boolean unix) {
public String eol(boolean unix) {
return unix ? "\n" : "\r\n";
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
/**
* Copyright (C) 2008 Mycila (mathieu.carbou@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.mycila.maven.plugin.license.header;

import java.io.IOException;
import java.net.URL;

import com.mycila.maven.plugin.license.util.FileUtils;
import com.mycila.maven.plugin.license.util.resource.ResourceFinder;

/**
* Provides an access to the license template text.
*
* @author <a href="https://github.com/ppalaga">Peter Palaga</a>
*/
public abstract class HeaderSource {

/**
* A {@link HeaderSource} built from a lincense header template literal.
*/
public static class LiteralHeaderSource extends HeaderSource {
public LiteralHeaderSource(String content) {
super(content, true);
}

/**
* @return always {@code false} because this {@link LiteralHeaderSource} was not loaded from any {@link URL}
*/
@Override
public boolean isFromUrl(URL location) {
return false;
}

@Override
public String toString() {
return "inline: " + content;
}

}

/**
* A {@link HeaderSource} loaded from a {@link URL}.
*/
public static class UrlHeaderSource extends HeaderSource {
private final URL url;

public UrlHeaderSource(URL url, String encoding) throws IOException {
super(FileUtils.read(url, encoding), false);
this.url = url;
}

@Override
public boolean isFromUrl(URL location) {
return this.url.equals(location);
}

@Override
public String toString() {
return url + ": " + content;
}

}

public static HeaderSource of(String headerPath, String encoding, ResourceFinder finder) {
return of(null, encoding, finder);
}

/**
* Checking the params left to right, returns the first available {@link HeaderSource} that can be created. If
* {@code inlineHeader} is not {@code null} returns a new {@link LiteralHeaderSource}. Otherwise attempts to create a
* new {@link UrlHeaderSource} out of {@code headerPath} and {@code encoding}.
*
* @param inlineHeader the text of a lincense header template
* @param headerPath a path resolvable by the {@code finder}
* @param encoding the encoding to use when readinf {@code headerPath}
* @param finder the {@link ResourceFinder} to use to resolve {@code headerPath}
* @return a new {@link HeaderSource}
*/
public static HeaderSource of(String inlineHeader, String headerPath, String encoding, ResourceFinder finder) {
if (inlineHeader != null && !inlineHeader.isEmpty()) {
return new LiteralHeaderSource(inlineHeader);
} else if (headerPath == null) {
throw new IllegalArgumentException("Either inlineHeader or header path need to be specified");
} else {
try {
final URL headerUrl = finder.findResource(headerPath);
return new UrlHeaderSource(headerUrl, encoding);
} catch (Exception e) {
throw new IllegalArgumentException(
"Cannot read header document " + headerPath + ". Cause: " + e.getMessage(), e);
}
}
}

protected final String content;
private final boolean inline;

public HeaderSource(String content, boolean inline) {
super();
this.content = content;
this.inline = inline;
}

/**
* @return the text of the license template
*/
public String getContent() {
return content;
}

/**
* @return {@code true} if this {@link HeaderSource} was created from a string rather by loading the bits from an
* URL; {@code false} otherwise
*/
public boolean isInline() {
return inline;
}

/**
* Retuns {@code true} if this {@link HeaderSource} was loaded from the URL given in the {@code location} parameter
* or {@code false} otherwise.
*
* @param location
* the URL to tell if this {@link HeaderSource} was loaded from it
* @return {@code true} if this {@link HeaderSource} was loaded from the URL given in the {@code location} parameter
* or {@code false} otherwise
*/
public abstract boolean isFromUrl(URL location);

}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.junit.Test;

import com.mycila.maven.plugin.license.util.FileUtils;

import java.io.File;

/**
Expand Down Expand Up @@ -84,4 +86,17 @@ public void test_load_header_from_plugin_classpath() throws Exception {
check.execute();
}

@Test
public void test_inlineHeader() throws Exception {
MavenProjectStub project = new MavenProjectStub();
LicenseCheckMojo check = new LicenseCheckMojo();
check.basedir = new File("src/test/resources/check");
check.inlineHeader = FileUtils.read(new File("src/test/resources/check/header.txt"), "utf-8");
check.project = project;
check.failIfMissing = false;
check.strictCheck = true;
check.execute();
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,24 @@ public void test_update() throws Exception {
assertEquals(FileUtils.read(new File(tmp, "doc2.txt"), System.getProperty("file.encoding")), "====\r\n My @Copyright license 2 with my-custom-value and 2008 and doc2.txt\r\n====\r\n\r\nsome data\r\n");
}

@Test
public void test_update_inlineHeader() throws Exception {
File tmp = new File("target/test/update-inlineHeader");
tmp.mkdirs();
FileUtils.copyFileToFolder(new File("src/test/resources/update/doc1.txt"), tmp);
FileUtils.copyFileToFolder(new File("src/test/resources/update/doc2.txt"), tmp);

LicenseFormatMojo updater = new LicenseFormatMojo();
updater.basedir = tmp;
updater.inlineHeader = FileUtils.read(new File("src/test/resources/update/header.txt"), "utf-8");
updater.project = new MavenProjectStub();
updater.properties = ImmutableMap.of("year", "2008");
updater.execute();

assertEquals(FileUtils.read(new File(tmp, "doc1.txt"), System.getProperty("file.encoding")), "====\r\n My @Copyright license 2 with my-custom-value and 2008 and doc1.txt\r\n====\r\n\r\nsome data\r\n");
assertEquals(FileUtils.read(new File(tmp, "doc2.txt"), System.getProperty("file.encoding")), "====\r\n My @Copyright license 2 with my-custom-value and 2008 and doc2.txt\r\n====\r\n\r\nsome data\r\n");
}

@Test
public void test_skipExistingHeaders() throws Exception {
File tmp = new File("target/test/test_skipExistingHeaders");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
package com.mycila.maven.plugin.license.document;

import com.mycila.maven.plugin.license.header.Header;
import com.mycila.maven.plugin.license.header.HeaderSource.UrlHeaderSource;
import com.mycila.maven.plugin.license.util.FileUtils;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Properties;

Expand All @@ -42,9 +44,9 @@ public Properties load(Document d) {
};

@BeforeClass
public static void setup() throws MalformedURLException {
public static void setup() throws IOException {

header = new Header(new File("src/test/resources/test-header1.txt").toURI().toURL(), "UTF-8", null, null);
header = new Header(new UrlHeaderSource(new File("src/test/resources/test-header1.txt").toURI().toURL(), "UTF-8"), null);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package com.mycila.maven.plugin.license.header;

import com.mycila.maven.plugin.license.header.HeaderSource.UrlHeaderSource;
import com.mycila.maven.plugin.license.util.FileUtils;
import com.mycila.xmltool.XMLDoc;
import com.mycila.xmltool.XMLTag;
Expand Down Expand Up @@ -49,7 +50,7 @@ public void test_load_definitions() throws Exception {
assertEquals(loader.getDefinitions().get("xquery").getType(), "xquery");
assertNull(loader.getDefinitions().get("xquery").getSkipLinePattern());

Header header = new Header(getClass().getResource("/test-header1.txt"), "UTF-8", null, null);
Header header = new Header(new UrlHeaderSource(getClass().getResource("/test-header1.txt"), "UTF-8"), null);

//FileUtils.write(new File("src/test/resources/test-header3.txt"), header.buildForDefinition(loader.getDefinitions().get("xquery")));

Expand All @@ -74,7 +75,7 @@ public void test_load_definitions2() throws Exception {

AdditionalHeaderDefinition loader = new AdditionalHeaderDefinition(def);

Header header = new Header(getClass().getResource("/check/header.txt"), "UTF-8", null, null);
Header header = new Header(new UrlHeaderSource(getClass().getResource("/check/header.txt"), "UTF-8"), null);

System.out.println(header.buildForDefinition(loader.getDefinitions().get("text"), false));
}
Expand All @@ -93,7 +94,7 @@ public void test_advanced_definitions() throws Exception {

AdditionalHeaderDefinition loader = new AdditionalHeaderDefinition(def);

Header header = new Header(getClass().getResource("/test-header1.txt"), "UTF-8", null, null);
Header header = new Header(new UrlHeaderSource(getClass().getResource("/test-header1.txt"), "UTF-8"), null);

//FileUtils.write(new File("src/test/resources/test-header4.txt"), header.buildForDefinition(loader.getDefinitions().get("csregion"), false), System.getProperty("file.encoding"));

Expand Down
Loading

0 comments on commit a1f4d64

Please sign in to comment.