Fix more pmd_analyze issues.

Author: phipag

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/TracingE2ET.java

@@ -85,7 +85,7 @@ void test_tracing() {
         // We need to filter segments based on name because they are not returned in-order from the X-Ray API
         // The Init segment is created by default for Lambda functions in X-Ray
         final SubSegment initSegment = trace.getSubsegments().stream()
-                .filter(subSegment -> subSegment.getName().equals("Init"))
+                .filter(subSegment -> "Init".equals(subSegment.getName()))
                 .findFirst().orElse(null);
         assertThat(initSegment.getName()).isEqualTo("Init");
         assertThat(initSegment.getAnnotations()).isNull();

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java

@@ -98,7 +98,7 @@
  * `PutObjectRequest`)
  * and the CloudFormation stack is created (with the SDK `createStack`)
  */
-public class Infrastructure {
+public final class Infrastructure {
     public static final String FUNCTION_NAME_OUTPUT = "functionName";
     private static final Logger LOG = LoggerFactory.getLogger(Infrastructure.class);
 
@@ -121,7 +121,6 @@ public class Infrastructure {
     private final String kinesisStream;
     private final String largeMessagesBucket;
     private String ddbStreamsTableName;
-    private String functionName;
     private Object cfnTemplate;
     private String cfnAssetDirectory;
 
@@ -224,7 +223,7 @@ private Stack createStackWithLambda() {
                 ? dockerConfig.createGraalVMBundlingOptions(pathToFunction, runtime)
                 : dockerConfig.createJVMBundlingOptions(pathToFunction, runtime);
 
-        functionName = stackName + "-function";
+        String functionName = stackName + "-function";
         CfnOutput.Builder.create(e2eStack, FUNCTION_NAME_OUTPUT)
                 .value(functionName)
                 .build();

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/tracing/TraceFetcher.java

@@ -112,12 +112,11 @@ private Trace getTrace(List<String> traceIds) {
                 trace.segments().forEach(segment -> {
                     try {
                         SegmentDocument document = MAPPER.readValue(segment.document(), SegmentDocument.class);
-                        if (document.getOrigin().equals("AWS::Lambda::Function")) {
-                            if (document.hasSubsegments()) {
-                                getNestedSubSegments(document.getSubsegments(), traceRes,
-                                        Collections.emptyList());
-                            }
+                        if ("AWS::Lambda::Function".equals(document.getOrigin()) && document.hasSubsegments()) {
+                            getNestedSubSegments(document.getSubsegments(), traceRes,
+                                    Collections.emptyList());
                         }
+
                     } catch (JsonProcessingException e) {
                         LOG.error("Failed to parse segment document: " + e.getMessage());
                         throw new RuntimeException(e);