renames class files to avoid AbbreviationAsWordInName checkstyle rule

kcsurapaneni · kcsurapaneni · commit 583e06389b35 · 2025-02-18T09:27:02.000-07:00
diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionInstrumentation.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionInstrumentation.java
@@ -7,7 +7,7 @@
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
-import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActiveJHttpServerConnectionSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerConnectionSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -29,8 +29,7 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-@SuppressWarnings("AbbreviationAsWordInName")
-public class ActiveJHttpServerConnectionInstrumentation implements TypeInstrumentation {
+public class ActivejHttpServerConnectionInstrumentation implements TypeInstrumentation {
 
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
@@ -90,7 +89,7 @@ public static void methodExit(
         if (responsePromise.isException()) {
           error = responsePromise.getException();
         }
-        httpResponse = ActiveJHttpServerHelper.createResponse(error, traceparent, httpResponse);
+        httpResponse = ActivejHttpServerHelper.createResponse(error, traceparent, httpResponse);
         instrumenter().end(context, httpRequest, httpResponse, error);
         responsePromise = Promise.of(httpResponse);
       } else if (throwable != null) {
diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionInstrumentationModule.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionInstrumentationModule.java
@@ -13,21 +13,20 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.List;
 
-@SuppressWarnings("AbbreviationAsWordInName")
 @AutoService(InstrumentationModule.class)
-public class ActiveJHttpServerConnectionInstrumentationModule extends InstrumentationModule {
+public class ActivejHttpServerConnectionInstrumentationModule extends InstrumentationModule {
 
-  public ActiveJHttpServerConnectionInstrumentationModule() {
+  public ActivejHttpServerConnectionInstrumentationModule() {
     super("activej-http", "activej-http-6.0");
   }
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return singletonList(new ActiveJHttpServerConnectionInstrumentation());
+    return singletonList(new ActivejHttpServerConnectionInstrumentation());
   }
 
   @Override
   public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) {
-    helperResourceBuilder.register(ActiveJHttpServerHelper.class.getName());
+    helperResourceBuilder.register(ActivejHttpServerHelper.class.getName());
   }
 }
diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionSingletons.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionSingletons.java
@@ -10,8 +10,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 
-@SuppressWarnings("AbbreviationAsWordInName")
-public class ActiveJHttpServerConnectionSingletons {
+public class ActivejHttpServerConnectionSingletons {
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.activej-http-6.0";
 
@@ -21,13 +20,13 @@ public class ActiveJHttpServerConnectionSingletons {
     INSTRUMENTER =
         JavaagentHttpServerInstrumenters.create(
             INSTRUMENTATION_NAME,
-            new ActiveJHttpServerHttpAttributesGetter(),
-            ActiveJHttpServerHeaders.INSTANCE);
+            new ActivejHttpServerHttpAttributesGetter(),
+            ActivejHttpServerHeaders.INSTANCE);
   }
 
   public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
     return INSTRUMENTER;
   }
 
-  private ActiveJHttpServerConnectionSingletons() {}
+  private ActivejHttpServerConnectionSingletons() {}
 }
diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHeaders.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHeaders.java
@@ -16,8 +16,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-@SuppressWarnings("AbbreviationAsWordInName")
-enum ActiveJHttpServerHeaders implements ExtendedTextMapGetter<HttpRequest> {
+enum ActivejHttpServerHeaders implements ExtendedTextMapGetter<HttpRequest> {
   INSTANCE;
 
   @Override
diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHelper.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHelper.java
@@ -12,10 +12,9 @@
 import io.activej.http.HttpResponse;
 import java.util.Map;
 
-@SuppressWarnings("AbbreviationAsWordInName")
-public final class ActiveJHttpServerHelper {
+public final class ActivejHttpServerHelper {
 
-  private ActiveJHttpServerHelper() {
+  private ActivejHttpServerHelper() {
     throw new UnsupportedOperationException();
   }
 
diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHttpAttributesGetter.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHttpAttributesGetter.java
@@ -12,30 +12,29 @@
 import java.util.List;
 import javax.annotation.Nullable;
 
-@SuppressWarnings("AbbreviationAsWordInName")
-final class ActiveJHttpServerHttpAttributesGetter
+final class ActivejHttpServerHttpAttributesGetter
     implements HttpServerAttributesGetter<HttpRequest, HttpResponse> {
 
   @Override
   public String getHttpRequestMethod(HttpRequest request) {
-    return ActiveJHttpServerUtil.getHttpRequestMethod(request);
+    return ActivejHttpServerUtil.getHttpRequestMethod(request);
   }
 
   @Override
   public List<String> getHttpRequestHeader(HttpRequest request, String name) {
-    return ActiveJHttpServerUtil.requestHeader(request, name);
+    return ActivejHttpServerUtil.requestHeader(request, name);
   }
 
   @Override
   public Integer getHttpResponseStatusCode(
       HttpRequest request, HttpResponse httpResponse, @Nullable Throwable error) {
-    return ActiveJHttpServerUtil.getHttpResponseStatusCode(request, httpResponse, error);
+    return ActivejHttpServerUtil.getHttpResponseStatusCode(request, httpResponse, error);
   }
 
   @Override
   public List<String> getHttpResponseHeader(
       HttpRequest request, HttpResponse httpResponse, String name) {
-    return ActiveJHttpServerUtil.getHttpResponseHeader(request, httpResponse, name);
+    return ActivejHttpServerUtil.getHttpResponseHeader(request, httpResponse, name);
   }
 
   @Override
diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerUtil.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerUtil.java
@@ -15,10 +15,9 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
-@SuppressWarnings("AbbreviationAsWordInName")
-public final class ActiveJHttpServerUtil {
+public final class ActivejHttpServerUtil {
 
-  private ActiveJHttpServerUtil() {
+  private ActivejHttpServerUtil() {
     throw new UnsupportedOperationException();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -13,21 +13,20 @@`
`13`	`13`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;`
`14`	`14`	`import java.util.List;`
`15`	`15`
`16`		`-@SuppressWarnings("AbbreviationAsWordInName")`
`17`	`16`	`@AutoService(InstrumentationModule.class)`
`18`		`-public class ActiveJHttpServerConnectionInstrumentationModule extends InstrumentationModule {`
	`17`	`+public class ActivejHttpServerConnectionInstrumentationModule extends InstrumentationModule {`
`19`	`18`
`20`		`- public ActiveJHttpServerConnectionInstrumentationModule() {`
	`19`	`+ public ActivejHttpServerConnectionInstrumentationModule() {`
`21`	`20`	`super("activej-http", "activej-http-6.0");`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`@Override`
`25`	`24`	`public List<TypeInstrumentation> typeInstrumentations() {`
`26`		`- return singletonList(new ActiveJHttpServerConnectionInstrumentation());`
	`25`	`+ return singletonList(new ActivejHttpServerConnectionInstrumentation());`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`@Override`
`30`	`29`	`public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) {`
`31`		`- helperResourceBuilder.register(ActiveJHttpServerHelper.class.getName());`
	`30`	`+ helperResourceBuilder.register(ActivejHttpServerHelper.class.getName());`
`32`	`31`	`}`
`33`	`32`	`}`