archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8294472: Remove redundant rawtypes suppression in AbstractChronology

Browse source 
Reviewed-by: lancea, naoto
This commit is contained in:
Andrey Turbanov 2022-09-28 18:44:01 +00:00
parent 3b7fc80b18
commit 9309786dbf
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/java.base/share/classes/java/time/chrono/AbstractChronology.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -93,7 +93,6 @@ import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAdjusters; import java.time.temporal.TemporalAdjusters;
import java.time.temporal.TemporalField; import java.time.temporal.TemporalField;
import java.time.temporal.ValueRange; import java.time.temporal.ValueRange;
import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -193,8 +192,7 @@ public abstract class AbstractChronology implements Chronology {
registerChrono(ThaiBuddhistChronology.INSTANCE); registerChrono(ThaiBuddhistChronology.INSTANCE);
// Register Chronologies from the ServiceLoader // Register Chronologies from the ServiceLoader
@SuppressWarnings("rawtypes") ServiceLoader<AbstractChronology> loader = ServiceLoader.load(AbstractChronology.class, null);
ServiceLoader<AbstractChronology> loader = ServiceLoader.load(AbstractChronology.class, null);
for (AbstractChronology chrono : loader) { for (AbstractChronology chrono : loader) {
String id = chrono.getId(); String id = chrono.getId();
if (id.equals("ISO") || registerChrono(chrono) != null) { if (id.equals("ISO") || registerChrono(chrono) != null) {
@ -238,7 +236,6 @@ public abstract class AbstractChronology implements Chronology {
// Look for a Chronology using ServiceLoader of the Thread's ContextClassLoader // Look for a Chronology using ServiceLoader of the Thread's ContextClassLoader
// Application provided Chronologies must not be cached // Application provided Chronologies must not be cached
@SuppressWarnings("rawtypes")
ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class); ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
for (Chronology chrono : loader) { for (Chronology chrono : loader) {
if (type.equals(chrono.getCalendarType())) { if (type.equals(chrono.getCalendarType())) {
@ -271,7 +268,6 @@ public abstract class AbstractChronology implements Chronology {
// Look for a Chronology using ServiceLoader of the Thread's ContextClassLoader // Look for a Chronology using ServiceLoader of the Thread's ContextClassLoader
// Application provided Chronologies must not be cached // Application provided Chronologies must not be cached
@SuppressWarnings("rawtypes")
ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class); ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
for (Chronology chrono : loader) { for (Chronology chrono : loader) {
if (id.equals(chrono.getId()) || id.equals(chrono.getCalendarType())) { if (id.equals(chrono.getId()) || id.equals(chrono.getCalendarType())) {
@ -311,7 +307,6 @@ public abstract class AbstractChronology implements Chronology {
HashSet<Chronology> chronos = new HashSet<>(CHRONOS_BY_ID.values()); HashSet<Chronology> chronos = new HashSet<>(CHRONOS_BY_ID.values());
/// Add in Chronologies from the ServiceLoader configuration /// Add in Chronologies from the ServiceLoader configuration
@SuppressWarnings("rawtypes")
ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class); ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
for (Chronology chrono : loader) { for (Chronology chrono : loader) {
chronos.add(chrono); chronos.add(chrono);