From f8d5911d208b37345764e5c2e05b4597ce7c634d Mon Sep 17 00:00:00 2001 From: George Kankava Date: Mon, 4 Apr 2016 23:47:12 +0400 Subject: [PATCH] squid:S2325 - private methods that don't access instance data should be static --- .../importer/impl/SchemaTransformer.java | 12 +++++------ .../impl/sdk/ApiGatewaySdkApiImporter.java | 2 +- .../sdk/ApiGatewaySdkRamlApiImporter.java | 16 +++++++-------- .../sdk/ApiGatewaySdkSwaggerApiImporter.java | 20 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/com/amazonaws/service/apigateway/importer/impl/SchemaTransformer.java b/src/com/amazonaws/service/apigateway/importer/impl/SchemaTransformer.java index f6a8962..1932ebf 100644 --- a/src/com/amazonaws/service/apigateway/importer/impl/SchemaTransformer.java +++ b/src/com/amazonaws/service/apigateway/importer/impl/SchemaTransformer.java @@ -47,7 +47,7 @@ public String flatten(String model, String models) { return getFlattened(deserialize(model), deserialize(models)); } - private void buildSchemaReferenceMap(JsonNode model, JsonNode models, Map modelMap) { + private static void buildSchemaReferenceMap(JsonNode model, JsonNode models, Map modelMap) { Map refs = new HashMap<>(); findReferences(model, refs); @@ -67,7 +67,7 @@ private void buildSchemaReferenceMap(JsonNode model, JsonNode models, Map schemaMap) { /* * Replace a reference node with an inline reference */ - private void replaceRef(ObjectNode parent, String schemaName) { + private static void replaceRef(ObjectNode parent, String schemaName) { parent.set("$ref", new TextNode("#/definitions/" + schemaName)); } /* * Find all reference node in the schema tree. Build a map of the reference node to its parent */ - private void findReferences(JsonNode node, Map refNodes) { + private static void findReferences(JsonNode node, Map refNodes) { JsonNode refNode = node.path("$ref"); if (!refNode.isMissingNode()) { refNodes.put(refNode, node); @@ -161,7 +161,7 @@ JsonNode deserialize(String schemaText) { * Attempt to serialize an existing schema * If this fails something is seriously wrong, because this schema has already been saved by the control plane */ - private String serializeExisting(JsonNode root) { + private static String serializeExisting(JsonNode root) { try { return new ObjectMapper().writeValueAsString(root); } catch (JsonProcessingException e) { diff --git a/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkApiImporter.java b/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkApiImporter.java index 438a334..4e5ae84 100644 --- a/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkApiImporter.java +++ b/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkApiImporter.java @@ -234,7 +234,7 @@ protected String buildResourcePath(String basePath, String resourcePath) { return result; } - private String trimSlashes(String path) { + private static String trimSlashes(String path) { return StringUtils.removeEnd(StringUtils.removeStart(path, "/"), "/"); } diff --git a/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkRamlApiImporter.java b/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkRamlApiImporter.java index 9038a7f..3cbddd4 100644 --- a/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkRamlApiImporter.java +++ b/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkRamlApiImporter.java @@ -105,7 +105,7 @@ public void updateApi(String apiId, Raml raml, JSONObject config) { cleanupModels(api, this.models); } - private String getApiName (Raml raml, String fileName) { + private static String getApiName (Raml raml, String fileName) { String title = raml.getTitle(); return StringUtils.isNotBlank(title) ? title : fileName; } @@ -280,7 +280,7 @@ private void createMethod(final RestApi api, final Resource resource, final Acti createMethodResponses(api, method, action.getResponses(), update); } - private void createIntegration(Resource resource, Method method, JSONObject config) { + private static void createIntegration(Resource resource, Method method, JSONObject config) { if (config == null) { return; } @@ -312,7 +312,7 @@ private void createIntegration(Resource resource, Method method, JSONObject conf } } - private void createIntegrationResponses(Integration integration, JSONObject responses) { + private static void createIntegrationResponses(Integration integration, JSONObject responses) { if (responses == null) { return; } @@ -339,7 +339,7 @@ private void createIntegrationResponses(Integration integration, JSONObject resp } } - private List jsonObjectToListString (JSONArray json) { + private static List jsonObjectToListString (JSONArray json) { if (json == null) { return null; } @@ -355,7 +355,7 @@ private List jsonObjectToListString (JSONArray json) { return list; } - private Map jsonObjectToHashMapString (JSONObject json) { + private static Map jsonObjectToHashMapString (JSONObject json) { if (json == null) { return null; } @@ -473,7 +473,7 @@ private String createModel(RestApi api, String mime, MimeType mimeType) { return null; } - private String getExpression(String area, String part, String type, String name) { + private static String getExpression(String area, String part, String type, String name) { return area + "." + part + "." + type + "." + name; } @@ -492,7 +492,7 @@ private void updateMethod(RestApi api, Method method, String type, String name, method.updateMethod(createPatchDocument(createAddOperation("/requestParameters/" + expression, getStringValue(required)))); } - private String getAuthorizationTypeFromConfig(Resource resource, String method, JSONObject config) { + private static String getAuthorizationTypeFromConfig(Resource resource, String method, JSONObject config) { if (config == null) { return "NONE"; } @@ -508,7 +508,7 @@ private String getAuthorizationTypeFromConfig(Resource resource, String method, } } - private String escapeOperationString(String value) { + private static String escapeOperationString(String value) { return value.replaceAll("~", "~0").replaceAll("/", "~1"); } diff --git a/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkSwaggerApiImporter.java b/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkSwaggerApiImporter.java index acb910d..4a0524c 100644 --- a/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkSwaggerApiImporter.java +++ b/src/com/amazonaws/service/apigateway/importer/impl/sdk/ApiGatewaySdkSwaggerApiImporter.java @@ -93,7 +93,7 @@ public void updateApi(String apiId, Swagger swagger) { cleanupModels(api, this.processedModels); } - private String getApiName(Swagger swagger, String fileName) { + private static String getApiName(Swagger swagger, String fileName) { String title = swagger.getInfo().getTitle(); return StringUtils.isNotBlank(title) ? title : fileName; } @@ -183,7 +183,7 @@ private void createMethods(final RestApi api, final Resource resource, Path path }); } - private Map getOperations(Path path) { + private static Map getOperations(Path path) { final Map ops = new HashMap<>(); addOp(ops, "get", path.getGet()); @@ -196,7 +196,7 @@ private Map getOperations(Path path) { return ops; } - private void addOp(Map ops, String method, Operation operation) { + private static void addOp(Map ops, String method, Operation operation) { if (operation != null) { ops.put(method, operation); } @@ -288,7 +288,7 @@ private void createIntegrationResponses(Integration integration, Map pa cleanupResources(api, buildResourceSet(paths.keySet(), basePath)); } - private Set buildResourceSet(Set paths, String basePath) { + private static Set buildResourceSet(Set paths, String basePath) { if (StringUtils.isBlank(basePath)) { basePath = "/"; } @@ -562,12 +562,12 @@ private void createMethodParameters(RestApi api, Method method, List }); } - private String createRequestParameterExpression(Parameter p) { + private static String createRequestParameterExpression(Parameter p) { Optional loc = getParameterLocation(p); return "method.request." + loc.get() + "." + p.getName(); } - private Optional getParameterLocation(Parameter p) { + private static Optional getParameterLocation(Parameter p) { switch (p.getIn()) { case "path": return Optional.of("path");