mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-21 15:55:40 +00:00
[JENKINS-57678] - Change getInstance() (deprecated) to get() (#4042)
* Change getInstance() (deprecated) to get() * Reverting modifications according review * Changing for use the variable
This commit is contained in:
1 parent
fa0ba22dec
commit
0e62b68012
238 files changed
+618
-625
No files matched your search
@@ -369,7 +369,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
}
|
||||
|
||||
public Api getApi() {
|
||||
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
|
||||
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
|
||||
return new Api(this);
|
||||
}
|
||||
|
||||
@@ -533,7 +533,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
* Once the plugins are listed, schedule their initialization.
|
||||
*/
|
||||
public void run(Reactor session) throws Exception {
|
||||
Jenkins.getInstance().lookup.set(PluginInstanceStore.class, new PluginInstanceStore());
|
||||
Jenkins.get().lookup.set(PluginInstanceStore.class, new PluginInstanceStore());
|
||||
TaskGraphBuilder g = new TaskGraphBuilder();
|
||||
|
||||
// schedule execution of loading plugins
|
||||
@@ -924,7 +924,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
p.resolvePluginDependencies();
|
||||
strategy.load(p);
|
||||
|
||||
Jenkins.getInstance().refreshExtensions();
|
||||
Jenkins.get().refreshExtensions();
|
||||
|
||||
p.getPlugin().postInitialize();
|
||||
} catch (Exception e) {
|
||||
@@ -1331,7 +1331,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
*/
|
||||
@Restricted(DoNotUse.class) // WebOnly
|
||||
public HttpResponse doPlugins() {
|
||||
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
|
||||
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
|
||||
JSONArray response = new JSONArray();
|
||||
Map<String,JSONObject> allPlugins = new HashMap<>();
|
||||
for (PluginWrapper plugin : plugins) {
|
||||
@@ -1378,10 +1378,10 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
|
||||
@RequirePOST
|
||||
public HttpResponse doUpdateSources(StaplerRequest req) throws IOException {
|
||||
Jenkins.getInstance().checkPermission(CONFIGURE_UPDATECENTER);
|
||||
Jenkins.get().checkPermission(CONFIGURE_UPDATECENTER);
|
||||
|
||||
if (req.hasParameter("remove")) {
|
||||
UpdateCenter uc = Jenkins.getInstance().getUpdateCenter();
|
||||
UpdateCenter uc = Jenkins.get().getUpdateCenter();
|
||||
BulkChange bc = new BulkChange(uc);
|
||||
try {
|
||||
for (String id : req.getParameterValues("sources"))
|
||||
@@ -1403,7 +1403,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
@RequirePOST
|
||||
@Restricted(DoNotUse.class) // WebOnly
|
||||
public void doInstallPluginsDone() {
|
||||
Jenkins j = Jenkins.getInstance();
|
||||
Jenkins j = Jenkins.get();
|
||||
j.checkPermission(Jenkins.ADMINISTER);
|
||||
InstallUtil.proceedToNextStateFrom(InstallState.INITIAL_PLUGINS_INSTALLING);
|
||||
}
|
||||
@@ -1413,7 +1413,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
*/
|
||||
@RequirePOST
|
||||
public void doInstall(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
|
||||
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
|
||||
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
|
||||
Set<String> plugins = new LinkedHashSet<>();
|
||||
|
||||
Enumeration<String> en = req.getParameterNames();
|
||||
@@ -1442,7 +1442,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
@RequirePOST
|
||||
@Restricted(DoNotUse.class) // WebOnly
|
||||
public HttpResponse doInstallPlugins(StaplerRequest req) throws IOException {
|
||||
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
|
||||
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
|
||||
String payload = IOUtils.toString(req.getInputStream(), req.getCharacterEncoding());
|
||||
JSONObject request = JSONObject.fromObject(payload);
|
||||
JSONArray pluginListJSON = request.getJSONArray("plugins");
|
||||
@@ -1524,11 +1524,11 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
}
|
||||
|
||||
private void trackInitialPluginInstall(@Nonnull final List<Future<UpdateCenter.UpdateCenterJob>> installJobs) {
|
||||
final Jenkins jenkins = Jenkins.getInstance();
|
||||
final Jenkins jenkins = Jenkins.get();
|
||||
final UpdateCenter updateCenter = jenkins.getUpdateCenter();
|
||||
final Authentication currentAuth = Jenkins.getAuthentication();
|
||||
|
||||
if (!Jenkins.getInstance().getInstallState().isSetupComplete()) {
|
||||
if (!jenkins.getInstallState().isSetupComplete()) {
|
||||
jenkins.setInstallState(InstallState.INITIAL_PLUGINS_INSTALLING);
|
||||
updateCenter.persistInstallStatus();
|
||||
new Thread() {
|
||||
@@ -1592,7 +1592,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
}
|
||||
|
||||
private UpdateSite.Plugin getPlugin(String pluginName, String siteName) {
|
||||
UpdateSite updateSite = Jenkins.getInstance().getUpdateCenter().getById(siteName);
|
||||
UpdateSite updateSite = Jenkins.get().getUpdateCenter().getById(siteName);
|
||||
if (updateSite == null) {
|
||||
throw new Failure("No such update center: " + siteName);
|
||||
}
|
||||
@@ -1604,7 +1604,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
*/
|
||||
@RequirePOST
|
||||
public HttpResponse doSiteConfigure(@QueryParameter String site) throws IOException {
|
||||
Jenkins hudson = Jenkins.getInstance();
|
||||
Jenkins hudson = Jenkins.get();
|
||||
hudson.checkPermission(CONFIGURE_UPDATECENTER);
|
||||
UpdateCenter uc = hudson.getUpdateCenter();
|
||||
PersistedList<UpdateSite> sites = uc.getSites();
|
||||
@@ -1619,7 +1619,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
|
||||
@RequirePOST
|
||||
public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException {
|
||||
Jenkins jenkins = Jenkins.getInstance();
|
||||
Jenkins jenkins = Jenkins.get();
|
||||
jenkins.checkPermission(CONFIGURE_UPDATECENTER);
|
||||
|
||||
ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, req.getSubmittedForm());
|
||||
@@ -1639,7 +1639,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
@RequirePOST
|
||||
public HttpResponse doUploadPlugin(StaplerRequest req) throws IOException, ServletException {
|
||||
try {
|
||||
Jenkins.getInstance().checkPermission(UPLOAD_PLUGINS);
|
||||
Jenkins.get().checkPermission(UPLOAD_PLUGINS);
|
||||
|
||||
ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
|
||||
|
||||
@@ -1705,7 +1705,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
|
||||
@Restricted(NoExternalUse.class)
|
||||
@RequirePOST public HttpResponse doCheckUpdatesServer() throws IOException {
|
||||
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
|
||||
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
|
||||
|
||||
// We'll check the update servers with a try-retry mechanism. The retrier is built with a builder
|
||||
Retrier<FormValidation> updateServerRetrier = new Retrier.Builder<>(
|
||||
@@ -1801,7 +1801,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
}
|
||||
|
||||
public Descriptor<ProxyConfiguration> getProxyDescriptor() {
|
||||
return Jenkins.getInstance().getDescriptor(ProxyConfiguration.class);
|
||||
return Jenkins.get().getDescriptor(ProxyConfiguration.class);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1823,9 +1823,9 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
* @since 1.483
|
||||
*/
|
||||
public List<Future<UpdateCenter.UpdateCenterJob>> prevalidateConfig(InputStream configXml) throws IOException {
|
||||
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
|
||||
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
|
||||
List<Future<UpdateCenter.UpdateCenterJob>> jobs = new ArrayList<>();
|
||||
UpdateCenter uc = Jenkins.getInstance().getUpdateCenter();
|
||||
UpdateCenter uc = Jenkins.get().getUpdateCenter();
|
||||
// TODO call uc.updateAllSites() when available? perhaps not, since we should not block on network here
|
||||
for (Map.Entry<String,VersionNumber> requestedPlugin : parseRequestedPlugins(configXml).entrySet()) {
|
||||
PluginWrapper pw = getPlugin(requestedPlugin.getKey());
|
||||
@@ -1885,7 +1885,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
*/
|
||||
@RequirePOST
|
||||
public JSONArray doPrevalidateConfig(StaplerRequest req) throws IOException {
|
||||
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
|
||||
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
|
||||
|
||||
JSONArray response = new JSONArray();
|
||||
|
||||
@@ -2154,7 +2154,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
public boolean isActivated() {
|
||||
if(pluginsWithCycle == null){
|
||||
pluginsWithCycle = new ArrayList<>();
|
||||
for (PluginWrapper p : Jenkins.getInstance().getPluginManager().getPlugins()) {
|
||||
for (PluginWrapper p : Jenkins.get().getPluginManager().getPlugins()) {
|
||||
if(p.hasCycleDependency()){
|
||||
pluginsWithCycle.add(p);
|
||||
isActive = true;
|
||||
@@ -2194,7 +2194,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
* @param message the message to show (plain text)
|
||||
*/
|
||||
public void ifPluginOlderThenReport(String pluginName, String requiredVersion, String message){
|
||||
Plugin plugin = Jenkins.getInstance().getPlugin(pluginName);
|
||||
Plugin plugin = Jenkins.get().getPlugin(pluginName);
|
||||
if(plugin != null){
|
||||
if(plugin.getWrapper().getVersionNumber().isOlderThan(new VersionNumber(requiredVersion))) {
|
||||
pluginsToBeUpdated.put(pluginName, new PluginUpdateInfo(pluginName, message));
|
||||
@@ -2239,7 +2239,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
@Restricted(NoExternalUse.class)
|
||||
public Object getTarget() {
|
||||
if (!SKIP_PERMISSION_CHECK) {
|
||||
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
|
||||
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user