post-review changes

Author: SylvainJuge

instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/LoadInjectedClassInstrumentation.java

@@ -60,22 +60,14 @@ public static class LoadClassAdvice {
     @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
     public static Class<?> onEnter(
         @Advice.This ClassLoader classLoader, @Advice.Argument(0) String name) {
-      Class<?> helperClass = InjectedClassHelper.loadHelperClass(classLoader, name);
-      if (helperClass != null) {
-        return helperClass;
-      }
-      return null;
+      return InjectedClassHelper.loadHelperClass(classLoader, name);
     }
 
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class)
     public static Class<?> onExit(
         @Advice.Return Class<?> originalResult, @Advice.Enter Class<?> loadedClass) {
-      Class<?> result = originalResult;
-      if (loadedClass != null) {
-        result = loadedClass;
-      }
-      return result;
+      return loadedClass != null ? loadedClass : originalResult;
     }
   }
 }

instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentation.java

@@ -57,11 +57,7 @@ public static boolean onEnter(@Advice.Argument(0) String packageName) {
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static boolean onExit(
         @Advice.Return boolean originalResult, @Advice.Enter boolean inClassLoaderMatcher) {
-      boolean result = originalResult;
-      if (inClassLoaderMatcher) {
-        result = false;
-      }
-      return result;
+      return inClassLoaderMatcher ? false : originalResult;
     }
   }
 }