Skip to content
Permalink
Browse files

Merge pull request #79 from jenkinsci/jenkins-38606-follow-up

[JENKINS-38606 Follow-up] Ensure AllView gets migrated
  • Loading branch information...
stephenc committed Jan 9, 2017
2 parents a5d63d0 + 375eb15 commit 929bd4d32fdffad1167b4a52b1fe8352b7644e05
@@ -70,6 +70,8 @@
import hudson.views.ViewsTabBar;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URLEncoder;
import java.text.ParseException;
import java.util.ArrayList;
@@ -230,6 +232,21 @@ protected void init() {

if (folderViews == null) {
if (views != null && !views.isEmpty()) {
if (primaryView != null) {
// TODO replace reflection with direct access once baseline core has JENKINS-38606 fix merged
try {
Method migrateLegacyPrimaryAllViewLocalizedName = AllView.class
.getMethod("migrateLegacyPrimaryAllViewLocalizedName", List.class, String.class);
primaryView =
(String) migrateLegacyPrimaryAllViewLocalizedName.invoke(null, views, primaryView);
} catch (NoSuchMethodException e) {
// ignore, Jenkins core does not have JENKINS-38606 fix merged
} catch (IllegalAccessException e) {
// ignore, Jenkins core does not have JENKINS-38606 fix merged
} catch (InvocationTargetException e) {
// ignore, Jenkins core does not have JENKINS-38606 fix merged
}
}
folderViews = new DefaultFolderViewHolder(views, primaryView, viewsTabBar == null ? newDefaultViewsTabBar()
: viewsTabBar);
} else {
@@ -27,17 +27,27 @@
import com.cloudbees.hudson.plugins.folder.AbstractFolder;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.model.AllView;
import hudson.model.View;
import hudson.views.ViewsTabBar;
import java.io.ObjectStreamException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.kohsuke.stapler.DataBoundConstructor;

/**
* The default implementation of {@link AbstractFolderViewHolder} which allows all the elements to be modified.
*/
public class DefaultFolderViewHolder extends AbstractFolderViewHolder {
/**
* Our logger.
*/
private static final Logger LOGGER = Logger.getLogger(DefaultFolderViewHolder.class.getName());
/**
* The views.
*/
@@ -122,4 +132,22 @@ public void setTabBar(ViewsTabBar tabBar) {
this.tabBar = tabBar;
}

private Object readResolve() throws ObjectStreamException {
if (primaryView != null) {
// TODO replace reflection with direct access once baseline core has JENKINS-38606 fix merged
try {
Method migrateLegacyPrimaryAllViewLocalizedName = AllView.class
.getMethod("migrateLegacyPrimaryAllViewLocalizedName", List.class, String.class);
primaryView =
(String) migrateLegacyPrimaryAllViewLocalizedName.invoke(null, views, primaryView);
} catch (NoSuchMethodException e) {
// ignore, Jenkins core does not have JENKINS-38606 fix merged
} catch (IllegalAccessException e) {
// ignore, Jenkins core does not have JENKINS-38606 fix merged
} catch (InvocationTargetException e) {
// ignore, Jenkins core does not have JENKINS-38606 fix merged
}
}

}
}

0 comments on commit 929bd4d

Please sign in to comment.
You can’t perform that action at this time.