End groovy files with newline (#7127)

This commit is contained in:
Trask Stalnaker 2022-11-10 03:21:55 -08:00 committed by GitHub
parent 31f4d12d31
commit 5345c87680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
76 changed files with 63 additions and 77 deletions

View File

@ -14,6 +14,7 @@ spotless {
plugins.withId("groovy") { plugins.withId("groovy") {
groovy { groovy {
licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class)") licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class)")
endWithNewline()
} }
} }
plugins.withId("scala") { plugins.withId("scala") {

View File

@ -25,4 +25,4 @@ tasks.test {
doFirst { doFirst {
jvmArgs("-Dio.opentelemetry.smoketest.agent.shadowJar.path=${shadowTask.archiveFile.get()}") jvmArgs("-Dio.opentelemetry.smoketest.agent.shadowJar.path=${shadowTask.archiveFile.get()}")
} }
} }

View File

@ -107,4 +107,4 @@ class S3CamelTest extends AgentInstrumentationSpecification {
} }
clearExportedData() clearExportedData()
} }
} }

View File

@ -132,4 +132,3 @@ class SnsCamelTest extends AgentInstrumentationSpecification {
clearExportedData() clearExportedData()
} }
} }

View File

@ -250,4 +250,4 @@ class ApacheClientUriRequestContext extends ApacheHttpClientTest<HttpUriRequest>
callback.accept(it) callback.accept(it)
}, new BasicHttpContext()) }, new BasicHttpContext())
} }
} }

View File

@ -70,5 +70,3 @@ class AsyncHttpClientTest extends HttpClientTest<Request> implements AgentTestTr
return null return null
} }
} }

View File

@ -784,4 +784,4 @@ class S3TracingTest extends AgentInstrumentationSpecification {
} }
} }
} }
} }

View File

@ -228,4 +228,4 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
} }
} }
} }
} }

View File

@ -176,4 +176,4 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification {
then: then:
receive.getAttributeNames() == ["AWSTraceHeader"] receive.getAttributeNames() == ["AWSTraceHeader"]
} }
} }

View File

@ -186,4 +186,4 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification {
} }
} }
} }
} }

View File

@ -15,4 +15,4 @@ type Book {
type Author { type Author {
id: ID id: ID
name: String name: String
} }

View File

@ -610,4 +610,3 @@ class SessionTest extends AbstractHibernateTest {
sessionId1 != sessionId2 != sessionId3 sessionId1 != sessionId2 != sessionId3
} }
} }

View File

@ -603,4 +603,3 @@ class SessionTest extends AbstractHibernateTest {
sessionId1 != sessionId2 != sessionId3 sessionId1 != sessionId2 != sessionId3
} }
} }

View File

@ -184,4 +184,3 @@ class ProcedureCallTest extends AgentInstrumentationSpecification {
} }
} }
} }

View File

@ -101,4 +101,4 @@ interface ResteasyProxyResource {
Response get_error(@QueryParam("with") String param, Response get_error(@QueryParam("with") String param,
@HeaderParam("is-test-server") String isTestServer, @HeaderParam("is-test-server") String isTestServer,
@HeaderParam("test-request-id") String requestId) @HeaderParam("test-request-id") String requestId)
} }

View File

@ -38,4 +38,4 @@ abstract class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest<Server> {
String getContextPath() { String getContextPath() {
"/rest-app" "/rest-app"
} }
} }

View File

@ -237,4 +237,4 @@ class JaxRsTestApplication extends Application {
@ApplicationPath("/rest-app") @ApplicationPath("/rest-app")
class JaxRsApplicationPathTestApplication extends JaxRsTestApplication { class JaxRsApplicationPathTestApplication extends JaxRsTestApplication {
} }

View File

@ -56,4 +56,4 @@ class CxfFilterTest extends JaxRsFilterTest implements HttpServerTestTrait<Serve
return [response.contentUtf8(), response.status().code()] return [response.contentUtf8(), response.status().code()]
} }
} }

View File

@ -40,4 +40,4 @@ class CxfHttpServerTest extends JaxRsHttpServerTest<Server> {
void stopServer(Server httpServer) { void stopServer(Server httpServer) {
httpServer.stop() httpServer.stop()
} }
} }

View File

@ -4,4 +4,4 @@
*/ */
class CxfJettyHttpServerTest extends JaxRsJettyHttpServerTest { class CxfJettyHttpServerTest extends JaxRsJettyHttpServerTest {
} }

View File

@ -81,4 +81,4 @@ class JerseyFilterTest extends JaxRsFilterTest implements HttpServerTestTrait<Se
return singletons return singletons
} }
} }
} }

View File

@ -42,4 +42,4 @@ class JerseyHttpServerTest extends JaxRsHttpServerTest<Server> {
// disables a test that jersey deems invalid // disables a test that jersey deems invalid
false false
} }
} }

View File

@ -15,4 +15,4 @@ class JerseyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
// disables a test that jersey deems invalid // disables a test that jersey deems invalid
false false
} }
} }

View File

@ -41,4 +41,4 @@ class ResteasyFilterTest extends JaxRsFilterTest {
return [response.contentAsString, response.status] return [response.contentAsString, response.status]
} }
} }

View File

@ -32,4 +32,4 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
boolean shouldTestCompletableStageAsync() { boolean shouldTestCompletableStageAsync() {
false false
} }
} }

View File

@ -9,4 +9,4 @@ class ResteasyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
boolean shouldTestCompletableStageAsync() { boolean shouldTestCompletableStageAsync() {
false false
} }
} }

View File

@ -41,4 +41,4 @@ class ResteasyFilterTest extends JaxRsFilterTest {
return [response.contentAsString, response.status] return [response.contentAsString, response.status]
} }
} }

View File

@ -27,4 +27,4 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
void stopServer(UndertowJaxrsServer server) { void stopServer(UndertowJaxrsServer server) {
server.stop() server.stop()
} }
} }

View File

@ -5,4 +5,4 @@
class ResteasyJettyHttpServerTest extends JaxRsJettyHttpServerTest { class ResteasyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
} }

View File

@ -38,4 +38,4 @@ abstract class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest<Server> {
String getContextPath() { String getContextPath() {
"/rest-app" "/rest-app"
} }
} }

View File

@ -236,4 +236,4 @@ class JaxRsTestApplication extends Application {
@ApplicationPath("/rest-app") @ApplicationPath("/rest-app")
class JaxRsApplicationPathTestApplication extends JaxRsTestApplication { class JaxRsApplicationPathTestApplication extends JaxRsTestApplication {
} }

View File

@ -81,4 +81,4 @@ class JerseyFilterTest extends JaxRsFilterTest implements HttpServerTestTrait<Se
return singletons return singletons
} }
} }
} }

View File

@ -42,4 +42,4 @@ class JerseyHttpServerTest extends JaxRsHttpServerTest<Server> {
// disables a test that jersey deems invalid // disables a test that jersey deems invalid
false false
} }
} }

View File

@ -15,4 +15,4 @@ class JerseyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
// disables a test that jersey deems invalid // disables a test that jersey deems invalid
false false
} }
} }

View File

@ -40,4 +40,4 @@ class ResteasyFilterTest extends JaxRsFilterTest {
return [response.contentAsString, response.status] return [response.contentAsString, response.status]
} }
} }

View File

@ -32,4 +32,4 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
boolean shouldTestCompletableStageAsync() { boolean shouldTestCompletableStageAsync() {
false false
} }
} }

View File

@ -4,4 +4,4 @@
*/ */
class ResteasyJettyHttpServerTest extends JaxRsJettyHttpServerTest { class ResteasyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
} }

View File

@ -21,4 +21,4 @@ interface HelloService {
@WebResult(name = "message") @WebResult(name = "message")
String hello2(@WebParam(name = "name") String name) String hello2(@WebParam(name = "name") String name)
} }

View File

@ -19,4 +19,4 @@ class TestWsServlet extends CXFNonSpringServlet {
EndpointImpl endpoint = new EndpointImpl(bus, implementor) EndpointImpl endpoint = new EndpointImpl(bus, implementor)
endpoint.publish("/HelloService") endpoint.publish("/HelloService")
} }
} }

View File

@ -61,4 +61,3 @@ class TestDataSource implements DataSource {
} }
} }

View File

@ -269,4 +269,4 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
} }
} }
} }
} }

View File

@ -83,4 +83,4 @@ class KafkaClientPropagationDisabledTest extends KafkaClientPropagationBaseTest
} }
} }
} }
} }

View File

@ -184,4 +184,4 @@ class KafkaClientSuppressReceiveSpansTest extends KafkaClientPropagationBaseTest
} }
} }
} }
} }

View File

@ -31,4 +31,4 @@ abstract class KafkaClientPropagationBaseTest extends KafkaClientBaseTest implem
assert record.headers().iterator().hasNext() == producerPropagationEnabled assert record.headers().iterator().hasNext() == producerPropagationEnabled
} }
} }
} }

View File

@ -100,4 +100,3 @@ class InterceptorsTest extends KafkaClientBaseTest implements LibraryTestTrait {
} }
} }
} }

View File

@ -107,4 +107,3 @@ class WrappersTest extends KafkaClientBaseTest implements LibraryTestTrait {
testHeaders << [false, true] testHeaders << [false, true]
} }
} }

View File

@ -6,4 +6,4 @@
import io.opentelemetry.instrumentation.test.LibraryTestTrait import io.opentelemetry.instrumentation.test.LibraryTestTrait
class LibraryLog4j2Test extends Log4j2Test implements LibraryTestTrait { class LibraryLog4j2Test extends Log4j2Test implements LibraryTestTrait {
} }

View File

@ -35,4 +35,4 @@ trait WithRabbitMqTrait {
def stopRabbit() { def stopRabbit() {
rabbitMqContainer?.stop() rabbitMqContainer?.stop()
} }
} }

View File

@ -152,4 +152,3 @@ abstract class AbstractRedissonAsyncClientTest extends AgentInstrumentationSpeci
} }
} }
} }

View File

@ -315,4 +315,3 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
} }
} }
} }

View File

@ -19,4 +19,4 @@ class RocketMqClientTest extends AbstractRocketMqClientTest implements AgentTest
@Override @Override
void configureMQPushConsumer(DefaultMQPushConsumer consumer) { void configureMQPushConsumer(DefaultMQPushConsumer consumer) {
} }
} }

View File

@ -29,4 +29,4 @@ class RocketMqClientTest extends AbstractRocketMqClientTest implements LibraryTe
.setCaptureExperimentalSpanAttributes(true) .setCaptureExperimentalSpanAttributes(true)
.build().newTracingConsumeMessageHook()) .build().newTracingConsumeMessageHook())
} }
} }

View File

@ -39,4 +39,4 @@ trait ApplicationConfigTrait {
def postProcessJob(String jobName, Job job) { def postProcessJob(String jobName, Job job) {
} }
} }

View File

@ -33,4 +33,4 @@ trait JavaxBatchConfigTrait {
jobParams.setProperty("uniqueJobIdCounter", counter.getAndIncrement().toString()) jobParams.setProperty("uniqueJobIdCounter", counter.getAndIncrement().toString())
jobOperator.start(jobName, jobParams) jobOperator.start(jobName, jobParams)
} }
} }

View File

@ -12,4 +12,4 @@ class TestItemProcessor implements ItemProcessor {
Object processItem(Object item) throws Exception { Object processItem(Object item) throws Exception {
Integer.parseInt(item as String) Integer.parseInt(item as String)
} }
} }

View File

@ -35,4 +35,4 @@ class TestItemReader implements ItemReader {
Serializable checkpointInfo() throws Exception { Serializable checkpointInfo() throws Exception {
return null return null
} }
} }

View File

@ -29,4 +29,4 @@ class TestItemWriter implements ItemWriter {
Serializable checkpointInfo() throws Exception { Serializable checkpointInfo() throws Exception {
return null return null
} }
} }

View File

@ -12,4 +12,4 @@ class TestItemProcessor implements ItemProcessor<String, Integer> {
Integer process(String item) throws Exception { Integer process(String item) throws Exception {
Integer.parseInt(item) Integer.parseInt(item)
} }
} }

View File

@ -14,4 +14,4 @@ class TestItemReader extends ListItemReader<String> {
TestItemReader() { TestItemReader() {
super(IntStream.range(0, 13).mapToObj(String.&valueOf).collect(Collectors.toList()) as List<String>) super(IntStream.range(0, 13).mapToObj(String.&valueOf).collect(Collectors.toList()) as List<String>)
} }
} }

View File

@ -14,4 +14,4 @@ class TestItemWriter implements ItemWriter<Integer> {
void write(List<? extends Integer> items) throws Exception { void write(List<? extends Integer> items) throws Exception {
this.items.addAll(items) this.items.addAll(items)
} }
} }

View File

@ -18,4 +18,4 @@ class TestTasklet implements Tasklet {
} }
RepeatStatus.FINISHED RepeatStatus.FINISHED
} }
} }

View File

@ -100,4 +100,4 @@ trait WithRabbitProducerConsumerTrait {
runWithSpan("consumer") {} runWithSpan("consumer") {}
} }
} }
} }

View File

@ -58,4 +58,3 @@ class SecurityConfig {
} }
} }
} }

View File

@ -13,4 +13,4 @@ class VertxLatestHttpServerTest extends AbstractVertxHttpServerTest {
protected Class<? extends AbstractVerticle> verticle() { protected Class<? extends AbstractVerticle> verticle() {
return VertxLatestWebServer return VertxLatestWebServer
} }
} }

View File

@ -378,4 +378,4 @@ abstract class AppServerTest extends SmokeTest {
[serverVersion, jdk, isWindows] [serverVersion, jdk, isWindows]
] ]
} }
} }

View File

@ -100,4 +100,4 @@ class Jetty11Jdk11Openj9 extends JettySmokeTest {
@AppServer(version = "11.0.7", jdk = "16-openj9") @AppServer(version = "11.0.7", jdk = "16-openj9")
class Jetty11Jdk16Openj9 extends JettySmokeTest { class Jetty11Jdk16Openj9 extends JettySmokeTest {
} }

View File

@ -56,4 +56,4 @@ class LogsSmokeTest extends SmokeTest {
} }
} }

View File

@ -68,4 +68,4 @@ class Payara52021Jdk11 extends PayaraSmokeTest {
@AppServer(version = "5.2021.8", jdk = "11-openj9") @AppServer(version = "5.2021.8", jdk = "11-openj9")
class Payara52021Jdk11Openj9 extends PayaraSmokeTest { class Payara52021Jdk11Openj9 extends PayaraSmokeTest {
} }

View File

@ -53,4 +53,4 @@ class PrometheusSmokeTest extends SmokeTest {
jdk << [8, 11, 17] jdk << [8, 11, 17]
} }
} }

View File

@ -57,4 +57,3 @@ class SdkDisabledSmokeTest extends SmokeTest {
jdk << [8, 11, 17] jdk << [8, 11, 17]
} }
} }

View File

@ -112,4 +112,4 @@ class Tomcat10Jdk8Openj9 extends TomcatSmokeTest {
@AppServer(version = "10.0.12", jdk = "11-openj9") @AppServer(version = "10.0.12", jdk = "11-openj9")
class Tomcat10Jdk11Openj9 extends TomcatSmokeTest { class Tomcat10Jdk11Openj9 extends TomcatSmokeTest {
} }

View File

@ -108,4 +108,4 @@ class Tomee9Jdk11Openj9 extends TomeeSmokeTest {
@AppServer(version = "9.0.0-M7", jdk = "16-openj9") @AppServer(version = "9.0.0-M7", jdk = "16-openj9")
class Tomee9Jdk16Openj9 extends TomeeSmokeTest { class Tomee9Jdk16Openj9 extends TomeeSmokeTest {
} }

View File

@ -40,4 +40,4 @@ class Websphere8Jdk8Openj9 extends WebsphereSmokeTest {
@AppServer(version = "9.0.5.9", jdk = "8-openj9") @AppServer(version = "9.0.5.9", jdk = "8-openj9")
class Websphere9Jdk8Openj9 extends WebsphereSmokeTest { class Websphere9Jdk8Openj9 extends WebsphereSmokeTest {
} }

View File

@ -157,4 +157,4 @@ class Wildfly25Jdk11Openj9 extends WildflySmokeTest {
@AppServer(version = "25.0.1.Final", jdk = "16-openj9") @AppServer(version = "25.0.1.Final", jdk = "16-openj9")
class Wildfly25Jdk16Openj9 extends WildflySmokeTest { class Wildfly25Jdk16Openj9 extends WildflySmokeTest {
} }

View File

@ -224,5 +224,3 @@ class FieldBackedImplementationTest extends AgentInstrumentationSpecification {
new UntransformableKeyClass().incrementContextCount() == 1 new UntransformableKeyClass().incrementContextCount() == 1
} }
} }

View File

@ -38,4 +38,4 @@ trait RetryOnAddressAlreadyInUseTrait {
withRetryOnAddressAlreadyInUse(closure, numRetries - 1) withRetryOnAddressAlreadyInUse(closure, numRetries - 1)
} }
} }
} }