Skip to content

Commit

Permalink
maven plugin support adjustements
Browse files Browse the repository at this point in the history
  • Loading branch information
@cecom
cecom committed Feb 22, 2018
1 parent ac9bf59 commit 1278171
Show file tree
Hide file tree
Showing 4 changed files with 264 additions and 259 deletions.
306 changes: 153 additions & 153 deletions commandline/src/main/java/com/geewhiz/pacify/commandline/PacifyViaCommandline.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,157 +53,157 @@

public class PacifyViaCommandline {

public static void main(String... args) {
System.err.println("PACIFy Version: " + Utils.getJarVersion());

int resultValue = new PacifyViaCommandline().mainInternal(args);

System.exit(resultValue);
}

private Logger logger = LogManager.getLogger(PacifyViaCommandline.class.getName());

/**
* without system.exit(). If you call it from your java app.
*
* @param args
* commandline params.
* @return
*/
public int mainInternal(String[] args) {
int resultValue = execute(args);
logger.debug("Exiting with exit code " + resultValue);
return resultValue;
}

private int execute(String[] args) {
MainCommand mainCommand = new MainCommand();
ReplacerCommand replacerCommand = new ReplacerCommand();
CreatePropertyFileCommand createPropertyFileCommand = new CreatePropertyFileCommand();
ValidateCommand validateCommand = new ValidateCommand();
ValidateMarkerFilesCommand validateMarkerFilesCommand = new ValidateMarkerFilesCommand();
ShowUsedPropertiesCommand showUsedPropertiesCommand = new ShowUsedPropertiesCommand();
PreConfigureCommand preConfigureCommand = new PreConfigureCommand();

JCommander jc = new JCommander(mainCommand);
jc.addCommand("replace", replacerCommand);
jc.addCommand("createPropertyFile", createPropertyFileCommand);
jc.addCommand("validate", validateCommand);
jc.addCommand("validateMarkerFiles", validateMarkerFilesCommand);
jc.addCommand("showUsedProperties", showUsedPropertiesCommand);
jc.addCommand("preConfigure", preConfigureCommand);

try {
jc.parse(args);
} catch (ParameterException e) {
System.err.println(e.getMessage());
return 1;
}

if (mainCommand.isDebug()) {
LoggingUtils.setLogLevel(logger, Level.DEBUG);
} else if (mainCommand.isInfo()) {
LoggingUtils.setLogLevel(logger, Level.INFO);
} else {
LoggingUtils.setLogLevel(logger, Level.ERROR);
}

try {
if ("replace".equals(jc.getParsedCommand())) {
return executeReplacer(replacerCommand);
} else if ("createPropertyFile".equals(jc.getParsedCommand())) {
return executeCreatePropertyFile(createPropertyFileCommand);
} else if ("validate".equals(jc.getParsedCommand())) {
return executeValidate(validateCommand);
} else if ("validateMarkerFiles".equals(jc.getParsedCommand())) {
return executeValidateMarkerFiles(validateMarkerFilesCommand);
} else if ("showUsedProperties".equals(jc.getParsedCommand())) {
return executeShowUsedProperties(showUsedPropertiesCommand);
} else if ("preConfigure".equals(jc.getParsedCommand())) {
return executePreConfigure(preConfigureCommand);
} else {
jc.usage();
if (mainCommand.isHelp()) {
return 0;
}
}
} catch (DefectRuntimeException de) {
logger.debug("We got a DefectException.", de);
return 1;
} catch (Exception e) {
logger.error("We got an Exception.", e);
return 1;
}
return 1;
}

private int executeValidateMarkerFiles(ValidateMarkerFilesCommand validateMarkerFilesCommand) {
Validator validator = new Validator(null);
validateMarkerFilesCommand.configure(validator);
validator.execute();

return 0;
}

private int executeValidate(ValidateCommand validateCommand) {
Injector injector = getInjector(validateCommand);

Validator validator = injector.getInstance(Validator.class);
validateCommand.configure(validator);
validator.execute();

return 0;
}

private int executeCreatePropertyFile(CreatePropertyFileCommand createPropertyFileCommand) {
Injector injector = getInjector(createPropertyFileCommand);

CreatePropertyFile createPropertyFile = injector.getInstance(CreatePropertyFile.class);
createPropertyFileCommand.configure(createPropertyFile);
createPropertyFile.write();

return 0;
}

private int executeReplacer(ReplacerCommand replacerCommand) {
Injector injector = getInjector(replacerCommand);

Replacer replacer = injector.getInstance(Replacer.class);
replacerCommand.configure(replacer);
replacer.execute();

return 0;
}

private int executeShowUsedProperties(ShowUsedPropertiesCommand showUsedPropertiesCommand) {
ShowUsedProperties showUsedProperties = new ShowUsedProperties();
showUsedPropertiesCommand.configure(showUsedProperties);
showUsedProperties.execute();

return 0;
}

private int executePreConfigure(PreConfigureCommand preConfigureCommand) {
Injector injector = getInjector(preConfigureCommand);

PreConfigure preConfigure = injector.getInstance(PreConfigure.class);
preConfigureCommand.configure(preConfigure);
preConfigure.execute();

return 0;
}

private Injector getInjector(BasePropertyResolverCommand command) {
List<PropertyResolverModule> propertyResolverModules = command.getPropertyResolverModules();

LinkedHashSet<Defect> defects = new LinkedHashSet<Defect>();
for (PropertyResolverModule propertyResolverModule : propertyResolverModules) {
defects.addAll(propertyResolverModule.getDefects());
}

DefectUtils.abortIfDefectExists(defects);

Injector injector = Guice.createInjector(propertyResolverModules);
return injector;
}
public static void main(String... args) {
System.err.println("PACIFy Version: " + Utils.getJarVersion());

int resultValue = new PacifyViaCommandline().mainInternal(args);

System.exit(resultValue);
}

private Logger logger = LogManager.getLogger(PacifyViaCommandline.class.getName());

/**
* without system.exit(). If you call it from your java app.
*
* @param args
* commandline params.
* @return
*/
public int mainInternal(String[] args) {
int resultValue = execute(args);
logger.debug("Exiting with exit code " + resultValue);
return resultValue;
}

private int execute(String[] args) {
MainCommand mainCommand = new MainCommand();
ReplacerCommand replacerCommand = new ReplacerCommand();
CreatePropertyFileCommand createPropertyFileCommand = new CreatePropertyFileCommand();
ValidateCommand validateCommand = new ValidateCommand();
ValidateMarkerFilesCommand validateMarkerFilesCommand = new ValidateMarkerFilesCommand();
ShowUsedPropertiesCommand showUsedPropertiesCommand = new ShowUsedPropertiesCommand();
PreConfigureCommand preConfigureCommand = new PreConfigureCommand();

JCommander jc = new JCommander(mainCommand);
jc.addCommand("replace", replacerCommand);
jc.addCommand("createPropertyFile", createPropertyFileCommand);
jc.addCommand("validate", validateCommand);
jc.addCommand("validateMarkerFiles", validateMarkerFilesCommand);
jc.addCommand("showUsedProperties", showUsedPropertiesCommand);
jc.addCommand("preConfigure", preConfigureCommand);

try {
jc.parse(args);
} catch (ParameterException e) {
System.err.println(e.getMessage());
return 1;
}

if (mainCommand.isDebug()) {
LoggingUtils.setLogLevel(logger, Level.DEBUG);
} else if (mainCommand.isInfo()) {
LoggingUtils.setLogLevel(logger, Level.INFO);
} else {
LoggingUtils.setLogLevel(logger, Level.ERROR);
}

try {
if ("replace".equals(jc.getParsedCommand())) {
return executeReplacer(replacerCommand);
} else if ("createPropertyFile".equals(jc.getParsedCommand())) {
return executeCreatePropertyFile(createPropertyFileCommand);
} else if ("validate".equals(jc.getParsedCommand())) {
return executeValidate(validateCommand);
} else if ("validateMarkerFiles".equals(jc.getParsedCommand())) {
return executeValidateMarkerFiles(validateMarkerFilesCommand);
} else if ("showUsedProperties".equals(jc.getParsedCommand())) {
return executeShowUsedProperties(showUsedPropertiesCommand);
} else if ("preConfigure".equals(jc.getParsedCommand())) {
return executePreConfigure(preConfigureCommand);
} else {
jc.usage();
if (mainCommand.isHelp()) {
return 0;
}
}
} catch (DefectRuntimeException de) {
logger.debug("We got a DefectException.", de);
return 1;
} catch (Exception e) {
logger.error("We got an Exception.", e);
return 1;
}
return 1;
}

private int executeValidateMarkerFiles(ValidateMarkerFilesCommand validateMarkerFilesCommand) {
Validator validator = new Validator();
validateMarkerFilesCommand.configure(validator);
validator.execute();

return 0;
}

private int executeValidate(ValidateCommand validateCommand) {
Injector injector = getInjector(validateCommand);

Validator validator = injector.getInstance(Validator.class);
validateCommand.configure(validator);
validator.execute();

return 0;
}

private int executeCreatePropertyFile(CreatePropertyFileCommand createPropertyFileCommand) {
Injector injector = getInjector(createPropertyFileCommand);

CreatePropertyFile createPropertyFile = injector.getInstance(CreatePropertyFile.class);
createPropertyFileCommand.configure(createPropertyFile);
createPropertyFile.write();

return 0;
}

private int executeReplacer(ReplacerCommand replacerCommand) {
Injector injector = getInjector(replacerCommand);

Replacer replacer = injector.getInstance(Replacer.class);
replacerCommand.configure(replacer);
replacer.execute();

return 0;
}

private int executeShowUsedProperties(ShowUsedPropertiesCommand showUsedPropertiesCommand) {
ShowUsedProperties showUsedProperties = new ShowUsedProperties();
showUsedPropertiesCommand.configure(showUsedProperties);
showUsedProperties.execute();

return 0;
}

private int executePreConfigure(PreConfigureCommand preConfigureCommand) {
Injector injector = getInjector(preConfigureCommand);

PreConfigure preConfigure = injector.getInstance(PreConfigure.class);
preConfigureCommand.configure(preConfigure);
preConfigure.execute();

return 0;
}

private Injector getInjector(BasePropertyResolverCommand command) {
List<PropertyResolverModule> propertyResolverModules = command.getPropertyResolverModules();

LinkedHashSet<Defect> defects = new LinkedHashSet<Defect>();
for (PropertyResolverModule propertyResolverModule : propertyResolverModules) {
defects.addAll(propertyResolverModule.getDefects());
}

DefectUtils.abortIfDefectExists(defects);

Injector injector = Guice.createInjector(propertyResolverModules);
return injector;
}
}
6 changes: 3 additions & 3 deletions common/src/main/java/com/geewhiz/pacify/utils/FileUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static void setPosixPermissions(Set<PosixFilePermission> permissions, Fil
if (!IS_POSIX) {
return;
}

try {
Files.setPosixFilePermissions(Paths.get(forFile.toURI()), permissions);
} catch (IOException e) {
Expand Down Expand Up @@ -140,9 +140,9 @@ public static Boolean matches(Path relativePath, String regEx) {

public static void copyDirectory(File sourceDir, File targetDir) throws IOException {
if (sourceDir.isDirectory()) {
copyDirectoryRecursively(sourceDir, targetDir);
copyDirectoryRecursively(sourceDir.getAbsoluteFile(), targetDir.getAbsoluteFile());
} else {
Files.copy(sourceDir.toPath(), targetDir.toPath(), java.nio.file.StandardCopyOption.COPY_ATTRIBUTES);
Files.copy(sourceDir.getAbsoluteFile().toPath(), targetDir.getAbsoluteFile().toPath(), java.nio.file.StandardCopyOption.COPY_ATTRIBUTES);
}
}

Expand Down
4 changes: 3 additions & 1 deletion impl/src/main/java/com/geewhiz/pacify/Replacer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ private File createCopy() throws DefectException {
throw new DefectMessage(
"Destination directory [" + getCopyDestination().getAbsolutePath() + "] is not writable.");
}
} else {
getCopyDestination().mkdirs();
}

FileUtils.copyDirectory(getPackagePath(), getCopyDestination());
return getCopyDestination();
} catch (IOException e) {
Expand Down
Loading

0 comments on commit 1278171

Please sign in to comment.