From 95cac497d29d92dab6d9e239ae555a442fd1a9a0 Mon Sep 17 00:00:00 2001 From: Richard Startin Date: Fri, 1 May 2020 15:50:08 +0100 Subject: [PATCH] Replace collection.size() > 0 with not collection.isEmpty() (DataDog/dd-trace-java#1420) --- .../main/java/io/opentelemetry/auto/tooling/Instrumenter.java | 2 +- .../auto/tooling/muzzle/MuzzleVersionScanPlugin.java | 2 +- .../auto/instrumentation/hibernate/HibernateDecorator.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Instrumenter.java b/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Instrumenter.java index a98176b86d..e2b3328ba3 100644 --- a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Instrumenter.java +++ b/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Instrumenter.java @@ -82,7 +82,7 @@ public interface Instrumenter { instrumentationPrimaryName = instrumentationName; enabled = Config.get().isIntegrationEnabled(instrumentationNames, defaultEnabled()); - if (contextStore().size() > 0) { + if (!contextStore().isEmpty()) { contextProvider = new FieldBackedProvider(this); } else { contextProvider = NoopContextProvider.INSTANCE; diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVersionScanPlugin.java b/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVersionScanPlugin.java index 597464b84e..aaac42ace6 100644 --- a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVersionScanPlugin.java +++ b/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVersionScanPlugin.java @@ -181,7 +181,7 @@ public class MuzzleVersionScanPlugin { if (ref.getSuperName() != null) { builder.append(" extends<").append(ref.getSuperName()).append(">"); } - if (ref.getInterfaces().size() > 0) { + if (!ref.getInterfaces().isEmpty()) { builder.append(" implements "); for (final String iface : ref.getInterfaces()) { builder.append(" <").append(iface).append(">"); diff --git a/instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java b/instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java index c732e99a82..660091783e 100644 --- a/instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java +++ b/instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java @@ -62,7 +62,7 @@ public class HibernateDecorator extends OrmClientDecorator { } else if (annotations.contains("javax.persistence.Entity")) { // We were given an instance of an entity. name = entity.getClass().getName(); - } else if (entity instanceof List && ((List) entity).size() > 0) { + } else if (entity instanceof List && !((List) entity).isEmpty()) { // We have a list of entities. name = entityName(((List) entity).get(0)); }