From 7822b0b29d496640f4f9fb898ac2078033bbf17e Mon Sep 17 00:00:00 2001
From: Bennett Lynch <lyncbenn@amazon.com>
Date: Wed, 3 Nov 2021 17:15:43 -0700
Subject: [PATCH] Enable & fix inspections: Single character string argument in
 `String.indexOf()` call

Reports single character strings being used as an argument in String.indexOf() and String.lastIndexOf() calls.

A quick-fix is suggested to replace such string literals with equivalent character literals, gaining some performance enhancement.

Example:

```
  return s.indexOf("x");
```

After the quick-fix is applied:

```
  return s.indexOf('x');
```
---
 .idea/inspectionProfiles/AWS_Java_SDK_2_0.xml                 | 1 +
 .../awssdk/codegen/lite/emitters/UnusedImportRemover.java     | 2 +-
 .../amazon/awssdk/codegen/emitters/UnusedImportRemover.java   | 2 +-
 .../amazon/awssdk/codegen/internal/DocumentationUtils.java    | 4 ++--
 .../amazon/awssdk/codegen/model/intermediate/ListModel.java   | 2 +-
 .../awssdk/codegen/model/intermediate/VariableModel.java      | 2 +-
 .../java/software/amazon/awssdk/codegen/poet/PoetUtils.java   | 4 ++--
 .../awssdk/codegen/poet/client/specs/JsonProtocolSpec.java    | 2 +-
 .../json/internal/unmarshall/JsonErrorCodeParser.java         | 2 +-
 .../software/amazon/awssdk/protocols/core/ProtocolUtils.java  | 4 ++--
 .../glacier/internal/GlacierExecutionInterceptor.java         | 2 +-
 .../services/route53/internal/Route53IdInterceptor.java       | 2 +-
 .../awssdk/protocol/asserts/marshalling/UriAssertion.java     | 2 +-
 13 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.idea/inspectionProfiles/AWS_Java_SDK_2_0.xml b/.idea/inspectionProfiles/AWS_Java_SDK_2_0.xml
index 5242f9c7446f..5d464240e77a 100644
--- a/.idea/inspectionProfiles/AWS_Java_SDK_2_0.xml
+++ b/.idea/inspectionProfiles/AWS_Java_SDK_2_0.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="AWS Java SDK 2.0" />
+    <inspection_tool class="LengthOneStringInIndexOf" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreObjectMethods" value="false" />
       <option name="ignoreAnonymousClassMethods" value="false" />
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/UnusedImportRemover.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/UnusedImportRemover.java
index a2410d38dce6..223612bf482c 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/UnusedImportRemover.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/UnusedImportRemover.java
@@ -62,7 +62,7 @@ private Predicate<String> isUnused(String content) {
     }
 
     private boolean isNotReferenced(String contentWithoutImports, String importToCheck) {
-        String symbol = importToCheck.substring(importToCheck.lastIndexOf(".") + 1);
+        String symbol = importToCheck.substring(importToCheck.lastIndexOf('.') + 1);
         return !Pattern.compile(String.format("\\b%s\\b", symbol)).matcher(contentWithoutImports).find();
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemover.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemover.java
index 567c56277226..0ecdaf7b7907 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemover.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemover.java
@@ -62,7 +62,7 @@ private Predicate<String> isUnused(String content) {
     }
 
     private boolean isNotReferenced(String contentWithoutImports, String importToCheck) {
-        String symbol = importToCheck.substring(importToCheck.lastIndexOf(".") + 1);
+        String symbol = importToCheck.substring(importToCheck.lastIndexOf('.') + 1);
         return !Pattern.compile(String.format("\\b%s\\b", symbol)).matcher(contentWithoutImports).find();
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java
index 5247adbeb2cd..f076da52c803 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java
@@ -72,8 +72,8 @@ public static String stripHtmlTags(String documentation) {
         }
 
         if (documentation.startsWith("<")) {
-            int startTagIndex = documentation.indexOf(">");
-            int closingTagIndex = documentation.lastIndexOf("<");
+            int startTagIndex = documentation.indexOf('>');
+            int closingTagIndex = documentation.lastIndexOf('<');
             if (closingTagIndex > startTagIndex) {
                 documentation = stripHtmlTags(documentation.substring(startTagIndex + 1, closingTagIndex));
             } else {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ListModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ListModel.java
index dba47d4e83c2..35ccf70963a1 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ListModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ListModel.java
@@ -125,7 +125,7 @@ public String getTemplateImplType() {
     }
 
     public String getSimpleType() {
-        int startIndex = memberType.lastIndexOf(".");
+        int startIndex = memberType.lastIndexOf('.');
         return memberType.substring(startIndex + 1);
     }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/VariableModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/VariableModel.java
index fdddc2b6f95d..bdf0668a9d21 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/VariableModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/VariableModel.java
@@ -64,7 +64,7 @@ public void setVariableType(String variableType) {
 
     public String getSimpleType() {
         if (variableType.contains(".")) {
-            return variableType.substring(variableType.lastIndexOf(".") + 1);
+            return variableType.substring(variableType.lastIndexOf('.') + 1);
         }
         return variableType;
     }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetUtils.java
index db57074fc515..b2e3f50ba358 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetUtils.java
@@ -98,8 +98,8 @@ public static TypeVariableName createBoundedTypeVariableName(String parameterNam
     }
 
     public static ClassName classNameFromFqcn(String fqcn) {
-        String basePath = fqcn.substring(0, fqcn.lastIndexOf("."));
-        String className = fqcn.substring(fqcn.lastIndexOf(".") + 1);
+        String basePath = fqcn.substring(0, fqcn.lastIndexOf('.'));
+        String className = fqcn.substring(fqcn.lastIndexOf('.') + 1);
         return ClassName.get(basePath, className);
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
index 2b6834a960c7..612e36308cc8 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
@@ -389,7 +389,7 @@ private String protocolEnumName(software.amazon.awssdk.codegen.model.intermediat
 
     private ClassName baseExceptionClassName(IntermediateModel model) {
         String exceptionPath = model.getSdkModeledExceptionBaseFqcn()
-                                    .substring(0, model.getSdkModeledExceptionBaseFqcn().lastIndexOf("."));
+                                    .substring(0, model.getSdkModeledExceptionBaseFqcn().lastIndexOf('.'));
 
         return ClassName.get(exceptionPath, model.getSdkModeledExceptionBaseClassName());
     }
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonErrorCodeParser.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonErrorCodeParser.java
index 8bdffecadfaf..e7ff60047bcc 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonErrorCodeParser.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonErrorCodeParser.java
@@ -124,7 +124,7 @@ private String parseErrorCodeFromContents(JsonNode jsonContents) {
             return null;
         }
         String code = errorCodeField.text();
-        int separator = code.lastIndexOf("#");
+        int separator = code.lastIndexOf('#');
         return code.substring(separator + 1);
     }
 }
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolUtils.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolUtils.java
index cead56f1cf65..cabd1a843e43 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolUtils.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolUtils.java
@@ -62,13 +62,13 @@ static String addStaticQueryParametersToRequest(SdkHttpFullRequest.Builder reque
 
         String resourcePath = uriResourcePath;
 
-        int index = resourcePath.indexOf("?");
+        int index = resourcePath.indexOf('?');
         if (index != -1) {
             String queryString = resourcePath.substring(index + 1);
             resourcePath = resourcePath.substring(0, index);
 
             for (String s : queryString.split("[;&]")) {
-                index = s.indexOf("=");
+                index = s.indexOf('=');
                 if (index != -1) {
                     request.putRawQueryParameter(s.substring(0, index), s.substring(index + 1));
                 } else {
diff --git a/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java b/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java
index 263e5c8bbbed..b47275ce35e5 100644
--- a/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java
+++ b/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java
@@ -66,7 +66,7 @@ private long parseContentLengthFromRange(String range) {
         String end = range.substring(range.indexOf('-') + 1);
 
         if (end.contains("/")) {
-            end = end.substring(0, end.indexOf("/"));
+            end = end.substring(0, end.indexOf('/'));
         }
 
         return Long.parseLong(end) - Long.parseLong(start) + 1;
diff --git a/services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java b/services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java
index 1f4f39710b1c..00f391085827 100644
--- a/services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java
+++ b/services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java
@@ -252,7 +252,7 @@ private String removePrefix(String s) {
             return null;
         }
 
-        int lastIndex = s.lastIndexOf("/");
+        int lastIndex = s.lastIndexOf('/');
         if (lastIndex > 0) {
             return s.substring(lastIndex + 1);
         }
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/UriAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/UriAssertion.java
index c45ab5f434f6..7d4ff4e51a0c 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/UriAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/UriAssertion.java
@@ -41,6 +41,6 @@ private String getActualPath(LoggedRequest actual) {
     }
 
     private String removeTrailingSlash(String str) {
-        return (str.endsWith("/")) ? str.substring(0, str.lastIndexOf("/")) : str;
+        return (str.endsWith("/")) ? str.substring(0, str.lastIndexOf('/')) : str;
     }
 }