Skip to content

Clean up generics #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jglick merged 1 commit into from
Nov 13, 2019
Merged

Clean up generics #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/main/java/hudson/plugins/timestamper/annotator/TimestampAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
*
* @author Steven G. Brown
*/
public final class TimestampAnnotator extends ConsoleAnnotator<Object> {
public final class TimestampAnnotator extends ConsoleAnnotator<Run<?, ?>> {

private static final long serialVersionUID = 1L;

Expand All @@ -69,9 +69,7 @@ public final class TimestampAnnotator extends ConsoleAnnotator<Object> {

/** {@inheritDoc} */
@Override
public ConsoleAnnotator<Object> annotate(Object context, MarkupText text) {
Run<?, ?> build = (Run<?, ?>) context;

public ConsoleAnnotator<Run<?, ?>> annotate(Run<?, ?> build, MarkupText text) {
try {
if (timestampsReader == null) {
ConsoleLogParser.Result logPosition = logParser.seek(build);
Expand Down
11 changes: 3 additions & 8 deletions src/main/java/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,12 @@
* @author Steven G. Brown
*/
@Extension(dynamicLoadable = YesNoMaybe.YES)
public final class TimestampAnnotatorFactory3 extends ConsoleAnnotatorFactory<Object> {
public final class TimestampAnnotatorFactory3 extends ConsoleAnnotatorFactory<Run<?, ?>> {

/** {@inheritDoc} */
@Override
public ConsoleAnnotator<Object> newInstance(Object context) {
// Prior to Jenkins 2.145, context was the build class (see 7bc431f)
Class<?> contextClass = context instanceof Class<?> ? (Class<?>) context : context.getClass();
if (!Run.class.isAssignableFrom(contextClass)) {
return null; // something else
}
if (TimestampNote.useTimestampNotes(contextClass)) {
public ConsoleAnnotator<Run<?, ?>> newInstance(Run<?, ?> build) {
if (TimestampNote.useTimestampNotes(build.getClass())) {
return null; // not using this system
}
StaplerRequest request = Stapler.getCurrentRequest();
Expand Down