Skip to content

Commit f3644ad

Browse files
author
Tomas Longo
committed
[WIP] Fix checkstyle findings
Signed-off-by: Tomas Longo <tomas.longo@sap.com>
1 parent f199d3a commit f3644ad

3 files changed

Lines changed: 1 addition & 35 deletions

File tree

‎data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.linecorp.armeria.client.Clients;
1414
import com.linecorp.armeria.client.WebClient;
1515
import com.linecorp.armeria.common.AggregatedHttpResponse;
16-
import com.linecorp.armeria.common.ClosedSessionException;
1716
import com.linecorp.armeria.common.HttpData;
1817
import com.linecorp.armeria.common.HttpMethod;
1918
import com.linecorp.armeria.common.HttpStatus;
@@ -84,12 +83,10 @@
8483
import java.util.StringJoiner;
8584
import java.util.UUID;
8685
import java.util.concurrent.CompletableFuture;
87-
import java.util.concurrent.CompletionException;
8886
import java.util.concurrent.ExecutionException;
8987
import java.util.function.Function;
9088
import java.util.stream.Collectors;
9189

92-
import static org.hamcrest.CoreMatchers.instanceOf;
9390
import static org.hamcrest.MatcherAssert.assertThat;
9491
import static org.hamcrest.Matchers.contains;
9592
import static org.hamcrest.Matchers.equalTo;

‎data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource_GrpcRequestTest.java‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,35 @@
1313
import static org.hamcrest.Matchers.not;
1414
import static org.hamcrest.Matchers.notNullValue;
1515
import static org.hamcrest.Matchers.nullValue;
16-
import static org.junit.jupiter.api.Assertions.assertEquals;
1716
import static org.junit.jupiter.api.Assertions.assertThrows;
18-
import static org.junit.jupiter.api.Assertions.assertTrue;
1917
import static org.junit.jupiter.params.provider.Arguments.arguments;
2018
import static org.mockito.ArgumentMatchers.any;
2119
import static org.mockito.ArgumentMatchers.anyBoolean;
2220
import static org.mockito.ArgumentMatchers.anyCollection;
2321
import static org.mockito.ArgumentMatchers.anyInt;
2422
import static org.mockito.ArgumentMatchers.eq;
25-
import static org.mockito.ArgumentMatchers.isA;
2623
import static org.mockito.Mockito.doThrow;
2724
import static org.mockito.Mockito.lenient;
2825
import static org.mockito.Mockito.mock;
29-
import static org.mockito.Mockito.never;
30-
import static org.mockito.Mockito.times;
3126
import static org.mockito.Mockito.verify;
3227
import static org.mockito.Mockito.verifyNoInteractions;
3328
import static org.mockito.Mockito.when;
3429
import static org.opensearch.dataprepper.plugins.source.oteltrace.OTelTraceSourceConfig.DEFAULT_PORT;
3530
import static org.opensearch.dataprepper.plugins.source.oteltrace.OTelTraceSourceConfig.DEFAULT_REQUEST_TIMEOUT_MS;
36-
import static org.opensearch.dataprepper.plugins.source.oteltrace.OTelTraceSourceConfig.SSL;
3731

38-
import java.io.ByteArrayOutputStream;
39-
import java.io.IOException;
40-
import java.io.InputStream;
4132
import java.nio.charset.StandardCharsets;
42-
import java.nio.file.Files;
43-
import java.nio.file.Path;
4433
import java.time.Duration;
4534
import java.util.Base64;
4635
import java.util.Collection;
47-
import java.util.Collections;
48-
import java.util.HashMap;
4936
import java.util.List;
5037
import java.util.Map;
51-
import java.util.Optional;
52-
import java.util.StringJoiner;
5338
import java.util.UUID;
5439
import java.util.concurrent.CompletableFuture;
55-
import java.util.concurrent.ExecutionException;
5640
import java.util.concurrent.TimeoutException;
5741
import java.util.function.Function;
5842
import java.util.stream.Collectors;
5943
import java.util.stream.Stream;
60-
import java.util.zip.GZIPOutputStream;
6144

62-
import org.apache.commons.io.IOUtils;
6345
import org.junit.jupiter.api.AfterEach;
6446
import org.junit.jupiter.api.BeforeEach;
6547
import org.junit.jupiter.api.Test;
@@ -72,13 +54,10 @@
7254
import org.mockito.ArgumentCaptor;
7355
import org.mockito.ArgumentMatchers;
7456
import org.mockito.Mock;
75-
import org.mockito.MockedStatic;
76-
import org.mockito.Mockito;
7757
import org.mockito.junit.jupiter.MockitoExtension;
7858
import org.opensearch.dataprepper.GrpcRequestExceptionHandler;
7959
import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider;
8060
import org.opensearch.dataprepper.armeria.authentication.HttpBasicAuthenticationConfig;
81-
import org.opensearch.dataprepper.metrics.MetricNames;
8261
import org.opensearch.dataprepper.metrics.MetricsTestUtil;
8362
import org.opensearch.dataprepper.metrics.PluginMetrics;
8463
import org.opensearch.dataprepper.model.buffer.Buffer;
@@ -93,38 +72,28 @@
9372
import org.opensearch.dataprepper.plugins.certificate.CertificateProvider;
9473
import org.opensearch.dataprepper.plugins.certificate.model.Certificate;
9574
import org.opensearch.dataprepper.plugins.codec.CompressionOption;
96-
import org.opensearch.dataprepper.plugins.health.HealthGrpcService;
9775
import org.opensearch.dataprepper.plugins.source.oteltrace.certificate.CertificateProviderFactory;
9876

99-
import com.fasterxml.jackson.databind.ObjectMapper;
100-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
10177
import com.google.protobuf.ByteString;
10278
import com.google.protobuf.InvalidProtocolBufferException;
10379
import com.google.protobuf.util.JsonFormat;
104-
import com.linecorp.armeria.client.ClientFactory;
10580
import com.linecorp.armeria.client.Clients;
10681
import com.linecorp.armeria.client.WebClient;
10782
import com.linecorp.armeria.common.AggregatedHttpResponse;
10883
import com.linecorp.armeria.common.HttpData;
109-
import com.linecorp.armeria.common.HttpHeaderNames;
11084
import com.linecorp.armeria.common.HttpMethod;
11185
import com.linecorp.armeria.common.HttpStatus;
11286
import com.linecorp.armeria.common.MediaType;
11387
import com.linecorp.armeria.common.RequestHeaders;
11488
import com.linecorp.armeria.common.SessionProtocol;
115-
import com.linecorp.armeria.server.HttpService;
11689
import com.linecorp.armeria.server.Server;
11790
import com.linecorp.armeria.server.ServerBuilder;
11891
import com.linecorp.armeria.server.grpc.GrpcService;
11992
import com.linecorp.armeria.server.grpc.GrpcServiceBuilder;
120-
import com.linecorp.armeria.server.healthcheck.HealthCheckService;
12193

12294
import io.grpc.BindableService;
123-
import io.grpc.ServerServiceDefinition;
12495
import io.grpc.Status;
12596
import io.grpc.StatusRuntimeException;
126-
import io.micrometer.core.instrument.Measurement;
127-
import io.micrometer.core.instrument.Statistic;
12897
import io.netty.util.AsciiString;
12998
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
13099
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse;

‎data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource_HttpServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.dataprepper.plugins.source.oteltrace;
77

8+
import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
89
import static org.hamcrest.CoreMatchers.equalTo;
910
import static org.hamcrest.CoreMatchers.instanceOf;
1011
import static org.hamcrest.MatcherAssert.assertThat;
@@ -84,7 +85,6 @@
8485
import io.opentelemetry.proto.trace.v1.ResourceSpans;
8586
import io.opentelemetry.proto.trace.v1.ScopeSpans;
8687
import io.opentelemetry.proto.trace.v1.Span;
87-
import static com.jayway.jsonpath.matchers.JsonPathMatchers.*;
8888

8989
@ExtendWith(MockitoExtension.class)
9090
class OTelTraceSource_HttpServiceTest {

0 commit comments

Comments
 (0)