From fff55f85eace3796ecab9c85a80abc0595a952fd Mon Sep 17 00:00:00 2001 From: imod Date: Sun, 25 Mar 2012 18:57:46 +0200 Subject: [PATCH] refactor interaction with config-file-provider plugin to make dependency optional --- .../java/hudson/maven/MavenModuleSet.java | 30 +---- .../hudson/maven/MavenModuleSetBuild.java | 8 +- .../java/hudson/maven/RedeployPublisher.java | 15 +-- .../settings/GlobalMavenSettingsProvider.java | 24 ---- .../maven/settings/MavenSettingsProvider.java | 32 ----- .../maven/settings/SettingsProviderUtils.java | 125 ++++++------------ 6 files changed, 58 insertions(+), 176 deletions(-) delete mode 100644 maven-plugin/src/main/java/hudson/maven/settings/GlobalMavenSettingsProvider.java delete mode 100644 maven-plugin/src/main/java/hudson/maven/settings/MavenSettingsProvider.java diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 95dbbdc96f..c46eaa72aa 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -37,6 +37,7 @@ import hudson.Util; import hudson.maven.local_repo.DefaultLocalRepositoryLocator; import hudson.maven.local_repo.LocalRepositoryLocator; import hudson.maven.local_repo.PerJobLocalRepositoryLocator; +import hudson.maven.settings.SettingConfig; import hudson.maven.settings.SettingsProviderUtils; import hudson.model.AbstractProject; import hudson.model.Action; @@ -96,8 +97,6 @@ import net.sf.json.JSONObject; import org.apache.commons.lang.math.NumberUtils; import org.apache.maven.model.building.ModelBuildingRequest; -import org.jenkinsci.lib.configprovider.ConfigProvider; -import org.jenkinsci.lib.configprovider.model.Config; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.QueryParameter; @@ -117,7 +116,6 @@ import org.kohsuke.stapler.export.Exported; */ public class MavenModuleSet extends AbstractMavenProject implements TopLevelItem, ItemGroup, SCMedItem, Saveable, BuildableItemWithBuildWrappers { - /** * All {@link MavenModule}s, keyed by their {@link MavenModule#getModuleName()} module name}s. */ @@ -944,34 +942,16 @@ public class MavenModuleSet extends AbstractMavenProject getAllMavenSettingsConfigs() { - List mavenSettingsConfigs = new ArrayList(); - ExtensionList configProviders = ConfigProvider.all(); - if (configProviders != null && configProviders.size() > 0) { - for (ConfigProvider configProvider : configProviders) { - if (SettingsProviderUtils.isMavenSettingsProvider( configProvider )){ - mavenSettingsConfigs.addAll( configProvider.getAllConfigs() ); - } - } - } - return mavenSettingsConfigs; + public List getAllMavenSettingsConfigs() { + return SettingsProviderUtils.getAllMavenSettingsConfigs(); } /** * @since 1.426 * @return */ - public List getAllGlobalMavenSettingsConfigs() { - List globalMavenSettingsConfigs = new ArrayList(); - ExtensionList configProviders = ConfigProvider.all(); - if (configProviders != null && configProviders.size() > 0) { - for (ConfigProvider configProvider : configProviders) { - if (SettingsProviderUtils.isGlobalMavenSettingsProvider( configProvider )){ - globalMavenSettingsConfigs.addAll( configProvider.getAllConfigs() ); - } - } - } - return globalMavenSettingsConfigs; + public List getAllGlobalMavenSettingsConfigs() { + return SettingsProviderUtils.getAllGlobalMavenSettingsConfigs(); } /** diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 5988574a2f..08604ca29b 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -34,8 +34,7 @@ import hudson.maven.MavenBuild.ProxyImpl2; import hudson.maven.reporters.MavenAggregatedArtifactRecord; import hudson.maven.reporters.MavenFingerprinter; import hudson.maven.reporters.MavenMailer; -import hudson.maven.settings.GlobalMavenSettingsProvider; -import hudson.maven.settings.MavenSettingsProvider; +import hudson.maven.settings.SettingConfig; import hudson.maven.settings.SettingsProviderUtils; import hudson.model.AbstractProject; import hudson.model.Action; @@ -92,7 +91,6 @@ import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.util.PathTool; -import org.jenkinsci.lib.configprovider.model.Config; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; @@ -624,7 +622,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild... types) { - ExtensionList configProviders = ConfigProvider.all(); - if (configProviders != null && configProviders.size() > 0) { - for (ConfigProvider configProvider : configProviders) { - for (Class type : types) { - - if (type.isAssignableFrom(configProvider.getClass())) { - if (configProvider.isResponsibleFor(settingsConfigId)) { - return configProvider.getConfigById(settingsConfigId); - } - } + private static ConfigProviderFacade configProvider = new ConfigProviderDelegate(); - } - } - } - return null; - } + private SettingsProviderUtils() { + } - /** - * - * @param config - * @param workspace - */ - public static FilePath copyConfigContentToFilePath(Config config, FilePath workspace) throws IOException, InterruptedException { - return workspace.createTextTempFile("config", ".tmp", config.content, false); - } + /** + * @since 1.426 + * @return + */ + public static List getAllMavenSettingsConfigs() { + return configProvider.getAllMavenSettingsConfigs(); + } - /** - * - * @return a temp file which must be deleted after use - */ - public static File copyConfigContentToFile(Config config) throws IOException { + /** + * @since 1.426 + * @return + */ + public static List getAllGlobalMavenSettingsConfigs() { + return configProvider.getAllGlobalMavenSettingsConfigs(); + } - File tmpContentFile = File.createTempFile("config", "tmp"); - FileUtils.writeStringToFile(tmpContentFile, config.content); - return tmpContentFile; - } + /** + * utility method to retrieve Config of type (MavenSettingsProvider etc..) + * + * @param settingsConfigId + * @param type + * @return SettingConfig + */ + public static SettingConfig findSettings(String settingsConfigId) { + return configProvider.findConfig(settingsConfigId); + } - /** - * tells whether a config file provider serves global settings configs - * - * @param configProvider - * the provider to check - * @return true if it implements one of the supported - * interfaces - */ - public static boolean isGlobalMavenSettingsProvider(ConfigProvider configProvider) { - // first prio to old implementation - if (configProvider instanceof GlobalMavenSettingsProvider) { - return true; - } - // second prio to new impl, only if the plugin is installed - if (org.jenkinsci.lib.configprovider.maven.GlobalMavenSettingsProvider.class.isAssignableFrom(configProvider.getClass())) { - return true; - } - return false; - } + /** + * + * @param config + * @param workspace + */ + public static FilePath copyConfigContentToFilePath(SettingConfig config, FilePath workspace) throws IOException, InterruptedException { + return workspace.createTextTempFile("config", ".tmp", config.content, false); + } - /** - * tells whether a config file provider serves settings configs - * - * @param configProvider - * the provider to check - * @return true if it implements one of the supported - * interfaces - */ - public static boolean isMavenSettingsProvider(ConfigProvider configProvider) { - // first prio to old implementation - if (configProvider instanceof MavenSettingsProvider) { - return true; - } - // second prio to new impl, only if the plugin is installed - if (org.jenkinsci.lib.configprovider.maven.MavenSettingsProvider.class.isAssignableFrom(configProvider.getClass())) { - return true; - } - return false; - } + /** + * @return a temp file which must be deleted after use + */ + public static File copyConfigContentToFile(SettingConfig config) throws IOException { + File tmpContentFile = File.createTempFile("config", "tmp"); + FileUtils.writeStringToFile(tmpContentFile, config.content); + return tmpContentFile; + } }