From a5ee2953d09a7160b8f57c20dd8fad72426e8f0b Mon Sep 17 00:00:00 2001 From: Tomasz Boczkowski <24374337+tomboc@users.noreply.github.com> Date: Tue, 27 Jul 2021 09:27:27 -0600 Subject: [PATCH] Fix linter issues. --- .../google/api/server/spi/auth/GoogleJwtAuthenticator.java | 1 - .../api/server/spi/auth/GoogleOAuth2Authenticator.java | 1 - .../server/spi/config/model/ApiIssuerAudienceConfig.java | 1 - .../api/server/spi/config/model/ApiMethodConfig.java | 2 +- .../server/spi/config/model/ApiSerializationConfig.java | 7 +++++++ .../com/google/api/server/spi/config/model/Schema.java | 4 ++-- .../api/server/spi/discovery/DiscoveryGenerator.java | 1 - .../server/spi/request/RestServletRequestParamReader.java | 1 - .../api/server/spi/request/ServletRequestParamReader.java | 2 +- .../api/server/spi/response/RestResponseResultWriter.java | 3 --- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/auth/GoogleJwtAuthenticator.java b/endpoints-framework/src/main/java/com/google/api/server/spi/auth/GoogleJwtAuthenticator.java index b02292a5..8dc452b9 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/auth/GoogleJwtAuthenticator.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/auth/GoogleJwtAuthenticator.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.security.GeneralSecurityException; -import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.http.HttpServletRequest; diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/auth/GoogleOAuth2Authenticator.java b/endpoints-framework/src/main/java/com/google/api/server/spi/auth/GoogleOAuth2Authenticator.java index 08eb7585..235c0429 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/auth/GoogleOAuth2Authenticator.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/auth/GoogleOAuth2Authenticator.java @@ -26,7 +26,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; -import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.http.HttpServletRequest; diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiIssuerAudienceConfig.java b/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiIssuerAudienceConfig.java index a1aab9d1..79172f83 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiIssuerAudienceConfig.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiIssuerAudienceConfig.java @@ -15,7 +15,6 @@ */ package com.google.api.server.spi.config.model; -import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiMethodConfig.java b/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiMethodConfig.java index be1e6adf..4fa5704f 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiMethodConfig.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiMethodConfig.java @@ -260,7 +260,7 @@ public boolean equals(Object o) { Objects.equals(peerAuthenticators, config.peerAuthenticators) && Objects.equals(typeLoader, config.typeLoader) && ignored == config.ignored && - apiKeyRequired == config.apiKeyRequired && + Objects.equals(apiKeyRequired, config.apiKeyRequired) && Objects.equals(returnType, config.returnType) && Objects.equals(metricCosts, config.metricCosts); } else { diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiSerializationConfig.java b/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiSerializationConfig.java index 4baeca4b..def0ffcc 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiSerializationConfig.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/ApiSerializationConfig.java @@ -107,5 +107,12 @@ public boolean equals(Object obj) { } return false; } + + @Override + public int hashCode() { + int result = sourceType.hashCode(); + result = 31 * result + serializer.hashCode(); + return result; + } } } diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/Schema.java b/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/Schema.java index 66e55f25..fc73cc95 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/Schema.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/config/model/Schema.java @@ -24,12 +24,12 @@ public abstract class Schema { /** * If the schema is an enum, a list of possible enum values in their string representation. */ - @Nullable public abstract ImmutableList enumValues(); + public abstract ImmutableList enumValues(); /** * If the schema is an enum, a list of enum value descriptions. */ - @Nullable public abstract ImmutableList enumDescriptions(); + public abstract ImmutableList enumDescriptions(); public static Builder builder() { return new AutoValue_Schema.Builder(); diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/discovery/DiscoveryGenerator.java b/endpoints-framework/src/main/java/com/google/api/server/spi/discovery/DiscoveryGenerator.java index a06aaba9..ebb8afd7 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/discovery/DiscoveryGenerator.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/discovery/DiscoveryGenerator.java @@ -66,7 +66,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.SortedSet; import java.util.TreeMap; /** diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/request/RestServletRequestParamReader.java b/endpoints-framework/src/main/java/com/google/api/server/spi/request/RestServletRequestParamReader.java index 65aedd21..745cca21 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/request/RestServletRequestParamReader.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/request/RestServletRequestParamReader.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import java.util.Collection; import java.util.Enumeration; import java.util.List; import java.util.Map; diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/request/ServletRequestParamReader.java b/endpoints-framework/src/main/java/com/google/api/server/spi/request/ServletRequestParamReader.java index a74fda37..a78ae2fb 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/request/ServletRequestParamReader.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/request/ServletRequestParamReader.java @@ -118,7 +118,7 @@ protected static List getParameterNames(EndpointMethod endpointMethod) if (annotation == null) { parameterNames.add(null); } else { - parameterNames.add((String) annotation.getClass().getMethod("value").invoke(annotation)); + parameterNames.add((String) annotation.annotationType().getMethod("value").invoke(annotation)); } } endpointMethod.setParameterNames(parameterNames); diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/response/RestResponseResultWriter.java b/endpoints-framework/src/main/java/com/google/api/server/spi/response/RestResponseResultWriter.java index 917a5ec3..ea7214e4 100644 --- a/endpoints-framework/src/main/java/com/google/api/server/spi/response/RestResponseResultWriter.java +++ b/endpoints-framework/src/main/java/com/google/api/server/spi/response/RestResponseResultWriter.java @@ -16,14 +16,11 @@ package com.google.api.server.spi.response; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.api.server.spi.ObjectMapperUtil; import com.google.api.server.spi.ServiceException; import com.google.api.server.spi.config.model.ApiSerializationConfig; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import java.io.IOException;