OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-10-28 20:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into keyboard-shortcut-animation

Browse Source
This commit is contained in:
Jan Faracik committed 2024-08-04 15:01:26 +01:00
2 parents 02a8466f6b 4137e4992d
commit ae0685ab82
349 files changed
+6004 -3494
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/Functions.java
+6 -9
View File
@@ -317,8 +317,7 @@ public class Functions {
*/
public static <B> Class getTypeParameter(Class<? extends B> c, Class<B> base, int n) {
Type parameterization = Types.getBaseClass(c, base);
if (parameterization instanceof ParameterizedType) {
ParameterizedType pt = (ParameterizedType) parameterization;
if (parameterization instanceof ParameterizedType pt) {
return Types.erasure(Types.getTypeArgument(pt, n));
} else {
throw new AssertionError(c + " doesn't properly parameterize " + base);
@@ -1423,7 +1422,7 @@ public class Functions {
StringBuilder buf = new StringBuilder();
Item i = p;
while (true) {
if (buf.length() > 0) buf.insert(0, separationString);
if (!buf.isEmpty()) buf.insert(0, separationString);
buf.insert(0, useDisplayName ? i.getDisplayName() : i.getName());
ItemGroup gr = i.getParent();
@@ -1874,7 +1873,7 @@ public class Functions {
for (String s : components) {
if (s.isEmpty()) continue;
if (buf.length() > 0) {
if (!buf.isEmpty()) {
if (buf.charAt(buf.length() - 1) != '/')
buf.append('/');
if (s.charAt(0) == '/') s = s.substring(1);
@@ -1980,8 +1979,7 @@ public class Functions {
@Deprecated
public String getCheckUrl(String userDefined, Object descriptor, String field) {
if (userDefined != null || field == null) return userDefined;
if (descriptor instanceof Descriptor) {
Descriptor d = (Descriptor) descriptor;
if (descriptor instanceof Descriptor d) {
return d.getCheckUrl(field);
}
return null;
@@ -1994,8 +1992,7 @@ public class Functions {
public void calcCheckUrl(Map attributes, String userDefined, Object descriptor, String field) {
if (userDefined != null || field == null) return;
if (descriptor instanceof Descriptor) {
Descriptor d = (Descriptor) descriptor;
if (descriptor instanceof Descriptor d) {
CheckMethod m = d.getCheckMethod(field);
attributes.put("checkUrl", m.toStemUrl());
attributes.put("checkDependsOn", m.getDependsOn());
@@ -2058,7 +2055,7 @@ public class Functions {
* Prepend a prefix only when there's the specified body.
*/
public String prepend(String prefix, String body) {
if (body != null && body.length() > 0)
if (body != null && !body.isEmpty())
return prefix + body;
return body;
}