提交 441bf1c2 编写于 作者: J Jesse Glick

Placate the JDK 9 compiler.

上级 6cad6735
...@@ -698,7 +698,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R ...@@ -698,7 +698,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
@Exported(name="allBuilds",visibility=-2) @Exported(name="allBuilds",visibility=-2)
@WithBridgeMethods(List.class) @WithBridgeMethods(List.class)
public RunList<RunT> getBuilds() { public RunList<RunT> getBuilds() {
return RunList.fromRuns(_getRuns().values()); return RunList.<RunT>fromRuns(_getRuns().values());
} }
/** /**
...@@ -730,7 +730,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R ...@@ -730,7 +730,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
* Gets all the builds in a map. * Gets all the builds in a map.
*/ */
public SortedMap<Integer, RunT> getBuildsAsMap() { public SortedMap<Integer, RunT> getBuildsAsMap() {
return Collections.unmodifiableSortedMap(_getRuns()); return Collections.<Integer, RunT>unmodifiableSortedMap(_getRuns());
} }
/** /**
......
...@@ -50,7 +50,7 @@ import java.util.TreeSet; ...@@ -50,7 +50,7 @@ import java.util.TreeSet;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import static com.google.common.collect.Lists.newArrayList; import com.google.common.collect.Lists;
import static com.google.common.collect.Sets.newHashSet; import static com.google.common.collect.Sets.newHashSet;
import javax.annotation.CheckForNull; import javax.annotation.CheckForNull;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
...@@ -169,7 +169,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q ...@@ -169,7 +169,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
@Exported(visibility=2) @Exported(visibility=2)
public List<ParameterValue> getParameters() { public List<ParameterValue> getParameters() {
return Collections.unmodifiableList(filter(parameters)); return Collections.<ParameterValue>unmodifiableList(filter(parameters));
} }
public ParameterValue getParameter(String name) { public ParameterValue getParameter(String name) {
...@@ -231,7 +231,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q ...@@ -231,7 +231,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
parametersAction.safeParameters = this.safeParameters; parametersAction.safeParameters = this.safeParameters;
return parametersAction; return parametersAction;
} }
List<ParameterValue> combinedParameters = newArrayList(overrides); List<ParameterValue> combinedParameters = Lists.<ParameterValue>newArrayList(overrides);
Set<String> names = newHashSet(); Set<String> names = newHashSet();
for(ParameterValue v : overrides) { for(ParameterValue v : overrides) {
......
...@@ -100,7 +100,7 @@ public abstract class ToolDescriptor<T extends ToolInstallation> extends Descrip ...@@ -100,7 +100,7 @@ public abstract class ToolDescriptor<T extends ToolInstallation> extends Descrip
* Lists up {@link ToolPropertyDescriptor}s that are applicable to this {@link ToolInstallation}. * Lists up {@link ToolPropertyDescriptor}s that are applicable to this {@link ToolInstallation}.
*/ */
public List<ToolPropertyDescriptor> getPropertyDescriptors() { public List<ToolPropertyDescriptor> getPropertyDescriptors() {
return PropertyDescriptor.for_(ToolProperty.all(),clazz); return PropertyDescriptor.<ToolPropertyDescriptor, ToolInstallation>for_(ToolProperty.all(), clazz);
} }
......
...@@ -143,7 +143,7 @@ public class CopyOnWriteList<E> implements Iterable<E> { ...@@ -143,7 +143,7 @@ public class CopyOnWriteList<E> implements Iterable<E> {
} }
public List<E> getView() { public List<E> getView() {
return Collections.unmodifiableList(core); return Collections.<E>unmodifiableList(core);
} }
public void addAllTo(Collection<? super E> dst) { public void addAllTo(Collection<? super E> dst) {
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
package hudson.util; package hudson.util;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
...@@ -314,12 +315,13 @@ public class Iterators { ...@@ -314,12 +315,13 @@ public class Iterators {
* <p> * <p>
* That is, this creates {A,B,C,D} from {A,B},{C,D}. * That is, this creates {A,B,C,D} from {A,B},{C,D}.
*/ */
@SafeVarargs
public static <T> Iterable<T> sequence( final Iterable<? extends T>... iterables ) { public static <T> Iterable<T> sequence( final Iterable<? extends T>... iterables ) {
return new Iterable<T>() { return new Iterable<T>() {
public Iterator<T> iterator() { public Iterator<T> iterator() {
return new FlattenIterator<T,Iterable<? extends T>>(Arrays.asList(iterables)) { return new FlattenIterator<T,Iterable<? extends T>>(ImmutableList.copyOf(iterables)) {
protected Iterator<T> expand(Iterable<? extends T> iterable) { protected Iterator<T> expand(Iterable<? extends T> iterable) {
return cast(iterable).iterator(); return Iterators.<T>cast(iterable).iterator();
} }
}; };
} }
...@@ -350,8 +352,9 @@ public class Iterators { ...@@ -350,8 +352,9 @@ public class Iterators {
}; };
} }
@SafeVarargs
public static <T> Iterator<T> sequence(Iterator<? extends T>... iterators) { public static <T> Iterator<T> sequence(Iterator<? extends T>... iterators) {
return com.google.common.collect.Iterators.concat(iterators); return com.google.common.collect.Iterators.<T>concat(iterators);
} }
/** /**
......
...@@ -43,7 +43,7 @@ public class InterruptedBuildAction extends InvisibleAction { ...@@ -43,7 +43,7 @@ public class InterruptedBuildAction extends InvisibleAction {
private final List<CauseOfInterruption> causes; private final List<CauseOfInterruption> causes;
public InterruptedBuildAction(Collection<? extends CauseOfInterruption> causes) { public InterruptedBuildAction(Collection<? extends CauseOfInterruption> causes) {
this.causes = ImmutableList.copyOf(causes); this.causes = ImmutableList.<CauseOfInterruption>copyOf(causes);
} }
@Exported @Exported
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册