Rename widgets

src/main/java/com/groupon/jenkins/branchhistory/BuildHistoryTab.java

@@ -40,9 +40,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-public class BuildHistoryTab {
-
-    private boolean active;
+public class BuildHistoryTab extends HistoryTab {
     private String url;
     private String font;
     private String state;
@@ -75,7 +73,7 @@ private DynamicBuildRepository getDynamicBuildRepository(){
 
     public Iterable<BuildHistoryRow> getBuilds() {
         String branch = getUrl().equals("all")?null:getUrl();
-        Iterable<BuildHistoryRow> processedBuilds = Iterables.transform(filterSkipped(isMyBuilds() ? getDynamicBuildRepository().<DynamicBuild>getCurrentUserBuilds(project, BranchHistoryWidget.BUILD_COUNT) : getDynamicBuildRepository().<DynamicBuild>getLast(project, BranchHistoryWidget.BUILD_COUNT, branch)), getBuildTransformer());
+        Iterable<BuildHistoryRow> processedBuilds = Iterables.transform(filterSkipped(isMyBuilds() ? getDynamicBuildRepository().<DynamicBuild>getCurrentUserBuilds(project, JobHistoryWidget.BUILD_COUNT) : getDynamicBuildRepository().<DynamicBuild>getLast(project, JobHistoryWidget.BUILD_COUNT, branch)), getBuildTransformer());
         return Iterables.concat(getQueuedBuilds(),processedBuilds);
     }
 
@@ -86,7 +84,7 @@ private Iterable<BuildHistoryRow> getQueuedBuilds() {
             int number = queuedItems.size() == 1 ? project.getNextBuildNumber() : project.getNextBuildNumber() + queuedItems.size() - i - 1;
             queuedBuilds.add(new QueuedBuildHistoryRow(queuedItems.get(i),number));
         }
-       return  queuedBuilds;
+        return  queuedBuilds;
     }
 
     private Function<DynamicBuild, BuildHistoryRow> getBuildTransformer() {
@@ -106,9 +104,7 @@ public boolean apply(DynamicBuild build) {
             }
         });
     }
-    public boolean isActive(){
-        return active;
-    }
+
     public String getUrl(){
         return url;
     }
@@ -126,8 +122,8 @@ public boolean isRemovable(){
         return removable;
     }
 
-    private static Iterable<BuildHistoryTab> getTabs(List<String> branches,DynamicProject project) {
-        ArrayList<BuildHistoryTab> tabs = new ArrayList<BuildHistoryTab>();
+    private static Iterable<HistoryTab> getTabs(List<String> branches,DynamicProject project) {
+        ArrayList<HistoryTab> tabs = new ArrayList<HistoryTab>();
         tabs.add(getAll(project));
         tabs.add(getMine(project));
         for(String branch:branches){
@@ -136,11 +132,9 @@ private static Iterable<BuildHistoryTab> getTabs(List<String> branches,DynamicPr
         return tabs;
     }
 
-    public void setActive() {
-       this.active =true;
-    }
 
-    public static Iterable<BuildHistoryTab> getTabs(DynamicProject project) {
+
+    public static Iterable<HistoryTab> getTabs(DynamicProject project) {
         DynamicProjectBranchTabsProperty tabsProperty = getTabsProperty(project);
         List<String> branches = tabsProperty == null ? Collections.<String>emptyList() : tabsProperty.getBranches();
         return getTabs(branches,project);

src/main/java/com/groupon/jenkins/branchhistory/HistoryTab.java

@@ -0,0 +1,38 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014, Groupon, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.groupon.jenkins.branchhistory;
+
+public abstract  class HistoryTab {
+    private boolean active;
+
+    public boolean isActive(){
+        return active;
+    }
+    public void setActive() {
+        this.active =true;
+    }
+
+    public abstract String getUrl();
+}

src/main/java/com/groupon/jenkins/branchhistory/BranchHistoryWidget.java → src/main/java/com/groupon/jenkins/branchhistory/JobHistoryWidget.java

@@ -37,33 +37,33 @@ of this software and associated documentation files (the "Software"), to deal
 import java.io.IOException;
 
 
-public class BranchHistoryWidget extends Widget{
+public class JobHistoryWidget extends Widget{
 
 
     protected static final int BUILD_COUNT = 30;
     public static final String TAB_SELECTION = "tabSelection";
     private final DynamicProject project;
-    private final Iterable<BuildHistoryTab> tabs;
-    private final BuildHistoryTab currentTab;
+    private final Iterable<HistoryTab> tabs;
+    private final HistoryTab currentTab;
 
     @Override
     public String getUrlName() {
         return "buildHistory";
     }
 
 
-    public BranchHistoryWidget(DynamicProject project) {
+    public JobHistoryWidget(DynamicProject project) {
         this.project = project;
         this.tabs = intializeTabs();
         this.currentTab = getActiveTab(tabs);
         currentTab.setActive();
     }
 
-    public Iterable<BuildHistoryTab> getTabs(){
+    public Iterable<HistoryTab> getTabs(){
         return tabs;
     }
-    public Iterable<BuildHistoryTab> intializeTabs(){
-        Iterable<BuildHistoryTab> tabs = BuildHistoryTab.getTabs(project);
+    public Iterable<HistoryTab> intializeTabs(){
+        Iterable<HistoryTab> tabs = BuildHistoryTab.getTabs(project);
         return tabs;
     }
 
@@ -72,11 +72,11 @@ public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp)
         return findTab(token);
     }
 
-    private BuildHistoryTab findTab(final String tabUrl) {
-       return Iterables.find(tabs, new Predicate<BuildHistoryTab>() {
+    private HistoryTab findTab(final String tabUrl) {
+       return Iterables.find(tabs, new Predicate<HistoryTab>() {
            @Override
-           public boolean apply(BuildHistoryTab buildHistoryTab) {
-               return buildHistoryTab.getUrl().equals(tabUrl);
+           public boolean apply(HistoryTab historyTab) {
+               return historyTab.getUrl().equals(tabUrl);
            }
        });
     }
@@ -111,10 +111,10 @@ private DynamicProjectBranchTabsProperty getTabsProperty() {
         return  project.getProperty(DynamicProjectBranchTabsProperty.class);
     }
 
-    private BuildHistoryTab getActiveTab(Iterable<BuildHistoryTab> tabs) {
-        for(BuildHistoryTab buildHistoryTab : tabs){
-            if(buildHistoryTab.getUrl().equals(getCurrentTab())){
-                return  buildHistoryTab;
+    private HistoryTab getActiveTab(Iterable<HistoryTab> tabs) {
+        for(HistoryTab historyTab : tabs){
+            if(historyTab.getUrl().equals(getCurrentTab())){
+                return historyTab;
             }
         }
         return  Iterables.get(tabs, 0);

src/main/java/com/groupon/jenkins/dynamic/build/DynamicProject.java

@@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.groupon.jenkins.SetupConfig;
-import com.groupon.jenkins.branchhistory.BranchHistoryWidget;
+import com.groupon.jenkins.branchhistory.JobHistoryWidget;
 import com.groupon.jenkins.dynamic.buildtype.BuildType;
 import com.groupon.jenkins.dynamic.buildtype.BuildTypeProperty;
 import com.groupon.jenkins.dynamic.organizationcontainer.OrganizationContainer;
@@ -38,30 +38,21 @@ of this software and associated documentation files (the "Software"), to deal
 import hudson.PermalinkList;
 import hudson.matrix.Combination;
 import hudson.model.*;
-import hudson.model.Queue;
 import hudson.model.Queue.Task;
 import hudson.util.CaseInsensitiveComparator;
 import hudson.util.CopyOnWriteMap;
-import hudson.widgets.HistoryWidget;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
 import hudson.widgets.Widget;
 import jenkins.model.Jenkins;
-import jenkins.model.ParameterizedJobMixIn;
-import jenkins.util.TimeDuration;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
-import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.mongodb.morphia.annotations.PostLoad;
 import org.mongodb.morphia.annotations.PrePersist;
 
-import javax.servlet.ServletException;
-
 public class DynamicProject extends DbBackedProject<DynamicProject, DynamicBuild> implements TopLevelItem, Saveable, IdentifableItemGroup<DynamicSubProject> {
     private transient Map<String, DynamicSubProject> items;
     private String containerName;
@@ -169,7 +160,7 @@ public OrganizationContainer getParent() {
     @Override
     public List<Widget> getWidgets() {
         List<Widget> widgets = new ArrayList<Widget>();
-        widgets.add(new BranchHistoryWidget(this));
+        widgets.add(new JobHistoryWidget(this));
         return widgets;
     }
 

src/test/java/com/groupon/jenkins/branchhistory/BranchHistoryWidgetTest.java → src/test/java/com/groupon/jenkins/branchhistory/JobHistoryWidgetTest.java

@@ -45,7 +45,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings("unchecked")
-public class BranchHistoryWidgetTest {
+public class JobHistoryWidgetTest {
 
     private DynamicBuildRepository buildRepo;
     private DynamicProject project;
@@ -64,7 +64,7 @@ public void should_not_show_skipped_builds() {
         DynamicBuild skippedBuild = newBuild().skipped().get();
         when(skippedBuild.isSkipped()).thenReturn(true);
         List<? extends DbBackedBuild> builds = list(skippedBuild, unSkippedBuild);
-        when(buildRepo.getLast(project, BranchHistoryWidget.BUILD_COUNT, null)).thenReturn((Iterable<DbBackedBuild>) builds);
+        when(buildRepo.getLast(project, JobHistoryWidget.BUILD_COUNT, null)).thenReturn((Iterable<DbBackedBuild>) builds);
         assertEquals(1, Iterables.size(historyWidget.getBaseList()));
         assertEquals(unSkippedBuild, Iterables.getOnlyElement(historyWidget.getBaseList()));
     }
@@ -77,7 +77,7 @@ public void should_return_oldest_running_build() {
         DynamicBuild runningBuild2 = newBuild().building().get();
         List<? extends DbBackedBuild> builds = list(finishedBuild, runningBuild, finishedBuild2, runningBuild2);
         String buildId = String.valueOf(runningBuild2.getNumber());
-        when(buildRepo.getLast(project, BranchHistoryWidget.BUILD_COUNT, null)).thenReturn((Iterable<DbBackedBuild>) builds);
+        when(buildRepo.getLast(project, JobHistoryWidget.BUILD_COUNT, null)).thenReturn((Iterable<DbBackedBuild>) builds);
 
         assertEquals(buildId, historyWidget.getNextBuildToFetch((Iterable<DbBackedBuild>) builds, adapter).getBuildNumber(adapter));
 
@@ -91,7 +91,7 @@ public void should_return_most_recent_build_plus_one() {
         List<? extends DbBackedBuild> builds = list(finishedBuild, finishedBuild2, finishedBuild3);
         String buildId = String.valueOf(finishedBuild.getNumber() + 1);
 
-        when(buildRepo.getLast(project, BranchHistoryWidget.BUILD_COUNT, null)).thenReturn((Iterable<DbBackedBuild>) builds);
+        when(buildRepo.getLast(project, JobHistoryWidget.BUILD_COUNT, null)).thenReturn((Iterable<DbBackedBuild>) builds);
 
         assertEquals(buildId, historyWidget.getNextBuildToFetch((Iterable<DbBackedBuild>) builds, adapter).getBuildNumber(adapter));
 
@@ -101,7 +101,7 @@ public void should_return_most_recent_build_plus_one() {
     public void should_return_one_for_empty_build_list() {
         String buildId = "1";
         List<? extends DbBackedBuild> builds = Collections.emptyList();
-        when(buildRepo.getLast(project, BranchHistoryWidget.BUILD_COUNT, null)).thenReturn((Iterable<DbBackedBuild>) builds);
+        when(buildRepo.getLast(project, JobHistoryWidget.BUILD_COUNT, null)).thenReturn((Iterable<DbBackedBuild>) builds);
 
         assertEquals(buildId, historyWidget.getNextBuildToFetch((Iterable<DbBackedBuild>) builds, adapter).getBuildNumber(adapter));