Skip to content

Commit a65d922

Browse files
kweinmeisterkweinmeister
authored
fix: address generic type warnings (GoogleCloudPlatform#8005)
* fix: address generic type warnings * linting * review feedback: use diamond operator * linting
1 parent 5f62688 commit a65d922

55 files changed

Lines changed: 107 additions & 91 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class UrlShortener {
3939
* <p>Note: Error handling elided for simplicity.
4040
*/
4141
public String createShortUrl(String longUrl) throws Exception {
42-
ArrayList<String> scopes = new ArrayList<String>();
42+
ArrayList<String> scopes = new ArrayList<>();
4343
scopes.add("https://www.googleapis.com/auth/urlshortener");
4444
final AppIdentityService appIdentity = AppIdentityServiceFactory.getAppIdentityService();
4545
final AppIdentityService.GetAccessTokenResult accessToken = appIdentity.getAccessToken(scopes);

‎appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryHome.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ private static String convertRunToHtmlTable(TableResult result) {
5555
return sb.toString();
5656
}
5757

58-
private static String convertAveragesToHtmlTable(List<TimeSeriesSummary> values) {
58+
private static String convertAveragesToHtmlTable(List<TimeSeriesSummary<?>> values) {
5959

6060
StringBuilder sb = new StringBuilder();
61-
for (TimeSeriesSummary metric : values) {
61+
for (TimeSeriesSummary<?> metric : values) {
6262
sb.append("<tr>");
6363
addColumn(sb, metric.getName());
6464
addColumn(sb, metric.getValues().size());

‎appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ private TimeSeries prepareMetric(MetricDescriptor requiredMetric, long metricVal
185185
return TimeSeries.newBuilder().setMetric(metric).addAllPoints(pointList).build();
186186
}
187187

188-
public List<TimeSeriesSummary> getTimeSeriesValues() {
189-
List<TimeSeriesSummary> summaries = Lists.newArrayList();
188+
public List<TimeSeriesSummary<?>> getTimeSeriesValues() {
189+
List<TimeSeriesSummary<?>> summaries = Lists.newArrayList();
190190
createMetricsIfNeeded();
191191
for (MetricDescriptor metric : REQUIRED_METRICS) {
192192
ListTimeSeriesRequest listTimeSeriesRequest =

‎appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/TimeSeriesSummary.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public abstract class TimeSeriesSummary<T> {
3232
T mostRecentValue;
3333
List<T> values;
3434

35-
public static TimeSeriesSummary fromTimeSeries(TimeSeries timeSeries) {
35+
public static TimeSeriesSummary<?> fromTimeSeries(TimeSeries timeSeries) {
3636
switch (timeSeries.getValueType()) {
3737
case STRING:
3838
return new StringTimeSeriesSummary(timeSeries);

‎appengine-java8/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void setUp() {
7979

8080
when(metricsServiceStub.listMetricDescriptorsPagedCallable()).thenReturn(listCallable);
8181
when(listCallable.call(any(ListMetricDescriptorsRequest.class))).thenReturn(listResponse);
82-
when(listResponse.iterateAll()).thenReturn(Collections.EMPTY_LIST);
82+
when(listResponse.iterateAll()).thenReturn(Collections.emptyList());
8383

8484
when(metricsServiceStub.createMetricDescriptorCallable()).thenReturn(createMetricCallable);
8585
when(createMetricCallable.call(any(CreateMetricDescriptorRequest.class))).thenReturn(null);

‎appengine-java8/datastore-schedule-export/src/main/java/com/example/datastore/DatastoreExportServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
6868
connection.addRequestProperty("Content-Type", "application/json");
6969

7070
// Get an access token to authorize export request
71-
ArrayList<String> scopes = new ArrayList<String>();
71+
ArrayList<String> scopes = new ArrayList<>();
7272
scopes.add("https://www.googleapis.com/auth/datastore");
7373
final AppIdentityService appIdentity = AppIdentityServiceFactory.getAppIdentityService();
7474
final AppIdentityService.GetAccessTokenResult accessToken =

‎appengine-java8/datastore/src/test/java/com/example/appengine/EntitiesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public void deletingAnEntity_deletesAnEntity() throws Exception {
209209
public void repeatedProperties_storesList() throws Exception {
210210
// [START repeated_properties]
211211
Entity employee = new Entity("Employee");
212-
ArrayList<String> favoriteFruit = new ArrayList<String>();
212+
ArrayList<String> favoriteFruit = new ArrayList<>();
213213
favoriteFruit.add("Pear");
214214
favoriteFruit.add("Apple");
215215
employee.setProperty("favoriteFruit", favoriteFruit);

‎appengine-java8/datastore/src/test/java/com/example/appengine/MetadataKindsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void printLowercaseKinds(DatastoreService ds, PrintWriter writer) {
7575
// Start with unrestricted kind query
7676
Query q = new Query(Entities.KIND_METADATA_KIND);
7777

78-
List<Filter> subFils = new ArrayList();
78+
List<Filter> subFils = new ArrayList<>();
7979

8080
// Limit to lowercase initial letters
8181
subFils.add(

‎appengine-java8/datastore/src/test/java/com/example/appengine/MetadataNamespacesTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ List<String> getNamespaces(DatastoreService ds, String start, String end) {
104104

105105
// Start with unrestricted namespace query
106106
Query q = new Query(Entities.NAMESPACE_METADATA_KIND);
107-
List<Filter> subFilters = new ArrayList();
107+
List<Filter> subFilters = new ArrayList<>();
108108
// Limit to specified range, if any
109109
if (start != null) {
110110
subFilters.add(
@@ -124,7 +124,7 @@ List<String> getNamespaces(DatastoreService ds, String start, String end) {
124124
q.setFilter(CompositeFilterOperator.and(subFilters));
125125

126126
// Initialize result list
127-
List<String> results = new ArrayList<String>();
127+
List<String> results = new ArrayList<>();
128128

129129
// Build list of query results
130130
for (Entity e : ds.prepare(q).asIterable()) {

‎appengine-java8/datastore/src/test/java/com/example/appengine/MetadataPropertiesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ List<String> propertiesOfKind(DatastoreService ds, String kind) {
169169
q.setAncestor(Entities.createKindKey(kind));
170170

171171
// Initialize result list
172-
ArrayList<String> results = new ArrayList<String>();
172+
ArrayList<String> results = new ArrayList<>();
173173

174174
//Build list of query results
175175
for (Entity e : ds.prepare(q).asIterable()) {

0 commit comments

Comments
 (0)