From 2bae7a965eb4089101538c6c0ae6e73ae282525a Mon Sep 17 00:00:00 2001 From: lovehzj <1922919664@qq.com> Date: Fri, 27 May 2022 22:25:20 +0800 Subject: [PATCH 1/2] [SCB-2529] enable checkstyle NewlineAtEndOfFile --- ci/checkstyle/checkstyle.xml | 2 ++ .../config/center/client/AddressManager.java | 2 +- .../http/client/common/HttpTransportImpl.java | 2 +- .../center/client/model/SchemaInfo.java | 2 +- .../impl/InvocationContextItemTest.java | 2 +- .../converter/SwaggerToProtoGenerator.java | 2 +- .../runtime/model/ModelProtobuf.java | 8 +++--- .../codec/param/RestClientRequestImpl.java | 2 +- .../RestProducerInvocationCreatorTest.java | 2 +- .../common/rest/VertxRestInvocationTest.java | 2 +- .../rest/codec/query/QueryCodecCsvTest.java | 2 +- .../rest/codec/query/QueryCodecMultiTest.java | 2 +- .../rest/codec/query/QueryCodecPipesTest.java | 2 +- .../rest/codec/query/QueryCodecSsvTest.java | 2 +- .../rest/codec/query/QueryCodecTsvTest.java | 2 +- .../rest/codec/query/QueryCodecsTest.java | 2 +- .../path/PathVarParamWriterTest.java | 2 +- .../path/URLPathStringBuilderTest.java | 2 +- .../inner/RestServerCodecFilterTest.java | 2 +- .../event/InvocationHandlersStartEvent.java | 2 +- .../InvocationStartSendRequestEvent.java | 2 +- .../event/InvocationTimeoutCheckEvent.java | 2 +- .../impl/JacksonPropertyNodeNameProvider.java | 2 +- .../filter/impl/ParameterValidatorFilter.java | 2 +- .../endpoint/EndpointCacheUtils.java | 2 +- .../invocation/endpoint/EndpointUtils.java | 2 +- .../producer/ProducerProviderManager.java | 2 +- .../core/definition/OperationConfigTest.java | 2 +- .../core/exception/ExceptionsTest.java | 2 +- .../TimeoutExceptionConverterTest.java | 2 +- .../core/filter/FilterChainTest.java | 2 +- .../impl/ParameterValidatorFilterTest.java | 2 +- .../impl/ProducerOperationFilterTest.java | 2 +- .../impl/SimpleLoadBalanceFilterTest.java | 2 +- .../ProducerInvocationFlowTest.java | 2 +- .../invocation/endpoint/EndpointTest.java | 2 +- .../endpoint/EndpointUtilsTest.java | 2 +- .../timeout/PassingTimeStrategyTest.java | 2 +- .../timeout/ProcessingTimeStrategyTest.java | 2 +- .../demo/edge/consumer/Consumer.java | 4 +-- .../filter/EdgeSignatureRequestFilter.java | 2 +- .../main/resources/config/log4j.properties | 2 +- .../server/QueryParamWithListSchema.java | 10 +++---- .../server/SchemeInterfaceJaxrsImpl.java | 2 +- .../multiServiceCenterClient/ServerBTest.java | 2 +- .../src/main/resources/application.properties | 2 +- .../demo/pojo/client/invoker/ClientModel.java | 2 +- .../demo/pojo/server/TestImpl.java | 2 +- .../demo/pojo/server/TestImpl.java | 2 +- .../client/ConsumerTestsAfterBootup.java | 3 +- .../demo/springmvc/server/DownloadSchema.java | 2 +- .../demo/springmvc/third/EarlyConsumer.java | 2 +- .../demo/springmvc/third/HealthSchema.java | 2 +- .../demo/springmvc/third/NormalConsumer.java | 2 +- .../demo/springmvc/third/Register.java | 2 +- .../client/ClientServerEndpoint.java | 2 +- ...nfigCenterConfigurationSourceImplTest.java | 2 +- .../center/client/AddressManagerTest.java | 2 +- .../foundation/common/event/AlarmEvent.java | 2 +- .../foundation/common/log/AbstractMarker.java | 2 +- .../foundation/common/utils/JvmUtils.java | 2 +- .../foundation/common/DynamicObjectTest.java | 2 +- .../common/base/DynamicEnumTest.java | 2 +- .../common/utils/AsyncUtilsTest.java | 2 +- .../DynamicWatchedConfigurationExt.java | 2 +- .../config/inject/PlaceholderResolver.java | 2 +- .../config/priority/ConfigObjectFactory.java | 2 +- .../config/BootStrapPropertiesTest.java | 2 +- .../priority/TestPriorityPropertyFactory.java | 2 +- .../main/java/io/protostuff/package-info.java | 2 +- .../serializer/repeated/AbstractWriters.java | 2 +- .../internal/model/CustomGeneric.java | 2 +- .../protobuf/internal/model/ProtobufRoot.java | 12 ++++---- .../schema/scalar/TestFixed64Schema.java | 2 +- .../schema/scalar/TestUInt64Schema.java | 2 +- .../registry/RegistrationManager.java | 2 +- .../registry/consumer/AppManager.java | 2 +- .../foundation/ssl/CertificateUtil.java | 2 +- .../foundation/ssl/TrustManagerExt.java | 4 +-- .../test/scaffolding/AssertUtils.java | 2 +- .../main/resources/config/log4j.properties | 2 +- .../foundation/vertx/server/TcpServer.java | 2 +- .../vertx/http/TestReadStreamPart.java | 4 +-- ...txServerResponseToHttpServletResponse.java | 4 +-- .../GovernanceConfigurationChangedEvent.java | 2 +- .../marker/operator/MatchOperator.java | 2 +- .../router/ExampleDistributor.java | 2 +- .../filter/IsolationDiscoveryFilterTest.java | 2 +- ...tyInstancePropertyDiscoveryFilterTest.java | 2 +- .../dynamicconfig/test/SimApolloServer.java | 2 +- .../it/schema/objectparams/Color.java | 2 +- .../objectparams/FlattenObjectRequest.java | 2 +- .../FluentSetterFlattenObjectRequest.java | 2 +- .../org/apache/servicecomb/it/Consumers.java | 2 +- .../apache/servicecomb/it/ResultPrinter.java | 2 +- .../servicecomb/it/testcase/TestDownload.java | 2 +- .../TestSpringMVCObjectParamType.java | 28 +++++++++---------- .../it/edge/PreLoadBootListener.java | 2 +- .../filter/EdgeSignatureRequestFilter.java | 2 +- .../schema/DefaultJsonValueJaxrsSchema.java | 2 +- .../servicecomb/it/schema/DownloadSchema.java | 2 +- .../demo/pojo/test/endpoints/TestImpl.java | 2 +- ...oSpringConnectionLimitIntegrationTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/microservice.yaml | 2 +- .../pojo/test/PojoSpringIntegrationTest.java | 2 +- .../src/test/resources/microservice.yaml | 2 +- .../tests/tracing/TracingTestBase.java | 2 +- .../core/meter/os/net/InterfaceUsage.java | 2 +- .../metrics/core/meter/os/net/NetStat.java | 2 +- .../core/publish/DefaultLogPublisher.java | 2 +- .../metrics/core/TestHealthBootListener.java | 2 +- .../reference/async/CseAsyncRestTemplate.java | 2 +- .../CseAsyncClientHttpRequestFactoryTest.java | 2 +- .../async/CseAsyncClientHttpRequestTest.java | 2 +- .../AbstractLightweightDiscovery.java | 2 +- .../AbstractLightweightRegistration.java | 2 +- .../registry/lightweight/store/Store.java | 2 +- .../registry/lightweight/MessageTest.java | 2 +- .../lightweight/StoreServiceTest.java | 2 +- .../servicecomb/serviceregistry/api/Type.java | 2 +- .../client/http/RestClientUtil.java | 4 +-- .../http/ServiceRegistryClientImpl.java | 4 +-- .../client/http/WebsocketClientUtil.java | 2 +- .../instance/InstanceCacheChecker.java | 4 +-- .../MicroserviceInstanceStatusSyncTask.java | 2 +- .../serviceregistry/RegistryUtilsTest.java | 2 +- .../serviceregistry/ServiceRegistryTest.java | 2 +- .../auth/TestRBACBootStrapService.java | 2 +- .../auth/TokenCacheManagerTest.java | 2 +- .../refresh/AddressManagerTest.java | 2 +- .../AggregateServiceRegistryCacheTest.java | 2 +- .../cache/MicroserviceCacheKeyTest.java | 2 +- .../RefreshableMicroserviceCacheTest.java | 2 +- .../RefreshableServiceRegistryCacheTest.java | 2 +- .../servlet/RestServletInitializer.java | 2 +- .../starter/servlet/package-info.java | 2 +- .../parameter/JsonViewProcessor.java | 2 +- .../swagger/converter/ConverterMgrTest.java | 2 +- .../RequestPartAnnotationProcessorTest.java | 2 +- .../InvocationContextCompletableFuture.java | 2 +- .../PartListToPartArrayConverterTest.java | 2 +- .../part/PartListToPartListConverterTest.java | 2 +- .../impl/part/PartToPartConverterTest.java | 2 +- .../exception/CommonExceptionDataTest.java | 2 +- .../validator/ParameterValidator.java | 2 +- .../highway/HighwayServerCodecFilterTest.java | 2 +- .../rest/client/BoundaryFactory.java | 2 +- .../rest/client/HttpClientRequestFactory.java | 3 +- .../client/RestClientCodecFilterTest.java | 2 +- .../rest/client/RestClientDecoderTest.java | 2 +- .../rest/client/RestClientEncoderTest.java | 2 +- ...RestClientTransportContextFactoryTest.java | 2 +- 153 files changed, 188 insertions(+), 184 deletions(-) diff --git a/ci/checkstyle/checkstyle.xml b/ci/checkstyle/checkstyle.xml index 963b85364fd..9afaa124944 100644 --- a/ci/checkstyle/checkstyle.xml +++ b/ci/checkstyle/checkstyle.xml @@ -26,6 +26,8 @@ Description: none --> + + diff --git a/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/AddressManager.java b/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/AddressManager.java index 1f4b24ce0d2..fc72e36355d 100644 --- a/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/AddressManager.java +++ b/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/AddressManager.java @@ -43,4 +43,4 @@ protected String normalizeUri(String endpoint) { public void onRefreshEndpointEvent(RefreshEndpointEvent event) { refreshEndpoint(event, RefreshEndpointEvent.CONFIG_CENTER_NAME); } -} \ No newline at end of file +} diff --git a/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/HttpTransportImpl.java b/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/HttpTransportImpl.java index 496cdd14185..da87892929c 100644 --- a/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/HttpTransportImpl.java +++ b/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/HttpTransportImpl.java @@ -107,4 +107,4 @@ private static SignRequest createSignRequest() { public void addHeaders(Map headers) { this.globalHeaders = headers; } -} \ No newline at end of file +} diff --git a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/SchemaInfo.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/SchemaInfo.java index 720e0e98b0e..40180433d0b 100755 --- a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/SchemaInfo.java +++ b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/SchemaInfo.java @@ -57,4 +57,4 @@ public String getSummary() { public void setSummary(String summary) { this.summary = summary; } -} \ No newline at end of file +} diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/InvocationContextItemTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/InvocationContextItemTest.java index 9bcda0ac458..644ac99de8f 100644 --- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/InvocationContextItemTest.java +++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/InvocationContextItemTest.java @@ -148,4 +148,4 @@ public void clientGetFormattedItemOnInvocationNotFound() { ITEM.appendClientFormattedItem(finishEvent, strBuilder); MatcherAssert.assertThat(strBuilder.toString(), Matchers.is(InvocationContextAccessItem.NOT_FOUND)); } -} \ No newline at end of file +} diff --git a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java index 841bab20c01..8df320d26d2 100644 --- a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java +++ b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java @@ -242,7 +242,7 @@ private void wrapPropertyToMessage(String protoName, Object property) { private String tryFindEnumType(List enums) { if (enums != null && !enums.isEmpty()) { String strEnums = enums.toString(); - String enumName = "Enum_" + Hashing.sha256().hashString(strEnums, StandardCharsets.UTF_8).toString(); + String enumName = "Enum_" + Hashing.sha256().hashString(strEnums, StandardCharsets.UTF_8); pending.add(() -> createEnum(enumName, enums)); return enumName; } diff --git a/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtobuf.java b/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtobuf.java index a4a2eb555d2..9bde21a30a1 100644 --- a/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtobuf.java +++ b/common/common-protobuf/src/test/java/io/protostuff/runtime/model/ModelProtobuf.java @@ -2167,8 +2167,8 @@ public Builder setOperationNameBytes( } private com.google.protobuf.MapField internalGetMutableCseContext() { - onChanged();; - if (cseContext_ == null) { + onChanged(); + if (cseContext_ == null) { cseContext_ = com.google.protobuf.MapField.newMapField( CseContextDefaultEntryHolder.defaultEntry); } @@ -2298,8 +2298,8 @@ public Builder putAllCseContext( } private com.google.protobuf.MapField internalGetMutableUserMap() { - onChanged();; - if (userMap_ == null) { + onChanged(); + if (userMap_ == null) { userMap_ = com.google.protobuf.MapField.newMapField( UserMapDefaultEntryHolder.defaultEntry); } diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/RestClientRequestImpl.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/RestClientRequestImpl.java index 1280af73fe6..b02242b9453 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/RestClientRequestImpl.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/RestClientRequestImpl.java @@ -134,7 +134,7 @@ public Future end() { protected Future doEndWithUpload() { request.setChunked(true); - String boundary = "boundary" + UUID.randomUUID().toString(); + String boundary = "boundary" + UUID.randomUUID(); putHeader(CONTENT_TYPE, MULTIPART_FORM_DATA + "; charset=UTF-8; boundary=" + boundary); return genBodyForm(boundary).onSuccess(v -> attachFiles(boundary)).onFailure(e -> asyncResp.consumerFail(e)); diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java index f8159a60e42..18697dbf59e 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java @@ -181,4 +181,4 @@ public void should_merge_invocation_context_from_request() { assertThat(invocation.getContext("k")).isEqualTo("v"); } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/VertxRestInvocationTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/VertxRestInvocationTest.java index 28ab24b89a2..235699897a5 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/VertxRestInvocationTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/VertxRestInvocationTest.java @@ -54,4 +54,4 @@ void createInvocation() { Mockito.verify(routingContext, Mockito.times(1)).put(RestConst.REST_INVOCATION_CONTEXT, invocation); } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecCsvTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecCsvTest.java index 18e9ba48c15..3d34e109799 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecCsvTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecCsvTest.java @@ -114,4 +114,4 @@ void should_decode_values_start_with_delimiter() { should_decode(",,1", new int[] {0, 0, 1}); } } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMultiTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMultiTest.java index 948b831294b..759b74d69ad 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMultiTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMultiTest.java @@ -104,4 +104,4 @@ void should_decode_null_to_single() { should_decode((String) null, null); } } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecPipesTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecPipesTest.java index aaa07123123..3b7f33459c2 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecPipesTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecPipesTest.java @@ -114,4 +114,4 @@ void should_decode_values_start_with_delimiter() { should_decode("||1", new int[] {0, 0, 1}); } } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecSsvTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecSsvTest.java index bbbfb550cd8..c719eae0819 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecSsvTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecSsvTest.java @@ -114,4 +114,4 @@ void should_decode_values_start_with_delimiter() { should_decode(" 1", new int[] {0, 0, 1}); } } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTsvTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTsvTest.java index 2a835991512..2e913bf2900 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTsvTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTsvTest.java @@ -114,4 +114,4 @@ void should_decode_values_start_with_delimiter() { should_decode("\t\t1", new int[] {0, 0, 1}); } } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecsTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecsTest.java index c2c5fed1f41..7ccdbb2b38b 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecsTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecsTest.java @@ -40,4 +40,4 @@ void can_override_by_customize_implement() { assertThat(queryCodecs.find(QueryCodecCsv.CODEC_NAME).getClass()) .isEqualTo(MyQueryCodecCsv.class); } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java index 04ab59c9233..81e8658fdd5 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/PathVarParamWriterTest.java @@ -93,4 +93,4 @@ public String getParamName(){ }.getMockInstance(); return new PathVarParamWriter(restParam); } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathStringBuilderTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathStringBuilderTest.java index 80cc2370540..5ccb4a7eff2 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathStringBuilderTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/path/URLPathStringBuilderTest.java @@ -50,4 +50,4 @@ public void appendQuery() { builder.appendQuery("gh", "jk"); Assertions.assertEquals("?ab=cd&ef=&gh=jk", builder.build()); } -} \ No newline at end of file +} diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java index 24942a076cb..204dfe5644a 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java @@ -218,4 +218,4 @@ public void should_not_encode_transfer_encoding_header() throws ExecutionExcepti } }; } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/apache/servicecomb/core/event/InvocationHandlersStartEvent.java b/core/src/main/java/org/apache/servicecomb/core/event/InvocationHandlersStartEvent.java index a064b164855..55d57001b89 100644 --- a/core/src/main/java/org/apache/servicecomb/core/event/InvocationHandlersStartEvent.java +++ b/core/src/main/java/org/apache/servicecomb/core/event/InvocationHandlersStartEvent.java @@ -23,4 +23,4 @@ public class InvocationHandlersStartEvent extends InvocationBaseEvent { public InvocationHandlersStartEvent(Invocation invocation) { super(invocation); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/apache/servicecomb/core/event/InvocationStartSendRequestEvent.java b/core/src/main/java/org/apache/servicecomb/core/event/InvocationStartSendRequestEvent.java index a5bd8c8acda..9a8770ea8ec 100644 --- a/core/src/main/java/org/apache/servicecomb/core/event/InvocationStartSendRequestEvent.java +++ b/core/src/main/java/org/apache/servicecomb/core/event/InvocationStartSendRequestEvent.java @@ -23,4 +23,4 @@ public class InvocationStartSendRequestEvent extends InvocationBaseEvent { public InvocationStartSendRequestEvent(Invocation invocation) { super(invocation); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/apache/servicecomb/core/event/InvocationTimeoutCheckEvent.java b/core/src/main/java/org/apache/servicecomb/core/event/InvocationTimeoutCheckEvent.java index 168081eb855..3dc563161e8 100644 --- a/core/src/main/java/org/apache/servicecomb/core/event/InvocationTimeoutCheckEvent.java +++ b/core/src/main/java/org/apache/servicecomb/core/event/InvocationTimeoutCheckEvent.java @@ -23,4 +23,4 @@ public class InvocationTimeoutCheckEvent extends InvocationBaseEvent { public InvocationTimeoutCheckEvent(Invocation invocation) { super(invocation); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/impl/JacksonPropertyNodeNameProvider.java b/core/src/main/java/org/apache/servicecomb/core/filter/impl/JacksonPropertyNodeNameProvider.java index 403ca6cfdd5..f617f5fe567 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/impl/JacksonPropertyNodeNameProvider.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/impl/JacksonPropertyNodeNameProvider.java @@ -54,4 +54,4 @@ private String getJavaBeanPropertyName(JavaBeanProperty property) { .findFirst() .orElse(property.getName()); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilter.java b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilter.java index c1d1e70df5a..4b2bcaba2f7 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilter.java @@ -90,7 +90,7 @@ private boolean useResourceBundleMessageInterpolator() { public CompletableFuture onFilter(Invocation invocation, FilterNode nextNode) { Set> violations = doValidate(invocation); if (violations.size() > 0) { - LOGGER.error("Parameter validation failed : " + violations.toString()); + LOGGER.error("Parameter validation failed : " + violations); return AsyncUtils.completeExceptionally(new ConstraintViolationException(violations)); } diff --git a/core/src/main/java/org/apache/servicecomb/core/invocation/endpoint/EndpointCacheUtils.java b/core/src/main/java/org/apache/servicecomb/core/invocation/endpoint/EndpointCacheUtils.java index 316a48bf21c..141a6e9063b 100644 --- a/core/src/main/java/org/apache/servicecomb/core/invocation/endpoint/EndpointCacheUtils.java +++ b/core/src/main/java/org/apache/servicecomb/core/invocation/endpoint/EndpointCacheUtils.java @@ -44,4 +44,4 @@ public static Endpoint getOrCreate(String uri) { public static Endpoint create(String uri) { return EndpointUtils.parse(EndpointUtils.formatFromUri(uri)); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/apache/servicecomb/core/invocation/endpoint/EndpointUtils.java b/core/src/main/java/org/apache/servicecomb/core/invocation/endpoint/EndpointUtils.java index 6aa4cc53111..d906de63ba5 100644 --- a/core/src/main/java/org/apache/servicecomb/core/invocation/endpoint/EndpointUtils.java +++ b/core/src/main/java/org/apache/servicecomb/core/invocation/endpoint/EndpointUtils.java @@ -135,7 +135,7 @@ private static String extractHostFromPath(URIBuilder builder) { if (path.startsWith("/")) { path = path.substring(1); } - if (path.indexOf("/") != -1) { + if (path.contains("/")) { path = path.substring(0, path.indexOf("/")); } return path; diff --git a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java index 6a2c484f343..752df947fe5 100644 --- a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java +++ b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java @@ -130,4 +130,4 @@ private void registerUrlPrefixToSwagger(Swagger swagger) { swagger.setBasePath(urlPrefix + swagger.getBasePath()); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/definition/OperationConfigTest.java b/core/src/test/java/org/apache/servicecomb/core/definition/OperationConfigTest.java index dc8076befe4..3a2ae4d1cf5 100644 --- a/core/src/test/java/org/apache/servicecomb/core/definition/OperationConfigTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/definition/OperationConfigTest.java @@ -68,4 +68,4 @@ void should_get_invocation_timeout_value() { assertThat(config.getMsInvocationTimeout()).isEqualTo(1); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/exception/ExceptionsTest.java b/core/src/test/java/org/apache/servicecomb/core/exception/ExceptionsTest.java index c0cd78a9592..1ff9aab9c66 100644 --- a/core/src/test/java/org/apache/servicecomb/core/exception/ExceptionsTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/exception/ExceptionsTest.java @@ -106,4 +106,4 @@ void should_protect_when_converter_throw_exception() { + "converter exception:org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace: mock exception when convert\n"); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java b/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java index e82e4636f08..4de741c5118 100644 --- a/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java @@ -55,4 +55,4 @@ void should_log_detail() { "Request timeout, Details: The timeout period of 30000ms has been exceeded while executing GET /xxx for server 1.1.1.1:8080."); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/FilterChainTest.java b/core/src/test/java/org/apache/servicecomb/core/filter/FilterChainTest.java index aa78b07a585..aece3799aa6 100644 --- a/core/src/test/java/org/apache/servicecomb/core/filter/FilterChainTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/filter/FilterChainTest.java @@ -216,4 +216,4 @@ private void checkHighwayChain(Transport transport, FilterNode chain) .get(); assertThat(msg).containsExactly("main", THREAD_NAME, THREAD_NAME); } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilterTest.java b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilterTest.java index d21e9a991f4..7942a355f67 100644 --- a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilterTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilterTest.java @@ -171,4 +171,4 @@ public void should_include_all_validate_detail() { assertThat(details.stream().map(ValidateDetail::getMessage)) .contains("not null", "can not be null", "can not be blank"); } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java index b7403e9874a..91cb0f832c6 100644 --- a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java @@ -201,4 +201,4 @@ public void should_unify_IllegalArgumentException_message_when_convert_exception CommonExceptionData data = (CommonExceptionData) throwable.getErrorData(); assertThat(data.getMessage()).isEqualTo("Parameters not valid or types not match."); } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/impl/SimpleLoadBalanceFilterTest.java b/core/src/test/java/org/apache/servicecomb/core/filter/impl/SimpleLoadBalanceFilterTest.java index 589df771ce4..08c1eda3f8d 100644 --- a/core/src/test/java/org/apache/servicecomb/core/filter/impl/SimpleLoadBalanceFilterTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/filter/impl/SimpleLoadBalanceFilterTest.java @@ -73,4 +73,4 @@ public void should_invoke_next_directly_when_invocation_already_has_endpoint() } }; } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/invocation/ProducerInvocationFlowTest.java b/core/src/test/java/org/apache/servicecomb/core/invocation/ProducerInvocationFlowTest.java index f1d3ef76d72..1cc4b4db84a 100644 --- a/core/src/test/java/org/apache/servicecomb/core/invocation/ProducerInvocationFlowTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/invocation/ProducerInvocationFlowTest.java @@ -156,4 +156,4 @@ public void should_finish_invocation_when_invocation_fail() { } }; } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java b/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java index aa9c3a8c672..d6203589c18 100644 --- a/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java @@ -93,4 +93,4 @@ void should_set_endpoint_to_invocation_when_map_arguments() { assertThat(holder.value).isSameAs(endpoint); } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointUtilsTest.java b/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointUtilsTest.java index 2338cca0c09..43cc21ba478 100644 --- a/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointUtilsTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointUtilsTest.java @@ -117,4 +117,4 @@ void should_not_change() { assertThat(formatFromUri("abc://host:123?q1=v1")).isEqualTo("abc://host:123?q1=v1"); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/invocation/timeout/PassingTimeStrategyTest.java b/core/src/test/java/org/apache/servicecomb/core/invocation/timeout/PassingTimeStrategyTest.java index 5aa99147388..9481fd19e38 100644 --- a/core/src/test/java/org/apache/servicecomb/core/invocation/timeout/PassingTimeStrategyTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/invocation/timeout/PassingTimeStrategyTest.java @@ -75,4 +75,4 @@ void should_calc_elapsed_time_as_passing_time() { assertThat(elapsedNanoTime).isEqualTo(TimeUnit.MILLISECONDS.toNanos(90)); } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/apache/servicecomb/core/invocation/timeout/ProcessingTimeStrategyTest.java b/core/src/test/java/org/apache/servicecomb/core/invocation/timeout/ProcessingTimeStrategyTest.java index e348f10670c..07d84e5b3e4 100644 --- a/core/src/test/java/org/apache/servicecomb/core/invocation/timeout/ProcessingTimeStrategyTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/invocation/timeout/ProcessingTimeStrategyTest.java @@ -86,4 +86,4 @@ public void checkTimeout(Invocation invocation) { assertThat(invocation.getContext(CHAIN_PROCESSING)).isEqualTo("60"); } -} \ No newline at end of file +} diff --git a/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java b/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java index 6d00edbd393..015d3bd5980 100644 --- a/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java +++ b/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java @@ -141,7 +141,7 @@ public void testEncrypt() { String expected = "{name=userName, age=10, userId=serviceTokenTest-userId, body1=b1, body2=b2, body3=b3}"; Assert.isTrue(expected.equalsIgnoreCase(result.toString()), - String.format("expected: %s\nreal : %s", expected, result.toString())); + String.format("expected: %s\nreal : %s", expected, result)); } protected void testRecursiveSelf() { @@ -227,7 +227,7 @@ protected void testDownloadBigFile() { } return null; }); - Assert.isTrue(size.get() == 10 * 1024 * 1024, "size is : " + String.valueOf(size.get()) + " not 10 * 1024 * 1024"); + Assert.isTrue(size.get() == 10 * 1024 * 1024, "size is : " + size.get() + " not 10 * 1024 * 1024"); System.out.println("test download bigFile finished"); } diff --git a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureRequestFilter.java b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureRequestFilter.java index 0eae860c273..3df32f6b457 100644 --- a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureRequestFilter.java +++ b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureRequestFilter.java @@ -60,7 +60,7 @@ public Response afterReceiveRequest(Invocation invocation, HttpServletRequestEx hasher.putString(name, StandardCharsets.UTF_8); hasher.putString(requestEx.getParameter(name), StandardCharsets.UTF_8); } - LOGGER.info("afterReceiveRequest signature: {}", hasher.hash().toString()); + LOGGER.info("afterReceiveRequest signature: {}", hasher.hash()); return null; } diff --git a/demo/demo-edge/edge-service/src/main/resources/config/log4j.properties b/demo/demo-edge/edge-service/src/main/resources/config/log4j.properties index efd6a27d95f..0eb85f6a5fd 100644 --- a/demo/demo-edge/edge-service/src/main/resources/config/log4j.properties +++ b/demo/demo-edge/edge-service/src/main/resources/config/log4j.properties @@ -16,4 +16,4 @@ # log4j.rootLogger=INFO,stdout -log4j.appender.stdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss,SSS/zzz}][%t][%p]%m %l%n \ No newline at end of file +log4j.appender.stdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss,SSS/zzz}][%t][%p]%m %l%n diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java index c1fcfd9081c..d63b313f60b 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java @@ -33,30 +33,30 @@ public class QueryParamWithListSchema { @Path("queryListCSV") @GET public String queryListCSV(@ApiParam(collectionFormat = "csv") @QueryParam("queryList") List queryList) { - return queryList == null ? "null" : queryList.size() + ":" + queryList.toString(); + return queryList == null ? "null" : queryList.size() + ":" + queryList; } @Path("queryListSSV") @GET public String queryListSSV(@ApiParam(collectionFormat = "ssv") @QueryParam("queryList") List queryList) { - return queryList == null ? "null" : queryList.size() + ":" + queryList.toString(); + return queryList == null ? "null" : queryList.size() + ":" + queryList; } @Path("queryListTSV") @GET public String queryListTSV(@ApiParam(collectionFormat = "tsv") @QueryParam("queryList") List queryList) { - return queryList == null ? "null" : queryList.size() + ":" + queryList.toString(); + return queryList == null ? "null" : queryList.size() + ":" + queryList; } @Path("queryListPIPES") @GET public String queryListPIPES(@ApiParam(collectionFormat = "pipes") @QueryParam("queryList") List queryList) { - return queryList == null ? "null" : queryList.size() + ":" + queryList.toString(); + return queryList == null ? "null" : queryList.size() + ":" + queryList; } @Path("queryListMULTI") @GET public String queryListMULTI(@ApiParam(collectionFormat = "multi") @QueryParam("queryList") List queryList) { - return queryList == null ? "null" : queryList.size() + ":" + queryList.toString(); + return queryList == null ? "null" : queryList.size() + ":" + queryList; } } diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/SchemeInterfaceJaxrsImpl.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/SchemeInterfaceJaxrsImpl.java index 862db168d76..a551644834e 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/SchemeInterfaceJaxrsImpl.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/SchemeInterfaceJaxrsImpl.java @@ -32,7 +32,7 @@ public int reduce(int a, int b) { } public int add(String a, String b) { - return Integer.valueOf(a) + Integer.valueOf(b); + return Integer.parseInt(a) + Integer.parseInt(b); } @Override diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/ServerBTest.java b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/ServerBTest.java index cbb2b42c0e0..f76836d4ef8 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/ServerBTest.java +++ b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/ServerBTest.java @@ -64,4 +64,4 @@ public void testRestTransport() throws Exception { public String getMicroserviceName() { return "demo-multi-service-center-serverB"; } -} \ No newline at end of file +} diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/application.properties b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/application.properties index 6072aab4566..121f1aa95c6 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/application.properties +++ b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/application.properties @@ -17,4 +17,4 @@ demo.multi.service.center.serverB.actual.key6=key6 demo.multi.service.center.serverB.actual.key7.1=key71 -demo.multi.service.center.serverB.actual.key7.2=key72 \ No newline at end of file +demo.multi.service.center.serverB.actual.key7.2=key72 diff --git a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/invoker/ClientModel.java b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/invoker/ClientModel.java index 52f4bd92ca8..fd699064d46 100644 --- a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/invoker/ClientModel.java +++ b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/invoker/ClientModel.java @@ -36,4 +36,4 @@ public int getCode() { public void setCode(int code) { this.code = code; } -} \ No newline at end of file +} diff --git a/demo/demo-pojo/pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/TestImpl.java b/demo/demo-pojo/pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/TestImpl.java index be1bacab11d..711f59007e3 100644 --- a/demo/demo-pojo/pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/TestImpl.java +++ b/demo/demo-pojo/pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/TestImpl.java @@ -37,7 +37,7 @@ public String testStringArray(String[] arr) { @Override public String getTestString(String code) { - return String.format("code is '%s'", String.valueOf(code)); + return String.format("code is '%s'", code); } @Override diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/TestImpl.java b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/TestImpl.java index c842f929456..bfe57e670d3 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/TestImpl.java +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/pojo/server/TestImpl.java @@ -35,7 +35,7 @@ public String testStringArray(String[] arr) { @Override public String getTestString(String code) { - return String.format("code is '%s'", String.valueOf(code)); + return String.format("code is '%s'", code); } @Override diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/ConsumerTestsAfterBootup.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/ConsumerTestsAfterBootup.java index 1624a21458c..65368c72cfe 100644 --- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/ConsumerTestsAfterBootup.java +++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/ConsumerTestsAfterBootup.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.servicecomb.core.BootListener; import org.apache.servicecomb.demo.TestMgr; @@ -49,7 +50,7 @@ private String readFile(String restController) { int len = inputStream.read(buffer); TestMgr.check(2048 * 10 > len, true); inputStream.close(); - return new String(buffer, 0, len, Charset.forName("UTF-8")); + return new String(buffer, 0, len, StandardCharsets.UTF_8); } catch (IOException e) { TestMgr.failed(e.getMessage(), e); return null; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java index 5079017c0e3..c75775f24eb 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java @@ -48,7 +48,7 @@ private File createTempFile(String content) throws IOException { private File createTempFile(String name, String content) throws IOException { if (name == null) { - name = "download-" + UUID.randomUUID().toString() + ".txt"; + name = "download-" + UUID.randomUUID() + ".txt"; } File file = new File(tempDir, name); FileUtils.write(file, content, StandardCharsets.UTF_8, false); diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/EarlyConsumer.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/EarlyConsumer.java index eb43fe1aeab..6e282df8a11 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/EarlyConsumer.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/EarlyConsumer.java @@ -59,4 +59,4 @@ public void run() { public void onAfterRegistry(BootEvent event) { stopped = true; } -} \ No newline at end of file +} diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/HealthSchema.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/HealthSchema.java index d1f8be2b451..eab4a09e89b 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/HealthSchema.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/HealthSchema.java @@ -24,4 +24,4 @@ public interface HealthSchema { @GetMapping(value = "/heartbeat") void heartbeat(); -} \ No newline at end of file +} diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/NormalConsumer.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/NormalConsumer.java index 72ce2eca908..b9bd2daa7c6 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/NormalConsumer.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/NormalConsumer.java @@ -53,4 +53,4 @@ public int getOrder() { // 比ThirdServiceRegister晚 return 0; } -} \ No newline at end of file +} diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/Register.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/Register.java index 16cb416d7e2..687ade9e331 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/Register.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/third/Register.java @@ -32,4 +32,4 @@ public Register() { addSchema("heartbeat", HealthSchema.class); setUrls("", Arrays.asList("rest://localhost:8080?sslEnabled=false")); } -} \ No newline at end of file +} diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/ClientServerEndpoint.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/ClientServerEndpoint.java index f2fb7328545..33d0e22baa4 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/ClientServerEndpoint.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/ClientServerEndpoint.java @@ -83,4 +83,4 @@ public JsonObject jsonObject(@RequestBody JsonObject jsonObject) { public String getString(@RawJsonRequestBody String jsonString) { return jsonString; } -} \ No newline at end of file +} diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImplTest.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImplTest.java index b40df787f2f..dc0dbb0e94d 100644 --- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImplTest.java +++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImplTest.java @@ -67,4 +67,4 @@ void onRefreshEndpointEventTest() { List availableAZ = Deencapsulation.getField(addressManager, "availableZone"); Assertions.assertEquals("https://127.0.0.1:30100/v3/test", availableAZ.get(0)); } -} \ No newline at end of file +} diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/center/client/AddressManagerTest.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/center/client/AddressManagerTest.java index 958a6a16bd2..fc8c0c95b69 100644 --- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/center/client/AddressManagerTest.java +++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/center/client/AddressManagerTest.java @@ -77,4 +77,4 @@ public void onRefreshEndpointEvent() { Assertions.assertEquals("http://127.0.0.3:30100/v3/project", addressManager1.address()); } -} \ No newline at end of file +} diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/AlarmEvent.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/AlarmEvent.java index 1f100c14849..3539764406d 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/AlarmEvent.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/AlarmEvent.java @@ -31,5 +31,5 @@ public Type getType() { public enum Type { OPEN, CLOSE - }; + } } diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/log/AbstractMarker.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/log/AbstractMarker.java index d3a22755747..15128c19bce 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/log/AbstractMarker.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/log/AbstractMarker.java @@ -65,4 +65,4 @@ public boolean contains(String name) { public String toString() { return getName(); } -} \ No newline at end of file +} diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java index 04196d303ff..8e0507a6f60 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java @@ -139,4 +139,4 @@ public static ClassLoader correctClassLoader(ClassLoader classLoader) { public static ClassLoader findClassLoader() { return correctClassLoader(null); } -} \ No newline at end of file +} diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/DynamicObjectTest.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/DynamicObjectTest.java index 25848c46ef4..6867124543b 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/DynamicObjectTest.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/DynamicObjectTest.java @@ -39,4 +39,4 @@ void should_support_json_encode_decode() { assertThat(dynamicObject.getDynamic()).isEqualTo(map); assertThat(Json.encode(dynamicObject)).isEqualTo("{\"k\":\"v\"}"); } -} \ No newline at end of file +} diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/base/DynamicEnumTest.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/base/DynamicEnumTest.java index 665817287b0..836be565147 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/base/DynamicEnumTest.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/base/DynamicEnumTest.java @@ -98,4 +98,4 @@ void should_not_cache_unknown_value() { Color value2 = Json.decodeValue(UNKNOWN_COLOR, Color.class); assertThat(value1).isNotSameAs(value2); } -} \ No newline at end of file +} diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/AsyncUtilsTest.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/AsyncUtilsTest.java index 8b38da0bc2a..7ec1a215034 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/AsyncUtilsTest.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/AsyncUtilsTest.java @@ -41,4 +41,4 @@ void should_convert_fail_async_to_sync() { Throwable catchThrowable = catchThrowable(() -> AsyncUtils.toSync(future)); assertThat(catchThrowable).isSameAs(throwable); } -} \ No newline at end of file +} diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicWatchedConfigurationExt.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicWatchedConfigurationExt.java index 3ea8a029056..0aa3b0491e5 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicWatchedConfigurationExt.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicWatchedConfigurationExt.java @@ -72,4 +72,4 @@ public DynamicWatchedConfigurationExt(final WatchedConfigurationSource source) { public void updateConfiguration(final WatchedUpdateResult result) { updater.updateProperties(result, this, ignoreDeletesFromSource); } -} \ No newline at end of file +} diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/inject/PlaceholderResolver.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/inject/PlaceholderResolver.java index 08614178e7a..2093561616f 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/inject/PlaceholderResolver.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/inject/PlaceholderResolver.java @@ -210,4 +210,4 @@ private Object findValue(Map parameters, String key) { } return value; } -} \ No newline at end of file +} diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java index 66fbf79170e..695e3488a34 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java @@ -225,4 +225,4 @@ private String[] collectPropertyKeys(Field field, String prefix, Map */ -package io.protostuff; \ No newline at end of file +package io.protostuff; diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/serializer/repeated/AbstractWriters.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/serializer/repeated/AbstractWriters.java index b448a5def71..bb784ff7632 100644 --- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/serializer/repeated/AbstractWriters.java +++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/serializer/repeated/AbstractWriters.java @@ -84,4 +84,4 @@ public void dynamicWriteTo(OutputEx output, Object value) throws IOException { ProtoUtils.throwNotSupportWrite(protoField, value); } -} \ No newline at end of file +} diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/CustomGeneric.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/CustomGeneric.java index 5cbb1ef788f..c57579ed18e 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/CustomGeneric.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/CustomGeneric.java @@ -18,4 +18,4 @@ public class CustomGeneric { public T user; -} \ No newline at end of file +} diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java index 7fbb80f9c40..11ac076317c 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java @@ -7609,8 +7609,8 @@ public com.google.protobuf.Any.Builder addAnysBuilder( } private com.google.protobuf.MapField internalGetMutableSsMap() { - onChanged();; - if (ssMap_ == null) { + onChanged(); + if (ssMap_ == null) { ssMap_ = com.google.protobuf.MapField.newMapField( SsMapDefaultEntryHolder.defaultEntry); } @@ -7740,8 +7740,8 @@ public Builder putAllSsMap( } private com.google.protobuf.MapField internalGetMutableSint32Map() { - onChanged();; - if (sint32Map_ == null) { + onChanged(); + if (sint32Map_ == null) { sint32Map_ = com.google.protobuf.MapField.newMapField( Sint32MapDefaultEntryHolder.defaultEntry); } @@ -7868,8 +7868,8 @@ public Builder putAllSint32Map( } private com.google.protobuf.MapField internalGetMutableSpMap() { - onChanged();; - if (spMap_ == null) { + onChanged(); + if (spMap_ == null) { spMap_ = com.google.protobuf.MapField.newMapField( SpMapDefaultEntryHolder.defaultEntry); } diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestFixed64Schema.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestFixed64Schema.java index 95d10338380..03ea489b263 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestFixed64Schema.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestFixed64Schema.java @@ -22,4 +22,4 @@ public TestFixed64Schema() { maxValue = Long.MAX_VALUE; initFields("fixed64", "objFixed64"); } -} \ No newline at end of file +} diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestUInt64Schema.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestUInt64Schema.java index 6aef61edcce..6235a4b3e24 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestUInt64Schema.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestUInt64Schema.java @@ -22,4 +22,4 @@ public TestUInt64Schema() { maxValue = Long.MAX_VALUE; initFields("uint64", "objUint64"); } -} \ No newline at end of file +} diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java index 19687128c96..2df6ab1dfb9 100644 --- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java +++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java @@ -357,4 +357,4 @@ public void afterRegistryInstance(MicroserviceInstanceRegisteredEvent event) { )); } } -} \ No newline at end of file +} diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/AppManager.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/AppManager.java index 82bea019b87..f149516e92e 100644 --- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/AppManager.java +++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/AppManager.java @@ -98,4 +98,4 @@ public void markWaitingDelete(String appId, String microserviceName) { .map(microserviceManager -> microserviceManager.getVersionsByName().get(microserviceName)) .ifPresent(MicroserviceVersions::markWaitingDelete); } -} \ No newline at end of file +} diff --git a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/CertificateUtil.java b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/CertificateUtil.java index 2091adba8c5..8fcf41af10a 100644 --- a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/CertificateUtil.java +++ b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/CertificateUtil.java @@ -126,7 +126,7 @@ public static Set getCN(X509Certificate cert) { Object key = list.get(0); Object value = list.get(1); if (key instanceof Integer && value instanceof String) { - int intKey = ((Integer) key).intValue(); + int intKey = (Integer) key; String strValue = (String) value; if (intKey == SUBALTNAME_DNSNAME || intKey == SUBALTNAME_IPADDRESS) { names.add(strValue); diff --git a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/TrustManagerExt.java b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/TrustManagerExt.java index b9c70e0bfcc..1177089097a 100644 --- a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/TrustManagerExt.java +++ b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/TrustManagerExt.java @@ -194,9 +194,9 @@ private void checkCNHost(X509Certificate[] chain, String ip) throws CertificateE } else if (cnValid(cns, ipTmp)) { return; } - LOG.error("CN does not match IP: e=" + cns.toString() + LOG.error("CN does not match IP: e=" + cns + ",t=" + ip); - throw new CertificateException("CN does not match IP: e=" + cns.toString() + throw new CertificateException("CN does not match IP: e=" + cns + ",t=" + ip); } } diff --git a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/AssertUtils.java b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/AssertUtils.java index 84560543d7b..ef310a9da51 100644 --- a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/AssertUtils.java +++ b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/AssertUtils.java @@ -30,4 +30,4 @@ static AbstractStringAssert assertPrettyJson(Object value) { .replace(LineSeparator.WINDOWS.value(), LineSeparator.UNIX.value()); return assertThat(json); } -} \ No newline at end of file +} diff --git a/foundations/foundation-test-scaffolding/src/main/resources/config/log4j.properties b/foundations/foundation-test-scaffolding/src/main/resources/config/log4j.properties index a6911b4f6b3..b9da5260d72 100644 --- a/foundations/foundation-test-scaffolding/src/main/resources/config/log4j.properties +++ b/foundations/foundation-test-scaffolding/src/main/resources/config/log4j.properties @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -paas.logs.dir=target/ \ No newline at end of file +paas.logs.dir=target/ diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java index b378bf40b52..49fbe011275 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java @@ -89,7 +89,7 @@ public void init(Vertx vertx, String sslKey, AsyncResultCallback changedConfigurations) { public Set getChangedConfigurations() { return changedConfigurations; } -} \ No newline at end of file +} diff --git a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/MatchOperator.java b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/MatchOperator.java index c4f157c4732..db92907455a 100644 --- a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/MatchOperator.java +++ b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/MatchOperator.java @@ -19,4 +19,4 @@ public interface MatchOperator { boolean match(String targetStr, String patternStr); -} \ No newline at end of file +} diff --git a/governance/src/test/java/org/apache/servicecomb/router/ExampleDistributor.java b/governance/src/test/java/org/apache/servicecomb/router/ExampleDistributor.java index 38f09686f97..7c6aa04f945 100644 --- a/governance/src/test/java/org/apache/servicecomb/router/ExampleDistributor.java +++ b/governance/src/test/java/org/apache/servicecomb/router/ExampleDistributor.java @@ -25,4 +25,4 @@ public class ExampleDistributor extends AbstractRouterDistributor a, ServiceIns::getVersion, ServiceIns::getServerName, ServiceIns::getTags); } -} \ No newline at end of file +} diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilterTest.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilterTest.java index da282c975e1..fe9e50f5a89 100644 --- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilterTest.java +++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/IsolationDiscoveryFilterTest.java @@ -247,4 +247,4 @@ public void discoveryRecoverInstance() { Assertions.assertEquals(data.get("i2"), childNodeData.get("i2")); Assertions.assertFalse(ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(server0).isIsolated()); } -} \ No newline at end of file +} diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/PriorityInstancePropertyDiscoveryFilterTest.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/PriorityInstancePropertyDiscoveryFilterTest.java index 2c29456bd3d..0ba2584b3b4 100644 --- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/PriorityInstancePropertyDiscoveryFilterTest.java +++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/PriorityInstancePropertyDiscoveryFilterTest.java @@ -134,4 +134,4 @@ private void executeTest(String selfProperty, Set expectedMatchedKeys) { Map filterInstance = node.data(); assertThat(filterInstance.keySet()).containsAnyElementsOf(expectedMatchedKeys); } -} \ No newline at end of file +} diff --git a/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java b/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java index fac81834a16..be80ac28994 100644 --- a/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java +++ b/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java @@ -42,4 +42,4 @@ public void start() { .end(response); }).listen(23334); } -} \ No newline at end of file +} diff --git a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/Color.java b/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/Color.java index 23ea5149e08..e43c5c4d894 100644 --- a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/Color.java +++ b/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/Color.java @@ -18,5 +18,5 @@ package org.apache.servicecomb.it.schema.objectparams; public enum Color { - RED,BLUE,GREEN; + RED,BLUE,GREEN } diff --git a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/FlattenObjectRequest.java b/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/FlattenObjectRequest.java index b0b134f33f2..71ff6b3deec 100644 --- a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/FlattenObjectRequest.java +++ b/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/FlattenObjectRequest.java @@ -284,4 +284,4 @@ public static FlattenObjectRequest createFlattenObjectRequest() { request.setColor(Color.BLUE); return request; } -} \ No newline at end of file +} diff --git a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/FluentSetterFlattenObjectRequest.java b/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/FluentSetterFlattenObjectRequest.java index 90f0efd056c..425080be9a2 100644 --- a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/FluentSetterFlattenObjectRequest.java +++ b/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/FluentSetterFlattenObjectRequest.java @@ -301,4 +301,4 @@ public static FluentSetterFlattenObjectRequest createFlattenObjectRequest() { .setString("abc") .setColor(Color.BLUE); } -} \ No newline at end of file +} diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/Consumers.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/Consumers.java index 8a56980970c..1ed20e743f3 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/Consumers.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/Consumers.java @@ -85,4 +85,4 @@ public String getTransport() { public CseAsyncRestTemplate getCseAsyncRestTemplate() { return cseAsyncRestTemplate; } -} \ No newline at end of file +} diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ResultPrinter.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ResultPrinter.java index 2a35762bc42..50854117d2c 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ResultPrinter.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/ResultPrinter.java @@ -60,6 +60,6 @@ public void print() { ITJUnitUtils.getRunCount(), ITJUnitUtils.getFailures().size(), totalTime)); - System.out.println(sb.toString()); + System.out.println(sb); } } diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDownload.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDownload.java index 8a75f9ba00b..31136077b65 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDownload.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDownload.java @@ -65,7 +65,7 @@ private String readFileToString(File file) { private CompletableFuture checkFile(ReadStreamPart part) { CompletableFuture future = part.saveToFile("target/download/" - + UUID.randomUUID().toString() + + UUID.randomUUID() + "-" + part.getSubmittedFileName()); return checkFuture(future); diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/objectparams/TestSpringMVCObjectParamType.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/objectparams/TestSpringMVCObjectParamType.java index d2e327ab219..63ab0abd683 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/objectparams/TestSpringMVCObjectParamType.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/objectparams/TestSpringMVCObjectParamType.java @@ -467,13 +467,13 @@ public void testFluentSetterQueryObjectParam() { public void testQueryObjectWithHeader_rt() { HttpHeaders headers = new HttpHeaders(); headers.add("prefix", prefix); - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, queryObjectHeader(consumers, headers, "/testQueryObjectWithHeader?" + queryParam)); } @Test public void testQueryObjectWithHeader_pojo() { - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, consumers.getIntf().testQueryObjectWithHeader(prefix, 23, "demo")); } @@ -481,13 +481,13 @@ public void testQueryObjectWithHeader_pojo() { public void testQueryObjectWithHeaderName_rt() { HttpHeaders headers = new HttpHeaders(); headers.add("prefix", prefix); - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, queryObjectHeader(consumers, headers, "/testQueryObjectWithHeaderName?" + queryParam)); } @Test public void testQueryObjectWithHeaderName_pojo() { - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, consumers.getIntf().testQueryObjectWithHeaderName(prefix, 23, "demo")); } @@ -495,13 +495,13 @@ public void testQueryObjectWithHeaderName_pojo() { public void testQueryObjectWithHeaderValue_rt() { HttpHeaders headers = new HttpHeaders(); headers.add("prefix", prefix); - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, queryObjectHeader(consumers, headers, "/testQueryObjectWithHeaderValue?" + queryParam)); } @Test public void testQueryObjectWithHeaderValue_pojo() { - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, consumers.getIntf().testQueryObjectWithHeaderValue(prefix, 23, "demo")); } @@ -510,49 +510,49 @@ public void testQueryObjectWithHeaderValueAndName_rt() { HttpHeaders headers = new HttpHeaders(); headers.add("prefix", prefix); headers.add("suffix", suffix); - Assertions.assertEquals(prefix + queryModel.toString() + suffix, + Assertions.assertEquals(prefix + queryModel + suffix, queryObjectHeader(consumers, headers, "/testQueryObjectWithHeaderValueAndName?" + queryParam)); } @Test public void testQueryObjectWithHeaderValueAndName_pojo() { - Assertions.assertEquals(prefix + queryModel.toString() + suffix, + Assertions.assertEquals(prefix + queryModel + suffix, consumers.getIntf().testQueryObjectWithHeaderValueAndName(prefix, suffix, 23, "demo")); } @Test public void testQueryObjectWithParam_rt() { - Assertions.assertEquals(prefix + queryModel.toString(), consumers.getSCBRestTemplate() + Assertions.assertEquals(prefix + queryModel, consumers.getSCBRestTemplate() .getForObject("/testQueryObjectWithParam?prefix=" + prefix + "&" + queryParam, String.class)); } @Test public void testQueryObjectWithParam_pojo() { - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, consumers.getIntf().testQueryObjectWithParam(prefix, 23, "demo")); } @Test public void testQueryObjectWithParamName_rt() { - Assertions.assertEquals(prefix + queryModel.toString(), consumers.getSCBRestTemplate() + Assertions.assertEquals(prefix + queryModel, consumers.getSCBRestTemplate() .getForObject("/testQueryObjectWithParamName?prefix=" + prefix + "&" + queryParam, String.class)); } @Test public void testQueryObjectWithParamName_pojo() { - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, consumers.getIntf().testQueryObjectWithParamName(prefix, 23, "demo")); } @Test public void testQueryObjectWithParamValue_rt() { - Assertions.assertEquals(prefix + queryModel.toString(), consumers.getSCBRestTemplate() + Assertions.assertEquals(prefix + queryModel, consumers.getSCBRestTemplate() .getForObject("/testQueryObjectWithParamValue?prefix=" + prefix + "&" + queryParam, String.class)); } @Test public void testQueryObjectWithParamValue_pojo() { - Assertions.assertEquals(prefix + queryModel.toString(), + Assertions.assertEquals(prefix + queryModel, consumers.getIntf().testQueryObjectWithParamValue(prefix, 23, "demo")); } diff --git a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/PreLoadBootListener.java b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/PreLoadBootListener.java index 45d4d8cf0ab..72ad9316915 100644 --- a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/PreLoadBootListener.java +++ b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/PreLoadBootListener.java @@ -45,4 +45,4 @@ public void onBootEvent(BootEvent bootEvent) { } } } -} \ No newline at end of file +} diff --git a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/encrypt/filter/EdgeSignatureRequestFilter.java b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/encrypt/filter/EdgeSignatureRequestFilter.java index 3eb60906e2c..6e00773d969 100644 --- a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/encrypt/filter/EdgeSignatureRequestFilter.java +++ b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/edge/encrypt/filter/EdgeSignatureRequestFilter.java @@ -60,7 +60,7 @@ public Response afterReceiveRequest(Invocation invocation, HttpServletRequestEx hasher.putString(name, StandardCharsets.UTF_8); hasher.putString(requestEx.getParameter(name), StandardCharsets.UTF_8); } - LOGGER.info("afterReceiveRequest signature: {}", hasher.hash().toString()); + LOGGER.info("afterReceiveRequest signature: {}", hasher.hash()); return null; } diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultJsonValueJaxrsSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultJsonValueJaxrsSchema.java index 65308533dd1..d8992f76e02 100644 --- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultJsonValueJaxrsSchema.java +++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultJsonValueJaxrsSchema.java @@ -34,7 +34,7 @@ public DefaultJsonValueResponse jsonInput(DefaultJsonValueRequest request) { response.setType(request.getType()); StringBuilder sb = new StringBuilder(); sb.append(request.getDefaultValue()); - response.setMessage("expected:" + sb.toString() + ":" + (request.getItems() == null ? null + response.setMessage("expected:" + sb + ":" + (request.getItems() == null ? null : request.getItems().size())); return response; } diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DownloadSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DownloadSchema.java index 16dbd588fbf..ad274bbc8d8 100644 --- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DownloadSchema.java +++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DownloadSchema.java @@ -92,7 +92,7 @@ protected File createTempFile(String content) throws IOException { protected File createTempFile(String name, String content) throws IOException { if (name == null) { - name = "download-" + UUID.randomUUID().toString() + ".txt"; + name = "download-" + UUID.randomUUID() + ".txt"; } File file = new File(tempDir, name); FileUtils.write(file, content, StandardCharsets.UTF_8, false); diff --git a/integration-tests/pojo-test/src/test/java/org/apache/servicecomb/demo/pojo/test/endpoints/TestImpl.java b/integration-tests/pojo-test/src/test/java/org/apache/servicecomb/demo/pojo/test/endpoints/TestImpl.java index 46d1bf70440..2b0d7e6e530 100644 --- a/integration-tests/pojo-test/src/test/java/org/apache/servicecomb/demo/pojo/test/endpoints/TestImpl.java +++ b/integration-tests/pojo-test/src/test/java/org/apache/servicecomb/demo/pojo/test/endpoints/TestImpl.java @@ -38,7 +38,7 @@ public String testStringArray(String[] arr) { @Override public String getTestString(String code) { - return String.format("code is '%s'", String.valueOf(code)); + return String.format("code is '%s'", code); } @Override diff --git a/integration-tests/spring-pojo-connection-limit-test/src/test/java/org/apache/servicecomb/demo/pojo/test/PojoSpringConnectionLimitIntegrationTest.java b/integration-tests/spring-pojo-connection-limit-test/src/test/java/org/apache/servicecomb/demo/pojo/test/PojoSpringConnectionLimitIntegrationTest.java index f254d436f02..001ec7f6cf3 100644 --- a/integration-tests/spring-pojo-connection-limit-test/src/test/java/org/apache/servicecomb/demo/pojo/test/PojoSpringConnectionLimitIntegrationTest.java +++ b/integration-tests/spring-pojo-connection-limit-test/src/test/java/org/apache/servicecomb/demo/pojo/test/PojoSpringConnectionLimitIntegrationTest.java @@ -39,4 +39,4 @@ public void remoteHelloPojo_sayHello() { Assertions.assertEquals("io.vertx.core.http.HttpClosedException: Connection was closed", e.getCause().toString()); } } -} \ No newline at end of file +} diff --git a/integration-tests/spring-pojo-connection-limit-test/src/test/resources/log4j.properties b/integration-tests/spring-pojo-connection-limit-test/src/test/resources/log4j.properties index 8cc015c91d0..705b2f7c5a0 100644 --- a/integration-tests/spring-pojo-connection-limit-test/src/test/resources/log4j.properties +++ b/integration-tests/spring-pojo-connection-limit-test/src/test/resources/log4j.properties @@ -17,4 +17,4 @@ log4j.rootLogger=WARN, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n \ No newline at end of file +log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n diff --git a/integration-tests/spring-pojo-connection-limit-test/src/test/resources/microservice.yaml b/integration-tests/spring-pojo-connection-limit-test/src/test/resources/microservice.yaml index 62bdc4ac84f..ecb1b3d827c 100644 --- a/integration-tests/spring-pojo-connection-limit-test/src/test/resources/microservice.yaml +++ b/integration-tests/spring-pojo-connection-limit-test/src/test/resources/microservice.yaml @@ -26,4 +26,4 @@ servicecomb: rest: address: 0.0.0.0:7070 server: - connection-limit: 0 \ No newline at end of file + connection-limit: 0 diff --git a/integration-tests/spring-pojo-tests/src/test/java/org/apache/servicecomb/demo/pojo/test/PojoSpringIntegrationTest.java b/integration-tests/spring-pojo-tests/src/test/java/org/apache/servicecomb/demo/pojo/test/PojoSpringIntegrationTest.java index cfbe610ee8e..ab413d26986 100644 --- a/integration-tests/spring-pojo-tests/src/test/java/org/apache/servicecomb/demo/pojo/test/PojoSpringIntegrationTest.java +++ b/integration-tests/spring-pojo-tests/src/test/java/org/apache/servicecomb/demo/pojo/test/PojoSpringIntegrationTest.java @@ -35,4 +35,4 @@ public static void setUpClass() throws Exception { public static void teardownClass() { SCBEngine.getInstance().destroy(); } -} \ No newline at end of file +} diff --git a/integration-tests/spring-pojo-tests/src/test/resources/microservice.yaml b/integration-tests/spring-pojo-tests/src/test/resources/microservice.yaml index 322f22ba944..fbfebd4b277 100644 --- a/integration-tests/spring-pojo-tests/src/test/resources/microservice.yaml +++ b/integration-tests/spring-pojo-tests/src/test/resources/microservice.yaml @@ -18,4 +18,4 @@ servicecomb: service: registry: - enabled: false \ No newline at end of file + enabled: false diff --git a/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java b/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java index 7f4c712bb76..9f1a1de8068 100644 --- a/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java +++ b/integration-tests/test-common/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestBase.java @@ -72,7 +72,7 @@ protected void assertThatSpansReceivedByZipkin(Collection logs, String.. spans = zipkin.getTrace(traceId(loggedIds)); tracedValues = tracedValues(spans); } catch (InterruptedException e) { - log.error("Thread interrupted, ", e.getMessage()); + log.error("Thread interrupted, {}", e.getMessage()); Thread.currentThread().interrupt(); } } diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/InterfaceUsage.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/InterfaceUsage.java index 4bc4f1d0e30..c29d9598ff9 100644 --- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/InterfaceUsage.java +++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/InterfaceUsage.java @@ -67,4 +67,4 @@ public String getName() { public List getNetStats() { return netStats; } -} \ No newline at end of file +} diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/NetStat.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/NetStat.java index 876c8c99d00..3d3f08b706e 100644 --- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/NetStat.java +++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/os/net/NetStat.java @@ -59,4 +59,4 @@ public int getIndex() { public Id getId() { return id; } -} \ No newline at end of file +} diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java index 5b8af2986b1..ac2b7a63c3d 100644 --- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java +++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java @@ -197,7 +197,7 @@ private void printNetLog(StringBuilder sb, MeasurementNode osNode) { interfaceNode.getName()); } if (tmpSb.length() != 0) { - sb.append(tmpSb.toString()); + sb.append(tmpSb); } } diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java index c14704103e4..1c8624fc0b4 100644 --- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java +++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java @@ -101,4 +101,4 @@ public ProducerProviderManager getProducerProviderManager() { MatcherAssert.assertThat(producerMetas, Matchers.empty()); } -} \ No newline at end of file +} diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java index 683c1b4f5ff..c309854201a 100644 --- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java +++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java @@ -59,4 +59,4 @@ protected org.springframework.web.client.AsyncRequestCallback httpEntityCall Type responseType) { return new CseAsyncRequestCallback(requestBody); } -} \ No newline at end of file +} diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java index 7475fff1056..5c81868e866 100644 --- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java +++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java @@ -30,4 +30,4 @@ public void testCseAsyncClientHttpRequestFactory() { Assertions.assertEquals(HttpMethod.GET, cseAsyncClientHttpRequestFactory.createAsyncRequest(URI.create("/test"), HttpMethod.GET).getMethod()); } -} \ No newline at end of file +} diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java index 60c8ac6adca..251cfbea457 100644 --- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java +++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java @@ -122,4 +122,4 @@ public void onSuccess(ClientHttpResponse result) { } ); } -} \ No newline at end of file +} diff --git a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java index 921ab08ff37..11cf2c8da9f 100644 --- a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java +++ b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java @@ -124,4 +124,4 @@ public MicroserviceInstances findServiceInstances(String appId, String serviceNa String revision) { return store.findServiceInstances(appId, serviceName, revision); } -} \ No newline at end of file +} diff --git a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightRegistration.java b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightRegistration.java index 39ce59dff79..ac2799ceec2 100644 --- a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightRegistration.java +++ b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightRegistration.java @@ -143,4 +143,4 @@ public void destroy() { } protected abstract void doSendUnregister() throws IOException; -} \ No newline at end of file +} diff --git a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/store/Store.java b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/store/Store.java index cd9ca8c87f5..dedc35cf64a 100644 --- a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/store/Store.java +++ b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/store/Store.java @@ -129,4 +129,4 @@ public Stream findDeadInstances(Duration timeout) { .filter(instanceStore -> instanceStore.isHeartBeatTimeout(nanoNow, nanoTimeout)) .map(InstanceStore::getInstance); } -} \ No newline at end of file +} diff --git a/service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/MessageTest.java b/service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/MessageTest.java index c91a14b861e..66181ce87e7 100644 --- a/service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/MessageTest.java +++ b/service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/MessageTest.java @@ -77,4 +77,4 @@ void should_decode_unregister_type() { assertThat(message.getBody()).isInstanceOf(UnregisterRequest.class); } -} \ No newline at end of file +} diff --git a/service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/StoreServiceTest.java b/service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/StoreServiceTest.java index f443ed5ea6d..1858c87f708 100644 --- a/service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/StoreServiceTest.java +++ b/service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/StoreServiceTest.java @@ -146,4 +146,4 @@ void should_process_as_heartbeat_when_nothing_changed() { should_register_microservice_and_instance_when_both_not_exist(); assertThat(instanceStore.getLastHeartBeat()).isEqualTo(1); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/api/Type.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/api/Type.java index d198f9f17d3..da620221311 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/api/Type.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/api/Type.java @@ -22,4 +22,4 @@ public enum Type { KIE, CseConfigCenter, CseMonitoring -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/RestClientUtil.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/RestClientUtil.java index f7dd6e5bff3..565fcd655f6 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/RestClientUtil.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/RestClientUtil.java @@ -144,7 +144,7 @@ public void httpDo(long timeout, RequestContext requestContext, Handler { LOGGER.error("{} {} fail, endpoint is {}:{}, message: {}", httpMethod, - url.toString(), + url, ipPort.getHostOrIp(), ipPort.getPort(), failure.getMessage()); @@ -176,7 +176,7 @@ public SignRequest createSignRequest(String method, IpPort ipPort, RequestParam try { signReq.setEndpoint(new URI(endpoint.toString())); } catch (URISyntaxException e) { - LOGGER.error("set uri failed, uri is {}, message: {}", endpoint.toString(), e.getMessage()); + LOGGER.error("set uri failed, uri is {}, message: {}", endpoint, e.getMessage()); } signReq.setContent((requestParam.getBody() != null && requestParam.getBody().length > 0) ? new ByteArrayInputStream(requestParam.getBody()) diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java index 3e991875922..4657dc3ef07 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java @@ -178,7 +178,7 @@ public Handler syncHandler(CountDownLatch countDownLatch, Clas } } } catch (IOException e) { - LOGGER.warn("read value failed from buffer {}", bodyBuffer.toString()); + LOGGER.warn("read value failed from buffer {}", bodyBuffer); } } @@ -287,7 +287,7 @@ private Handler syncHandlerForInstances(CountDownLatch countDownLa mInstances.setMicroserviceNotExist(true); mInstances.setNeedRefresh(false); } - LOGGER.warn("failed to findInstances: " + bodyBuffer.toString()); + LOGGER.warn("failed to findInstances: " + bodyBuffer); } break; default: diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketClientUtil.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketClientUtil.java index 12b81dff9fe..d73b1016c9b 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketClientUtil.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/WebsocketClientUtil.java @@ -118,7 +118,7 @@ public SignRequest createSignRequest(String method, IpPort ipPort, RequestParam try { signReq.setEndpoint(new URI(endpoint.toString())); } catch (URISyntaxException e) { - LOGGER.error("set uri failed, uri is {}, message: {}", endpoint.toString(), e.getMessage()); + LOGGER.error("set uri failed, uri is {}, message: {}", endpoint, e.getMessage()); } signReq.setContent((requestParam.getBody() != null && requestParam.getBody().length > 0) ? new ByteArrayInputStream(requestParam.getBody()) diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheChecker.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheChecker.java index a2593d2328d..3ec0cea7cdf 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheChecker.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheChecker.java @@ -121,7 +121,7 @@ protected InstanceCacheResult check(MicroserviceVersions microserviceVersions) { + "current cache: {}\n", microserviceVersions.getAppId(), microserviceVersions.getMicroserviceName(), - remoteInstances.toString()); + remoteInstances); instanceCacheResult.setStatus(Status.NORMAL); return instanceCacheResult; } @@ -132,7 +132,7 @@ protected InstanceCacheResult check(MicroserviceVersions microserviceVersions) { microserviceVersions.getAppId(), microserviceVersions.getMicroserviceName(), microserviceVersions.getPulledInstances().toString(), - remoteInstances.toString()); + remoteInstances); instanceCacheResult.setStatus(Status.ABNORMAL); instanceCacheResult.setDetail("instance cache not match"); diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceStatusSyncTask.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceStatusSyncTask.java index b4aa9f8d28b..e932d638fd1 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceStatusSyncTask.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceStatusSyncTask.java @@ -87,4 +87,4 @@ private MicroserviceInstance queryMicroserviceInstance() { } return serviceInstance; } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/RegistryUtilsTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/RegistryUtilsTest.java index 4e6453c86e1..93e0395e933 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/RegistryUtilsTest.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/RegistryUtilsTest.java @@ -74,4 +74,4 @@ public void convertCacheToMicroserviceInstances() { Assertions.assertEquals("0166f3c18702617d5e55cf911e4e412cc8760dab", microserviceInstances.getRevision()); Assertions.assertNull(microserviceInstances.getInstancesResponse()); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/ServiceRegistryTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/ServiceRegistryTest.java index 987c90b6597..41a285cc21e 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/ServiceRegistryTest.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/ServiceRegistryTest.java @@ -63,4 +63,4 @@ public void testNameFormat() { matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("ab@c"); Assertions.assertFalse(matcher.matches()); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TestRBACBootStrapService.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TestRBACBootStrapService.java index 95b6e4c1453..aa8ea632d79 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TestRBACBootStrapService.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TestRBACBootStrapService.java @@ -33,4 +33,4 @@ public void testGetCipher() { String result = String.valueOf(cipher.decrypt(encrypted)); Assertions.assertEquals(result, "test"); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManagerTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManagerTest.java index 2f0b2f5036d..5be2c12a841 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManagerTest.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManagerTest.java @@ -37,4 +37,4 @@ public void testCreateHeaders() { request.setPassword(new String(cipher.decrypt("testtest".toCharArray()))); Assertions.assertEquals(request.getPassword(), "test"); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/refresh/AddressManagerTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/refresh/AddressManagerTest.java index 8a28f426d99..de34af90dc1 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/refresh/AddressManagerTest.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/refresh/AddressManagerTest.java @@ -99,4 +99,4 @@ public void addressIPV6Test() { Assertions.assertEquals("[2008::7:957f:b2d6:1af4:a1f8]", ipPort.getHostOrIp()); Assertions.assertEquals(30100, ipPort.getPort()); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateServiceRegistryCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateServiceRegistryCacheTest.java index 9cc76686a19..1380881f8d5 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateServiceRegistryCacheTest.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateServiceRegistryCacheTest.java @@ -205,4 +205,4 @@ public void onMicroserviceCacheRefreshed() { Assertions.assertEquals(1, aggregateServiceRegistryCache.microserviceCache.size()); Assertions.assertSame(serviceCache2, aggregateServiceRegistryCache.microserviceCache.get(microserviceCacheKey2)); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/MicroserviceCacheKeyTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/MicroserviceCacheKeyTest.java index 1666bbb9559..715bc5a57bc 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/MicroserviceCacheKeyTest.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/MicroserviceCacheKeyTest.java @@ -83,4 +83,4 @@ public void plainKey() { MicroserviceCacheKey.builder().env("env").appId("app").serviceName("svc").build(); Assertions.assertEquals("svc@app@env@0.0.0.0+", microserviceCacheKey.plainKey()); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java index 3de3c30ec41..143128afa9a 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java @@ -315,4 +315,4 @@ public void set_consumer_service_id() { microserviceCache.refresh(); Assertions.assertEquals(Integer.valueOf(2), assertCounter.value); } -} \ No newline at end of file +} diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java index 0c49a08513b..1af46511600 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java @@ -179,4 +179,4 @@ public void refresh() { }; return statusHolder; } -} \ No newline at end of file +} diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java index b5ffc4bd2ea..bba62e0ec06 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java @@ -78,4 +78,4 @@ public void onStartup(ServletContext servletContext) throws ServletException { throw new ServletException(e); } } -} \ No newline at end of file +} diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java index 041302864db..e8ac3f10c95 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java @@ -15,4 +15,4 @@ * limitations under the License. */ -package org.apache.servicecomb.springboot2.starter.servlet; \ No newline at end of file +package org.apache.servicecomb.springboot2.starter.servlet; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/JsonViewProcessor.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/JsonViewProcessor.java index acbe566cdb6..e099a7158f1 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/JsonViewProcessor.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/JsonViewProcessor.java @@ -61,4 +61,4 @@ public void fillParameter(Swagger swagger, Operation operation, Parameter parame } parameter.getVendorExtensions().put(SwaggerConst.EXT_JSON_VIEW, jvValue[0].getName()); } -} \ No newline at end of file +} diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java index 51c15e7d72f..889b2041704 100644 --- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java +++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java @@ -183,4 +183,4 @@ public void should_support_object_property() { assertThat(ConverterMgr.findJavaType(swagger, property).getRawClass()) .isEqualTo(Object.class); } -} \ No newline at end of file +} diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RequestPartAnnotationProcessorTest.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RequestPartAnnotationProcessorTest.java index 36cee10cba5..7ad611b2819 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RequestPartAnnotationProcessorTest.java +++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/RequestPartAnnotationProcessorTest.java @@ -167,4 +167,4 @@ public void fun(@RequestPart("stringParam") String stringParam, @RequestPart("fileCollection") List fileCollection) { } } -} \ No newline at end of file +} diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContextCompletableFuture.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContextCompletableFuture.java index d780be7841d..363025afae7 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContextCompletableFuture.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContextCompletableFuture.java @@ -29,4 +29,4 @@ public InvocationContextCompletableFuture(InvocationContext context) { public InvocationContext getContext() { return context; } -} \ No newline at end of file +} diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java index 6ea4205016e..d985f96818b 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java @@ -49,4 +49,4 @@ public void convert() { public void should_got_null_when_convert_null() { Assertions.assertNull(converter.convert(null)); } -} \ No newline at end of file +} diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java index 11dfb099069..9b5111ae2e3 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java @@ -43,4 +43,4 @@ public void convert() { List parts = Arrays.asList(new FilePart("name", "file")); Assertions.assertSame(parts, converter.convert(parts)); } -} \ No newline at end of file +} diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java index d6fc0639c90..13125dbb981 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java @@ -40,4 +40,4 @@ public void convert() { Part part = new FilePart("name", "file"); Assertions.assertSame(part, converter.convert(part)); } -} \ No newline at end of file +} diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/CommonExceptionDataTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/CommonExceptionDataTest.java index d30bb05fa7a..39a071f1f48 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/CommonExceptionDataTest.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/CommonExceptionDataTest.java @@ -56,4 +56,4 @@ void should_decode_dynamic_field_from_json() { assertThat(data.getDynamic()).isEqualTo(of("k", "v")); assertThat(Json.encode(data)).isEqualTo(json); } -} \ No newline at end of file +} diff --git a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java index 4209475bf41..9fc573e45b9 100644 --- a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java +++ b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java @@ -77,7 +77,7 @@ public void beforeMethodInvoke(SwaggerInvocation invocation, SwaggerProducer args, Default.class); if (violations.size() > 0) { - LOGGER.warn("Parameter validation failed : " + violations.toString()); + LOGGER.warn("Parameter validation failed : " + violations); throw new ConstraintViolationException(violations); } } diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilterTest.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilterTest.java index a331a2ddc0c..7539e13860b 100644 --- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilterTest.java +++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilterTest.java @@ -172,4 +172,4 @@ public void should_encode_response() throws ExecutionException, InterruptedExcep } }; } -} \ No newline at end of file +} diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/BoundaryFactory.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/BoundaryFactory.java index a5bb2e8f5e8..d50193b4aba 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/BoundaryFactory.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/BoundaryFactory.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicLong; public interface BoundaryFactory { - String BOUNDARY_PREFIX = "boundary-" + UUID.randomUUID().toString() + "-"; + String BOUNDARY_PREFIX = "boundary-" + UUID.randomUUID() + "-"; AtomicLong BOUNDARY_INDEX = new AtomicLong(); diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java index cf01542a0a4..fe36469be89 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java @@ -46,4 +46,5 @@ public interface HttpClientRequestFactory { Future create(Invocation invocation, HttpClient httpClient, RequestOptions options) throws Throwable; -} \ No newline at end of file +} + diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilterTest.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilterTest.java index 625c7111c0b..893c2a80ae9 100644 --- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilterTest.java +++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilterTest.java @@ -60,4 +60,4 @@ class RestClientCodecFilterTest extends RestClientTestBase { // assertThat(invocation.getInvocationStageTrace().getStartClientFiltersRequest()).isNotEqualTo(0); // assertThat(invocation.getInvocationStageTrace().getFinishClientFiltersResponse()).isNotEqualTo(0); // } -} \ No newline at end of file +} diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientDecoderTest.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientDecoderTest.java index 84c6adbc2ba..f4b35dacb6c 100644 --- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientDecoderTest.java +++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientDecoderTest.java @@ -97,4 +97,4 @@ class RestClientDecoderTest extends RestClientTestBase { // assertThat(throwable.toString()).isEqualTo( // "InvocationException: code=400;msg=CommonExceptionData{code='scb_rest_client.40000003', message='failed to decode fail response body.', dynamic={}}"); // } -} \ No newline at end of file +} diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientEncoderTest.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientEncoderTest.java index b133d75379e..3d0ea1ba8da 100644 --- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientEncoderTest.java +++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientEncoderTest.java @@ -167,4 +167,4 @@ class RestClientEncoderTest extends RestClientTestBase { // assertThat(((FilePart) parts.get(0)).getAbsolutePath()).endsWith("f1"); // assertThat(((FilePart) parts.get(1)).getAbsolutePath()).endsWith("f2"); // } -} \ No newline at end of file +} diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactoryTest.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactoryTest.java index c891636816a..a5a299ac638 100644 --- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactoryTest.java +++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactoryTest.java @@ -104,4 +104,4 @@ class RestClientTransportContextFactoryTest extends RestClientTestBase { // // factory.setHttpClientRequestFactory(HttpClientRequestFactory.DEFAULT); // } -} \ No newline at end of file +} From b1a0ead346c628d62185b3f63d4a12cca4be1f12 Mon Sep 17 00:00:00 2001 From: lovehzj <1922919664@qq.com> Date: Fri, 27 May 2022 22:35:38 +0800 Subject: [PATCH 2/2] fix unused import --- .../demo/springmvc/client/ConsumerTestsAfterBootup.java | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/ConsumerTestsAfterBootup.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/ConsumerTestsAfterBootup.java index 65368c72cfe..aabf0d0bd59 100644 --- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/ConsumerTestsAfterBootup.java +++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/ConsumerTestsAfterBootup.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import org.apache.servicecomb.core.BootListener;