SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Regenerate wiki if necessary

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-11-18 11:57:56 +01:00
parent 9d2d2a3a63
commit a98207e100
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/template/ReleaseNotesTemplateGenerator.java
View File

@@ -1,24 +1,20 @@
package org.springframework.cloud.release.internal.template;
import com.github.jknack.handlebars.Template;
import com.google.common.collect.ImmutableMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import com.github.jknack.handlebars.Template;
import com.google.common.collect.ImmutableMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.release.internal.git.ProjectGitHandler;
import org.springframework.cloud.release.internal.pom.Projects;
import org.springframework.util.StringUtils;
/**
* @author Marcin Grzejszczak
@@ -46,9 +42,9 @@ class ReleaseNotesTemplateGenerator {
File releaseNotes() {
File cached = CACHE.get(this.releaseVersion);
if (cached != null) {
if (cached != null && fileSize(cached) > 0) {
log.info("Found an existing entry [{}] in the cache "
+ "for version [{}]", cached, this.releaseVersion);
+ "for version [{}] with size [{}]", cached, this.releaseVersion, fileSize(cached));
return cached;
}
try {
@@ -68,4 +64,18 @@ class ReleaseNotesTemplateGenerator {
return null;
}
}
private int fileSize(File cached) {
try {
int length = Files.readAllBytes(cached.toPath()).length;
if (length == 0) {
log.warn("Cached file has no contents!");
}
return length;
}
catch (IOException e) {
log.warn("Exception [" + e + "] occurred while trying to retrieve file length - will assume it's empty");
return 0;
}
}
}

4
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/template/ReleaseNotesTemplateGeneratorTests.java
View File

@@ -7,8 +7,6 @@ import org.assertj.core.api.BDDAssertions;
import org.junit.Test;
import org.mockito.BDDMockito;
import static org.junit.Assert.*;
/**
* @author Marcin Grzejszczak
*/
@@ -19,7 +17,7 @@ public class ReleaseNotesTemplateGeneratorTests {
Template template = BDDMockito.mock(Template.class);
ReleaseNotesTemplateGenerator generator =
new ReleaseNotesTemplateGenerator(template, "Foo.RELEASE", null, null, null);
ReleaseNotesTemplateGenerator.CACHE.put("Foo.RELEASE", new File("."));
ReleaseNotesTemplateGenerator.CACHE.put("Foo.RELEASE", new File("pom.xml"));
BDDAssertions.then(generator.releaseNotes()).isNotNull();