diff --git a/src/main/java/com/appland/appmap/AgentCommandLineLoader.java b/src/main/java/com/appland/appmap/AgentCommandLineLoader.java index 94f2648..7f844ad 100644 --- a/src/main/java/com/appland/appmap/AgentCommandLineLoader.java +++ b/src/main/java/com/appland/appmap/AgentCommandLineLoader.java @@ -16,16 +16,16 @@ import org.gradle.util.RelativePathUtil; /** - * This class is the actual responsible of building the JVM args to run the Appmap Agent. + * This class is the actual responsible of building the JVM args to run the AppMap Agent. */ public class AgentCommandLineLoader implements CommandLineArgumentProvider, Named { private static final Logger LOGGER = Logging.getLogger(CommandLineArgumentProvider.class); private static final List DEBUG_FLAGS = Arrays.asList("hooks", "locals", "http"); - private final AppmapPluginExtension appmap; + private final AppMapPluginExtension appmap; - public AgentCommandLineLoader(AppmapPluginExtension appmap) { + public AgentCommandLineLoader(AppMapPluginExtension appmap) { this.appmap = appmap; } @@ -55,7 +55,7 @@ public List getAsJvmArg() { + appmap.getConfigFile().get().getAsFile().getPath()); } if (appmap.shouldSkip()) { - LOGGER.warn("Appmap task was executed but but is disable, skip property set to " + appmap + LOGGER.warn("AppMap task was executed but but is disable, skip property set to " + appmap .shouldSkip()); return new ArrayList<>(); } else { diff --git a/src/main/java/com/appland/appmap/AppmapPlugin.java b/src/main/java/com/appland/appmap/AppMapPlugin.java similarity index 79% rename from src/main/java/com/appland/appmap/AppmapPlugin.java rename to src/main/java/com/appland/appmap/AppMapPlugin.java index 9a64e36..be9b4c3 100644 --- a/src/main/java/com/appland/appmap/AppmapPlugin.java +++ b/src/main/java/com/appland/appmap/AppMapPlugin.java @@ -12,7 +12,7 @@ /** * The actual plugin definition for appmap plugin. */ -public class AppmapPlugin implements Plugin { +public class AppMapPlugin implements Plugin { public static final String DEFAULT_AGENT_VERSION = "latest.release"; public static final String AGENT_CONFIGURATION_NAME = "appmapAgent"; @@ -27,28 +27,28 @@ public void apply(Project project) { final Configuration config = project.getConfigurations().getAt(AGENT_CONFIGURATION_NAME); config.setVisible(false); config.setTransitive(true); - config.setDescription("Appmap agent to generate app map data."); + config.setDescription("AppMap agent to generate app map data."); config.defaultDependencies(dependencies -> dependencies.add( project.getDependencies().create("com.appland:appmap-agent:" + DEFAULT_AGENT_VERSION) ) ); - AppmapPluginExtension extension = project.getExtensions() - .create(PLUGIN_EXTENSION_NAME, AppmapPluginExtension.class, project, config); + AppMapPluginExtension extension = project.getExtensions() + .create(PLUGIN_EXTENSION_NAME, AppMapPluginExtension.class, project, config); //extension.setAgentVersion(DEFAULT_AGENT_VERSION);*/ - addAppmapGradleTasks(extension); + addAppMapGradleTasks(extension); } private void registerAgentConfiguration() { Configuration agentConf = project.getConfigurations().create(AGENT_CONFIGURATION_NAME); agentConf.setVisible(false); agentConf.setTransitive(true); - agentConf.setDescription("Appmap agent to generate app map data."); + agentConf.setDescription("AppMap agent to generate app map data."); } - private void addAppmapGradleTasks(AppmapPluginExtension extension) { + private void addAppMapGradleTasks(AppMapPluginExtension extension) { project.getPlugins().withType(JavaPlugin.class, javaPlugin -> { - addAppmapTasks(extension); + addAppMapTasks(extension); }); } @@ -58,10 +58,10 @@ private void addAppmapGradleTasks(AppmapPluginExtension extension) { * * @param extension holds the config parameters for the plugin. */ - private void addAppmapTasks(AppmapPluginExtension extension) { + private void addAppMapTasks(AppMapPluginExtension extension) { project.getTasks().register( "appmap", - AppmapTask.class, + AppMapTask.class, prepareAgentTask -> { prepareAgentTask.doFirst( new ValidateConfigAction(extension.getConfigFile().getAsFile()) @@ -71,10 +71,10 @@ private void addAppmapTasks(AppmapPluginExtension extension) { ((ProjectInternal) project).getServices().get(FileSystemOperations.class), extension.getOutputDirectory().getAsFile()) ); - prepareAgentTask.doLast(new LoadAppmapAgentAction(project, extension)); + prepareAgentTask.doLast(new LoadAppMapAgentAction(project, extension)); prepareAgentTask.setGroup(LifecycleBasePlugin.BUILD_GROUP); prepareAgentTask.setDescription( - String.format("Attaches Appmap Agent to the Test task") + String.format("Attaches AppMap Agent to the Test task") ); }); @@ -86,7 +86,7 @@ private void addAppmapTasks(AppmapPluginExtension extension) { ); validateConfigTask.setGroup(LifecycleBasePlugin.BUILD_GROUP); validateConfigTask.setDescription( - String.format("Searches Appmap Agent config file and validates it") + String.format("Searches AppMap Agent config file and validates it") ); } ); diff --git a/src/main/java/com/appland/appmap/AppmapPluginExtension.java b/src/main/java/com/appland/appmap/AppMapPluginExtension.java similarity index 93% rename from src/main/java/com/appland/appmap/AppmapPluginExtension.java rename to src/main/java/com/appland/appmap/AppMapPluginExtension.java index e719f58..de7e29a 100644 --- a/src/main/java/com/appland/appmap/AppmapPluginExtension.java +++ b/src/main/java/com/appland/appmap/AppMapPluginExtension.java @@ -15,7 +15,7 @@ /** * This class holds the configuration parameters read from the target project gradle.build */ -public class AppmapPluginExtension { +public class AppMapPluginExtension { public static final String DEFAULT_OUTPUT_DIRECTORY = "build/appmap"; protected final Project project; @@ -32,12 +32,12 @@ public class AppmapPluginExtension { /** * Constructor method, receives the project, configuration and fork options, read and provide the - * rest of the configuration to the AppmapPlugin class. + * rest of the configuration to the AppMapPlugin class. * * @param project Actual project object representation. * @param agentConf Holdder of the project configuration. */ - public AppmapPluginExtension(Project project, Configuration agentConf) { + public AppMapPluginExtension(Project project, Configuration agentConf) { this.project = project; this.agentConf = agentConf; this.configFile = project.getObjects().fileProperty().fileValue(new File("appmap.yml")); @@ -45,7 +45,7 @@ public AppmapPluginExtension(Project project, Configuration agentConf) { .fileValue(new File(DEFAULT_OUTPUT_DIRECTORY)); this.debugFile = project.getObjects().fileProperty() .fileValue(new File("build/appmap/agent.log")); - logger.info("Appmap Plugin Initialized."); + logger.info("AppMap Plugin Initialized."); } public Configuration getAgentConf() { diff --git a/src/main/java/com/appland/appmap/AppmapTask.java b/src/main/java/com/appland/appmap/AppMapTask.java similarity index 79% rename from src/main/java/com/appland/appmap/AppmapTask.java rename to src/main/java/com/appland/appmap/AppMapTask.java index fb703f3..b4c86a7 100644 --- a/src/main/java/com/appland/appmap/AppmapTask.java +++ b/src/main/java/com/appland/appmap/AppMapTask.java @@ -5,6 +5,6 @@ /** * The actual task for adding gradle appmap to the build. */ -public class AppmapTask extends Test { +public class AppMapTask extends Test { } diff --git a/src/main/java/com/appland/appmap/CleanOutputDirectoryAction.java b/src/main/java/com/appland/appmap/CleanOutputDirectoryAction.java index 485c150..1defba5 100644 --- a/src/main/java/com/appland/appmap/CleanOutputDirectoryAction.java +++ b/src/main/java/com/appland/appmap/CleanOutputDirectoryAction.java @@ -27,7 +27,7 @@ public void execute(Task task) { throw new GradleException(" destination file must not be null if output type is FILE"); } if (fs.delete(spec -> spec.delete(outputDirectoryFile)).getDidWork()) { - task.getLogger().info("Appmap output directory cleared"); + task.getLogger().info("AppMap output directory cleared"); } else { task.getLogger().info("Output directory already cleared or is read only."); } diff --git a/src/main/java/com/appland/appmap/LoadAppmapAgentAction.java b/src/main/java/com/appland/appmap/LoadAppMapAgentAction.java similarity index 75% rename from src/main/java/com/appland/appmap/LoadAppmapAgentAction.java rename to src/main/java/com/appland/appmap/LoadAppMapAgentAction.java index de1b4d5..67ac794 100644 --- a/src/main/java/com/appland/appmap/LoadAppmapAgentAction.java +++ b/src/main/java/com/appland/appmap/LoadAppMapAgentAction.java @@ -11,14 +11,14 @@ /** * This action if called sets a JvmArgumentProvider to the "test" task of the build. */ -public class LoadAppmapAgentAction implements Action { +public class LoadAppMapAgentAction implements Action { - private static final Logger LOGGER = Logging.getLogger(LoadAppmapAgentAction.class); + private static final Logger LOGGER = Logging.getLogger(LoadAppMapAgentAction.class); private final Project project; - private final AppmapPluginExtension extension; + private final AppMapPluginExtension extension; - public LoadAppmapAgentAction(Project project, AppmapPluginExtension extension) { + public LoadAppMapAgentAction(Project project, AppMapPluginExtension extension) { this.project = project; this.extension = extension; } @@ -29,11 +29,11 @@ public void execute(Task task) { } private void applyTo(final T task) { - if (task instanceof AppmapTask) { + if (task instanceof AppMapTask) { return; } final String taskName = task.getName(); - LOGGER.lifecycle("Attaching Appmap Agent to task: " + taskName); + LOGGER.lifecycle("Attaching AppMap Agent to task: " + taskName); task.getJvmArgumentProviders().add(new AgentCommandLineLoader(extension)); } diff --git a/src/test/java/com/appland/appmap/AppmapPluginFunctionalTest.java b/src/test/java/com/appland/appmap/AppMapPluginFunctionalTest.java similarity index 97% rename from src/test/java/com/appland/appmap/AppmapPluginFunctionalTest.java rename to src/test/java/com/appland/appmap/AppMapPluginFunctionalTest.java index 61a50dc..d6cae26 100644 --- a/src/test/java/com/appland/appmap/AppmapPluginFunctionalTest.java +++ b/src/test/java/com/appland/appmap/AppMapPluginFunctionalTest.java @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -public class AppmapPluginFunctionalTest { +public class AppMapPluginFunctionalTest { @TempDir File testProjectDir; private File settingsFile; @@ -61,7 +61,7 @@ public void testValidateConfigGoalSucceed() throws IOException { } @Test - public void testAppmapGoalSucceed() throws IOException { + public void testAppMapGoalSucceed() throws IOException { writeFile(settingsFile, SETTINGS_GRADLE_CONTENT); writeFile(buildFile, BUILD_FILE_CONTENT); writeFile(appmapConfigFile, APPMAP_CONFIGFILE_CONTENT); diff --git a/src/test/java/com/appland/appmap/AppmapPluginTest.java b/src/test/java/com/appland/appmap/AppMapPluginTest.java similarity index 90% rename from src/test/java/com/appland/appmap/AppmapPluginTest.java rename to src/test/java/com/appland/appmap/AppMapPluginTest.java index 64db59a..1839ef1 100644 --- a/src/test/java/com/appland/appmap/AppmapPluginTest.java +++ b/src/test/java/com/appland/appmap/AppMapPluginTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; -public class AppmapPluginTest { +public class AppMapPluginTest { @Test public void test() { // Given