diff --git a/src/main/java/hudson/plugins/global_build_stats/FieldFilter.java b/src/main/java/hudson/plugins/global_build_stats/FieldFilter.java index 693355e..f65071c 100644 --- a/src/main/java/hudson/plugins/global_build_stats/FieldFilter.java +++ b/src/main/java/hudson/plugins/global_build_stats/FieldFilter.java @@ -1,14 +1,13 @@ package hudson.plugins.global_build_stats; - public interface FieldFilter { boolean isFieldValueValid(String fieldValue); - public static final FieldFilter ALL = new FieldFilter() { + @Override public boolean isFieldValueValid(String fieldValue) { return true; } }; -} +} \ No newline at end of file diff --git a/src/main/java/hudson/plugins/global_build_stats/GlobalBuildStatsPlugin.java b/src/main/java/hudson/plugins/global_build_stats/GlobalBuildStatsPlugin.java index 711e4ec..67d9076 100644 --- a/src/main/java/hudson/plugins/global_build_stats/GlobalBuildStatsPlugin.java +++ b/src/main/java/hudson/plugins/global_build_stats/GlobalBuildStatsPlugin.java @@ -11,7 +11,7 @@ import hudson.model.listeners.RunListener; import hudson.plugins.global_build_stats.business.GlobalBuildStatsBusiness; import hudson.plugins.global_build_stats.model.*; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import hudson.plugins.global_build_stats.validation.GlobalBuildStatsValidator; import hudson.security.Permission; import hudson.util.ChartUtil; @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; import javax.servlet.ServletException; @@ -45,8 +44,6 @@ @ExportedBean public class GlobalBuildStatsPlugin extends Plugin { - private static final Logger LOGGER = Logger.getLogger(GlobalBuildStatsPlugin.class.getName()); - /** * List of aggregated job build results * This list will grow over time, but will be monthly sharded in different files to keep @@ -60,7 +57,7 @@ public class GlobalBuildStatsPlugin extends Plugin { * @deprecated Use jobBuildResultsSharder instead of jobBuildResults (since v8 file format) */ @Deprecated - transient private List jobBuildResults = new ArrayList(); + private transient List jobBuildResults = new ArrayList(); /** * List of persisted build statistics configurations used on the @@ -71,17 +68,17 @@ public class GlobalBuildStatsPlugin extends Plugin { /** * List of retention strategies applied on job results */ - private List retentionStrategies = new ArrayList(); + private List retentionStrategies = new ArrayList(); /** * Business layer for global build stats */ - transient private final GlobalBuildStatsBusiness business = new GlobalBuildStatsBusiness(this); + private transient final GlobalBuildStatsBusiness business = new GlobalBuildStatsBusiness(this); /** * Validator layer for global build stats */ - transient private final GlobalBuildStatsValidator validator = new GlobalBuildStatsValidator(); + private transient final GlobalBuildStatsValidator validator = new GlobalBuildStatsValidator(); /** * Expose {@link GlobalBuildStatsPlugin} to the remote API : @@ -95,6 +92,7 @@ public Api getApi() { /** * Highered visibility of load method */ + @Override public void load() throws IOException { super.load(); } @@ -127,7 +125,7 @@ public void doPython(StaplerRequest req, StaplerResponse rsp) } } - private boolean exposeChartData(StaplerRequest req, StaplerResponse rsp, Flavor flavor) throws ServletException, IOException{ + private static boolean exposeChartData(StaplerRequest req, StaplerResponse rsp, Flavor flavor) throws ServletException, IOException{ boolean chartDataHasBeenExposed = false; String buildStatConfigId = req.getParameter("buildStatConfigId"); if(buildStatConfigId != null){ @@ -164,14 +162,17 @@ public void onLoaded() { @Extension public static class GlobalBuildStatsManagementLink extends ManagementLink { + @Override public String getIconFileName() { return "/plugin/global-build-stats/icons/global-build-stats.png"; } + @Override public String getDisplayName() { return Messages.Global_Builds_Stats(); } + @Override public String getUrlName() { return "plugin/global-build-stats/"; } @@ -273,6 +274,7 @@ public HttpResponse doRecordBuildInfos() throws IOException { business.recordBuildInfos(); return new HttpResponse() { + @Override public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException { } @@ -304,7 +306,7 @@ public void doCreateChartMap(StaplerRequest req, StaplerResponse res) throws Ser Hudson.getInstance().checkPermission(getRequiredPermission()); String buildStatId = req.getParameter("buildStatId"); - BuildStatConfiguration config = null; + BuildStatConfiguration config; if(buildStatId != null){ config = business.searchBuildStatConfigById(buildStatId); } else { @@ -331,7 +333,7 @@ public void doBuildHistory(StaplerRequest req, StaplerResponse res) throws Servl public void doUpdateBuildStatConfiguration(StaplerRequest req, StaplerResponse res) throws ServletException, IOException { Hudson.getInstance().checkPermission(getRequiredPermission()); - boolean regenerateId = Boolean.valueOf(req.getParameter("regenerateId")).booleanValue(); + boolean regenerateId = Boolean.parseBoolean(req.getParameter("regenerateId")); BuildStatConfiguration config = FromRequestObjectFactory.createBuildStatConfiguration(req.getParameter("buildStatId"), req); business.updateBuildStatConfiguration(req.getParameter("buildStatId"), config, regenerateId); @@ -377,10 +379,10 @@ public void doMoveDownConf(StaplerRequest req, StaplerResponse res) throws Servl public void doUpdateRetentionStrategies(StaplerRequest req, StaplerResponse res) throws ServletException, IOException { Hudson.getInstance().checkPermission(getRequiredPermission()); - List selectedStrategies = new ArrayList(); + List selectedStrategies = new ArrayList(); if(req.getParameterValues("retentionStrategies") != null){ for(String selectedStrategyId : req.getParameterValues("retentionStrategies")){ - RetentionStragegy retentionStrategy = RetentionStragegy.valueOf(selectedStrategyId); + RetentionStrategy retentionStrategy = RetentionStrategy.valueOf(selectedStrategyId); retentionStrategy.updateState(req.getParameterMap()); selectedStrategies.add(retentionStrategy); } @@ -459,19 +461,19 @@ public void reloadJobBuildResults(List results) { this.jobBuildResultsSharder = new JobBuildResultSharder(this.jobBuildResultsSharder, results); } - public List getAvailableRetentionStrategies(){ - return RetentionStragegy.values(); + public List getAvailableRetentionStrategies(){ + return RetentionStrategy.values(); } public boolean isStrategySelected(String strategyId){ - return retentionStrategies.contains(RetentionStragegy.valueOf(strategyId)); + return retentionStrategies.contains(RetentionStrategy.valueOf(strategyId)); } - public void setRetentionStrategies(List retentionStrategies) { + public void setRetentionStrategies(List retentionStrategies) { this.retentionStrategies = retentionStrategies; } - public List getRetentionStrategies() { + public List getRetentionStrategies() { return retentionStrategies; } } diff --git a/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsBusiness.java b/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsBusiness.java index 3603450..e973adb 100644 --- a/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsBusiness.java +++ b/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsBusiness.java @@ -10,7 +10,7 @@ import hudson.plugins.global_build_stats.JobBuildResultFactory; import hudson.plugins.global_build_stats.model.*; import hudson.plugins.global_build_stats.model.AbstractBuildStatChartDimension.LegendItemData; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import hudson.plugins.global_build_stats.util.CollectionsUtil; import hudson.util.DataSetBuilder; import hudson.util.ShiftedCategoryAxis; @@ -53,12 +53,12 @@ public GlobalBuildStatsBusiness(GlobalBuildStatsPlugin _plugin){ * Records the result of a build. */ public void onJobCompleted(final AbstractBuild build) { - for(RetentionStragegy s : plugin.getRetentionStrategies()){ + for(RetentionStrategy s : plugin.getRetentionStrategies()){ s.onBuildCompleted(build, pluginSaver); } this.pluginSaver.updatePlugin(new GlobalBuildStatsPluginSaver.BeforeSavePluginCallback(){ + @Override public void changePluginStateBeforeSavingIt(GlobalBuildStatsPlugin plugin) { - plugin.getJobBuildResultsSharder().queueResultToAdd(JobBuildResultFactory.INSTANCE.createJobBuildResult(build)); } }); @@ -92,6 +92,7 @@ private int searchBuildStatConfigIndexById(String id){ public void recordBuildInfos() throws IOException { this.pluginSaver.updatePlugin(new GlobalBuildStatsPluginSaver.BeforeSavePluginCallback(){ + @Override public void changePluginStateBeforeSavingIt(GlobalBuildStatsPlugin plugin) { List jobBuildResultsRead = new ArrayList(); @@ -121,7 +122,7 @@ public void handleItem(List results, TopLevelItem item){ public JFreeChart createChart(BuildStatConfiguration config){ List dimensions = createDataSetBuilder(config); - return createChart(config, dimensions, config.getBuildStatTitle()); + return createChart(dimensions, config.getBuildStatTitle()); } public List searchBuilds(BuildHistorySearchCriteria searchCriteria){ @@ -145,8 +146,8 @@ public void updateBuildStatConfiguration(final String oldBuildStatId, final boolean regenerateId) throws IOException { this.pluginSaver.updatePlugin(new GlobalBuildStatsPluginSaver.BeforeSavePluginCallback(){ + @Override public void changePluginStateBeforeSavingIt(GlobalBuildStatsPlugin plugin) { - if(regenerateId){ String newBuildStatId = ModelIdGenerator.INSTANCE.generateIdForClass(BuildStatConfiguration.class); config.setId(newBuildStatId); @@ -154,7 +155,6 @@ public void changePluginStateBeforeSavingIt(GlobalBuildStatsPlugin plugin) { int buildStatIndex = searchBuildStatConfigIndexById(oldBuildStatId); - plugin.getBuildStatConfigs().addAll(plugin.getBuildStatConfigs()); plugin.getBuildStatConfigs().set(buildStatIndex, config); } @@ -235,7 +235,7 @@ public static String escapeAntiSlashes(String value){ } } - private JFreeChart createChart(final BuildStatConfiguration config, List dimensions, String title) { + private JFreeChart createChart(List dimensions, String title) { final JFreeChart chart = ChartFactory.createStackedAreaChart(title, null, "", new DataSetBuilder().build(), PlotOrientation.VERTICAL, true, true, false); @@ -300,12 +300,12 @@ private static LegendItemCollection sortLegendItems(LegendItemCollection legendI return sortedLegendItems; } - public void updateRetentionStrategies(final List selectedStrategies) { + public void updateRetentionStrategies(final List selectedStrategies) { this.pluginSaver.updatePlugin(new GlobalBuildStatsPluginSaver.BeforeSavePluginCallback(){ @Override public void changePluginStateBeforeSavingIt(GlobalBuildStatsPlugin plugin) { plugin.setRetentionStrategies(selectedStrategies); - for(RetentionStragegy s : selectedStrategies){ + for(RetentionStrategy s : selectedStrategies){ s.strategyActivated(pluginSaver); } } @@ -395,7 +395,7 @@ public void reloadPlugin() { this.pluginSaver.reloadPlugin(); // If job results are empty, let's perform an initialization ! - if(this.plugin.getJobBuildResults()==null || this.plugin.getJobBuildResults().size() == 0){ + if(this.plugin.getJobBuildResults()==null || this.plugin.getJobBuildResults().isEmpty()){ try { this.recordBuildInfos(); } catch (IOException e) { @@ -405,7 +405,7 @@ public void reloadPlugin() { } public void onBuildDeleted(AbstractBuild build) { - for(RetentionStragegy s : plugin.getRetentionStrategies()){ + for(RetentionStrategy s : plugin.getRetentionStrategies()){ s.onBuildDeleted(build, pluginSaver); } } diff --git a/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsPluginSaver.java b/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsPluginSaver.java index f24421b..6102027 100644 --- a/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsPluginSaver.java +++ b/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsPluginSaver.java @@ -6,7 +6,7 @@ import hudson.plugins.global_build_stats.rententionstrategies.DiscardResultsOlderThanDays; import hudson.plugins.global_build_stats.rententionstrategies.DoNotKeepBuildResultWhenDiscarded; import hudson.plugins.global_build_stats.rententionstrategies.KeepExistingJobResultsOnly; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import hudson.plugins.global_build_stats.xstream.GlobalBuildStatsXStreamConverter; import hudson.security.Permission; import hudson.util.DaemonThreadFactory; @@ -119,7 +119,7 @@ public void reloadPlugin() { */ public void updatePlugin(BeforeSavePluginCallback callback){ final List configsBeforeStateChange = new ArrayList(plugin.getBuildStatConfigs()); - final List retentionStrategiesBeforeStateChange = new ArrayList(plugin.getRetentionStrategies()); + final List retentionStrategiesBeforeStateChange = new ArrayList(plugin.getRetentionStrategies()); callback.changePluginStateBeforeSavingIt(plugin); LOGGER.log(Level.FINER, "Global build stats state update queued !"); diff --git a/src/main/java/hudson/plugins/global_build_stats/model/BuildSearchCriteria.java b/src/main/java/hudson/plugins/global_build_stats/model/BuildSearchCriteria.java index 7f0c424..fb01bd8 100644 --- a/src/main/java/hudson/plugins/global_build_stats/model/BuildSearchCriteria.java +++ b/src/main/java/hudson/plugins/global_build_stats/model/BuildSearchCriteria.java @@ -137,4 +137,19 @@ public String getLauncherFilter() { public void setShownBuildResults(short shownBuildResults) { this.shownBuildResults = shownBuildResults; } + + @Override + public boolean equals(Object o) { + if (o == null) return false; + if (o == this) return true; + + BuildSearchCriteria bsc = (BuildSearchCriteria) o; + + if (!jobFilter.equals(bsc.jobFilter)) return false; + if (!nodeFilter.equals(bsc.nodeFilter)) return false; + if (!launcherFilter.equals(bsc.launcherFilter)) return false; + if (shownBuildResults!=bsc.shownBuildResults) return false; + + return true; + } } diff --git a/src/main/java/hudson/plugins/global_build_stats/model/BuildStatConfiguration.java b/src/main/java/hudson/plugins/global_build_stats/model/BuildStatConfiguration.java index 2f6969e..f98b187 100644 --- a/src/main/java/hudson/plugins/global_build_stats/model/BuildStatConfiguration.java +++ b/src/main/java/hudson/plugins/global_build_stats/model/BuildStatConfiguration.java @@ -265,7 +265,15 @@ public boolean equals(Object o) { BuildStatConfiguration that = (BuildStatConfiguration) o; if (!id.equals(that.id)) return false; - + if (!buildStatTitle.equals(that.buildStatTitle)) return false; + if (buildStatWidth != that.buildStatWidth) return false; + if (buildStatHeight != that.buildStatHeight) return false; + if (historicLength != that.historicLength) return false; + if (!historicScale.equals(that.historicScale)) return false; + if (!yAxisChartType.equals(that.yAxisChartType)) return false; + if (!dimensionsShown.equals(that.dimensionsShown)) return false; + if (!buildFilters.equals(that.buildFilters)) return false; + return true; } diff --git a/src/main/java/hudson/plugins/global_build_stats/model/JobBuildResult.java b/src/main/java/hudson/plugins/global_build_stats/model/JobBuildResult.java index b84daad..2a3e6a4 100644 --- a/src/main/java/hudson/plugins/global_build_stats/model/JobBuildResult.java +++ b/src/main/java/hudson/plugins/global_build_stats/model/JobBuildResult.java @@ -13,7 +13,7 @@ public class JobBuildResult implements Serializable { private static final long serialVersionUID = -4697202185011561179L; - public static long EMPTY_DURATION = -1; + public static final long EMPTY_DURATION = -1; public static final String EMPTY_NODE_NAME = null; public static final String EMPTY_USER_NAME = null; public static final String MASTER_NODE_NAME = "master"; diff --git a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/DiscardResultsOlderThanDays.java b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/DiscardResultsOlderThanDays.java index f222a39..2e772b7 100644 --- a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/DiscardResultsOlderThanDays.java +++ b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/DiscardResultsOlderThanDays.java @@ -17,7 +17,7 @@ /** * @author fcamblor */ -public class DiscardResultsOlderThanDays extends RetentionStragegy +public class DiscardResultsOlderThanDays extends RetentionStrategy implements ParameterizedStrategy, BuildCompletedListener { private static final long PURGE_FREQUENCY = 1000L * 3600L * 24L; // Let's purge job build results once a day diff --git a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/DoNotKeepBuildResultWhenDiscarded.java b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/DoNotKeepBuildResultWhenDiscarded.java index 6a854fe..6e7f59a 100644 --- a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/DoNotKeepBuildResultWhenDiscarded.java +++ b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/DoNotKeepBuildResultWhenDiscarded.java @@ -10,7 +10,7 @@ /** * @author fcamblor */ -public class DoNotKeepBuildResultWhenDiscarded extends RetentionStragegy +public class DoNotKeepBuildResultWhenDiscarded extends RetentionStrategy implements BuildDeletedListener { @Override diff --git a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/KeepExistingJobResultsOnly.java b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/KeepExistingJobResultsOnly.java index e521d51..321836a 100644 --- a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/KeepExistingJobResultsOnly.java +++ b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/KeepExistingJobResultsOnly.java @@ -12,7 +12,7 @@ /** * @author fcamblor */ -public class KeepExistingJobResultsOnly extends RetentionStragegy { +public class KeepExistingJobResultsOnly extends RetentionStrategy { @Override public String getConfigPage() { return "keepExistingJobResultsOnly.jelly"; diff --git a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/RetentionStragegy.java b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/RetentionStrategy.java similarity index 84% rename from src/main/java/hudson/plugins/global_build_stats/rententionstrategies/RetentionStragegy.java rename to src/main/java/hudson/plugins/global_build_stats/rententionstrategies/RetentionStrategy.java index 62a2bed..3527455 100644 --- a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/RetentionStragegy.java +++ b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/RetentionStrategy.java @@ -13,15 +13,15 @@ /** * @author fcamblor */ -public abstract class RetentionStragegy { +public abstract class RetentionStrategy { - protected static final List RETENTION_STRATEGIES_IMPLEMENTATIONS = new ArrayList(){{ + protected static final List RETENTION_STRATEGIES_IMPLEMENTATIONS = new ArrayList(){{ add(new DiscardResultsOlderThanDays()); add(new DoNotKeepBuildResultWhenDiscarded()); add(new KeepExistingJobResultsOnly()); }}; - protected RetentionStragegy(){ + protected RetentionStrategy(){ } public String getId(){ @@ -30,8 +30,8 @@ public String getId(){ public abstract String getConfigPage(); - public static RetentionStragegy valueOf(String strategyId){ - for(RetentionStragegy strategy : RETENTION_STRATEGIES_IMPLEMENTATIONS){ + public static RetentionStrategy valueOf(String strategyId){ + for(RetentionStrategy strategy : RETENTION_STRATEGIES_IMPLEMENTATIONS){ if(strategyId.equals(strategy.getId())){ return strategy; } @@ -65,7 +65,7 @@ public void onBuildCompleted(AbstractBuild build, GlobalBuildStatsPluginSaver pl } } - public static List values(){ + public static List values(){ return RETENTION_STRATEGIES_IMPLEMENTATIONS; } diff --git a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/strategybehaviours/ParameterizedStrategy.java b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/strategybehaviours/ParameterizedStrategy.java index a41b340..49e89da 100644 --- a/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/strategybehaviours/ParameterizedStrategy.java +++ b/src/main/java/hudson/plugins/global_build_stats/rententionstrategies/strategybehaviours/ParameterizedStrategy.java @@ -1,13 +1,13 @@ package hudson.plugins.global_build_stats.rententionstrategies.strategybehaviours; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import java.util.Map; /** * @author fcamblor */ -public interface ParameterizedStrategy { +public interface ParameterizedStrategy { public void updateStrategyParameters(Map parameters); public void updateStrategyParameters(T strategyToCopy); } diff --git a/src/main/java/hudson/plugins/global_build_stats/validation/GlobalBuildStatsValidator.java b/src/main/java/hudson/plugins/global_build_stats/validation/GlobalBuildStatsValidator.java index 112d933..bf3c3a5 100644 --- a/src/main/java/hudson/plugins/global_build_stats/validation/GlobalBuildStatsValidator.java +++ b/src/main/java/hudson/plugins/global_build_stats/validation/GlobalBuildStatsValidator.java @@ -1,75 +1,120 @@ package hudson.plugins.global_build_stats.validation; +import java.util.logging.Logger; + import hudson.plugins.global_build_stats.FieldFilterFactory; import hudson.plugins.global_build_stats.Messages; import hudson.plugins.global_build_stats.model.HistoricScale; +import hudson.plugins.global_build_stats.model.JobBuildResultSharder; import hudson.util.FormValidation; public class GlobalBuildStatsValidator { - public FormValidation checkJobFilter(String value){ - try{ FieldFilterFactory.createFieldFilter(value); return FormValidation.ok(); } - catch(Throwable t){ return FormValidation.error(Messages.Validation_Messages_JobFilter_Invalid()); } - } - - public FormValidation checkFailuresShown(String value){ - if(!ValidationHelper.isBool(value)){ return FormValidation.error(Messages.Validation_Messages_FailuresShown_Boolean()); } - else { return FormValidation.ok(); } - } - - public FormValidation checkUnstablesShown(String value){ - if(!ValidationHelper.isBool(value)){ return FormValidation.error(Messages.Validation_Messages_UnstablesShown_Boolean()); } - else { return FormValidation.ok(); } - } - - public FormValidation checkAbortedShown(String value){ - if(!ValidationHelper.isBool(value)){ return FormValidation.error(Messages.Validation_Messages_AbortedShown_Boolean()); } - else { return FormValidation.ok(); } - } - - public FormValidation checkNotBuildsShown(String value){ - if(!ValidationHelper.isBool(value)){ return FormValidation.error(Messages.Validation_Messages_NotBuildsShown_Boolean()); } - else { return FormValidation.ok(); } - } - - public FormValidation checkSuccessShown(String value){ - if(!ValidationHelper.isBool(value)){ return FormValidation.error(Messages.Validation_Messages_SuccessShown_Boolean()); } - else { return FormValidation.ok(); } - } - - public FormValidation checkHistoricScale(String value){ - if(!ValidationHelper.isMandatory(value)){ return FormValidation.error(Messages.Validation_Messages_HistoricScale_Mandatory()); } - else { - try{ HistoricScale.valueOf(value); return FormValidation.ok(); } - catch(Throwable t){ return FormValidation.error(Messages.Validation_Messages_HistoricScale_Invalid()); } - } - } + public FormValidation checkJobFilter(String value) { + try { + FieldFilterFactory.createFieldFilter(value); + return FormValidation.ok(); + } catch (Throwable t) { + return FormValidation.error(Messages.Validation_Messages_JobFilter_Invalid()); + } + } + + public FormValidation checkFailuresShown(String value) { + if (!ValidationHelper.isBool(value)) { + return FormValidation.error(Messages.Validation_Messages_FailuresShown_Boolean()); + } else { + return FormValidation.ok(); + } + } + + public FormValidation checkUnstablesShown(String value) { + if (!ValidationHelper.isBool(value)) { + return FormValidation.error(Messages.Validation_Messages_UnstablesShown_Boolean()); + } else { + return FormValidation.ok(); + } + } + + public FormValidation checkAbortedShown(String value) { + if (!ValidationHelper.isBool(value)) { + return FormValidation.error(Messages.Validation_Messages_AbortedShown_Boolean()); + } else { + return FormValidation.ok(); + } + } + + public FormValidation checkNotBuildsShown(String value) { + if (!ValidationHelper.isBool(value)) { + return FormValidation.error(Messages.Validation_Messages_NotBuildsShown_Boolean()); + } else { + return FormValidation.ok(); + } + } + + public FormValidation checkSuccessShown(String value) { + if (!ValidationHelper.isBool(value)) { + return FormValidation.error(Messages.Validation_Messages_SuccessShown_Boolean()); + } else { + return FormValidation.ok(); + } + } + + public FormValidation checkHistoricScale(String value) { + if (!ValidationHelper.isMandatory(value)) { + return FormValidation.error(Messages.Validation_Messages_HistoricScale_Mandatory()); + } else { + try { + HistoricScale.valueOf(value); + return FormValidation.ok(); + } catch (Throwable t) { + return FormValidation.error(Messages.Validation_Messages_HistoricScale_Invalid()); + } + } + } + + public FormValidation checkHistoricLength(String value) { + if (!ValidationHelper.isMandatory(value)) { + return FormValidation.error(Messages.Validation_Messages_HistoricLength_Mandatory()); + } else if (!ValidationHelper.isInt(value)) { + return FormValidation.error(Messages.Validation_Messages_HistoricLength_Integer()); + } else { + return FormValidation.ok(); + } + } - public FormValidation checkHistoricLength(String value){ - if(!ValidationHelper.isMandatory(value)){ return FormValidation.error(Messages.Validation_Messages_HistoricLength_Mandatory()); } - else if(!ValidationHelper.isInt(value)){ return FormValidation.error(Messages.Validation_Messages_HistoricLength_Integer()); } - else { return FormValidation.ok(); } - } + public FormValidation checkBuildStatHeight(String value) { + if (!ValidationHelper.isMandatory(value)) { + return FormValidation.error(Messages.Validation_Messages_BuildStatsHeight_Mandatory()); + } else if (!ValidationHelper.isInt(value)) { + return FormValidation.error(Messages.Validation_Messages_BuildStatsHeight_Integer()); + } else { + return FormValidation.ok(); + } + } - public FormValidation checkBuildStatHeight(String value){ - if(!ValidationHelper.isMandatory(value)){ return FormValidation.error(Messages.Validation_Messages_BuildStatsHeight_Mandatory()); } - else if(!ValidationHelper.isInt(value)){ return FormValidation.error(Messages.Validation_Messages_BuildStatsHeight_Integer()); } - else { return FormValidation.ok(); } - } + public FormValidation checkBuildStatWidth(String value) { + if (!ValidationHelper.isMandatory(value)) { + return FormValidation.error(Messages.Validation_Messages_BuildStatsWidth_Mandatory()); + } else if (!ValidationHelper.isInt(value)) { + return FormValidation.error(Messages.Validation_Messages_BuildStatsWidth_Integer()); + } else { + return FormValidation.ok(); + } + } - public FormValidation checkBuildStatWidth(String value){ - if(!ValidationHelper.isMandatory(value)){ return FormValidation.error(Messages.Validation_Messages_BuildStatsWidth_Mandatory()); } - else if(!ValidationHelper.isInt(value)){ return FormValidation.error(Messages.Validation_Messages_BuildStatsWidth_Integer()); } - else { return FormValidation.ok(); } - } + public FormValidation checkTitle(String value) { + if (!ValidationHelper.isMandatory(value)) { + return FormValidation.error(Messages.Validation_Messages_Title_Mandatory()); + } else { + return FormValidation.ok(); + } + } - public FormValidation checkTitle(String value){ - if(!ValidationHelper.isMandatory(value)){ return FormValidation.error(Messages.Validation_Messages_Title_Mandatory()); } - else { return FormValidation.ok(); } - } - - public FormValidation checkYAxisChartType(String value){ - if(!ValidationHelper.isMandatory(value)){ return FormValidation.error(Messages.Validation_Messages_YAxisChartType_Mandatory()); } - else { return FormValidation.ok(); } - } + public FormValidation checkYAxisChartType(String value) { + if (!ValidationHelper.isMandatory(value)) { + return FormValidation.error(Messages.Validation_Messages_YAxisChartType_Mandatory()); + } else { + return FormValidation.ok(); + } + } } diff --git a/src/main/java/hudson/plugins/global_build_stats/xstream/GlobalBuildStatsXStreamConverter.java b/src/main/java/hudson/plugins/global_build_stats/xstream/GlobalBuildStatsXStreamConverter.java index 7d64f06..8736487 100644 --- a/src/main/java/hudson/plugins/global_build_stats/xstream/GlobalBuildStatsXStreamConverter.java +++ b/src/main/java/hudson/plugins/global_build_stats/xstream/GlobalBuildStatsXStreamConverter.java @@ -6,7 +6,7 @@ import hudson.plugins.global_build_stats.GlobalBuildStatsPlugin; import hudson.plugins.global_build_stats.model.BuildStatConfiguration; import hudson.plugins.global_build_stats.model.JobBuildResult; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import hudson.plugins.global_build_stats.xstream.migration.GlobalBuildStatsDataMigrator; import hudson.plugins.global_build_stats.xstream.migration.GlobalBuildStatsPOJO; import hudson.plugins.global_build_stats.xstream.migration.v0.InitialMigrator; diff --git a/src/main/java/hudson/plugins/global_build_stats/xstream/migration/AbstractMigrator.java b/src/main/java/hudson/plugins/global_build_stats/xstream/migration/AbstractMigrator.java index 4cf57f7..9a8d38b 100644 --- a/src/main/java/hudson/plugins/global_build_stats/xstream/migration/AbstractMigrator.java +++ b/src/main/java/hudson/plugins/global_build_stats/xstream/migration/AbstractMigrator.java @@ -9,7 +9,7 @@ import hudson.plugins.global_build_stats.model.JobBuildResult; import hudson.plugins.global_build_stats.model.JobBuildResultSharder; import hudson.plugins.global_build_stats.model.ModelIdGenerator; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import java.util.ArrayList; import java.util.List; @@ -54,12 +54,12 @@ public TTO readGlobalBuildStatsPOJO( // Retention strategies reader.moveDown(); - List retentionStrategiesFakedInstances = (List)context.convertAnother(pojo, List.class); - List retentionStrategies = new ArrayList(retentionStrategiesFakedInstances.size()); + List retentionStrategiesFakedInstances = (List)context.convertAnother(pojo, List.class); + List retentionStrategies = new ArrayList(retentionStrategiesFakedInstances.size()); // Retention strategies read are not the same instance as the one in RetentionStrategies.IMPLEMENTATIONS - for(RetentionStragegy fakeStrategy : retentionStrategiesFakedInstances){ + for(RetentionStrategy fakeStrategy : retentionStrategiesFakedInstances){ // So we must convert it to a "true" instance - RetentionStragegy rs = RetentionStragegy.valueOf(fakeStrategy.getId()); + RetentionStrategy rs = RetentionStrategy.valueOf(fakeStrategy.getId()); rs.from(fakeStrategy); retentionStrategies.add(rs); } @@ -83,8 +83,8 @@ protected List migrateJobBuildResults(List jobBu } // Overridable - protected List migrateRetentionStrategies(List retentionStrategies) { - return new ArrayList(retentionStrategies); + protected List migrateRetentionStrategies(List retentionStrategies) { + return new ArrayList(retentionStrategies); } // Overridable diff --git a/src/main/java/hudson/plugins/global_build_stats/xstream/migration/DefaultGBSPOJO.java b/src/main/java/hudson/plugins/global_build_stats/xstream/migration/DefaultGBSPOJO.java index 47b66b1..0b843c5 100644 --- a/src/main/java/hudson/plugins/global_build_stats/xstream/migration/DefaultGBSPOJO.java +++ b/src/main/java/hudson/plugins/global_build_stats/xstream/migration/DefaultGBSPOJO.java @@ -2,7 +2,7 @@ import hudson.plugins.global_build_stats.model.BuildStatConfiguration; import hudson.plugins.global_build_stats.model.JobBuildResult; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import java.util.List; @@ -23,7 +23,7 @@ public class DefaultGBSPOJO implements GlobalBuildStatsPOJO { /** * List of retention strategies used for job build results cleaning */ - public List retentionStrategies; + public List retentionStrategies; public List getJobBuildResults() { return jobBuildResults; @@ -41,11 +41,11 @@ public void setBuildStatConfigs(List buildStatConfigs) { this.buildStatConfigs = buildStatConfigs; } - public List getRetentionStrategies() { + public List getRetentionStrategies() { return retentionStrategies; } - public void setRetentionStrategies(List retentionStrategies) { + public void setRetentionStrategies(List retentionStrategies) { this.retentionStrategies = retentionStrategies; } } diff --git a/src/main/java/hudson/plugins/global_build_stats/xstream/migration/GlobalBuildStatsPOJO.java b/src/main/java/hudson/plugins/global_build_stats/xstream/migration/GlobalBuildStatsPOJO.java index 47c66fb..2cc3e0f 100644 --- a/src/main/java/hudson/plugins/global_build_stats/xstream/migration/GlobalBuildStatsPOJO.java +++ b/src/main/java/hudson/plugins/global_build_stats/xstream/migration/GlobalBuildStatsPOJO.java @@ -2,7 +2,7 @@ import hudson.plugins.global_build_stats.model.BuildStatConfiguration; import hudson.plugins.global_build_stats.model.JobBuildResult; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import java.util.List; @@ -15,6 +15,6 @@ public interface GlobalBuildStatsPOJO { public void setJobBuildResults(List jobBuildResults); public List getBuildStatConfigs(); public void setBuildStatConfigs(List buildStatConfigs); - public List getRetentionStrategies(); - public void setRetentionStrategies(List retentionStrategies); + public List getRetentionStrategies(); + public void setRetentionStrategies(List retentionStrategies); } diff --git a/src/main/java/hudson/plugins/global_build_stats/xstream/migration/v9/V8ToV9Migrator.java b/src/main/java/hudson/plugins/global_build_stats/xstream/migration/v9/V8ToV9Migrator.java index 4c14d8c..bf7be2e 100644 --- a/src/main/java/hudson/plugins/global_build_stats/xstream/migration/v9/V8ToV9Migrator.java +++ b/src/main/java/hudson/plugins/global_build_stats/xstream/migration/v9/V8ToV9Migrator.java @@ -1,6 +1,6 @@ package hudson.plugins.global_build_stats.xstream.migration.v9; -import hudson.plugins.global_build_stats.rententionstrategies.RetentionStragegy; +import hudson.plugins.global_build_stats.rententionstrategies.RetentionStrategy; import hudson.plugins.global_build_stats.xstream.migration.AbstractMigrator; import hudson.plugins.global_build_stats.xstream.migration.PreV9AbstractMigrator; import hudson.plugins.global_build_stats.xstream.migration.v7.V7GlobalBuildStatsPOJO; @@ -20,9 +20,9 @@ protected V9GlobalBuildStatsPOJO createMigratedPojo() { } @Override - protected List migrateRetentionStrategies(List retentionStrategies) { + protected List migrateRetentionStrategies(List retentionStrategies) { if(retentionStrategies == null){ - return new ArrayList(); + return new ArrayList(); } else { return super.migrateRetentionStrategies(retentionStrategies); }