Minor cleanup

This commit is contained in:
Erik C. Thauvin 2023-07-06 20:30:46 -07:00
parent ca6efe2306
commit 79dbc093f4
4 changed files with 45 additions and 39 deletions

5
.idea/misc.xml generated
View file

@ -11,6 +11,11 @@
<pattern value="rife.bld.extension.GeneratedVersionOperationBuild" method="pmd" /> <pattern value="rife.bld.extension.GeneratedVersionOperationBuild" method="pmd" />
</component> </component>
<component name="PDMPlugin"> <component name="PDMPlugin">
<option name="customRuleSets">
<list>
<option value="K:\java\semver\config\pmd.xml" />
</list>
</option>
<option name="skipTestSources" value="false" /> <option name="skipTestSources" value="false" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">

View file

@ -25,7 +25,7 @@ public class GeneratedVersionOperationBuild extends Project {
autoDownloadPurge = true; autoDownloadPurge = true;
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
var rife2 = version(1,7,0); var rife2 = version(1, 7, 0);
scope(compile) scope(compile)
.include(dependency("com.uwyn.rife2", "rife2", rife2)) .include(dependency("com.uwyn.rife2", "rife2", rife2))
.include(dependency("com.uwyn.rife2", "bld", rife2)); .include(dependency("com.uwyn.rife2", "bld", rife2));

View file

@ -42,41 +42,6 @@ public class GeneratedVersion {
return classFile; return classFile;
} }
/**
* Returns the class name.
*/
public String getClassName() {
return className;
}
/**
* Returns the package name.
*/
public String getPackageName() {
return packageName;
}
/**
* Returns the project.
*/
public BaseProject getProject() {
return project;
}
/**
* Returns the project name.
*/
public String getProjectName() {
return projectName;
}
/**
* Returns the template.
*/
public File getTemplate() {
return template;
}
/** /**
* Sets the class file. * Sets the class file.
*/ */
@ -84,6 +49,13 @@ public class GeneratedVersion {
this.classFile = classFile; this.classFile = classFile;
} }
/**
* Returns the class name.
*/
public String getClassName() {
return className;
}
/** /**
* Sets the class name. * Sets the class name.
*/ */
@ -91,6 +63,13 @@ public class GeneratedVersion {
this.className = className; this.className = className;
} }
/**
* Returns the package name.
*/
public String getPackageName() {
return packageName;
}
/** /**
* Sets the package name. * Sets the package name.
*/ */
@ -98,6 +77,13 @@ public class GeneratedVersion {
this.packageName = packageName; this.packageName = packageName;
} }
/**
* Returns the project.
*/
public BaseProject getProject() {
return project;
}
/** /**
* Sets the project. * Sets the project.
*/ */
@ -105,6 +91,13 @@ public class GeneratedVersion {
this.project = project; this.project = project;
} }
/**
* Returns the project name.
*/
public String getProjectName() {
return projectName;
}
/** /**
* Sets the project name. * Sets the project name.
*/ */
@ -112,6 +105,13 @@ public class GeneratedVersion {
this.projectName = projectName; this.projectName = projectName;
} }
/**
* Returns the template.
*/
public File getTemplate() {
return template;
}
/** /**
* Sets the template file. * Sets the template file.
*/ */

View file

@ -60,7 +60,7 @@ public class GeneratedVersionOperation extends AbstractOperation<GeneratedVersio
if (gv.getTemplate() == null) { if (gv.getTemplate() == null) {
template = TemplateFactory.TXT.get("version.txt"); template = TemplateFactory.TXT.get("version.txt");
} else { } else {
var files = new ResourceFinderDirectories(new File[]{gv.getTemplate().getParentFile()}); var files = new ResourceFinderDirectories(gv.getTemplate().getParentFile());
template = new TemplateFactory(TemplateConfig.TXT, "txtFiles", TemplateFactory.TXT) template = new TemplateFactory(TemplateConfig.TXT, "txtFiles", TemplateFactory.TXT)
.setResourceFinder(files).get(gv.getTemplate().getName()); .setResourceFinder(files).get(gv.getTemplate().getName());
} }
@ -135,8 +135,9 @@ public class GeneratedVersionOperation extends AbstractOperation<GeneratedVersio
var updated = gv.getClassFile().exists(); var updated = gv.getClassFile().exists();
FileUtils.writeString(template.getContent(), gv.getClassFile()); FileUtils.writeString(template.getContent(), gv.getClassFile());
if (LOGGER.isLoggable(Level.INFO)) { if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.log(Level.INFO, "Generated version class has been {0}: {1}", LOGGER.log(Level.INFO, "Generated version class has been {0} to {1}: {2}",
new String[]{updated ? "updated" : "created", gv.getClassFile().toString()}); new String[]{updated ? "updated" : "created", gv.getProject().version().toString(),
gv.getClassFile().toString()});
} }
} catch (IOException e) { } catch (IOException e) {
if (LOGGER.isLoggable(Level.SEVERE)) { if (LOGGER.isLoggable(Level.SEVERE)) {