From dcbc9226f50bb1b701303e549f1f8194cf20773b Mon Sep 17 00:00:00 2001 From: Graeme Rocher Date: Tue, 9 Feb 2021 17:16:30 +0100 Subject: [PATCH] Introduce nullability annotations and remove hard dependency on spotbugs (#4907) --- .../aop/MethodInvocationContext.java | 2 +- .../micronaut/aop/chain/InterceptorChain.java | 4 +- .../aop/chain/MethodInterceptorChain.java | 2 +- .../micronaut/aop/writer/AopProxyWriter.java | 2 +- core/build.gradle | 3 +- .../core/annotation/AnnotationClassValue.java | 2 - .../core/annotation/AnnotationMetadata.java | 2 - .../AnnotationMetadataDelegate.java | 2 - .../AnnotationMetadataProvider.java | 1 - .../AnnotationMetadataResolver.java | 4 - .../core/annotation/AnnotationSource.java | 2 - .../core/annotation/AnnotationUtil.java | 1 + .../core/annotation/AnnotationValue.java | 2 - .../annotation/AnnotationValueBuilder.java | 3 - .../annotation/AnnotationValueResolver.java | 2 - .../annotation/EmptyAnnotationMetadata.java | 2 - .../io/micronaut/core/annotation/NonNull.java | 43 ++++ .../micronaut/core/annotation/Nullable.java | 44 ++++ .../micronaut/core/attr/AttributeHolder.java | 2 +- .../core/attr/MutableAttributeHolder.java | 4 +- .../core/beans/AbstractBeanIntrospection.java | 4 +- .../AbstractBeanIntrospectionReference.java | 2 +- .../core/beans/AbstractBeanMethod.java | 4 +- .../core/beans/AbstractBeanProperty.java | 4 +- .../core/beans/BeanIntrospection.java | 2 +- .../core/beans/BeanIntrospectionMap.java | 2 +- .../beans/BeanIntrospectionReference.java | 2 +- .../core/beans/BeanIntrospector.java | 2 +- .../java/io/micronaut/core/beans/BeanMap.java | 2 +- .../io/micronaut/core/beans/BeanMethod.java | 2 +- .../io/micronaut/core/beans/BeanProperty.java | 4 +- .../io/micronaut/core/beans/BeanWrapper.java | 4 +- .../core/beans/DefaultBeanIntrospector.java | 2 +- .../core/beans/DefaultBeanWrapper.java | 2 +- .../core/beans/PropertyDescriptor.java | 2 +- .../core/beans/ReflectionBeanMap.java | 2 +- .../core/bind/DefaultExecutableBinder.java | 2 +- .../AbstractAnnotatedArgumentBinder.java | 2 +- .../core/convert/ConversionContext.java | 2 +- .../core/convert/ConversionService.java | 2 +- .../convert/value/ConvertibleMultiValues.java | 2 +- .../core/convert/value/ConvertibleValues.java | 2 +- .../convert/value/ConvertibleValuesMap.java | 2 +- .../value/MutableConvertibleValues.java | 2 +- .../core/exceptions/BeanExceptionHandler.java | 4 +- .../io/micronaut/core/io/FileReadable.java | 2 +- .../java/io/micronaut/core/io/Readable.java | 2 +- .../micronaut/core/io/ResourceResolver.java | 2 +- .../java/io/micronaut/core/io/Streamable.java | 2 +- .../io/micronaut/core/io/UrlReadable.java | 2 +- .../java/io/micronaut/core/io/Writable.java | 2 +- .../core/io/scan/ClassPathResourceLoader.java | 2 +- .../io/micronaut/core/naming/NameUtils.java | 2 +- .../java/io/micronaut/core/naming/Named.java | 2 +- .../io/micronaut/core/reflect/ClassUtils.java | 4 +- .../core/reflect/InstantiationUtils.java | 2 +- .../core/serialize/ObjectSerializer.java | 2 +- .../java/io/micronaut/core/type/Argument.java | 4 +- .../io/micronaut/core/type/Executable.java | 4 +- .../io/micronaut/core/type/ReturnType.java | 2 +- .../io/micronaut/core/util/ArgumentUtils.java | 2 +- .../io/micronaut/core/util/ArrayUtils.java | 2 +- .../micronaut/core/util/CollectionUtils.java | 4 +- .../io/micronaut/core/util/KotlinUtils.java | 2 +- .../micronaut/core/util/LocaleResolver.java | 2 +- .../io/micronaut/core/util/StringUtils.java | 2 +- .../io/micronaut/core/util/clhm/Weigher.java | 3 - .../util/locale/AbstractLocaleResolver.java | 2 +- .../core/util/locale/FixedLocaleResolver.java | 2 +- .../locale/LocaleResolutionConfiguration.java | 2 +- .../core/value/MapPropertyResolver.java | 2 +- .../micronaut/core/value/OptionalValues.java | 2 +- .../core/value/PropertyResolver.java | 4 +- .../micronaut/core/version/VersionUtils.java | 2 +- .../core/bind/ExecutableBinderSpec.groovy | 1 - .../function/executor/AbstractExecutor.java | 4 +- .../DefaultHttpClientConfiguration.java | 2 +- .../io/micronaut/http/client/HttpClient.java | 2 +- .../http/client/HttpClientConfiguration.java | 4 +- .../micronaut/http/client/LoadBalancer.java | 2 +- .../micronaut/http/client/RxHttpClient.java | 2 +- .../http/client/RxHttpClientFactory.java | 2 +- .../http/client/RxHttpClientRegistry.java | 4 +- .../ServiceHttpClientConfiguration.java | 2 +- .../AnnotatedClientArgumentRequestBinder.java | 2 +- .../bind/ClientArgumentRequestBinder.java | 2 +- .../bind/DefaultHttpClientBinderRegistry.java | 2 +- .../client/bind/HttpClientBinderRegistry.java | 2 +- .../TypedClientArgumentRequestBinder.java | 2 +- .../filter/ClientFilterResolutionContext.java | 4 +- .../client/loadbalance/FixedLoadBalancer.java | 2 +- ...iceInstanceListRoundRobinLoadBalancer.java | 2 +- .../client/multipart/AbstractFilePart.java | 4 +- .../multipart/MultipartDataFactory.java | 4 +- .../micronaut/http/client/multipart/Part.java | 2 +- .../http/client/multipart/StringPart.java | 2 +- .../http/client/netty/DefaultHttpClient.java | 4 +- .../netty/FullNettyClientHttpResponse.java | 2 +- .../client/netty/NettyClientHttpRequest.java | 2 +- .../netty/NettyStreamedHttpResponse.java | 4 +- .../netty/RxNettyHttpClientRegistry.java | 4 +- .../http/client/ClientRedirectSpec.groovy | 2 +- .../micronaut/http/client/HttpPutSpec.groovy | 2 +- .../client/retry/HttpClientRetrySpec.groovy | 2 +- .../http/netty/AbstractNettyHttpRequest.java | 2 +- .../http/netty/NettyHttpParameters.java | 2 +- .../http/netty/NettyHttpRequestBuilder.java | 2 +- .../http/netty/NettyHttpResponseBuilder.java | 2 +- .../http/netty/NettyMutableHttpResponse.java | 4 +- .../channel/ChannelPipelineCustomizer.java | 2 +- .../channel/ChannelPipelineListener.java | 2 +- .../DefaultEventLoopGroupConfiguration.java | 4 +- .../channel/DefaultEventLoopGroupFactory.java | 4 +- .../DefaultEventLoopGroupRegistry.java | 2 +- .../channel/EpollEventLoopGroupFactory.java | 4 +- .../netty/channel/EventLoopGroupFactory.java | 4 +- .../netty/channel/EventLoopGroupRegistry.java | 2 +- .../channel/KQueueEventLoopGroupFactory.java | 4 +- .../channel/NioEventLoopGroupFactory.java | 4 +- .../http/netty/cookies/NettyCookie.java | 4 +- .../websocket/NettyRxWebSocketSession.java | 2 +- http-server-netty/build.gradle | 2 +- .../DefaultHttpContentProcessorResolver.java | 2 +- .../netty/HttpContentProcessorResolver.java | 2 +- .../http/server/netty/NettyHttpRequest.java | 2 +- .../http/server/netty/NettyHttpServer.java | 4 +- .../server/netty/RoutingInBoundHandler.java | 2 +- .../binders/CompletableFutureBodyBinder.java | 2 +- .../server/netty/binders/MaybeBodyBinder.java | 2 +- .../netty/binders/NettyBinderRegistrar.java | 2 +- .../netty/binders/ObservableBodyBinder.java | 2 +- .../netty/binders/SingleBodyBinder.java | 2 +- .../NettyHttpServerConfiguration.java | 2 +- .../netty/jackson/JsonContentProcessor.java | 2 +- .../JsonHttpContentSubscriberFactory.java | 2 +- .../netty/jackson/JsonViewCodecResolver.java | 2 +- .../JsonViewMediaTypeCodecFactory.java | 4 +- .../multipart/NettyFileUploadInputStream.java | 6 +- .../files/FileTypeHandlerConfiguration.java | 2 +- .../server/netty/http2/Http2PostTest.java | 4 +- .../netty/java/ParameterController.java | 2 +- .../server/netty/util/MockHttpHeaders.java | 2 +- .../http/server/HttpServerConfiguration.java | 4 +- .../http/server/codec/TextStreamCodec.java | 2 +- ...rRequestContextInvocationInstrumenter.java | 2 +- .../server/cors/CorsOriginConfiguration.java | 2 +- .../DefaultHttpClientAddressResolver.java | 4 +- .../server/util/DefaultHttpHostResolver.java | 4 +- .../util/HttpClientAddressResolver.java | 4 +- .../http/server/util/HttpHostResolver.java | 4 +- .../http/server/util/ProxyHeaderParser.java | 2 +- .../locale/CompositeHttpLocaleResolver.java | 2 +- .../util/locale/CookieLocaleResolver.java | 2 +- .../HttpLocaleResolutionConfiguration.java | 2 +- .../util/locale/RequestLocaleResolver.java | 2 +- .../http/server/util/MockHttpHeaders.java | 2 +- .../java/io/micronaut/http/BasicAuth.java | 3 - .../java/io/micronaut/http/HttpMessage.java | 2 +- .../java/io/micronaut/http/HttpRequest.java | 4 +- .../io/micronaut/http/HttpRequestWrapper.java | 2 +- .../java/io/micronaut/http/HttpResponse.java | 2 +- .../java/io/micronaut/http/MediaType.java | 4 +- .../io/micronaut/http/MutableHttpRequest.java | 2 +- .../micronaut/http/MutableHttpResponse.java | 2 +- .../binders/TypedRequestArgumentBinder.java | 2 +- .../context/ServerContextPathProvider.java | 2 +- .../http/context/ServerRequestContext.java | 4 +- .../event/HttpRequestReceivedEvent.java | 2 +- .../event/HttpRequestTerminatedEvent.java | 2 +- .../java/io/micronaut/http/cookie/Cookie.java | 4 +- .../http/cookie/CookieConfiguration.java | 2 +- .../http/filter/DefaultFilterEntry.java | 2 +- .../http/filter/HttpFilterResolver.java | 4 +- .../http/hateoas/AbstractResource.java | 2 +- .../micronaut/http/hateoas/DefaultLink.java | 2 +- .../io/micronaut/http/hateoas/JsonError.java | 2 +- .../java/io/micronaut/http/hateoas/Link.java | 2 +- .../http/resource/ResourceLoaderFactory.java | 2 +- .../http/simple/SimpleHttpResponse.java | 2 +- .../http/simple/cookies/SimpleCookie.java | 2 +- .../java/io/micronaut/http/sse/Event.java | 2 +- .../http/ssl/ClientSslConfiguration.java | 2 +- .../http/ssl/ServerSslConfiguration.java | 2 +- .../micronaut/http/uri/DefaultUriBuilder.java | 4 +- .../io/micronaut/http/uri/UriBuilder.java | 4 +- .../AbstractBeanDefinitionSpec.groovy | 162 +------------ .../test/AbstractBeanDefinitionSpec.groovy | 181 ++++++++++++++ inject-groovy/build.gradle | 1 + .../ast/groovy/InjectTransform.groovy | 2 +- .../GroovyAnnotationMetadataBuilder.groovy | 2 +- .../groovy/visitor/AbstractGroovyElement.java | 4 +- .../groovy/visitor/GroovyClassElement.java | 4 +- .../groovy/visitor/GroovyElementFactory.java | 4 +- .../groovy/visitor/GroovyFieldElement.java | 2 +- .../groovy/visitor/GroovyMethodElement.java | 2 +- .../groovy/visitor/GroovyPackageElement.java | 2 +- .../visitor/GroovyParameterElement.java | 4 +- .../groovy/visitor/GroovyVisitorContext.java | 4 +- .../ast/groovy/visitor/LoadedVisitor.groovy | 2 +- .../aop/adapter/MethodAdapterSpec.groovy | 2 +- .../AbstractClassIntroductionSpec.groovy | 2 +- .../ExecutableDefaultMethodSpec.groovy | 2 +- .../aop/compile/FinalModifierSpec.groovy | 2 +- .../InheritedAnnotationMetadataSpec.groovy | 2 +- .../IntroductionGenericTypesSpec.groovy | 2 +- .../compile/IntroductionWithAroundSpec.groovy | 3 +- .../aop/compile/LifeCycleWithProxySpec.groovy | 2 +- .../aop/compile/PropertyAdviceSpec.groovy | 3 +- .../aop/compile/ValidatedNonBeanSpec.groovy | 2 +- .../aop/factory/SessionProxySpec.groovy | 2 +- ...roductionAdviceWithNewInterfaceSpec.groovy | 2 +- ...GroovyAnnotationMetadataBuilderSpec.groovy | 7 +- .../aliasfor/AliasForQualifierSpec.groovy | 2 +- .../AnnotationMetadataWriterSpec.groovy | 2 +- .../annotation/SourceRetentionSpec.groovy | 2 +- .../inject/beans/AbstractBeanSpec.groovy | 2 +- .../ConfigPropertiesParseSpec.groovy | 6 +- .../ConfigurationPropertiesBuilderSpec.groovy | 2 +- ...mmutableConfigurationPropertiesSpec.groovy | 4 +- ...eritedConfigurationReaderPrefixSpec.groovy | 3 +- ...nterfaceConfigurationPropertiesSpec.groovy | 2 +- .../ValidatedConfigurationSpec.groovy | 2 +- .../VisibilityIssuesSpec.groovy | 2 +- .../GroovyConfigBuilderSpec.groovy | 3 +- ...ovyConfigurationMetadataBuilderSpec.groovy | 2 +- .../inject/context/NoPackageSpec.groovy | 2 +- .../inject/errors/GroovySingletonSpec.groovy | 5 +- .../inject/errors/RouteTraitSpec.groovy | 4 +- .../executable/ExecutableBeanSpec.groovy | 5 +- .../InheritedExecutableSpec.groovy | 2 +- .../inject/factory/FactoryEnumSpec.groovy | 2 +- .../generics/GenericTypeArgumentsSpec.groovy | 3 +- .../inject/generics/TypeArgumentsSpec.groovy | 2 +- .../lifecyle/PostConstructCompileSpec.groovy | 2 +- .../PreDestroyOnBeanAnnotationSpec.groovy | 2 +- .../property/PropertyWithQualifierSpec.groovy | 2 +- .../inject/value/ValueParseSpec.groovy | 3 +- .../visitor/BeanIntrospectionSpec.groovy | 2 +- .../inject/visitor/ClassElementSpec.groovy | 2 +- .../inject/visitor/CustomVisitorSpec.groovy | 2 +- .../inject/visitor/ElementAnnotateSpec.groovy | 3 +- .../inject/visitor/InterfaceWithGenerics.java | 2 +- .../visitor/IntroductionVisitorSpec.groovy | 4 +- .../inject/visitor/PropertyElementSpec.groovy | 2 +- .../validation/ValidatedParseSpec.groovy | 2 +- inject-java-test/build.gradle | 4 +- .../test/AbstractTypeElementSpec.groovy | 5 +- .../test/InMemoryJavaFileManager.java | 100 ++++---- .../processing/test/JavaFileObjects.java | 146 +++++++++++ .../processing/test/JavaParser.java | 6 +- .../annotation/processing/test/Parser.java | 57 +---- .../ToTransformRetentionTransformer.java | 2 +- .../inject/visitor/AllClassesVisitor.java | 2 +- .../inject/visitor/beans/NonNullBean.java | 2 +- .../inject/visitor/beans/NullabilityBean.java | 2 +- .../beans/TestEntityAnnotationMapper.java | 2 +- inject-java/build.gradle | 2 +- .../AbstractInjectAnnotationProcessor.java | 2 +- .../AnnotationProcessingOutputVisitor.java | 2 +- .../processing/AnnotationUtils.java | 2 +- .../BeanDefinitionInjectProcessor.java | 4 +- .../annotation/processing/GenericUtils.java | 4 +- .../JavaAnnotationMetadataBuilder.java | 4 +- .../JavaConfigurationMetadataBuilder.java | 2 +- .../annotation/processing/ModelUtils.java | 2 +- .../TypeElementVisitorProcessor.java | 2 +- .../visitor/AbstractJavaElement.java | 2 +- .../processing/visitor/JavaClassElement.java | 2 +- .../visitor/JavaElementFactory.java | 4 +- .../processing/visitor/JavaFieldElement.java | 2 +- .../processing/visitor/JavaMethodElement.java | 5 +- .../visitor/JavaParameterElement.java | 2 +- .../visitor/JavaPropertyElement.java | 2 +- .../visitor/JavaVisitorContext.java | 4 +- .../processing/visitor/JavaVoidElement.java | 2 +- .../processing/visitor/LoadedVisitor.java | 2 +- .../NullabilityAnnotationsSpec.groovy | 33 +++ .../inject/AbstractTypeElementSpec.groovy | 2 +- .../annotation/AnnotationMapperSpec.groovy | 2 +- .../AnnotationMetadataWriterSpec.groovy | 2 +- .../annotation/AnnotationRemapperSpec.groovy | 12 +- .../inheritance/ParentEachPropsCtor.java | 2 +- .../constructor/nullableinjection/B.java | 2 +- .../inject/context/EagerInitFactory.java | 2 +- .../inject/factory/nullreturn/DProcessor.java | 2 +- .../nullreturn/NullableDProcessor.java | 2 +- .../factory/nullreturn/NullableFactory.java | 2 +- .../factory/parameterizedfactory/D.java | 2 +- .../inject/field/nullableinjection/B.java | 2 +- .../inject/field/nullableinjection/D.java | 2 +- .../inject/foreach/SomeConfiguration.java | 2 +- .../inject/method/nullableinjection/B.java | 2 +- .../property/ConstructorPropertyInject.java | 2 +- .../inject/property/FieldPropertyInject.java | 2 +- .../inject/property/MethodPropertyInject.java | 2 +- .../inject/provider/EachBeanProvider.java | 2 +- .../provider/ErrorEachBeanProvider.java | 2 +- .../io/micronaut/inject/provider/Seats.java | 2 +- .../inject/value/nullablevalue/A.java | 2 +- .../visitors/InterfaceWithGenerics.java | 2 +- .../AbstractBeanContextConditional.java | 4 +- .../context/AbstractBeanDefinition.java | 4 +- .../AbstractBeanResolutionContext.java | 4 +- .../micronaut/context/AbstractExecutable.java | 2 +- .../context/AbstractExecutableMethod.java | 4 +- .../context/AbstractMessageSource.java | 2 +- .../micronaut/context/ApplicationContext.java | 4 +- .../context/ApplicationContextBuilder.java | 4 +- .../ApplicationContextConfiguration.java | 4 +- .../io/micronaut/context/BeanContext.java | 4 +- .../context/BeanContextConfiguration.java | 2 +- .../context/BeanDefinitionDelegate.java | 4 +- .../context/BeanDefinitionRegistry.java | 4 +- .../io/micronaut/context/BeanLocator.java | 4 +- .../context/BeanResolutionContext.java | 2 +- .../context/DefaultApplicationContext.java | 4 +- .../DefaultApplicationContextBuilder.java | 4 +- .../micronaut/context/DefaultBeanContext.java | 4 +- .../context/DefaultBeanResolutionContext.java | 2 +- .../context/DefaultConditionContext.java | 4 +- .../DefaultConstructorInjectionPoint.java | 2 +- .../context/DefaultFieldInjectionPoint.java | 2 +- .../context/DefaultMessageContext.java | 4 +- ...efaultMethodConstructorInjectionPoint.java | 2 +- .../context/DefaultMethodInjectionPoint.java | 2 +- .../context/EnvironmentAwareArgument.java | 2 +- .../java/io/micronaut/context/LifeCycle.java | 2 +- .../io/micronaut/context/MessageSource.java | 4 +- .../ReflectionFieldInjectionPoint.java | 2 +- ...ectionMethodConstructorInjectionPoint.java | 2 +- .../ReflectionMethodInjectionPoint.java | 2 +- .../context/StaticMessageSource.java | 2 +- .../context/condition/ConditionContext.java | 2 +- .../context/env/DefaultEnvironment.java | 4 +- .../DefaultPropertyPlaceholderResolver.java | 2 +- .../io/micronaut/context/env/Environment.java | 2 +- .../env/EnvironmentPropertySource.java | 2 +- .../env/PropertyPlaceholderResolver.java | 2 +- .../env/PropertySourcePropertyResolver.java | 4 +- .../event/ApplicationEventPublisher.java | 2 +- .../i18n/ResourceBundleMessageSource.java | 4 +- .../io/micronaut/inject/ArgumentBeanType.java | 4 +- .../inject/ArgumentInjectionPoint.java | 2 +- .../inject/BeanContextConditional.java | 4 +- .../io/micronaut/inject/BeanDefinition.java | 4 +- .../inject/DelegatingBeanDefinition.java | 4 +- .../io/micronaut/inject/ExecutionHandle.java | 2 +- .../io/micronaut/inject/InjectionPoint.java | 2 +- .../inject/MethodExecutionHandle.java | 2 +- .../io/micronaut/inject/MethodReference.java | 2 +- .../inject/ValidatedBeanDefinition.java | 4 +- .../AbstractAnnotationMetadata.java | 4 +- .../AbstractAnnotationMetadataBuilder.java | 4 +- ...AbstractEnvironmentAnnotationMetadata.java | 4 +- .../annotation/AnnotatedElementValidator.java | 4 +- .../AnnotationMetadataHierarchy.java | 8 +- .../annotation/AnnotationMetadataSupport.java | 4 +- .../inject/annotation/AnnotationRemapper.java | 4 +- .../annotation/DefaultAnnotationMetadata.java | 4 +- .../EnvironmentAnnotationMetadata.java | 4 +- .../annotation/PackageRenameRemapper.java | 2 +- .../CoreNullabilityAnnotationRemapper.java | 57 +++++ .../annotation/internal/FindBugsRemapper.java | 2 +- .../internal/KotlinNotNullMapper.java | 2 +- .../internal/KotlinNullableMapper.java | 2 +- .../io/micronaut/inject/ast/ClassElement.java | 2 +- .../java/io/micronaut/inject/ast/Element.java | 2 +- .../micronaut/inject/ast/ElementFactory.java | 2 +- .../io/micronaut/inject/ast/ElementQuery.java | 2 +- .../micronaut/inject/ast/MethodElement.java | 2 +- .../inject/ast/ParameterElement.java | 2 +- .../inject/ast/PrimitiveElement.java | 2 +- .../micronaut/inject/ast/PropertyElement.java | 2 +- .../io/micronaut/inject/ast/TypedElement.java | 2 +- .../visitor/BeanIntrospectionWriter.java | 4 +- .../beans/visitor/BeanMethodWriter.java | 2 +- .../beans/visitor/BeanPropertyWriter.java | 4 +- .../EntityIntrospectedAnnotationMapper.java | 2 +- .../IntrospectedTypeElementVisitor.java | 4 +- .../visitor/JsonCreatorAnnotationMapper.java | 2 +- .../MappedSuperClassIntrospectionMapper.java | 2 +- .../ConfigurationMetadataBuilder.java | 4 +- .../qualifiers/TypeAnnotationQualifier.java | 2 +- .../util/KotlinExecutableMethodUtils.java | 2 +- .../validation/BeanDefinitionValidator.java | 4 +- .../inject/visitor/TypeElementVisitor.java | 2 +- .../inject/visitor/VisitorContext.java | 4 +- .../AbstractAnnotationMetadataWriter.java | 2 +- .../writer/AbstractClassFileWriter.java | 4 +- .../inject/writer/BeanDefinitionVisitor.java | 4 +- .../inject/writer/BeanDefinitionWriter.java | 2 +- .../writer/ClassWriterOutputVisitor.java | 2 +- .../inject/writer/ConfigBuilderState.java | 3 - .../DirectoryClassWriterOutputVisitor.java | 2 +- .../inject/writer/ExecutableMethodWriter.java | 2 +- .../inject/writer/OriginatingElements.java | 2 +- ...onaut.inject.annotation.AnnotationRemapper | 3 +- .../EndpointDefaultConfiguration.java | 2 +- .../endpoint/health/HealthEndpoint.java | 2 +- .../endpoint/loggers/LoggersEndpoint.java | 2 +- .../loggers/ManagedLoggingSystem.java | 2 +- .../loggers/impl/Log4jLoggingSystem.java | 2 +- .../loggers/impl/LogbackLoggingSystem.java | 2 +- .../AbstractEndpointRouteBuilder.java | 2 +- .../endpoint/refresh/RefreshEndpoint.java | 2 +- .../health/indicator/jdbc/JdbcIndicator.java | 2 +- .../endpoint/EndpointRouteSpec.groovy | 2 +- .../web/router/AbstractRouteMatch.java | 4 +- .../router/AnnotatedFilterRouteBuilder.java | 2 +- .../web/router/BasicObjectRouteMatch.java | 2 +- .../web/router/BeanDefinitionFilterRoute.java | 2 +- .../web/router/DefaultFilterRoute.java | 2 +- .../web/router/DefaultRouteBuilder.java | 4 +- .../micronaut/web/router/DefaultRouter.java | 4 +- .../io/micronaut/web/router/RouteBuilder.java | 4 +- .../io/micronaut/web/router/RouteMatch.java | 2 +- .../java/io/micronaut/web/router/Router.java | 4 +- .../io/micronaut/web/router/StatusRoute.java | 2 +- .../io/micronaut/web/router/UriRoute.java | 2 +- .../web/router/filter/FilteredRouter.java | 4 +- .../naming/ConfigurableUriNamingStrategy.java | 2 +- .../naming/HyphenatedUriNamingStrategy.java | 2 +- .../resource/StaticResourceConfiguration.java | 2 +- .../version/DefaultVersionProvider.java | 2 +- .../router/version/RouteVersionFilter.java | 4 +- .../RoutesVersioningConfiguration.java | 2 +- .../io/watch/osx/MacOsWatchThread.java | 2 +- .../DefaultServiceInstanceIdGenerator.java | 2 +- .../discovery/ServiceInstanceIdGenerator.java | 2 +- .../discovery/StaticServiceInstanceList.java | 2 +- .../RegistrationConfiguration.java | 2 +- .../io/micronaut/health/HealthStatus.java | 2 - .../jackson/JacksonConfiguration.java | 2 +- .../jackson/ObjectMapperFactory.java | 2 +- .../jackson/codec/JsonMediaTypeCodec.java | 2 +- .../codec/JsonStreamMediaTypeCodec.java | 2 +- .../jackson/parser/JacksonProcessor.java | 2 +- .../rxjava2/RxInstrumenterFactory.java | 2 +- .../java/io/micronaut/retry/RetryState.java | 2 +- .../retry/intercept/CircuitBreakerRetry.java | 2 +- .../java/io/micronaut/runtime/Micronaut.java | 4 +- .../context/CompositeMessageSource.java | 4 +- .../runtime/http/codec/TextPlainCodec.java | 2 +- .../http/scope/RequestCustomScope.java | 4 +- .../DefaultTaskExceptionHandler.java | 4 +- .../micronaut/scheduling/TaskScheduler.java | 2 +- .../executor/ExecutorConfiguration.java | 2 +- .../executor/UserExecutorConfiguration.java | 4 +- .../instrument/Instrumentation.java | 2 +- .../instrument/InstrumentedExecutor.java | 2 +- .../InstrumentedExecutorService.java | 2 +- .../InstrumentedScheduledExecutorService.java | 2 +- .../instrument/InvocationInstrumenter.java | 2 +- .../InvocationInstrumenterFactory.java | 2 +- .../MultipleInvocationInstrumenter.java | 2 +- .../instrument/NoopInstrumentation.java | 2 +- ...ReactiveInvocationInstrumenterFactory.java | 2 +- .../io/watch/DefaultWatchThread.java | 2 +- .../io/watch/FileWatchConfiguration.java | 2 +- .../io/watch/event/FileChangedEvent.java | 4 +- .../support/InMemoryJavaFileManager.java | 229 ------------------ .../groovy/io/micronaut/support/Parser.java | 227 ----------------- .../io/micronaut/session/InMemorySession.java | 2 +- .../java/io/micronaut/session/Session.java | 2 +- .../session/SessionConfiguration.java | 2 +- .../session/http/SessionLocaleResolver.java | 2 +- .../session/docs/ShoppingController.java | 2 +- .../session/http/SessionBindingSpec.groovy | 2 +- .../docs/guide/introduction/whatsNew.adoc | 83 +------ .../MetadataClientArgumentBinder.groovy | 2 +- .../type/MetadataClientArgumentBinder.groovy | 2 +- .../custom/DurationPatternValidator.groovy | 4 +- .../bind/type/MetadataClientArgumentBinder.kt | 14 +- .../inject/visitor/AnnotatingVisitor.java | 2 +- ...idatedWithJavaxAnnoationNonNullSpec.groovy | 2 +- .../docs/config/immutable/EngineConfig.java | 2 +- .../MetadataClientArgumentBinder.java | 2 +- .../type/MetadataClientArgumentBinder.java | 2 +- .../custom/DurationPatternValidator.java | 4 +- .../server/binding/BindingController.java | 2 +- .../server/binding/BookmarkController.java | 2 +- .../server/binding/PaginationCommand.java | 2 +- .../docs/session/ShoppingController.java | 2 +- .../brave/AsyncReporterConfiguration.java | 2 +- .../brave/BraveTracerConfiguration.java | 2 +- .../tracing/brave/BraveTracerFactory.java | 2 +- .../http/OpenTracingClientFilter.java | 2 +- .../http/OpenTracingServerFilter.java | 2 +- .../TracingHystrixConcurrentStrategy.java | 2 +- .../TracingInvocationInstrumenterFactory.java | 2 +- .../instrument/util/TracingPublisher.java | 2 +- .../tracing/interceptor/TraceInterceptor.java | 2 +- .../tracing/jaeger/JaegerConfiguration.java | 2 +- .../tracing/jaeger/JaegerTracerFactory.java | 2 +- validation/build.gradle | 3 +- .../validation/ValidatingInterceptor.java | 2 +- .../async/AsyncTypeElementVisitor.java | 2 +- .../executable/ExecutableVisitor.java | 2 +- .../InternalApiTypeElementVisitor.java | 2 +- .../routes/RouteParameterElement.java | 2 +- .../routes/RouteValidationVisitor.java | 2 +- .../DefaultAnnotatedElementValidator.java | 2 +- .../validator/DefaultValidator.java | 4 +- .../DefaultValidatorConfiguration.java | 4 +- .../validator/ExecutableMethodValidator.java | 4 +- .../validator/ReactiveValidator.java | 2 +- .../validation/validator/Validator.java | 4 +- .../validator/ValidatorConfiguration.java | 4 +- .../constraints/AbstractPatternValidator.java | 2 +- .../constraints/ConstraintValidator.java | 8 +- .../ConstraintValidatorContext.java | 4 +- .../ConstraintValidatorRegistry.java | 2 +- .../constraints/DecimalMaxValidator.java | 4 +- .../constraints/DecimalMinValidator.java | 4 +- .../DefaultConstraintValidators.java | 4 +- .../constraints/DigitsValidator.java | 4 +- .../validator/constraints/EmailValidator.java | 4 +- .../constraints/PatternValidator.java | 4 +- .../validator/constraints/SizeValidator.java | 4 +- .../extractors/DefaultValueExtractors.java | 4 +- .../extractors/ValueExtractorRegistry.java | 2 +- .../websocket/WebSocketVisitor.java | 2 +- .../validation/BookmarkController.java | 2 +- .../validation/PaginationCommand.java | 2 +- .../executable/NullablePrimitiveSpec.groovy | 6 +- .../routes/MissingParameterRuleSpec.groovy | 2 +- .../routes/NullableParameterRuleSpec.groovy | 12 +- 527 files changed, 1226 insertions(+), 1513 deletions(-) create mode 100644 core/src/main/java/io/micronaut/core/annotation/NonNull.java create mode 100644 core/src/main/java/io/micronaut/core/annotation/Nullable.java create mode 100644 inject-groovy-test/src/main/groovy/io/micronaut/ast/transform/test/AbstractBeanDefinitionSpec.groovy create mode 100644 inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/JavaFileObjects.java create mode 100644 inject-java/src/test/groovy/io/micronaut/annotation/NullabilityAnnotationsSpec.groovy create mode 100644 inject/src/main/java/io/micronaut/inject/annotation/internal/CoreNullabilityAnnotationRemapper.java delete mode 100644 runtime/src/test/groovy/io/micronaut/support/InMemoryJavaFileManager.java delete mode 100644 runtime/src/test/groovy/io/micronaut/support/Parser.java diff --git a/aop/src/main/java/io/micronaut/aop/MethodInvocationContext.java b/aop/src/main/java/io/micronaut/aop/MethodInvocationContext.java index 4e68ca9c7e4..58494c2c59c 100644 --- a/aop/src/main/java/io/micronaut/aop/MethodInvocationContext.java +++ b/aop/src/main/java/io/micronaut/aop/MethodInvocationContext.java @@ -17,7 +17,7 @@ import io.micronaut.inject.ExecutableMethod; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Extended version of {@link InvocationContext} for {@link MethodInterceptor} instances. diff --git a/aop/src/main/java/io/micronaut/aop/chain/InterceptorChain.java b/aop/src/main/java/io/micronaut/aop/chain/InterceptorChain.java index ae735984687..7d00bf7368e 100644 --- a/aop/src/main/java/io/micronaut/aop/chain/InterceptorChain.java +++ b/aop/src/main/java/io/micronaut/aop/chain/InterceptorChain.java @@ -15,7 +15,7 @@ */ package io.micronaut.aop.chain; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.aop.*; import io.micronaut.aop.exceptions.UnimplementedAdviceException; import io.micronaut.context.ApplicationContext; @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/aop/src/main/java/io/micronaut/aop/chain/MethodInterceptorChain.java b/aop/src/main/java/io/micronaut/aop/chain/MethodInterceptorChain.java index 88174a446e6..42cb4f3ce6c 100644 --- a/aop/src/main/java/io/micronaut/aop/chain/MethodInterceptorChain.java +++ b/aop/src/main/java/io/micronaut/aop/chain/MethodInterceptorChain.java @@ -22,7 +22,7 @@ import io.micronaut.core.type.ReturnType; import io.micronaut.inject.ExecutableMethod; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.reflect.Method; /** diff --git a/aop/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java b/aop/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java index 7436f9295fe..c09592b795f 100644 --- a/aop/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java +++ b/aop/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java @@ -15,7 +15,7 @@ */ package io.micronaut.aop.writer; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.aop.HotSwappableInterceptedProxy; import io.micronaut.aop.Intercepted; import io.micronaut.aop.InterceptedProxy; diff --git a/core/build.gradle b/core/build.gradle index b85ebb9e686..07237295934 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -9,8 +9,7 @@ shadowJar { dependencies { api dependencyVersion("slf4j") api dependencyVersion("reactive.streams") - api dependencyVersion("spotbugs") - + compileOnly dependencyVersion('jsr305') compileOnly "org.graalvm.nativeimage:svm:$graalVersion" compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationClassValue.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationClassValue.java index cc9a2ba048f..99a70e609d6 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationClassValue.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationClassValue.java @@ -17,8 +17,6 @@ import io.micronaut.core.naming.Named; import io.micronaut.core.util.ArgumentUtils; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.Optional; diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadata.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadata.java index 75c43f5a7be..a77a633e5f8 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadata.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadata.java @@ -15,8 +15,6 @@ */ package io.micronaut.core.annotation; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.micronaut.core.naming.NameUtils; import io.micronaut.core.reflect.ClassUtils; import io.micronaut.core.reflect.ReflectionUtils; diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataDelegate.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataDelegate.java index 262b0402fd9..6ccea2a3fdd 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataDelegate.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataDelegate.java @@ -15,8 +15,6 @@ */ package io.micronaut.core.annotation; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.micronaut.core.type.Argument; import io.micronaut.core.value.OptionalValues; diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataProvider.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataProvider.java index a133ddc85f2..5e31ad49601 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataProvider.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataProvider.java @@ -15,7 +15,6 @@ */ package io.micronaut.core.annotation; -import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.annotation.Annotation; import java.util.Optional; diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataResolver.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataResolver.java index fadd68d822c..abf13ffe244 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataResolver.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationMetadataResolver.java @@ -15,10 +15,6 @@ */ package io.micronaut.core.annotation; - -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; - /** * An interface for types capable of resolving {@link AnnotationMetadata}. * diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationSource.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationSource.java index b07023b1f1b..b1b18b583fb 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationSource.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationSource.java @@ -15,8 +15,6 @@ */ package io.micronaut.core.annotation; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.micronaut.core.util.ArgumentUtils; import java.lang.annotation.Annotation; diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationUtil.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationUtil.java index 611d9ddaf1c..5f0b61ae7b4 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationUtil.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationUtil.java @@ -57,6 +57,7 @@ public class AnnotationUtil { */ public static final List STEREOTYPE_EXCLUDES = Arrays.asList( "javax.annotation", + "io.micronaut.core.annotation", "edu.umd.cs.findbugs.annotations" ); diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationValue.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationValue.java index fe408c3cf2e..7f83f02d02b 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationValue.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationValue.java @@ -15,8 +15,6 @@ */ package io.micronaut.core.annotation; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionContext; import io.micronaut.core.convert.ConversionService; diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationValueBuilder.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationValueBuilder.java index bac139cf703..ce060e8cdfe 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationValueBuilder.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationValueBuilder.java @@ -15,9 +15,6 @@ */ package io.micronaut.core.annotation; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; - import java.lang.annotation.Annotation; import java.lang.annotation.RetentionPolicy; import java.util.HashMap; diff --git a/core/src/main/java/io/micronaut/core/annotation/AnnotationValueResolver.java b/core/src/main/java/io/micronaut/core/annotation/AnnotationValueResolver.java index dbe894f050e..6c17e93ba94 100644 --- a/core/src/main/java/io/micronaut/core/annotation/AnnotationValueResolver.java +++ b/core/src/main/java/io/micronaut/core/annotation/AnnotationValueResolver.java @@ -16,8 +16,6 @@ package io.micronaut.core.annotation; import io.micronaut.core.value.ValueResolver; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.*; /** diff --git a/core/src/main/java/io/micronaut/core/annotation/EmptyAnnotationMetadata.java b/core/src/main/java/io/micronaut/core/annotation/EmptyAnnotationMetadata.java index 0e7837cd985..2abc2d21b62 100644 --- a/core/src/main/java/io/micronaut/core/annotation/EmptyAnnotationMetadata.java +++ b/core/src/main/java/io/micronaut/core/annotation/EmptyAnnotationMetadata.java @@ -15,8 +15,6 @@ */ package io.micronaut.core.annotation; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.micronaut.core.reflect.ReflectionUtils; import io.micronaut.core.type.Argument; import io.micronaut.core.util.StringUtils; diff --git a/core/src/main/java/io/micronaut/core/annotation/NonNull.java b/core/src/main/java/io/micronaut/core/annotation/NonNull.java new file mode 100644 index 00000000000..2b037cb2359 --- /dev/null +++ b/core/src/main/java/io/micronaut/core/annotation/NonNull.java @@ -0,0 +1,43 @@ +/* + * Copyright 2017-2021 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.micronaut.core.annotation; + +import javax.annotation.Nonnull; +import javax.annotation.meta.TypeQualifierNickname; +import java.lang.annotation.*; + + +/** + * A common annotation to declare that annotated elements cannot be {@code null}. Leverages JSR 305 meta-annotations to indicate + * nullability in Java to common tools with JSR 305 support and used by Kotlin to infer nullability of Spring API. + * + *

Should be used at parameter, return value, and field level. Method overrides should repeat parent {@code @NonNull} annotations unless + * they behave differently.

+ * + *

Use {@code @NonNullApi} (scope = parameters + return values) to set the default behavior to non-nullable in order to avoid annotating + * your whole codebase with {@code @NonNull}.

+ * + * @since 2.4 + * @author graemerocher + * @see Nullable + */ +@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Nonnull +@TypeQualifierNickname +public @interface NonNull { +} diff --git a/core/src/main/java/io/micronaut/core/annotation/Nullable.java b/core/src/main/java/io/micronaut/core/annotation/Nullable.java new file mode 100644 index 00000000000..e63ea8334d0 --- /dev/null +++ b/core/src/main/java/io/micronaut/core/annotation/Nullable.java @@ -0,0 +1,44 @@ +/* + * Copyright 2017-2021 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.micronaut.core.annotation; + +import javax.annotation.Nonnull; +import javax.annotation.meta.TypeQualifierNickname; +import javax.annotation.meta.When; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * A common annotation to declare that annotated elements can be {@code null} under some circumstance. Leverages JSR 305 meta-annotations to + * indicate nullability in Java to common tools with JSR 305 support and used by Kotlin to infer nullability of Spring API. + * + *

Should be used at parameter, return value, and field level. Methods override should repeat parent {@code @Nullable} annotations + * unless they behave differently.

+ * + * @since 2.4 + * @author graemerocher + * @see NonNull + */ +@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Nonnull(when = When.MAYBE) +@TypeQualifierNickname +public @interface Nullable { +} diff --git a/core/src/main/java/io/micronaut/core/attr/AttributeHolder.java b/core/src/main/java/io/micronaut/core/attr/AttributeHolder.java index a4b9f5ef528..996fdbd6a84 100644 --- a/core/src/main/java/io/micronaut/core/attr/AttributeHolder.java +++ b/core/src/main/java/io/micronaut/core/attr/AttributeHolder.java @@ -18,7 +18,7 @@ import io.micronaut.core.convert.value.ConvertibleValues; import io.micronaut.core.util.StringUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Optional; /** diff --git a/core/src/main/java/io/micronaut/core/attr/MutableAttributeHolder.java b/core/src/main/java/io/micronaut/core/attr/MutableAttributeHolder.java index cd5099c51b9..6e563c46eca 100644 --- a/core/src/main/java/io/micronaut/core/attr/MutableAttributeHolder.java +++ b/core/src/main/java/io/micronaut/core/attr/MutableAttributeHolder.java @@ -15,8 +15,8 @@ */ package io.micronaut.core.attr; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.convert.value.MutableConvertibleValues; import io.micronaut.core.util.StringUtils; diff --git a/core/src/main/java/io/micronaut/core/beans/AbstractBeanIntrospection.java b/core/src/main/java/io/micronaut/core/beans/AbstractBeanIntrospection.java index 1aee6a8d092..1fc6676f4b4 100644 --- a/core/src/main/java/io/micronaut/core/beans/AbstractBeanIntrospection.java +++ b/core/src/main/java/io/micronaut/core/beans/AbstractBeanIntrospection.java @@ -24,8 +24,8 @@ import io.micronaut.core.util.ArgumentUtils; import io.micronaut.core.util.StringUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.util.*; diff --git a/core/src/main/java/io/micronaut/core/beans/AbstractBeanIntrospectionReference.java b/core/src/main/java/io/micronaut/core/beans/AbstractBeanIntrospectionReference.java index 1964e9411f8..ca0e7f026ca 100644 --- a/core/src/main/java/io/micronaut/core/beans/AbstractBeanIntrospectionReference.java +++ b/core/src/main/java/io/micronaut/core/beans/AbstractBeanIntrospectionReference.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.Internal; import io.micronaut.core.annotation.UsedByGeneratedCode; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** diff --git a/core/src/main/java/io/micronaut/core/beans/AbstractBeanMethod.java b/core/src/main/java/io/micronaut/core/beans/AbstractBeanMethod.java index 9ef9f29e1f5..9f50b0df841 100644 --- a/core/src/main/java/io/micronaut/core/beans/AbstractBeanMethod.java +++ b/core/src/main/java/io/micronaut/core/beans/AbstractBeanMethod.java @@ -15,8 +15,8 @@ */ package io.micronaut.core.beans; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Internal; import io.micronaut.core.annotation.UsedByGeneratedCode; diff --git a/core/src/main/java/io/micronaut/core/beans/AbstractBeanProperty.java b/core/src/main/java/io/micronaut/core/beans/AbstractBeanProperty.java index 9ba3609d5b8..5f59e55295a 100644 --- a/core/src/main/java/io/micronaut/core/beans/AbstractBeanProperty.java +++ b/core/src/main/java/io/micronaut/core/beans/AbstractBeanProperty.java @@ -22,8 +22,8 @@ import io.micronaut.core.type.Argument; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Objects; diff --git a/core/src/main/java/io/micronaut/core/beans/BeanIntrospection.java b/core/src/main/java/io/micronaut/core/beans/BeanIntrospection.java index f7c681ab9c1..2322a500bcc 100644 --- a/core/src/main/java/io/micronaut/core/beans/BeanIntrospection.java +++ b/core/src/main/java/io/micronaut/core/beans/BeanIntrospection.java @@ -21,7 +21,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.annotation.concurrent.Immutable; import java.lang.annotation.Annotation; import java.util.Collection; diff --git a/core/src/main/java/io/micronaut/core/beans/BeanIntrospectionMap.java b/core/src/main/java/io/micronaut/core/beans/BeanIntrospectionMap.java index b0440a235fa..e18bf5e6ecb 100644 --- a/core/src/main/java/io/micronaut/core/beans/BeanIntrospectionMap.java +++ b/core/src/main/java/io/micronaut/core/beans/BeanIntrospectionMap.java @@ -19,7 +19,7 @@ import io.micronaut.core.convert.ConversionService; import io.micronaut.core.util.CollectionUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.*; import java.util.stream.Collectors; diff --git a/core/src/main/java/io/micronaut/core/beans/BeanIntrospectionReference.java b/core/src/main/java/io/micronaut/core/beans/BeanIntrospectionReference.java index 55d892833b2..f4e69414cc6 100644 --- a/core/src/main/java/io/micronaut/core/beans/BeanIntrospectionReference.java +++ b/core/src/main/java/io/micronaut/core/beans/BeanIntrospectionReference.java @@ -19,7 +19,7 @@ import io.micronaut.core.annotation.Internal; import io.micronaut.core.naming.Named; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * A reference to a {@link BeanIntrospection} that may or may not be present on the classpath. diff --git a/core/src/main/java/io/micronaut/core/beans/BeanIntrospector.java b/core/src/main/java/io/micronaut/core/beans/BeanIntrospector.java index 986ca3cefeb..a3504708d45 100644 --- a/core/src/main/java/io/micronaut/core/beans/BeanIntrospector.java +++ b/core/src/main/java/io/micronaut/core/beans/BeanIntrospector.java @@ -18,7 +18,7 @@ import io.micronaut.core.beans.exceptions.IntrospectionException; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.annotation.concurrent.Immutable; import java.lang.annotation.Annotation; import java.util.Arrays; diff --git a/core/src/main/java/io/micronaut/core/beans/BeanMap.java b/core/src/main/java/io/micronaut/core/beans/BeanMap.java index b135c582630..0f28b0e6da3 100644 --- a/core/src/main/java/io/micronaut/core/beans/BeanMap.java +++ b/core/src/main/java/io/micronaut/core/beans/BeanMap.java @@ -17,7 +17,7 @@ import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Map; /** diff --git a/core/src/main/java/io/micronaut/core/beans/BeanMethod.java b/core/src/main/java/io/micronaut/core/beans/BeanMethod.java index 9a164db2514..03dda91d212 100644 --- a/core/src/main/java/io/micronaut/core/beans/BeanMethod.java +++ b/core/src/main/java/io/micronaut/core/beans/BeanMethod.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.beans; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.naming.Named; import io.micronaut.core.type.Executable; import io.micronaut.core.type.ReturnType; diff --git a/core/src/main/java/io/micronaut/core/beans/BeanProperty.java b/core/src/main/java/io/micronaut/core/beans/BeanProperty.java index 0bc390c41b3..d6339cd73ef 100644 --- a/core/src/main/java/io/micronaut/core/beans/BeanProperty.java +++ b/core/src/main/java/io/micronaut/core/beans/BeanProperty.java @@ -24,8 +24,8 @@ import io.micronaut.core.type.Argument; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.annotation.concurrent.Immutable; import java.util.Arrays; import java.util.Collection; diff --git a/core/src/main/java/io/micronaut/core/beans/BeanWrapper.java b/core/src/main/java/io/micronaut/core/beans/BeanWrapper.java index 3c987218046..8e52f3b5bf5 100644 --- a/core/src/main/java/io/micronaut/core/beans/BeanWrapper.java +++ b/core/src/main/java/io/micronaut/core/beans/BeanWrapper.java @@ -24,8 +24,8 @@ import io.micronaut.core.type.Argument; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Collection; import java.util.Optional; diff --git a/core/src/main/java/io/micronaut/core/beans/DefaultBeanIntrospector.java b/core/src/main/java/io/micronaut/core/beans/DefaultBeanIntrospector.java index ee88b0361c6..48975d02501 100644 --- a/core/src/main/java/io/micronaut/core/beans/DefaultBeanIntrospector.java +++ b/core/src/main/java/io/micronaut/core/beans/DefaultBeanIntrospector.java @@ -22,7 +22,7 @@ import io.micronaut.core.util.ArgumentUtils; import org.slf4j.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Collection; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/io/micronaut/core/beans/DefaultBeanWrapper.java b/core/src/main/java/io/micronaut/core/beans/DefaultBeanWrapper.java index 89c4eb57de7..36454e47cb7 100644 --- a/core/src/main/java/io/micronaut/core/beans/DefaultBeanWrapper.java +++ b/core/src/main/java/io/micronaut/core/beans/DefaultBeanWrapper.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.Internal; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Objects; /** diff --git a/core/src/main/java/io/micronaut/core/beans/PropertyDescriptor.java b/core/src/main/java/io/micronaut/core/beans/PropertyDescriptor.java index 3a291a7dfd1..be06939ba48 100644 --- a/core/src/main/java/io/micronaut/core/beans/PropertyDescriptor.java +++ b/core/src/main/java/io/micronaut/core/beans/PropertyDescriptor.java @@ -17,7 +17,7 @@ import io.micronaut.core.naming.Named; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.lang.reflect.Method; /** diff --git a/core/src/main/java/io/micronaut/core/beans/ReflectionBeanMap.java b/core/src/main/java/io/micronaut/core/beans/ReflectionBeanMap.java index 6ae9f16f771..3db47094d5f 100644 --- a/core/src/main/java/io/micronaut/core/beans/ReflectionBeanMap.java +++ b/core/src/main/java/io/micronaut/core/beans/ReflectionBeanMap.java @@ -19,7 +19,7 @@ import io.micronaut.core.convert.ConversionService; import io.micronaut.core.reflect.ReflectionUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.reflect.Method; import java.util.Collection; import java.util.Map; diff --git a/core/src/main/java/io/micronaut/core/bind/DefaultExecutableBinder.java b/core/src/main/java/io/micronaut/core/bind/DefaultExecutableBinder.java index 958c5e25df3..288913e534f 100644 --- a/core/src/main/java/io/micronaut/core/bind/DefaultExecutableBinder.java +++ b/core/src/main/java/io/micronaut/core/bind/DefaultExecutableBinder.java @@ -23,7 +23,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.core.type.Executable; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.*; /** diff --git a/core/src/main/java/io/micronaut/core/bind/annotation/AbstractAnnotatedArgumentBinder.java b/core/src/main/java/io/micronaut/core/bind/annotation/AbstractAnnotatedArgumentBinder.java index e8496079dd6..0d1afa1ef04 100644 --- a/core/src/main/java/io/micronaut/core/bind/annotation/AbstractAnnotatedArgumentBinder.java +++ b/core/src/main/java/io/micronaut/core/bind/annotation/AbstractAnnotatedArgumentBinder.java @@ -23,7 +23,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.core.util.StringUtils; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.util.Optional; diff --git a/core/src/main/java/io/micronaut/core/convert/ConversionContext.java b/core/src/main/java/io/micronaut/core/convert/ConversionContext.java index b51a01f5c36..0a088325030 100644 --- a/core/src/main/java/io/micronaut/core/convert/ConversionContext.java +++ b/core/src/main/java/io/micronaut/core/convert/ConversionContext.java @@ -21,7 +21,7 @@ import io.micronaut.core.util.ArgumentUtils; import io.micronaut.core.util.ArrayUtils; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/core/src/main/java/io/micronaut/core/convert/ConversionService.java b/core/src/main/java/io/micronaut/core/convert/ConversionService.java index 50acece1cea..e99afba7288 100644 --- a/core/src/main/java/io/micronaut/core/convert/ConversionService.java +++ b/core/src/main/java/io/micronaut/core/convert/ConversionService.java @@ -17,7 +17,7 @@ import io.micronaut.core.convert.exceptions.ConversionErrorException; import io.micronaut.core.type.Argument; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Optional; import java.util.function.Function; diff --git a/core/src/main/java/io/micronaut/core/convert/value/ConvertibleMultiValues.java b/core/src/main/java/io/micronaut/core/convert/value/ConvertibleMultiValues.java index 8128d7e22a1..4715edc0f75 100644 --- a/core/src/main/java/io/micronaut/core/convert/value/ConvertibleMultiValues.java +++ b/core/src/main/java/io/micronaut/core/convert/value/ConvertibleMultiValues.java @@ -21,7 +21,7 @@ import io.micronaut.core.reflect.GenericTypeUtils; import io.micronaut.core.type.Argument; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Collection; import java.util.Iterator; import java.util.List; diff --git a/core/src/main/java/io/micronaut/core/convert/value/ConvertibleValues.java b/core/src/main/java/io/micronaut/core/convert/value/ConvertibleValues.java index 1f926cb3e1e..7b13e2edc87 100644 --- a/core/src/main/java/io/micronaut/core/convert/value/ConvertibleValues.java +++ b/core/src/main/java/io/micronaut/core/convert/value/ConvertibleValues.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.convert.value; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionContext; import io.micronaut.core.convert.ConversionService; diff --git a/core/src/main/java/io/micronaut/core/convert/value/ConvertibleValuesMap.java b/core/src/main/java/io/micronaut/core/convert/value/ConvertibleValuesMap.java index 5d4dab1481b..aa63a3f0ae2 100644 --- a/core/src/main/java/io/micronaut/core/convert/value/ConvertibleValuesMap.java +++ b/core/src/main/java/io/micronaut/core/convert/value/ConvertibleValuesMap.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.convert.value; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionService; diff --git a/core/src/main/java/io/micronaut/core/convert/value/MutableConvertibleValues.java b/core/src/main/java/io/micronaut/core/convert/value/MutableConvertibleValues.java index 9d52a8f7bf8..ef98a29bc50 100644 --- a/core/src/main/java/io/micronaut/core/convert/value/MutableConvertibleValues.java +++ b/core/src/main/java/io/micronaut/core/convert/value/MutableConvertibleValues.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.convert.value; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Map; /** diff --git a/core/src/main/java/io/micronaut/core/exceptions/BeanExceptionHandler.java b/core/src/main/java/io/micronaut/core/exceptions/BeanExceptionHandler.java index 864d5bd4b98..1da8776a7ee 100644 --- a/core/src/main/java/io/micronaut/core/exceptions/BeanExceptionHandler.java +++ b/core/src/main/java/io/micronaut/core/exceptions/BeanExceptionHandler.java @@ -15,8 +15,8 @@ */ package io.micronaut.core.exceptions; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.function.BiConsumer; /** diff --git a/core/src/main/java/io/micronaut/core/io/FileReadable.java b/core/src/main/java/io/micronaut/core/io/FileReadable.java index 9ff20fcc1f3..46c74678b0a 100644 --- a/core/src/main/java/io/micronaut/core/io/FileReadable.java +++ b/core/src/main/java/io/micronaut/core/io/FileReadable.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.Internal; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.io.*; import java.nio.charset.Charset; import java.nio.file.Files; diff --git a/core/src/main/java/io/micronaut/core/io/Readable.java b/core/src/main/java/io/micronaut/core/io/Readable.java index 5e5ecb43273..2f3fd7ab403 100644 --- a/core/src/main/java/io/micronaut/core/io/Readable.java +++ b/core/src/main/java/io/micronaut/core/io/Readable.java @@ -18,7 +18,7 @@ import io.micronaut.core.naming.Named; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.annotation.concurrent.Immutable; import java.io.*; import java.net.URL; diff --git a/core/src/main/java/io/micronaut/core/io/ResourceResolver.java b/core/src/main/java/io/micronaut/core/io/ResourceResolver.java index 56b0e98ecaf..f088dadbe3a 100644 --- a/core/src/main/java/io/micronaut/core/io/ResourceResolver.java +++ b/core/src/main/java/io/micronaut/core/io/ResourceResolver.java @@ -19,7 +19,7 @@ import io.micronaut.core.io.scan.ClassPathResourceLoader; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.io.InputStream; import java.net.URL; import java.util.Arrays; diff --git a/core/src/main/java/io/micronaut/core/io/Streamable.java b/core/src/main/java/io/micronaut/core/io/Streamable.java index 433c58ddc6a..162f0b37cc9 100644 --- a/core/src/main/java/io/micronaut/core/io/Streamable.java +++ b/core/src/main/java/io/micronaut/core/io/Streamable.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.io; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.io.File; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/io/micronaut/core/io/UrlReadable.java b/core/src/main/java/io/micronaut/core/io/UrlReadable.java index 9bd0e4b4e0d..19565f60a63 100644 --- a/core/src/main/java/io/micronaut/core/io/UrlReadable.java +++ b/core/src/main/java/io/micronaut/core/io/UrlReadable.java @@ -19,7 +19,7 @@ import io.micronaut.core.util.ArgumentUtils; import io.micronaut.core.util.StringUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/io/micronaut/core/io/Writable.java b/core/src/main/java/io/micronaut/core/io/Writable.java index a15a77e59be..0f7a2b19f5e 100644 --- a/core/src/main/java/io/micronaut/core/io/Writable.java +++ b/core/src/main/java/io/micronaut/core/io/Writable.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.io; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.io.File; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/io/micronaut/core/io/scan/ClassPathResourceLoader.java b/core/src/main/java/io/micronaut/core/io/scan/ClassPathResourceLoader.java index 071426d7ed0..6a42e99e0e6 100644 --- a/core/src/main/java/io/micronaut/core/io/scan/ClassPathResourceLoader.java +++ b/core/src/main/java/io/micronaut/core/io/scan/ClassPathResourceLoader.java @@ -17,7 +17,7 @@ import io.micronaut.core.io.ResourceLoader; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** * Abstraction to load resources from the the classpath. diff --git a/core/src/main/java/io/micronaut/core/naming/NameUtils.java b/core/src/main/java/io/micronaut/core/naming/NameUtils.java index df69d3a58e3..65674c111df 100644 --- a/core/src/main/java/io/micronaut/core/naming/NameUtils.java +++ b/core/src/main/java/io/micronaut/core/naming/NameUtils.java @@ -18,7 +18,7 @@ import io.micronaut.core.util.ArgumentUtils; import io.micronaut.core.util.StringUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Arrays; import java.util.Locale; import java.util.regex.Matcher; diff --git a/core/src/main/java/io/micronaut/core/naming/Named.java b/core/src/main/java/io/micronaut/core/naming/Named.java index 3712ca9fb16..b0e3071923d 100644 --- a/core/src/main/java/io/micronaut/core/naming/Named.java +++ b/core/src/main/java/io/micronaut/core/naming/Named.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.naming; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * An interface for components that are named. diff --git a/core/src/main/java/io/micronaut/core/reflect/ClassUtils.java b/core/src/main/java/io/micronaut/core/reflect/ClassUtils.java index e37fc62ab7a..3c9736744c5 100644 --- a/core/src/main/java/io/micronaut/core/reflect/ClassUtils.java +++ b/core/src/main/java/io/micronaut/core/reflect/ClassUtils.java @@ -22,8 +22,8 @@ import org.slf4j.LoggerFactory; import org.slf4j.helpers.NOPLogger; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.math.BigDecimal; import java.math.BigInteger; import java.net.URI; diff --git a/core/src/main/java/io/micronaut/core/reflect/InstantiationUtils.java b/core/src/main/java/io/micronaut/core/reflect/InstantiationUtils.java index aa98ace307d..d1d54c42919 100644 --- a/core/src/main/java/io/micronaut/core/reflect/InstantiationUtils.java +++ b/core/src/main/java/io/micronaut/core/reflect/InstantiationUtils.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.reflect.Constructor; import java.util.*; import java.util.function.Function; diff --git a/core/src/main/java/io/micronaut/core/serialize/ObjectSerializer.java b/core/src/main/java/io/micronaut/core/serialize/ObjectSerializer.java index a9f054cf178..4ccf151245f 100644 --- a/core/src/main/java/io/micronaut/core/serialize/ObjectSerializer.java +++ b/core/src/main/java/io/micronaut/core/serialize/ObjectSerializer.java @@ -17,7 +17,7 @@ import io.micronaut.core.serialize.exceptions.SerializationException; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.type.Argument; import java.io.ByteArrayInputStream; diff --git a/core/src/main/java/io/micronaut/core/type/Argument.java b/core/src/main/java/io/micronaut/core/type/Argument.java index b8e947b983a..2116160ae35 100644 --- a/core/src/main/java/io/micronaut/core/type/Argument.java +++ b/core/src/main/java/io/micronaut/core/type/Argument.java @@ -23,8 +23,8 @@ import io.micronaut.core.reflect.ReflectionUtils; import io.micronaut.core.util.ArrayUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/core/src/main/java/io/micronaut/core/type/Executable.java b/core/src/main/java/io/micronaut/core/type/Executable.java index bd841eb6017..f995baf1487 100644 --- a/core/src/main/java/io/micronaut/core/type/Executable.java +++ b/core/src/main/java/io/micronaut/core/type/Executable.java @@ -15,8 +15,8 @@ */ package io.micronaut.core.type; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadataProvider; /** diff --git a/core/src/main/java/io/micronaut/core/type/ReturnType.java b/core/src/main/java/io/micronaut/core/type/ReturnType.java index 29d5ea28746..86a96f97c3d 100644 --- a/core/src/main/java/io/micronaut/core/type/ReturnType.java +++ b/core/src/main/java/io/micronaut/core/type/ReturnType.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.type; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.AnnotationMetadataProvider; import io.micronaut.core.async.annotation.SingleResult; diff --git a/core/src/main/java/io/micronaut/core/util/ArgumentUtils.java b/core/src/main/java/io/micronaut/core/util/ArgumentUtils.java index 50a9ff24cbc..3175af05535 100644 --- a/core/src/main/java/io/micronaut/core/util/ArgumentUtils.java +++ b/core/src/main/java/io/micronaut/core/util/ArgumentUtils.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.util; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Utility methods for checking method argument values. diff --git a/core/src/main/java/io/micronaut/core/util/ArrayUtils.java b/core/src/main/java/io/micronaut/core/util/ArrayUtils.java index 9c883fd8654..11b4a2c082a 100644 --- a/core/src/main/java/io/micronaut/core/util/ArrayUtils.java +++ b/core/src/main/java/io/micronaut/core/util/ArrayUtils.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.util; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.lang.reflect.Array; import java.util.*; diff --git a/core/src/main/java/io/micronaut/core/util/CollectionUtils.java b/core/src/main/java/io/micronaut/core/util/CollectionUtils.java index 0928097e955..74de35811e6 100644 --- a/core/src/main/java/io/micronaut/core/util/CollectionUtils.java +++ b/core/src/main/java/io/micronaut/core/util/CollectionUtils.java @@ -18,8 +18,8 @@ import io.micronaut.core.annotation.UsedByGeneratedCode; import io.micronaut.core.convert.ConversionService; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.lang.reflect.Constructor; import java.util.*; diff --git a/core/src/main/java/io/micronaut/core/util/KotlinUtils.java b/core/src/main/java/io/micronaut/core/util/KotlinUtils.java index 59e6bdafe71..5ed5a0341f3 100644 --- a/core/src/main/java/io/micronaut/core/util/KotlinUtils.java +++ b/core/src/main/java/io/micronaut/core/util/KotlinUtils.java @@ -19,7 +19,7 @@ import io.micronaut.core.annotation.Internal; import kotlin.coroutines.intrinsics.IntrinsicsKt; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** *

Internal Utility methods for working with Kotlin suspend functions

. diff --git a/core/src/main/java/io/micronaut/core/util/LocaleResolver.java b/core/src/main/java/io/micronaut/core/util/LocaleResolver.java index 04dda3e9035..bb49e649251 100644 --- a/core/src/main/java/io/micronaut/core/util/LocaleResolver.java +++ b/core/src/main/java/io/micronaut/core/util/LocaleResolver.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.util; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.order.Ordered; import java.util.Locale; diff --git a/core/src/main/java/io/micronaut/core/util/StringUtils.java b/core/src/main/java/io/micronaut/core/util/StringUtils.java index d8e4c0123b8..f01762c6c67 100644 --- a/core/src/main/java/io/micronaut/core/util/StringUtils.java +++ b/core/src/main/java/io/micronaut/core/util/StringUtils.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.util; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.*; import java.util.function.Predicate; import java.util.regex.Pattern; diff --git a/core/src/main/java/io/micronaut/core/util/clhm/Weigher.java b/core/src/main/java/io/micronaut/core/util/clhm/Weigher.java index cb44cc197d2..f65128c160a 100644 --- a/core/src/main/java/io/micronaut/core/util/clhm/Weigher.java +++ b/core/src/main/java/io/micronaut/core/util/clhm/Weigher.java @@ -16,8 +16,6 @@ package io.micronaut.core.util.clhm; -import javax.annotation.concurrent.ThreadSafe; - /** * A class that can determine the weight of a value. The total weight threshold * is used to determine when an eviction is required. @@ -27,7 +25,6 @@ * @see * https://code.google.com/p/concurrentlinkedhashmap/ */ -@ThreadSafe public interface Weigher { /** diff --git a/core/src/main/java/io/micronaut/core/util/locale/AbstractLocaleResolver.java b/core/src/main/java/io/micronaut/core/util/locale/AbstractLocaleResolver.java index 76b1b2492f5..e0bdfe2a5fc 100644 --- a/core/src/main/java/io/micronaut/core/util/locale/AbstractLocaleResolver.java +++ b/core/src/main/java/io/micronaut/core/util/locale/AbstractLocaleResolver.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.util.locale; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.util.LocaleResolver; import java.util.Locale; diff --git a/core/src/main/java/io/micronaut/core/util/locale/FixedLocaleResolver.java b/core/src/main/java/io/micronaut/core/util/locale/FixedLocaleResolver.java index 20f680163bd..05992fe208c 100644 --- a/core/src/main/java/io/micronaut/core/util/locale/FixedLocaleResolver.java +++ b/core/src/main/java/io/micronaut/core/util/locale/FixedLocaleResolver.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.util.locale; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.util.LocaleResolver; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/io/micronaut/core/util/locale/LocaleResolutionConfiguration.java b/core/src/main/java/io/micronaut/core/util/locale/LocaleResolutionConfiguration.java index 696d6ed99d0..ca8533f2ace 100644 --- a/core/src/main/java/io/micronaut/core/util/locale/LocaleResolutionConfiguration.java +++ b/core/src/main/java/io/micronaut/core/util/locale/LocaleResolutionConfiguration.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.util.locale; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Locale; import java.util.Optional; diff --git a/core/src/main/java/io/micronaut/core/value/MapPropertyResolver.java b/core/src/main/java/io/micronaut/core/value/MapPropertyResolver.java index fcdbd960a80..369ae25b624 100644 --- a/core/src/main/java/io/micronaut/core/value/MapPropertyResolver.java +++ b/core/src/main/java/io/micronaut/core/value/MapPropertyResolver.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.value; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionService; import io.micronaut.core.util.StringUtils; diff --git a/core/src/main/java/io/micronaut/core/value/OptionalValues.java b/core/src/main/java/io/micronaut/core/value/OptionalValues.java index 8bc1b30c504..25ff927c2fe 100644 --- a/core/src/main/java/io/micronaut/core/value/OptionalValues.java +++ b/core/src/main/java/io/micronaut/core/value/OptionalValues.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.value; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Collection; import java.util.Collections; import java.util.Map; diff --git a/core/src/main/java/io/micronaut/core/value/PropertyResolver.java b/core/src/main/java/io/micronaut/core/value/PropertyResolver.java index dd8c90825ed..fc229ecc591 100644 --- a/core/src/main/java/io/micronaut/core/value/PropertyResolver.java +++ b/core/src/main/java/io/micronaut/core/value/PropertyResolver.java @@ -20,8 +20,8 @@ import io.micronaut.core.naming.conventions.StringConvention; import io.micronaut.core.type.Argument; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/io/micronaut/core/version/VersionUtils.java b/core/src/main/java/io/micronaut/core/version/VersionUtils.java index 54111e6a845..4ed23ceb2de 100644 --- a/core/src/main/java/io/micronaut/core/version/VersionUtils.java +++ b/core/src/main/java/io/micronaut/core/version/VersionUtils.java @@ -15,7 +15,7 @@ */ package io.micronaut.core.version; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.io.IOException; import java.io.InputStreamReader; diff --git a/core/src/test/groovy/io/micronaut/core/bind/ExecutableBinderSpec.groovy b/core/src/test/groovy/io/micronaut/core/bind/ExecutableBinderSpec.groovy index 074648f91fc..b7ca7b77e88 100644 --- a/core/src/test/groovy/io/micronaut/core/bind/ExecutableBinderSpec.groovy +++ b/core/src/test/groovy/io/micronaut/core/bind/ExecutableBinderSpec.groovy @@ -22,7 +22,6 @@ import io.micronaut.core.type.Argument import io.micronaut.core.type.Executable import spock.lang.Specification -import javax.annotation.Nullable class ExecutableBinderSpec extends Specification { diff --git a/function/src/main/java/io/micronaut/function/executor/AbstractExecutor.java b/function/src/main/java/io/micronaut/function/executor/AbstractExecutor.java index 41542cd47e0..93b9ca3ae14 100644 --- a/function/src/main/java/io/micronaut/function/executor/AbstractExecutor.java +++ b/function/src/main/java/io/micronaut/function/executor/AbstractExecutor.java @@ -24,8 +24,8 @@ import io.micronaut.function.LocalFunctionRegistry; import io.micronaut.inject.ExecutableMethod; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.annotation.PreDestroy; import java.io.Closeable; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/DefaultHttpClientConfiguration.java b/http-client-core/src/main/java/io/micronaut/http/client/DefaultHttpClientConfiguration.java index 6f5782d0282..753fea4f23f 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/DefaultHttpClientConfiguration.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/DefaultHttpClientConfiguration.java @@ -21,7 +21,7 @@ import io.micronaut.http.ssl.ClientSslConfiguration; import io.micronaut.runtime.ApplicationConfiguration; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; /** diff --git a/http-client-core/src/main/java/io/micronaut/http/client/HttpClient.java b/http-client-core/src/main/java/io/micronaut/http/client/HttpClient.java index d2d27c25668..693f364cc5b 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/HttpClient.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/HttpClient.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.LifeCycle; import io.micronaut.core.async.publisher.Publishers; import io.micronaut.core.io.buffer.ByteBuffer; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/HttpClientConfiguration.java b/http-client-core/src/main/java/io/micronaut/http/client/HttpClientConfiguration.java index b99b717c313..811f2e908e0 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/HttpClientConfiguration.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/HttpClientConfiguration.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.client; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.format.ReadableBytes; import io.micronaut.core.util.ArgumentUtils; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/LoadBalancer.java b/http-client-core/src/main/java/io/micronaut/http/client/LoadBalancer.java index 08bd2f5e1e3..9ad77346bb2 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/LoadBalancer.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/LoadBalancer.java @@ -21,7 +21,7 @@ import io.micronaut.http.client.loadbalance.FixedLoadBalancer; import org.reactivestreams.Publisher; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.net.URL; import java.util.Optional; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClient.java b/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClient.java index 199d83f6b49..2e91a07f884 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClient.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClient.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.io.buffer.ByteBuffer; import io.micronaut.core.type.Argument; import io.micronaut.http.HttpRequest; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClientFactory.java b/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClientFactory.java index c63084a4e84..821d20227e4 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClientFactory.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClientFactory.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.net.URL; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClientRegistry.java b/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClientRegistry.java index 9ecf9cecabb..7008aacf483 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClientRegistry.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/RxHttpClientRegistry.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.client; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Internal; import io.micronaut.http.HttpVersion; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/ServiceHttpClientConfiguration.java b/http-client-core/src/main/java/io/micronaut/http/client/ServiceHttpClientConfiguration.java index f8bc56d4df6..b5708b810d2 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/ServiceHttpClientConfiguration.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/ServiceHttpClientConfiguration.java @@ -23,7 +23,7 @@ import io.micronaut.http.ssl.SslConfiguration; import io.micronaut.runtime.ApplicationConfiguration; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import java.net.URI; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/bind/AnnotatedClientArgumentRequestBinder.java b/http-client-core/src/main/java/io/micronaut/http/client/bind/AnnotatedClientArgumentRequestBinder.java index 374942d6a12..b4ff942bae6 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/bind/AnnotatedClientArgumentRequestBinder.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/bind/AnnotatedClientArgumentRequestBinder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.bind; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Experimental; import java.lang.annotation.Annotation; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/bind/ClientArgumentRequestBinder.java b/http-client-core/src/main/java/io/micronaut/http/client/bind/ClientArgumentRequestBinder.java index bc7a5cef7c6..ee65a11231e 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/bind/ClientArgumentRequestBinder.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/bind/ClientArgumentRequestBinder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.bind; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.core.annotation.Experimental; import io.micronaut.core.annotation.Indexed; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/bind/DefaultHttpClientBinderRegistry.java b/http-client-core/src/main/java/io/micronaut/http/client/bind/DefaultHttpClientBinderRegistry.java index ee79e02cb57..9fd49f4031f 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/bind/DefaultHttpClientBinderRegistry.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/bind/DefaultHttpClientBinderRegistry.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.bind; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Internal; import io.micronaut.core.beans.BeanIntrospection; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/bind/HttpClientBinderRegistry.java b/http-client-core/src/main/java/io/micronaut/http/client/bind/HttpClientBinderRegistry.java index 1800043ed3a..762a5f2b908 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/bind/HttpClientBinderRegistry.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/bind/HttpClientBinderRegistry.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.bind; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.core.annotation.Experimental; import io.micronaut.core.type.Argument; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/bind/TypedClientArgumentRequestBinder.java b/http-client-core/src/main/java/io/micronaut/http/client/bind/TypedClientArgumentRequestBinder.java index 49e00c89162..ac2a65e03ab 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/bind/TypedClientArgumentRequestBinder.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/bind/TypedClientArgumentRequestBinder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.bind; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Experimental; import io.micronaut.core.type.Argument; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/filter/ClientFilterResolutionContext.java b/http-client-core/src/main/java/io/micronaut/http/client/filter/ClientFilterResolutionContext.java index f549a264589..ef42f744dfb 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/filter/ClientFilterResolutionContext.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/filter/ClientFilterResolutionContext.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.client.filter; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.AnnotationMetadataProvider; import java.util.Collections; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/loadbalance/FixedLoadBalancer.java b/http-client-core/src/main/java/io/micronaut/http/client/loadbalance/FixedLoadBalancer.java index c72e1a09cc6..d57452d364e 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/loadbalance/FixedLoadBalancer.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/loadbalance/FixedLoadBalancer.java @@ -20,7 +20,7 @@ import io.micronaut.http.client.LoadBalancer; import org.reactivestreams.Publisher; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.net.URL; import java.util.Optional; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/loadbalance/ServiceInstanceListRoundRobinLoadBalancer.java b/http-client-core/src/main/java/io/micronaut/http/client/loadbalance/ServiceInstanceListRoundRobinLoadBalancer.java index db745e91b92..9dffc214b3e 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/loadbalance/ServiceInstanceListRoundRobinLoadBalancer.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/loadbalance/ServiceInstanceListRoundRobinLoadBalancer.java @@ -20,7 +20,7 @@ import io.reactivex.Flowable; import org.reactivestreams.Publisher; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Optional; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/multipart/AbstractFilePart.java b/http-client-core/src/main/java/io/micronaut/http/client/multipart/AbstractFilePart.java index 287d64b714f..2ae60e2c23f 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/multipart/AbstractFilePart.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/multipart/AbstractFilePart.java @@ -15,10 +15,10 @@ */ package io.micronaut.http.client.multipart; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.naming.NameUtils; import io.micronaut.http.MediaType; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.io.IOException; import java.nio.charset.Charset; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/multipart/MultipartDataFactory.java b/http-client-core/src/main/java/io/micronaut/http/client/multipart/MultipartDataFactory.java index 9d8ec48c3a2..8d97148e691 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/multipart/MultipartDataFactory.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/multipart/MultipartDataFactory.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.client.multipart; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.http.MediaType; import java.io.IOException; diff --git a/http-client-core/src/main/java/io/micronaut/http/client/multipart/Part.java b/http-client-core/src/main/java/io/micronaut/http/client/multipart/Part.java index b0b4379c043..a4688c8e8c0 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/multipart/Part.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/multipart/Part.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.multipart; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * The base class representing multiple parts in the {@link MultipartBody} to build a Netty multipart request. diff --git a/http-client-core/src/main/java/io/micronaut/http/client/multipart/StringPart.java b/http-client-core/src/main/java/io/micronaut/http/client/multipart/StringPart.java index 3662d32f8ba..63e90b5e522 100644 --- a/http-client-core/src/main/java/io/micronaut/http/client/multipart/StringPart.java +++ b/http-client-core/src/main/java/io/micronaut/http/client/multipart/StringPart.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.multipart; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * A class representing a String {@link Part} in {@link MultipartBody} to build a Netty multipart request. diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/DefaultHttpClient.java b/http-client/src/main/java/io/micronaut/http/client/netty/DefaultHttpClient.java index 2f8b9c0f088..4e87d4e140d 100644 --- a/http-client/src/main/java/io/micronaut/http/client/netty/DefaultHttpClient.java +++ b/http-client/src/main/java/io/micronaut/http/client/netty/DefaultHttpClient.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.buffer.netty.NettyByteBufferFactory; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.AnnotationMetadataResolver; diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/FullNettyClientHttpResponse.java b/http-client/src/main/java/io/micronaut/http/client/netty/FullNettyClientHttpResponse.java index fe1569e1b77..4a69a37ac30 100644 --- a/http-client/src/main/java/io/micronaut/http/client/netty/FullNettyClientHttpResponse.java +++ b/http-client/src/main/java/io/micronaut/http/client/netty/FullNettyClientHttpResponse.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.netty; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.core.async.subscriber.Completable; import io.micronaut.core.convert.ConversionContext; diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/NettyClientHttpRequest.java b/http-client/src/main/java/io/micronaut/http/client/netty/NettyClientHttpRequest.java index 34d310a1e2a..17b14a07057 100644 --- a/http-client/src/main/java/io/micronaut/http/client/netty/NettyClientHttpRequest.java +++ b/http-client/src/main/java/io/micronaut/http/client/netty/NettyClientHttpRequest.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.netty; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.ConversionContext; import io.micronaut.core.convert.ConversionService; diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/NettyStreamedHttpResponse.java b/http-client/src/main/java/io/micronaut/http/client/netty/NettyStreamedHttpResponse.java index 40fb1c0bdfd..52859aed166 100644 --- a/http-client/src/main/java/io/micronaut/http/client/netty/NettyStreamedHttpResponse.java +++ b/http-client/src/main/java/io/micronaut/http/client/netty/NettyStreamedHttpResponse.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.client.netty; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.ConversionService; import io.micronaut.core.convert.value.MutableConvertibleValues; diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/RxNettyHttpClientRegistry.java b/http-client/src/main/java/io/micronaut/http/client/netty/RxNettyHttpClientRegistry.java index 8eeec298da7..de3933e7866 100644 --- a/http-client/src/main/java/io/micronaut/http/client/netty/RxNettyHttpClientRegistry.java +++ b/http-client/src/main/java/io/micronaut/http/client/netty/RxNettyHttpClientRegistry.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.BeanContext; import io.micronaut.context.annotation.*; import io.micronaut.core.annotation.AnnotationMetadata; diff --git a/http-client/src/test/groovy/io/micronaut/http/client/ClientRedirectSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/ClientRedirectSpec.groovy index 955f8e30113..36839bffb09 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/ClientRedirectSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/ClientRedirectSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.http.client -import edu.umd.cs.findbugs.annotations.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.NotYetImplemented import io.micronaut.context.ApplicationContext import io.micronaut.core.async.publisher.Publishers diff --git a/http-client/src/test/groovy/io/micronaut/http/client/HttpPutSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/HttpPutSpec.groovy index f91e998b689..6351a00edae 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/HttpPutSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/HttpPutSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.http.client -import edu.umd.cs.findbugs.annotations.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.EqualsAndHashCode import io.micronaut.http.HttpRequest import io.micronaut.http.HttpResponse diff --git a/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetrySpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetrySpec.groovy index dc71b29f721..8cd70f456bc 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetrySpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetrySpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.http.client.retry -import edu.umd.cs.findbugs.annotations.NonNull +import io.micronaut.core.annotation.NonNull import io.micronaut.http.annotation.Body import io.micronaut.http.annotation.Post import io.reactivex.Single diff --git a/http-netty/src/main/java/io/micronaut/http/netty/AbstractNettyHttpRequest.java b/http-netty/src/main/java/io/micronaut/http/netty/AbstractNettyHttpRequest.java index 26ee4b8406c..33a55a6e99f 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/AbstractNettyHttpRequest.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/AbstractNettyHttpRequest.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.netty; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.core.async.publisher.Publishers; import io.micronaut.core.convert.ConversionService; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpParameters.java b/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpParameters.java index 2b587629ccf..92edff8fd83 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpParameters.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpParameters.java @@ -16,13 +16,13 @@ package io.micronaut.http.netty; import io.micronaut.core.annotation.Internal; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionService; import io.micronaut.core.convert.value.ConvertibleMultiValues; import io.micronaut.core.convert.value.ConvertibleMultiValuesMap; import io.micronaut.http.MutableHttpParameters; -import javax.annotation.Nullable; import java.util.*; import java.util.function.BiConsumer; import java.util.stream.Collectors; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpRequestBuilder.java b/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpRequestBuilder.java index f4e64019466..5283ed1de58 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpRequestBuilder.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpRequestBuilder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.netty; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.http.HttpRequestWrapper; import io.micronaut.http.netty.stream.StreamedHttpRequest; import io.netty.buffer.ByteBuf; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpResponseBuilder.java b/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpResponseBuilder.java index 3d82dc3de16..b2334b609bc 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpResponseBuilder.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/NettyHttpResponseBuilder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.netty; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.async.publisher.Publishers; import io.micronaut.http.HttpResponseWrapper; import io.micronaut.http.netty.stream.DefaultStreamedHttpResponse; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/NettyMutableHttpResponse.java b/http-netty/src/main/java/io/micronaut/http/netty/NettyMutableHttpResponse.java index d83a792ed45..e5b98f12264 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/NettyMutableHttpResponse.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/NettyMutableHttpResponse.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.netty; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Internal; import io.micronaut.core.annotation.TypeHint; import io.micronaut.core.async.publisher.Publishers; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/ChannelPipelineCustomizer.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/ChannelPipelineCustomizer.java index 36e6f37b77b..627a2bc3004 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/ChannelPipelineCustomizer.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/ChannelPipelineCustomizer.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.netty.channel; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Interface that allows customizations to the {@link io.netty.channel.ChannelPipeline}. diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/ChannelPipelineListener.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/ChannelPipelineListener.java index e0feec35e26..81fbab041cf 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/ChannelPipelineListener.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/ChannelPipelineListener.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.netty.channel; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.netty.channel.ChannelPipeline; /** diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupConfiguration.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupConfiguration.java index a55c0a71861..7f0b52949c9 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupConfiguration.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupConfiguration.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.netty.channel; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.ConfigurationInject; import io.micronaut.context.annotation.EachProperty; import io.micronaut.context.annotation.Parameter; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupFactory.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupFactory.java index f98e65ca624..52e531dc956 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupFactory.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupFactory.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.netty.channel; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.context.annotation.Primary; import io.micronaut.context.annotation.Property; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupRegistry.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupRegistry.java index 14804e08091..3c6d1b8cab2 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupRegistry.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/DefaultEventLoopGroupRegistry.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.netty.channel; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.BeanLocator; import io.micronaut.context.annotation.*; import io.micronaut.context.exceptions.ConfigurationException; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/EpollEventLoopGroupFactory.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/EpollEventLoopGroupFactory.java index 18aeb816c8e..fdbada5b234 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/EpollEventLoopGroupFactory.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/EpollEventLoopGroupFactory.java @@ -18,8 +18,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.ThreadFactory; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Named; import javax.inject.Singleton; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/EventLoopGroupFactory.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/EventLoopGroupFactory.java index abdf09defcd..bfceaf5c57a 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/EventLoopGroupFactory.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/EventLoopGroupFactory.java @@ -18,12 +18,12 @@ import java.util.concurrent.Executor; import java.util.concurrent.ThreadFactory; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.util.ArgumentUtils; import io.netty.channel.EventLoopGroup; import io.netty.channel.socket.ServerSocketChannel; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.netty.channel.socket.SocketChannel; /** diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/EventLoopGroupRegistry.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/EventLoopGroupRegistry.java index 9234688ca68..9ed7154f150 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/EventLoopGroupRegistry.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/EventLoopGroupRegistry.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.netty.channel; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.netty.channel.EventLoopGroup; import java.util.Optional; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/KQueueEventLoopGroupFactory.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/KQueueEventLoopGroupFactory.java index 46c12cca195..a199e4d9ef4 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/KQueueEventLoopGroupFactory.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/KQueueEventLoopGroupFactory.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.netty.channel; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.context.annotation.Requires; import io.micronaut.core.annotation.Internal; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/channel/NioEventLoopGroupFactory.java b/http-netty/src/main/java/io/micronaut/http/netty/channel/NioEventLoopGroupFactory.java index 93908215d56..3a0d3c84bd6 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/channel/NioEventLoopGroupFactory.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/channel/NioEventLoopGroupFactory.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.netty.channel; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.core.annotation.Internal; import io.netty.channel.EventLoopGroup; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/cookies/NettyCookie.java b/http-netty/src/main/java/io/micronaut/http/netty/cookies/NettyCookie.java index 25eb7a8594b..54696c60d7e 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/cookies/NettyCookie.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/cookies/NettyCookie.java @@ -15,13 +15,13 @@ */ package io.micronaut.http.netty.cookies; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Internal; import io.micronaut.http.cookie.Cookie; import io.micronaut.http.cookie.SameSite; import io.netty.handler.codec.http.cookie.DefaultCookie; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Objects; import java.util.Optional; diff --git a/http-netty/src/main/java/io/micronaut/http/netty/websocket/NettyRxWebSocketSession.java b/http-netty/src/main/java/io/micronaut/http/netty/websocket/NettyRxWebSocketSession.java index 7221aecd1d8..33a68aca2e5 100644 --- a/http-netty/src/main/java/io/micronaut/http/netty/websocket/NettyRxWebSocketSession.java +++ b/http-netty/src/main/java/io/micronaut/http/netty/websocket/NettyRxWebSocketSession.java @@ -34,7 +34,7 @@ import io.reactivex.BackpressureStrategy; import io.reactivex.Flowable; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.net.URI; import java.util.Collection; import java.util.Collections; diff --git a/http-server-netty/build.gradle b/http-server-netty/build.gradle index 41bb9c1afac..0df917a112c 100644 --- a/http-server-netty/build.gradle +++ b/http-server-netty/build.gradle @@ -14,7 +14,7 @@ dependencies { testImplementation project(":inject") testImplementation project(":inject-java-test") testImplementation project(":http-client") - + testImplementation dependencyVersion("spotbugs") testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.7' testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.9' diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/DefaultHttpContentProcessorResolver.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/DefaultHttpContentProcessorResolver.java index 2037036795c..c54f627957b 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/DefaultHttpContentProcessorResolver.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/DefaultHttpContentProcessorResolver.java @@ -29,7 +29,7 @@ import io.micronaut.web.router.RouteMatch; import io.micronaut.web.router.qualifier.ConsumesMediaTypeQualifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.inject.Provider; import javax.inject.Singleton; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpContentProcessorResolver.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpContentProcessorResolver.java index 0faf8ecd706..faff9cc2dd4 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpContentProcessorResolver.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpContentProcessorResolver.java @@ -19,7 +19,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.web.router.RouteMatch; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Responsible for determining which {@link HttpContentProcessor} to use to process diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/NettyHttpRequest.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/NettyHttpRequest.java index c789b22623f..c6ebaa51716 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/NettyHttpRequest.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/NettyHttpRequest.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.netty; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.core.async.SupplierUtil; import io.micronaut.core.async.publisher.Publishers; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/NettyHttpServer.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/NettyHttpServer.java index e6e816ed3c5..bea421bf1f6 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/NettyHttpServer.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/NettyHttpServer.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.netty; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.ApplicationContext; import io.micronaut.context.BeanLocator; import io.micronaut.context.env.Environment; @@ -86,7 +86,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Provider; import javax.inject.Singleton; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/RoutingInBoundHandler.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/RoutingInBoundHandler.java index 84a2a54734b..3513003ba73 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/RoutingInBoundHandler.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/RoutingInBoundHandler.java @@ -35,7 +35,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.buffer.netty.NettyByteBufferFactory; import io.micronaut.context.BeanContext; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/CompletableFutureBodyBinder.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/CompletableFutureBodyBinder.java index c487ffe1b1b..3e9098ecd49 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/CompletableFutureBodyBinder.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/CompletableFutureBodyBinder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.netty.binders; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.http.netty.stream.StreamedHttpRequest; import io.micronaut.core.async.subscriber.CompletionAwareSubscriber; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/MaybeBodyBinder.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/MaybeBodyBinder.java index b0f01951ea0..f4f67e31d8f 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/MaybeBodyBinder.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/MaybeBodyBinder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.netty.binders; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionContext; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/NettyBinderRegistrar.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/NettyBinderRegistrar.java index 61e3ee33d4e..26735af2740 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/NettyBinderRegistrar.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/NettyBinderRegistrar.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.netty.binders; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.BeanLocator; import io.micronaut.context.annotation.Requires; import io.micronaut.context.event.BeanCreatedEvent; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/ObservableBodyBinder.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/ObservableBodyBinder.java index 5bd69b8bfaf..fc937b96c1d 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/ObservableBodyBinder.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/ObservableBodyBinder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.netty.binders; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionContext; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/SingleBodyBinder.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/SingleBodyBinder.java index cb14895d984..ac87068c782 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/SingleBodyBinder.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/binders/SingleBodyBinder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.netty.binders; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionContext; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/configuration/NettyHttpServerConfiguration.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/configuration/NettyHttpServerConfiguration.java index 8820831d347..376195ec2ce 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/configuration/NettyHttpServerConfiguration.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/configuration/NettyHttpServerConfiguration.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.netty.configuration; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.ConfigurationProperties; import io.micronaut.context.annotation.Replaces; import io.micronaut.core.convert.format.ReadableBytes; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonContentProcessor.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonContentProcessor.java index 64e169ede51..1b2c147e8f5 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonContentProcessor.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonContentProcessor.java @@ -35,7 +35,7 @@ import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Optional; /** diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonHttpContentSubscriberFactory.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonHttpContentSubscriberFactory.java index 16c5aeaeefd..d6f626e5567 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonHttpContentSubscriberFactory.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonHttpContentSubscriberFactory.java @@ -28,7 +28,7 @@ import io.micronaut.http.server.netty.HttpContentSubscriberFactory; import io.micronaut.http.server.netty.NettyHttpRequest; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; /** diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewCodecResolver.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewCodecResolver.java index 657f2d3734b..a77ff0d5bfc 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewCodecResolver.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewCodecResolver.java @@ -17,7 +17,7 @@ import io.micronaut.jackson.codec.JsonMediaTypeCodec; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Interface for resolving codecs for {@link com.fasterxml.jackson.annotation.JsonView} types. diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewMediaTypeCodecFactory.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewMediaTypeCodecFactory.java index 55614fa1e80..6f2807bb037 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewMediaTypeCodecFactory.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewMediaTypeCodecFactory.java @@ -25,8 +25,8 @@ import io.micronaut.jackson.codec.JsonMediaTypeCodec; import io.micronaut.runtime.ApplicationConfiguration; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Named; import javax.inject.Singleton; import java.util.Map; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/multipart/NettyFileUploadInputStream.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/multipart/NettyFileUploadInputStream.java index 02188a57160..32959c04eb3 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/multipart/NettyFileUploadInputStream.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/multipart/NettyFileUploadInputStream.java @@ -17,9 +17,9 @@ import io.micronaut.core.annotation.Internal; +import io.micronaut.core.annotation.NonNull; import io.netty.handler.codec.http.multipart.FileUpload; -import javax.annotation.Nonnull; import java.io.FileInputStream; import java.io.IOException; @@ -33,7 +33,7 @@ @Internal class NettyFileUploadInputStream extends FileInputStream { - @Nonnull + @NonNull private final FileUpload file; private final boolean releaseOnClose; @@ -42,7 +42,7 @@ class NettyFileUploadInputStream extends FileInputStream { * @param releaseOnClose Whether to release the file after the stream is closed * @throws IOException If an error occurred getting the underlying {@link java.io.File} */ - NettyFileUploadInputStream(@Nonnull FileUpload file, boolean releaseOnClose) throws IOException { + NettyFileUploadInputStream(@NonNull FileUpload file, boolean releaseOnClose) throws IOException { super(file.getFile()); this.file = file; this.releaseOnClose = releaseOnClose; diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/types/files/FileTypeHandlerConfiguration.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/types/files/FileTypeHandlerConfiguration.java index 2b6fbc02f65..9b1f514afdf 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/types/files/FileTypeHandlerConfiguration.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/types/files/FileTypeHandlerConfiguration.java @@ -17,7 +17,7 @@ import io.micronaut.context.annotation.ConfigurationProperties; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Allows configuration of properties for the {@link FileTypeHandler}. diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/http2/Http2PostTest.java b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/http2/Http2PostTest.java index 7bc9e7427fb..d019b9fc3bc 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/http2/Http2PostTest.java +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/http2/Http2PostTest.java @@ -2,6 +2,7 @@ import io.micronaut.context.annotation.Property; import io.micronaut.context.annotation.Requires; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.util.CollectionUtils; import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpResponse; @@ -25,7 +26,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import javax.annotation.Nonnull; import javax.inject.Inject; import java.util.Map; import java.util.concurrent.CompletableFuture; @@ -115,7 +115,7 @@ void testPostVertx() throws ExecutionException, InterruptedException, TimeoutExc ); } - @Nonnull + @NonNull @Override public Map getProperties() { return CollectionUtils.mapOf( diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/java/ParameterController.java b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/java/ParameterController.java index 47ae8eed9e9..bdb80272283 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/java/ParameterController.java +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/java/ParameterController.java @@ -22,7 +22,7 @@ import io.micronaut.http.annotation.Get; import io.micronaut.http.annotation.Post; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/util/MockHttpHeaders.java b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/util/MockHttpHeaders.java index be2cd5728e9..c3c0ac49cbc 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/util/MockHttpHeaders.java +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/util/MockHttpHeaders.java @@ -19,7 +19,7 @@ import io.micronaut.core.convert.ConversionService; import io.micronaut.http.MutableHttpHeaders; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.*; import java.util.stream.Collectors; diff --git a/http-server/src/main/java/io/micronaut/http/server/HttpServerConfiguration.java b/http-server/src/main/java/io/micronaut/http/server/HttpServerConfiguration.java index 38aac89d6fa..700673246af 100644 --- a/http-server/src/main/java/io/micronaut/http/server/HttpServerConfiguration.java +++ b/http-server/src/main/java/io/micronaut/http/server/HttpServerConfiguration.java @@ -27,8 +27,8 @@ import io.micronaut.runtime.ApplicationConfiguration; import io.micronaut.scheduling.executor.ThreadSelection; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import java.io.File; import java.nio.charset.Charset; diff --git a/http-server/src/main/java/io/micronaut/http/server/codec/TextStreamCodec.java b/http-server/src/main/java/io/micronaut/http/server/codec/TextStreamCodec.java index 541eaea33a5..6e877dccffd 100644 --- a/http-server/src/main/java/io/micronaut/http/server/codec/TextStreamCodec.java +++ b/http-server/src/main/java/io/micronaut/http/server/codec/TextStreamCodec.java @@ -28,7 +28,7 @@ import io.micronaut.http.sse.Event; import io.micronaut.runtime.ApplicationConfiguration; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/http-server/src/main/java/io/micronaut/http/server/context/ServerRequestContextInvocationInstrumenter.java b/http-server/src/main/java/io/micronaut/http/server/context/ServerRequestContextInvocationInstrumenter.java index 9f4129cacab..20298ad4246 100644 --- a/http-server/src/main/java/io/micronaut/http/server/context/ServerRequestContextInvocationInstrumenter.java +++ b/http-server/src/main/java/io/micronaut/http/server/context/ServerRequestContextInvocationInstrumenter.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.context; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.http.HttpRequest; import io.micronaut.http.context.ServerRequestContext; import io.micronaut.scheduling.instrument.Instrumentation; diff --git a/http-server/src/main/java/io/micronaut/http/server/cors/CorsOriginConfiguration.java b/http-server/src/main/java/io/micronaut/http/server/cors/CorsOriginConfiguration.java index 46920983af9..810313451a5 100644 --- a/http-server/src/main/java/io/micronaut/http/server/cors/CorsOriginConfiguration.java +++ b/http-server/src/main/java/io/micronaut/http/server/cors/CorsOriginConfiguration.java @@ -17,7 +17,7 @@ import io.micronaut.http.HttpMethod; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Collections; import java.util.List; diff --git a/http-server/src/main/java/io/micronaut/http/server/util/DefaultHttpClientAddressResolver.java b/http-server/src/main/java/io/micronaut/http/server/util/DefaultHttpClientAddressResolver.java index 160c618fec8..a3545303feb 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/DefaultHttpClientAddressResolver.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/DefaultHttpClientAddressResolver.java @@ -15,12 +15,12 @@ */ package io.micronaut.http.server.util; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Experimental; import io.micronaut.http.HttpRequest; import io.micronaut.http.server.HttpServerConfiguration; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.inject.Singleton; import java.net.InetSocketAddress; import java.util.List; diff --git a/http-server/src/main/java/io/micronaut/http/server/util/DefaultHttpHostResolver.java b/http-server/src/main/java/io/micronaut/http/server/util/DefaultHttpHostResolver.java index 97997809f73..0f42614c8e9 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/DefaultHttpHostResolver.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/DefaultHttpHostResolver.java @@ -22,8 +22,8 @@ import io.micronaut.http.server.HttpServerConfiguration.HostResolutionConfiguration; import io.micronaut.runtime.server.EmbeddedServer; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Provider; import javax.inject.Singleton; import java.net.URI; diff --git a/http-server/src/main/java/io/micronaut/http/server/util/HttpClientAddressResolver.java b/http-server/src/main/java/io/micronaut/http/server/util/HttpClientAddressResolver.java index 66c2f870f52..9a0588cabd3 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/HttpClientAddressResolver.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/HttpClientAddressResolver.java @@ -18,8 +18,8 @@ import io.micronaut.context.annotation.DefaultImplementation; import io.micronaut.http.HttpRequest; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; /** * Resolves the client IP address from the request. diff --git a/http-server/src/main/java/io/micronaut/http/server/util/HttpHostResolver.java b/http-server/src/main/java/io/micronaut/http/server/util/HttpHostResolver.java index 27fd2a24893..1ea3c62b1a3 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/HttpHostResolver.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/HttpHostResolver.java @@ -18,8 +18,8 @@ import io.micronaut.context.annotation.DefaultImplementation; import io.micronaut.http.HttpRequest; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; /** * Resolves the host name of the current server. diff --git a/http-server/src/main/java/io/micronaut/http/server/util/ProxyHeaderParser.java b/http-server/src/main/java/io/micronaut/http/server/util/ProxyHeaderParser.java index f7d85c99945..090cce1e13a 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/ProxyHeaderParser.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/ProxyHeaderParser.java @@ -19,7 +19,7 @@ import io.micronaut.http.HttpHeaders; import io.micronaut.http.HttpRequest; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/http-server/src/main/java/io/micronaut/http/server/util/locale/CompositeHttpLocaleResolver.java b/http-server/src/main/java/io/micronaut/http/server/util/locale/CompositeHttpLocaleResolver.java index 5ca80ada4f1..5d59558ea90 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/locale/CompositeHttpLocaleResolver.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/locale/CompositeHttpLocaleResolver.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.util.locale; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Primary; import io.micronaut.http.HttpRequest; diff --git a/http-server/src/main/java/io/micronaut/http/server/util/locale/CookieLocaleResolver.java b/http-server/src/main/java/io/micronaut/http/server/util/locale/CookieLocaleResolver.java index 7e4e1a7ac2f..84b1814344e 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/locale/CookieLocaleResolver.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/locale/CookieLocaleResolver.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.util.locale; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Requires; import io.micronaut.http.HttpRequest; import io.micronaut.http.server.HttpServerConfiguration; diff --git a/http-server/src/main/java/io/micronaut/http/server/util/locale/HttpLocaleResolutionConfiguration.java b/http-server/src/main/java/io/micronaut/http/server/util/locale/HttpLocaleResolutionConfiguration.java index 7d845aeee47..1d678693d35 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/locale/HttpLocaleResolutionConfiguration.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/locale/HttpLocaleResolutionConfiguration.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.util.locale; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.util.locale.LocaleResolutionConfiguration; import java.util.Optional; diff --git a/http-server/src/main/java/io/micronaut/http/server/util/locale/RequestLocaleResolver.java b/http-server/src/main/java/io/micronaut/http/server/util/locale/RequestLocaleResolver.java index 54ba185eade..906cc8dea67 100644 --- a/http-server/src/main/java/io/micronaut/http/server/util/locale/RequestLocaleResolver.java +++ b/http-server/src/main/java/io/micronaut/http/server/util/locale/RequestLocaleResolver.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.util.locale; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Requires; import io.micronaut.core.util.StringUtils; import io.micronaut.http.HttpRequest; diff --git a/http-server/src/test/groovy/io/micronaut/http/server/util/MockHttpHeaders.java b/http-server/src/test/groovy/io/micronaut/http/server/util/MockHttpHeaders.java index 2477f24139e..e380792b5b8 100644 --- a/http-server/src/test/groovy/io/micronaut/http/server/util/MockHttpHeaders.java +++ b/http-server/src/test/groovy/io/micronaut/http/server/util/MockHttpHeaders.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.server.util; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionService; import io.micronaut.http.MutableHttpHeaders; diff --git a/http/src/main/java/io/micronaut/http/BasicAuth.java b/http/src/main/java/io/micronaut/http/BasicAuth.java index 33d2da6d7d8..092fbc24ad8 100644 --- a/http/src/main/java/io/micronaut/http/BasicAuth.java +++ b/http/src/main/java/io/micronaut/http/BasicAuth.java @@ -15,8 +15,6 @@ */ package io.micronaut.http; -import javax.annotation.concurrent.Immutable; - /** * A class representing basic auth authorization header. Used in * declarative clients and server routes. @@ -24,7 +22,6 @@ * @author Ashwini Mutalik Desai * @since 1.3.0 */ -@Immutable public final class BasicAuth { private final String username; diff --git a/http/src/main/java/io/micronaut/http/HttpMessage.java b/http/src/main/java/io/micronaut/http/HttpMessage.java index b0bc56811a3..c038f985ee2 100644 --- a/http/src/main/java/io/micronaut/http/HttpMessage.java +++ b/http/src/main/java/io/micronaut/http/HttpMessage.java @@ -23,7 +23,7 @@ import io.micronaut.core.util.ArgumentUtils; import io.micronaut.http.util.HttpUtil; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Locale; diff --git a/http/src/main/java/io/micronaut/http/HttpRequest.java b/http/src/main/java/io/micronaut/http/HttpRequest.java index 5829335a85e..16b545c079c 100644 --- a/http/src/main/java/io/micronaut/http/HttpRequest.java +++ b/http/src/main/java/io/micronaut/http/HttpRequest.java @@ -17,8 +17,8 @@ import io.micronaut.http.cookie.Cookies; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.net.InetSocketAddress; import java.net.URI; import java.security.Principal; diff --git a/http/src/main/java/io/micronaut/http/HttpRequestWrapper.java b/http/src/main/java/io/micronaut/http/HttpRequestWrapper.java index a0c5b20f579..2403f1363d6 100644 --- a/http/src/main/java/io/micronaut/http/HttpRequestWrapper.java +++ b/http/src/main/java/io/micronaut/http/HttpRequestWrapper.java @@ -15,7 +15,7 @@ */ package io.micronaut.http; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.http.cookie.Cookies; import java.net.InetSocketAddress; diff --git a/http/src/main/java/io/micronaut/http/HttpResponse.java b/http/src/main/java/io/micronaut/http/HttpResponse.java index c26c873cd76..41242145a1a 100644 --- a/http/src/main/java/io/micronaut/http/HttpResponse.java +++ b/http/src/main/java/io/micronaut/http/HttpResponse.java @@ -19,7 +19,7 @@ import io.micronaut.http.cookie.Cookies; import io.micronaut.http.exceptions.UriSyntaxException; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.net.URI; import java.net.URISyntaxException; import java.util.Optional; diff --git a/http/src/main/java/io/micronaut/http/MediaType.java b/http/src/main/java/io/micronaut/http/MediaType.java index a6bb588237d..e2154317340 100644 --- a/http/src/main/java/io/micronaut/http/MediaType.java +++ b/http/src/main/java/io/micronaut/http/MediaType.java @@ -16,6 +16,7 @@ package io.micronaut.http; import io.micronaut.core.annotation.Internal; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.TypeHint; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.ConversionContext; @@ -29,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nonnull; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -459,7 +459,7 @@ public MediaType(String name, String extension, Map params) { * @param expectedContentType Content type to match against * @return if successful match */ - public boolean matches(@Nonnull MediaType expectedContentType) { + public boolean matches(@NonNull MediaType expectedContentType) { //noinspection ConstantConditions if (expectedContentType == null) { return false; diff --git a/http/src/main/java/io/micronaut/http/MutableHttpRequest.java b/http/src/main/java/io/micronaut/http/MutableHttpRequest.java index c4629624d73..553a495dc52 100644 --- a/http/src/main/java/io/micronaut/http/MutableHttpRequest.java +++ b/http/src/main/java/io/micronaut/http/MutableHttpRequest.java @@ -15,7 +15,7 @@ */ package io.micronaut.http; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.util.ArrayUtils; import io.micronaut.http.cookie.Cookie; import io.micronaut.http.uri.UriBuilder; diff --git a/http/src/main/java/io/micronaut/http/MutableHttpResponse.java b/http/src/main/java/io/micronaut/http/MutableHttpResponse.java index b292835bd1a..f3b2b1dc093 100644 --- a/http/src/main/java/io/micronaut/http/MutableHttpResponse.java +++ b/http/src/main/java/io/micronaut/http/MutableHttpResponse.java @@ -17,7 +17,7 @@ import io.micronaut.http.cookie.Cookie; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.nio.charset.Charset; import java.util.Collections; import java.util.Locale; diff --git a/http/src/main/java/io/micronaut/http/bind/binders/TypedRequestArgumentBinder.java b/http/src/main/java/io/micronaut/http/bind/binders/TypedRequestArgumentBinder.java index cd6f6003ffb..1e2b91f5ab1 100644 --- a/http/src/main/java/io/micronaut/http/bind/binders/TypedRequestArgumentBinder.java +++ b/http/src/main/java/io/micronaut/http/bind/binders/TypedRequestArgumentBinder.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.bind.binders; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.bind.TypeArgumentBinder; import io.micronaut.http.HttpRequest; diff --git a/http/src/main/java/io/micronaut/http/context/ServerContextPathProvider.java b/http/src/main/java/io/micronaut/http/context/ServerContextPathProvider.java index 511d65865c5..e5cdb623833 100644 --- a/http/src/main/java/io/micronaut/http/context/ServerContextPathProvider.java +++ b/http/src/main/java/io/micronaut/http/context/ServerContextPathProvider.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.context; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** * A contract for providing a context path to a server. diff --git a/http/src/main/java/io/micronaut/http/context/ServerRequestContext.java b/http/src/main/java/io/micronaut/http/context/ServerRequestContext.java index 1b28298f869..6b69a8e229b 100644 --- a/http/src/main/java/io/micronaut/http/context/ServerRequestContext.java +++ b/http/src/main/java/io/micronaut/http/context/ServerRequestContext.java @@ -19,8 +19,8 @@ import java.util.concurrent.Callable; import java.util.function.Supplier; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.http.HttpRequest; diff --git a/http/src/main/java/io/micronaut/http/context/event/HttpRequestReceivedEvent.java b/http/src/main/java/io/micronaut/http/context/event/HttpRequestReceivedEvent.java index 55862e0a411..cc85d5c9a48 100644 --- a/http/src/main/java/io/micronaut/http/context/event/HttpRequestReceivedEvent.java +++ b/http/src/main/java/io/micronaut/http/context/event/HttpRequestReceivedEvent.java @@ -18,7 +18,7 @@ import io.micronaut.context.event.ApplicationEvent; import io.micronaut.http.HttpRequest; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * An event fired when an {@link HttpRequest} is received by the server. Not that the event is fired in a diff --git a/http/src/main/java/io/micronaut/http/context/event/HttpRequestTerminatedEvent.java b/http/src/main/java/io/micronaut/http/context/event/HttpRequestTerminatedEvent.java index e961dc08004..4a3ca218c65 100644 --- a/http/src/main/java/io/micronaut/http/context/event/HttpRequestTerminatedEvent.java +++ b/http/src/main/java/io/micronaut/http/context/event/HttpRequestTerminatedEvent.java @@ -18,7 +18,7 @@ import io.micronaut.context.event.ApplicationEvent; import io.micronaut.http.HttpRequest; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * An event fired when an {@link HttpRequest} is finalized by the server. Note that the event is fired asynchronously and diff --git a/http/src/main/java/io/micronaut/http/cookie/Cookie.java b/http/src/main/java/io/micronaut/http/cookie/Cookie.java index dfd76d5d1b6..0e306a7b2bb 100644 --- a/http/src/main/java/io/micronaut/http/cookie/Cookie.java +++ b/http/src/main/java/io/micronaut/http/cookie/Cookie.java @@ -16,8 +16,8 @@ package io.micronaut.http.cookie; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.io.Serializable; import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalAmount; diff --git a/http/src/main/java/io/micronaut/http/cookie/CookieConfiguration.java b/http/src/main/java/io/micronaut/http/cookie/CookieConfiguration.java index 6cd5caf2d2d..e5464ec54a9 100644 --- a/http/src/main/java/io/micronaut/http/cookie/CookieConfiguration.java +++ b/http/src/main/java/io/micronaut/http/cookie/CookieConfiguration.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.cookie; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.time.temporal.TemporalAmount; import java.util.Optional; diff --git a/http/src/main/java/io/micronaut/http/filter/DefaultFilterEntry.java b/http/src/main/java/io/micronaut/http/filter/DefaultFilterEntry.java index ef24b2b65f1..e41374296af 100644 --- a/http/src/main/java/io/micronaut/http/filter/DefaultFilterEntry.java +++ b/http/src/main/java/io/micronaut/http/filter/DefaultFilterEntry.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.filter; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.util.ArrayUtils; import io.micronaut.core.util.CollectionUtils; diff --git a/http/src/main/java/io/micronaut/http/filter/HttpFilterResolver.java b/http/src/main/java/io/micronaut/http/filter/HttpFilterResolver.java index 9e6b38ee719..76f058b16bf 100644 --- a/http/src/main/java/io/micronaut/http/filter/HttpFilterResolver.java +++ b/http/src/main/java/io/micronaut/http/filter/HttpFilterResolver.java @@ -15,8 +15,8 @@ */ package io.micronaut.http.filter; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.AnnotationMetadataProvider; import io.micronaut.core.util.ArrayUtils; diff --git a/http/src/main/java/io/micronaut/http/hateoas/AbstractResource.java b/http/src/main/java/io/micronaut/http/hateoas/AbstractResource.java index 1378cb74044..8b673744f2a 100644 --- a/http/src/main/java/io/micronaut/http/hateoas/AbstractResource.java +++ b/http/src/main/java/io/micronaut/http/hateoas/AbstractResource.java @@ -24,7 +24,7 @@ import io.micronaut.http.MediaType; import io.micronaut.http.annotation.Produces; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/http/src/main/java/io/micronaut/http/hateoas/DefaultLink.java b/http/src/main/java/io/micronaut/http/hateoas/DefaultLink.java index e3bdd2cf1d9..1d4b7ce6988 100644 --- a/http/src/main/java/io/micronaut/http/hateoas/DefaultLink.java +++ b/http/src/main/java/io/micronaut/http/hateoas/DefaultLink.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.hateoas; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Introspected; import io.micronaut.core.util.StringUtils; import io.micronaut.http.MediaType; diff --git a/http/src/main/java/io/micronaut/http/hateoas/JsonError.java b/http/src/main/java/io/micronaut/http/hateoas/JsonError.java index 5b265516ab6..0e77ee1b04b 100644 --- a/http/src/main/java/io/micronaut/http/hateoas/JsonError.java +++ b/http/src/main/java/io/micronaut/http/hateoas/JsonError.java @@ -20,7 +20,7 @@ import io.micronaut.http.MediaType; import io.micronaut.http.annotation.Produces; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Optional; /** diff --git a/http/src/main/java/io/micronaut/http/hateoas/Link.java b/http/src/main/java/io/micronaut/http/hateoas/Link.java index fdd1afdbc0e..03ce0df2a29 100644 --- a/http/src/main/java/io/micronaut/http/hateoas/Link.java +++ b/http/src/main/java/io/micronaut/http/hateoas/Link.java @@ -17,7 +17,7 @@ import io.micronaut.http.MediaType; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.net.URI; import java.util.Optional; diff --git a/http/src/main/java/io/micronaut/http/resource/ResourceLoaderFactory.java b/http/src/main/java/io/micronaut/http/resource/ResourceLoaderFactory.java index 6f875fda002..f3db1948450 100644 --- a/http/src/main/java/io/micronaut/http/resource/ResourceLoaderFactory.java +++ b/http/src/main/java/io/micronaut/http/resource/ResourceLoaderFactory.java @@ -15,7 +15,7 @@ */ package io.micronaut.http.resource; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.context.annotation.Factory; import io.micronaut.context.env.Environment; diff --git a/http/src/main/java/io/micronaut/http/simple/SimpleHttpResponse.java b/http/src/main/java/io/micronaut/http/simple/SimpleHttpResponse.java index 8546e13b0ef..472336651eb 100644 --- a/http/src/main/java/io/micronaut/http/simple/SimpleHttpResponse.java +++ b/http/src/main/java/io/micronaut/http/simple/SimpleHttpResponse.java @@ -26,7 +26,7 @@ import io.micronaut.http.cookie.Cookies; import io.micronaut.http.simple.cookies.SimpleCookies; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Optional; import java.util.Set; diff --git a/http/src/main/java/io/micronaut/http/simple/cookies/SimpleCookie.java b/http/src/main/java/io/micronaut/http/simple/cookies/SimpleCookie.java index cc7b0d1b07a..ac161f717f7 100644 --- a/http/src/main/java/io/micronaut/http/simple/cookies/SimpleCookie.java +++ b/http/src/main/java/io/micronaut/http/simple/cookies/SimpleCookie.java @@ -18,7 +18,7 @@ import io.micronaut.http.cookie.Cookie; import io.micronaut.http.cookie.SameSite; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Objects; import java.util.Optional; diff --git a/http/src/main/java/io/micronaut/http/sse/Event.java b/http/src/main/java/io/micronaut/http/sse/Event.java index ecbcc509eb4..63086e40cd5 100644 --- a/http/src/main/java/io/micronaut/http/sse/Event.java +++ b/http/src/main/java/io/micronaut/http/sse/Event.java @@ -17,7 +17,7 @@ import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.time.Duration; /** diff --git a/http/src/main/java/io/micronaut/http/ssl/ClientSslConfiguration.java b/http/src/main/java/io/micronaut/http/ssl/ClientSslConfiguration.java index 852e208a972..c21dbc13968 100644 --- a/http/src/main/java/io/micronaut/http/ssl/ClientSslConfiguration.java +++ b/http/src/main/java/io/micronaut/http/ssl/ClientSslConfiguration.java @@ -18,7 +18,7 @@ import io.micronaut.context.annotation.BootstrapContextCompatible; import io.micronaut.context.annotation.ConfigurationProperties; import io.micronaut.context.annotation.Requires; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; /** diff --git a/http/src/main/java/io/micronaut/http/ssl/ServerSslConfiguration.java b/http/src/main/java/io/micronaut/http/ssl/ServerSslConfiguration.java index 689807691d8..a52dd57acdb 100644 --- a/http/src/main/java/io/micronaut/http/ssl/ServerSslConfiguration.java +++ b/http/src/main/java/io/micronaut/http/ssl/ServerSslConfiguration.java @@ -18,7 +18,7 @@ import io.micronaut.context.annotation.ConfigurationProperties; import io.micronaut.context.annotation.Requires; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; /** diff --git a/http/src/main/java/io/micronaut/http/uri/DefaultUriBuilder.java b/http/src/main/java/io/micronaut/http/uri/DefaultUriBuilder.java index 2a94a3282ec..21ef31fb4c3 100644 --- a/http/src/main/java/io/micronaut/http/uri/DefaultUriBuilder.java +++ b/http/src/main/java/io/micronaut/http/uri/DefaultUriBuilder.java @@ -21,8 +21,8 @@ import io.micronaut.core.util.StringUtils; import io.micronaut.http.exceptions.UriSyntaxException; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; diff --git a/http/src/main/java/io/micronaut/http/uri/UriBuilder.java b/http/src/main/java/io/micronaut/http/uri/UriBuilder.java index 1e2690aab41..4952eb50911 100644 --- a/http/src/main/java/io/micronaut/http/uri/UriBuilder.java +++ b/http/src/main/java/io/micronaut/http/uri/UriBuilder.java @@ -16,8 +16,8 @@ package io.micronaut.http.uri; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.net.URI; import java.util.Map; diff --git a/inject-groovy-test/src/main/groovy/io/micronaut/AbstractBeanDefinitionSpec.groovy b/inject-groovy-test/src/main/groovy/io/micronaut/AbstractBeanDefinitionSpec.groovy index 03e02685771..a4ccd20de69 100644 --- a/inject-groovy-test/src/main/groovy/io/micronaut/AbstractBeanDefinitionSpec.groovy +++ b/inject-groovy-test/src/main/groovy/io/micronaut/AbstractBeanDefinitionSpec.groovy @@ -15,165 +15,9 @@ */ package io.micronaut -import groovy.transform.CompileStatic -import io.micronaut.ast.groovy.utils.AstAnnotationUtils -import io.micronaut.ast.groovy.utils.ExtendedParameter -import io.micronaut.ast.groovy.visitor.GroovyClassElement -import io.micronaut.ast.groovy.visitor.GroovyVisitorContext -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.core.beans.BeanIntrospection -import io.micronaut.core.io.scan.ClassPathResourceLoader -import io.micronaut.inject.BeanDefinitionReference -import io.micronaut.inject.ast.ClassElement -import org.codehaus.groovy.ast.ASTNode -import org.codehaus.groovy.ast.ClassNode -import org.codehaus.groovy.ast.MethodNode -import org.codehaus.groovy.ast.Parameter -import org.codehaus.groovy.ast.builder.AstBuilder -import io.micronaut.ast.groovy.annotation.GroovyAnnotationMetadataBuilder -import io.micronaut.ast.groovy.utils.InMemoryByteCodeGroovyClassLoader -import io.micronaut.core.annotation.AnnotationMetadata -import io.micronaut.core.naming.NameUtils -import io.micronaut.inject.BeanDefinition -import io.micronaut.inject.annotation.AnnotationMetadataWriter -import org.codehaus.groovy.control.CompilationUnit -import org.codehaus.groovy.control.CompilerConfiguration -import org.codehaus.groovy.control.ErrorCollector -import org.codehaus.groovy.control.SourceUnit -import spock.lang.Specification - /** - * @author graemerocher - * @since 1.0 + * @deprecated Use {@link io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec} instead. */ -abstract class AbstractBeanDefinitionSpec extends Specification { - - /** - * Builds a class element from the given source. - * @param source The source - * @return The class element - */ - ClassElement buildClassElement(String source) { - def builder = new AstBuilder() - ASTNode[] nodes = builder.buildFromString(source) - def lastNode = nodes ? nodes[-1] : null - ClassNode cn = lastNode instanceof ClassNode ? lastNode : null - if (cn != null) { - def cc = new CompilerConfiguration() - def sourceUnit = new SourceUnit("test", source, cc, new GroovyClassLoader(), new ErrorCollector(cc)) - def compilationUnit = new CompilationUnit() - def metadata = AstAnnotationUtils.getAnnotationMetadata(sourceUnit, compilationUnit, cn) - return new GroovyClassElement( - new GroovyVisitorContext(sourceUnit, compilationUnit ), cn, metadata - ) - } else { - throw new IllegalArgumentException("No class found in passed source code") - } - } - - @CompileStatic - BeanDefinition buildBeanDefinition(String className, String classStr) { - def beanDefName= '$' + NameUtils.getSimpleName(className) + 'Definition' - def packageName = NameUtils.getPackageName(className) - String beanFullName = "${packageName}.${beanDefName}" - - def classLoader = new InMemoryByteCodeGroovyClassLoader() - classLoader.parseClass(classStr) - try { - return (BeanDefinition) classLoader.loadClass(beanFullName).newInstance() - } catch (ClassNotFoundException e) { - return null - } - } - - InMemoryByteCodeGroovyClassLoader buildClassLoader(String classStr) { - def classLoader = new InMemoryByteCodeGroovyClassLoader() - classLoader.parseClass(classStr) - return classLoader - } - - AnnotationMetadata buildTypeAnnotationMetadata(String cls, String source) { - ASTNode[] nodes = new AstBuilder().buildFromString(source) - - ClassNode element = nodes ? nodes.find { it instanceof ClassNode && it.name == cls } : null - GroovyAnnotationMetadataBuilder builder = new GroovyAnnotationMetadataBuilder(null, null) - AnnotationMetadata metadata = element != null ? builder.build(element) : null - return metadata - } - - AnnotationMetadata buildMethodAnnotationMetadata(String cls, String source, String methodName) { - ClassNode element = buildClassNode(source, cls) - MethodNode method = element.getMethods(methodName)[0] - GroovyAnnotationMetadataBuilder builder = new GroovyAnnotationMetadataBuilder(null, null) - AnnotationMetadata metadata = method != null ? builder.build(method) : null - return metadata - } - - AnnotationMetadata buildFieldAnnotationMetadata(String cls, String source, String methodName, String fieldName) { - ClassNode element = buildClassNode(source, cls) - MethodNode method = element.getMethods(methodName)[0] - Parameter parameter = Arrays.asList(method.getParameters()).find { it.name == fieldName } - GroovyAnnotationMetadataBuilder builder = new GroovyAnnotationMetadataBuilder(null, null) - AnnotationMetadata metadata = method != null ? builder.build(new ExtendedParameter(method, parameter)) : null - return metadata - } - - ClassNode buildClassNode(String source, String cls) { - ASTNode[] nodes = new AstBuilder().buildFromString(source) - - ClassNode element = nodes ? nodes.find { it instanceof ClassNode && it.name == cls } : null - return element - } - - - protected AnnotationMetadata writeAndLoadMetadata(String className, AnnotationMetadata toWrite) { - def stream = new ByteArrayOutputStream() - new AnnotationMetadataWriter(className, null, toWrite, true) - .writeTo(stream) - className = className + AnnotationMetadata.CLASS_NAME_SUFFIX - ClassLoader classLoader = new ClassLoader() { - @Override - protected Class findClass(String name) throws ClassNotFoundException { - if (name == className) { - def bytes = stream.toByteArray() - return defineClass(name, bytes, 0, bytes.length) - } - return super.findClass(name) - } - } - - AnnotationMetadata metadata = (AnnotationMetadata) classLoader.loadClass(className).newInstance() - return metadata - } - - /** - * Build and return a {@link io.micronaut.core.beans.BeanIntrospection} for the given class name and class data. - * - * @return the introspection if it is correct - **/ - protected BeanIntrospection buildBeanIntrospection(String className, String cls) { - def beanDefName= '$' + NameUtils.getSimpleName(className) + '$Introspection' - def packageName = NameUtils.getPackageName(className) - String beanFullName = "${packageName}.${beanDefName}" - - ClassLoader classLoader = buildClassLoader(cls) - return (BeanIntrospection)classLoader.loadClass(beanFullName).newInstance() - } - - protected ApplicationContext buildContext(String className, String cls) { - InMemoryByteCodeGroovyClassLoader classLoader = buildClassLoader(cls) - - return new DefaultApplicationContext( - ClassPathResourceLoader.defaultLoader(classLoader),"test") { - @Override - protected List resolveBeanDefinitionReferences() { - return classLoader.generatedClasses.keySet().findAll { - it.endsWith("DefinitionClass") - }.collect { - classLoader.loadClass(it).newInstance() - } - } - }.start() - } +@Deprecated +class AbstractBeanDefinitionSpec extends io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec { } diff --git a/inject-groovy-test/src/main/groovy/io/micronaut/ast/transform/test/AbstractBeanDefinitionSpec.groovy b/inject-groovy-test/src/main/groovy/io/micronaut/ast/transform/test/AbstractBeanDefinitionSpec.groovy new file mode 100644 index 00000000000..59fe00d7527 --- /dev/null +++ b/inject-groovy-test/src/main/groovy/io/micronaut/ast/transform/test/AbstractBeanDefinitionSpec.groovy @@ -0,0 +1,181 @@ +/* + * Copyright 2017-2020 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.micronaut.ast.transform.test + +import groovy.transform.CompileStatic +import io.micronaut.ast.groovy.utils.AstAnnotationUtils +import io.micronaut.ast.groovy.utils.ExtendedParameter +import io.micronaut.ast.groovy.visitor.GroovyClassElement +import io.micronaut.ast.groovy.visitor.GroovyVisitorContext +import io.micronaut.context.ApplicationContext +import io.micronaut.context.DefaultApplicationContext +import io.micronaut.core.beans.BeanIntrospection +import io.micronaut.core.io.scan.ClassPathResourceLoader +import io.micronaut.inject.BeanDefinitionReference +import io.micronaut.inject.ast.ClassElement +import org.codehaus.groovy.ast.ASTNode +import org.codehaus.groovy.ast.ClassNode +import org.codehaus.groovy.ast.MethodNode +import org.codehaus.groovy.ast.Parameter +import org.codehaus.groovy.ast.builder.AstBuilder +import io.micronaut.ast.groovy.annotation.GroovyAnnotationMetadataBuilder +import io.micronaut.ast.groovy.utils.InMemoryByteCodeGroovyClassLoader +import io.micronaut.core.annotation.AnnotationMetadata +import io.micronaut.core.naming.NameUtils +import io.micronaut.inject.BeanDefinition +import io.micronaut.inject.annotation.AnnotationMetadataWriter +import org.codehaus.groovy.control.CompilationUnit +import org.codehaus.groovy.control.CompilerConfiguration +import org.codehaus.groovy.control.ErrorCollector +import org.codehaus.groovy.control.SourceUnit +import spock.lang.Specification + +/** + * @author graemerocher + * @since 1.0 + */ +abstract class AbstractBeanDefinitionSpec extends Specification { + + /** + * Builds a class element from the given source. + * @param source The source + * @return The class element + */ + ClassElement buildClassElement(String source) { + def builder = new AstBuilder() + ASTNode[] nodes = builder.buildFromString(source) + def lastNode = nodes ? nodes[-1] : null + ClassNode cn = lastNode instanceof ClassNode ? lastNode : null + if (cn != null) { + def cc = new CompilerConfiguration() + def sourceUnit = new SourceUnit("test", source, cc, new GroovyClassLoader(), new ErrorCollector(cc)) + def compilationUnit = new CompilationUnit() + def metadata = AstAnnotationUtils.getAnnotationMetadata(sourceUnit, compilationUnit, cn) + return new GroovyClassElement( + new GroovyVisitorContext(sourceUnit, compilationUnit ), cn, metadata + ) + } else { + throw new IllegalArgumentException("No class found in passed source code") + } + } + + @CompileStatic + BeanDefinition buildBeanDefinition(String className, String classStr) { + def beanDefName= '$' + NameUtils.getSimpleName(className) + 'Definition' + def packageName = NameUtils.getPackageName(className) + String beanFullName = "${packageName}.${beanDefName}" + + def classLoader = new InMemoryByteCodeGroovyClassLoader() + classLoader.parseClass(classStr) + try { + return (BeanDefinition) classLoader.loadClass(beanFullName).newInstance() + } catch (ClassNotFoundException e) { + return null + } + } + + InMemoryByteCodeGroovyClassLoader buildClassLoader(String classStr) { + def classLoader = new InMemoryByteCodeGroovyClassLoader() + classLoader.parseClass(classStr) + return classLoader + } + + AnnotationMetadata buildTypeAnnotationMetadata(String cls, String source) { + ASTNode[] nodes = new AstBuilder().buildFromString(source) + + ClassNode element = nodes ? nodes.find { it instanceof ClassNode && it.name == cls } : null + def sourceUnit = Mock(SourceUnit) + sourceUnit.getErrorCollector() >> new ErrorCollector(new CompilerConfiguration()) + GroovyAnnotationMetadataBuilder builder = new GroovyAnnotationMetadataBuilder(sourceUnit, null) + AnnotationMetadata metadata = element != null ? builder.build(element) : null + return metadata + } + + AnnotationMetadata buildMethodAnnotationMetadata(String cls, String source, String methodName) { + ClassNode element = buildClassNode(source, cls) + MethodNode method = element.getMethods(methodName)[0] + GroovyAnnotationMetadataBuilder builder = new GroovyAnnotationMetadataBuilder(null, null) + AnnotationMetadata metadata = method != null ? builder.build(method) : null + return metadata + } + + AnnotationMetadata buildFieldAnnotationMetadata(String cls, String source, String methodName, String fieldName) { + ClassNode element = buildClassNode(source, cls) + MethodNode method = element.getMethods(methodName)[0] + Parameter parameter = Arrays.asList(method.getParameters()).find { it.name == fieldName } + GroovyAnnotationMetadataBuilder builder = new GroovyAnnotationMetadataBuilder(null, null) + AnnotationMetadata metadata = method != null ? builder.build(new ExtendedParameter(method, parameter)) : null + return metadata + } + + ClassNode buildClassNode(String source, String cls) { + ASTNode[] nodes = new AstBuilder().buildFromString(source) + + ClassNode element = nodes ? nodes.find { it instanceof ClassNode && it.name == cls } : null + return element + } + + + protected AnnotationMetadata writeAndLoadMetadata(String className, AnnotationMetadata toWrite) { + def stream = new ByteArrayOutputStream() + new AnnotationMetadataWriter(className, null, toWrite, true) + .writeTo(stream) + className = className + AnnotationMetadata.CLASS_NAME_SUFFIX + ClassLoader classLoader = new ClassLoader() { + @Override + protected Class findClass(String name) throws ClassNotFoundException { + if (name == className) { + def bytes = stream.toByteArray() + return defineClass(name, bytes, 0, bytes.length) + } + return super.findClass(name) + } + } + + AnnotationMetadata metadata = (AnnotationMetadata) classLoader.loadClass(className).newInstance() + return metadata + } + + /** + * Build and return a {@link io.micronaut.core.beans.BeanIntrospection} for the given class name and class data. + * + * @return the introspection if it is correct + **/ + protected BeanIntrospection buildBeanIntrospection(String className, String cls) { + def beanDefName= '$' + NameUtils.getSimpleName(className) + '$Introspection' + def packageName = NameUtils.getPackageName(className) + String beanFullName = "${packageName}.${beanDefName}" + + ClassLoader classLoader = buildClassLoader(cls) + return (BeanIntrospection)classLoader.loadClass(beanFullName).newInstance() + } + + protected ApplicationContext buildContext(String className, String cls) { + InMemoryByteCodeGroovyClassLoader classLoader = buildClassLoader(cls) + + return new DefaultApplicationContext( + ClassPathResourceLoader.defaultLoader(classLoader),"test") { + @Override + protected List resolveBeanDefinitionReferences() { + return classLoader.generatedClasses.keySet().findAll { + it.endsWith("DefinitionClass") + }.collect { + classLoader.loadClass(it).newInstance() + } + } + }.start() + } +} diff --git a/inject-groovy/build.gradle b/inject-groovy/build.gradle index 94ec870e39f..a329f6b56a9 100644 --- a/inject-groovy/build.gradle +++ b/inject-groovy/build.gradle @@ -4,6 +4,7 @@ dependencies { api dependencyModuleVersion("groovy", "groovy") // testImplementation 'javax.validation:validation-api:1.1.0.Final' + testImplementation dependencyVersion("spotbugs") testImplementation "org.hibernate:hibernate-core:5.4.27.Final" testImplementation 'org.hibernate:hibernate-validator:6.1.6.Final' testRuntimeOnly 'org.glassfish.web:el-impl:2.2.1-b05' diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/InjectTransform.groovy b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/InjectTransform.groovy index 15ccc8598a2..24c6288a9f0 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/InjectTransform.groovy +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/InjectTransform.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.ast.groovy -import edu.umd.cs.findbugs.annotations.Nullable +import io.micronaut.core.annotation.Nullable import io.micronaut.ast.groovy.visitor.GroovyPackageElement import io.micronaut.ast.groovy.visitor.GroovyVisitorContext import io.micronaut.inject.ast.Element diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilder.groovy b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilder.groovy index 8cf84ed526d..88c0dc9c524 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilder.groovy +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilder.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.ast.groovy.annotation -import edu.umd.cs.findbugs.annotations.NonNull +import io.micronaut.core.annotation.NonNull import groovy.transform.CompileStatic import io.micronaut.ast.groovy.utils.AstMessageUtils import io.micronaut.ast.groovy.utils.ExtendedParameter diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/AbstractGroovyElement.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/AbstractGroovyElement.java index 9d4e7f799a6..9f4e2ccbb08 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/AbstractGroovyElement.java +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/AbstractGroovyElement.java @@ -15,7 +15,7 @@ */ package io.micronaut.ast.groovy.visitor; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import groovy.transform.CompileStatic; import groovy.transform.PackageScope; import io.micronaut.ast.groovy.annotation.GroovyAnnotationMetadataBuilder; @@ -39,7 +39,7 @@ import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.SourceUnit; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.*; import java.util.function.Consumer; diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyClassElement.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyClassElement.java index 5a8373a485c..1979fb75272 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyClassElement.java +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyClassElement.java @@ -15,7 +15,7 @@ */ package io.micronaut.ast.groovy.visitor; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.ast.groovy.annotation.GroovyAnnotationMetadataBuilder; import io.micronaut.ast.groovy.utils.AstAnnotationUtils; import io.micronaut.ast.groovy.utils.AstClassUtils; @@ -31,7 +31,7 @@ import org.apache.groovy.ast.tools.ClassNodeUtils; import org.codehaus.groovy.ast.*; import org.codehaus.groovy.ast.stmt.BlockStatement; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.inject.Inject; import java.lang.reflect.Modifier; import java.util.*; diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyElementFactory.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyElementFactory.java index 0ad05b4368a..d35e836fd5e 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyElementFactory.java +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyElementFactory.java @@ -15,8 +15,8 @@ */ package io.micronaut.ast.groovy.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.inject.ast.*; import org.codehaus.groovy.ast.*; diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyFieldElement.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyFieldElement.java index 5480837f1f7..20f6d744f36 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyFieldElement.java +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyFieldElement.java @@ -23,7 +23,7 @@ import org.codehaus.groovy.ast.*; import org.codehaus.groovy.control.SourceUnit; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.reflect.Modifier; diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyMethodElement.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyMethodElement.java index 6f67d35044b..53a2447a095 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyMethodElement.java +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyMethodElement.java @@ -29,7 +29,7 @@ import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.control.SourceUnit; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyPackageElement.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyPackageElement.java index 67dc923ee3b..f6056d0378f 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyPackageElement.java +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyPackageElement.java @@ -15,7 +15,7 @@ */ package io.micronaut.ast.groovy.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Internal; import org.codehaus.groovy.ast.PackageNode; diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyParameterElement.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyParameterElement.java index 959eeade52c..830193e977c 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyParameterElement.java +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyParameterElement.java @@ -23,8 +23,8 @@ import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.control.SourceUnit; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; /** * Implementation of {@link ParameterElement} for Groovy. diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyVisitorContext.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyVisitorContext.java index 5de6d142eae..b33e78f3502 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyVisitorContext.java +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyVisitorContext.java @@ -15,8 +15,8 @@ */ package io.micronaut.ast.groovy.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import groovy.lang.GroovyClassLoader; import io.micronaut.ast.groovy.utils.AstAnnotationUtils; import io.micronaut.ast.groovy.utils.InMemoryByteCodeGroovyClassLoader; diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/LoadedVisitor.groovy b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/LoadedVisitor.groovy index 6ca2bce998a..d0ce7ce0ea0 100644 --- a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/LoadedVisitor.groovy +++ b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/LoadedVisitor.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.ast.groovy.visitor -import edu.umd.cs.findbugs.annotations.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import io.micronaut.ast.groovy.utils.AstAnnotationUtils import io.micronaut.core.annotation.AnnotationMetadata diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/adapter/MethodAdapterSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/adapter/MethodAdapterSpec.groovy index e050ec36d18..0f9c5245b3d 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/adapter/MethodAdapterSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/adapter/MethodAdapterSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.aop.adapter -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.event.ApplicationEventListener import io.micronaut.context.event.StartupEvent import io.micronaut.core.reflect.ReflectionUtils diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/AbstractClassIntroductionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/AbstractClassIntroductionSpec.groovy index 21193641c23..6d4dd9e7918 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/AbstractClassIntroductionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/AbstractClassIntroductionSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.DefaultBeanContext import io.micronaut.inject.BeanDefinition import io.micronaut.inject.BeanFactory diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/ExecutableDefaultMethodSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/ExecutableDefaultMethodSpec.groovy index 61555c6008c..19dc16ed0d3 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/ExecutableDefaultMethodSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/ExecutableDefaultMethodSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition import spock.lang.Ignore diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/FinalModifierSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/FinalModifierSpec.groovy index 4e39c835163..3b59ad9bf0a 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/FinalModifierSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/FinalModifierSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec class FinalModifierSpec extends AbstractBeanDefinitionSpec { void "test final modifier with AOP advice doesn't compile"() { diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/InheritedAnnotationMetadataSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/InheritedAnnotationMetadataSpec.groovy index a6fa4771362..ae94d169896 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/InheritedAnnotationMetadataSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/InheritedAnnotationMetadataSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.core.annotation.Blocking import io.micronaut.inject.BeanDefinition diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/IntroductionGenericTypesSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/IntroductionGenericTypesSpec.groovy index a707cbe6d98..0f1063d3503 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/IntroductionGenericTypesSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/IntroductionGenericTypesSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.DefaultBeanContext import io.micronaut.core.type.ReturnType import io.micronaut.inject.BeanDefinition diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/IntroductionWithAroundSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/IntroductionWithAroundSpec.groovy index 6b0e6ce0bd3..6181ed426b4 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/IntroductionWithAroundSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/IntroductionWithAroundSpec.groovy @@ -1,8 +1,7 @@ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext -import io.micronaut.context.BeanContext import io.micronaut.inject.BeanDefinition import io.micronaut.inject.BeanFactory import io.micronaut.inject.writer.BeanDefinitionVisitor diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/LifeCycleWithProxySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/LifeCycleWithProxySpec.groovy index 6077f2258ba..c2e6b9e8695 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/LifeCycleWithProxySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/LifeCycleWithProxySpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.inject.BeanDefinition import io.micronaut.inject.BeanFactory diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/PropertyAdviceSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/PropertyAdviceSpec.groovy index 054c3c52ebf..68cc8823139 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/PropertyAdviceSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/PropertyAdviceSpec.groovy @@ -1,10 +1,9 @@ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.inject.BeanDefinition import io.micronaut.inject.BeanFactory -import io.micronaut.inject.writer.BeanDefinitionVisitor class PropertyAdviceSpec extends AbstractBeanDefinitionSpec { void 'test advice can be applied to bean properties'() { diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/ValidatedNonBeanSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/ValidatedNonBeanSpec.groovy index 2495c7d0d78..2eae372e1f9 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/compile/ValidatedNonBeanSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/compile/ValidatedNonBeanSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.aop.compile -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition class ValidatedNonBeanSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/factory/SessionProxySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/factory/SessionProxySpec.groovy index 2c301d7155c..4fc3fc05541 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/factory/SessionProxySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/factory/SessionProxySpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.aop.factory -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.core.reflect.ReflectionUtils import io.micronaut.inject.BeanDefinition import io.micronaut.inject.writer.BeanDefinitionVisitor diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/IntroductionAdviceWithNewInterfaceSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/IntroductionAdviceWithNewInterfaceSpec.groovy index 9b0aefb362c..a2a96ab0e6e 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/IntroductionAdviceWithNewInterfaceSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/IntroductionAdviceWithNewInterfaceSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.aop.introduction -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.DefaultBeanContext import io.micronaut.context.event.ApplicationEventListener import io.micronaut.inject.BeanDefinition diff --git a/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy index e0a54a2dcf2..2a57bf45381 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy @@ -15,15 +15,11 @@ */ package io.micronaut.ast.groovy.annotation -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.annotation.ConfigurationReader import io.micronaut.core.annotation.AnnotationClassValue import io.micronaut.core.annotation.AnnotationValue import io.micronaut.inject.annotation.MultipleAlias -import org.codehaus.groovy.ast.ASTNode -import org.codehaus.groovy.ast.ClassNode -import org.codehaus.groovy.ast.MethodNode -import org.codehaus.groovy.ast.builder.AstBuilder import io.micronaut.aop.Around import io.micronaut.context.annotation.Primary import io.micronaut.context.annotation.Requirements @@ -32,7 +28,6 @@ import io.micronaut.core.annotation.AnnotationMetadata import io.micronaut.runtime.context.scope.Refreshable import io.micronaut.runtime.context.scope.ScopedProxy import spock.lang.Ignore -import spock.lang.Specification import javax.inject.Qualifier import javax.inject.Scope diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/aliasfor/AliasForQualifierSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/aliasfor/AliasForQualifierSpec.groovy index c67f20a446b..80ffb5a1e71 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/aliasfor/AliasForQualifierSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/aliasfor/AliasForQualifierSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.aliasfor -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition import javax.inject.Named diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/annotation/AnnotationMetadataWriterSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/annotation/AnnotationMetadataWriterSpec.groovy index 663a26ac17a..88119aeac62 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/annotation/AnnotationMetadataWriterSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/annotation/AnnotationMetadataWriterSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.annotation -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.annotation.Primary import io.micronaut.context.annotation.Requirements import io.micronaut.context.annotation.Requires diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/annotation/SourceRetentionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/annotation/SourceRetentionSpec.groovy index f4b8bd32d88..2b6436c9839 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/annotation/SourceRetentionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/annotation/SourceRetentionSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.annotation -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition import java.lang.annotation.Native diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/beans/AbstractBeanSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/beans/AbstractBeanSpec.groovy index 95bc521f8a3..431416d13a9 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/beans/AbstractBeanSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/beans/AbstractBeanSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.beans -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigPropertiesParseSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigPropertiesParseSpec.groovy index 8e00ea86574..3758a88b0ba 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigPropertiesParseSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigPropertiesParseSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.configproperties -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Property import io.micronaut.inject.BeanDefinition @@ -95,7 +95,7 @@ import io.micronaut.context.annotation.* @ConfigurationProperties(value = "foo", includes = ["property", "parentProperty"]) class MyProperties extends Parent { - @edu.umd.cs.findbugs.annotations.Nullable + @io.micronaut.core.annotation.Nullable String property String anotherProperty } @@ -173,7 +173,7 @@ import io.micronaut.context.annotation.* @ConfigurationProperties(value = "foo", excludes = ["anotherProperty", "anotherParentProperty"]) class MyProperties extends Parent { - @edu.umd.cs.findbugs.annotations.Nullable + @io.micronaut.core.annotation.Nullable String property String anotherProperty } diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesBuilderSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesBuilderSpec.groovy index 00389614167..dc2dacda179 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesBuilderSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesBuilderSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.configproperties -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.context.env.PropertySource import io.micronaut.inject.BeanDefinition diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ImmutableConfigurationPropertiesSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ImmutableConfigurationPropertiesSpec.groovy index 1402f472700..46667d4894b 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ImmutableConfigurationPropertiesSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ImmutableConfigurationPropertiesSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.configproperties -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Property import io.micronaut.inject.BeanDefinition @@ -23,7 +23,7 @@ class MyConfig { private int serverPort; @ConfigurationInject - MyConfig(@javax.validation.constraints.NotBlank String host, int serverPort, @edu.umd.cs.findbugs.annotations.Nullable String nullable) { + MyConfig(@javax.validation.constraints.NotBlank String host, int serverPort, @io.micronaut.core.annotation.Nullable String nullable) { this.host = host; this.serverPort = serverPort; } diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/InheritedConfigurationReaderPrefixSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/InheritedConfigurationReaderPrefixSpec.groovy index e538511b01f..1272804b5da 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/InheritedConfigurationReaderPrefixSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/InheritedConfigurationReaderPrefixSpec.groovy @@ -15,9 +15,8 @@ */ package io.micronaut.inject.configproperties -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.annotation.Property -import io.micronaut.core.annotation.AnnotationMetadata import io.micronaut.inject.BeanDefinition class InheritedConfigurationReaderPrefixSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/InterfaceConfigurationPropertiesSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/InterfaceConfigurationPropertiesSpec.groovy index 97958401dda..6e803d4d172 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/InterfaceConfigurationPropertiesSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/InterfaceConfigurationPropertiesSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.configproperties -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Property import io.micronaut.context.exceptions.NoSuchBeanException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy index 8b49f2c34cb..549a51c5939 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.configproperties -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.annotation.ConfigurationProperties import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/VisibilityIssuesSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/VisibilityIssuesSpec.groovy index 67bd54a1e52..6455d232cce 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/VisibilityIssuesSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/VisibilityIssuesSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.configproperties -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.inject.BeanDefinition import io.micronaut.inject.BeanFactory diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configuration/GroovyConfigBuilderSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configuration/GroovyConfigBuilderSpec.groovy index 9c528aa5ecc..f8cc9141663 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configuration/GroovyConfigBuilderSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configuration/GroovyConfigBuilderSpec.groovy @@ -1,9 +1,8 @@ package io.micronaut.inject.configuration -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import io.micronaut.context.env.PropertySource -import org.codehaus.groovy.GroovyBugError import org.codehaus.groovy.control.MultipleCompilationErrorsException class GroovyConfigBuilderSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configuration/GroovyConfigurationMetadataBuilderSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configuration/GroovyConfigurationMetadataBuilderSpec.groovy index 19b0430f023..6831ce918ca 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configuration/GroovyConfigurationMetadataBuilderSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configuration/GroovyConfigurationMetadataBuilderSpec.groovy @@ -16,7 +16,7 @@ package io.micronaut.inject.configuration import groovy.json.JsonSlurper -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.ast.groovy.config.GroovyConfigurationMetadataBuilder import org.codehaus.groovy.ast.ClassNode /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/context/NoPackageSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/context/NoPackageSpec.groovy index c32c6482f82..a00a07a88cc 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/context/NoPackageSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/context/NoPackageSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.context -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec class NoPackageSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/errors/GroovySingletonSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/errors/GroovySingletonSpec.groovy index d23f7f12f43..b4f8fe4fd10 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/errors/GroovySingletonSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/errors/GroovySingletonSpec.groovy @@ -15,11 +15,8 @@ */ package io.micronaut.inject.errors -import io.micronaut.AbstractBeanDefinitionSpec -import io.micronaut.context.DefaultBeanContext +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition -import io.micronaut.inject.BeanFactory -import io.micronaut.inject.qualifiers.One class GroovySingletonSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/errors/RouteTraitSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/errors/RouteTraitSpec.groovy index b40b3c2fcd5..34778c64a2e 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/errors/RouteTraitSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/errors/RouteTraitSpec.groovy @@ -15,8 +15,8 @@ */ package io.micronaut.inject.errors -import groovy.transform.NotYetImplemented -import io.micronaut.AbstractBeanDefinitionSpec + +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.http.annotation.Get import spock.lang.Issue diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/executable/ExecutableBeanSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/executable/ExecutableBeanSpec.groovy index 056b5ee0270..6d6a2224524 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/executable/ExecutableBeanSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/executable/ExecutableBeanSpec.groovy @@ -15,11 +15,8 @@ */ package io.micronaut.inject.executable -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition -import spock.lang.Ignore - -import java.util.function.Function class ExecutableBeanSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/executable/inheritance/InheritedExecutableSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/executable/inheritance/InheritedExecutableSpec.groovy index 3785f91ec31..3ae65d856b4 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/executable/inheritance/InheritedExecutableSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/executable/inheritance/InheritedExecutableSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.executable.inheritance -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition class InheritedExecutableSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/factory/FactoryEnumSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/factory/FactoryEnumSpec.groovy index 91c33678679..764f31cd32e 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/factory/FactoryEnumSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/factory/FactoryEnumSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.factory -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext class FactoryEnumSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/generics/GenericTypeArgumentsSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/generics/GenericTypeArgumentsSpec.groovy index 87112189d39..6a79bec7c3a 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/generics/GenericTypeArgumentsSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/generics/GenericTypeArgumentsSpec.groovy @@ -15,9 +15,8 @@ */ package io.micronaut.inject.generics -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.event.BeanCreatedEventListener -import io.micronaut.core.type.Argument import io.micronaut.inject.BeanDefinition import io.micronaut.inject.ExecutableMethod import spock.lang.Unroll diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/generics/TypeArgumentsSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/generics/TypeArgumentsSpec.groovy index 0c0e7713b7d..0a0d02d0a07 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/generics/TypeArgumentsSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/generics/TypeArgumentsSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.generics -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition class TypeArgumentsSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PostConstructCompileSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PostConstructCompileSpec.groovy index 83d75f204fe..e470967af78 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PostConstructCompileSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PostConstructCompileSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.lifecyle -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.inject.BeanDefinition class PostConstructCompileSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PreDestroyOnBeanAnnotationSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PreDestroyOnBeanAnnotationSpec.groovy index 6ae571a1c82..635322d0e1c 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PreDestroyOnBeanAnnotationSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/PreDestroyOnBeanAnnotationSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.inject.lifecyle -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.ApplicationContext import java.util.concurrent.ExecutorService diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyWithQualifierSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyWithQualifierSpec.groovy index e528e05af80..9a77b6cb112 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyWithQualifierSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyWithQualifierSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.property -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.inject.BeanDefinition diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/value/ValueParseSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/value/ValueParseSpec.groovy index 1818777ae04..678feb7be0e 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/value/ValueParseSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/value/ValueParseSpec.groovy @@ -1,8 +1,7 @@ package io.micronaut.inject.value -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.context.annotation.Value -import io.micronaut.inject.BeanDefinition class ValueParseSpec extends AbstractBeanDefinitionSpec{ diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/BeanIntrospectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/BeanIntrospectionSpec.groovy index 516c95e1d8b..b9bbdc8adc2 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/BeanIntrospectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/BeanIntrospectionSpec.groovy @@ -1,7 +1,7 @@ package io.micronaut.inject.visitor import com.blazebit.persistence.impl.function.entity.ValuesEntity -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.ast.groovy.TypeElementVisitorStart import io.micronaut.context.annotation.Executable import io.micronaut.core.annotation.Introspected diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/ClassElementSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/ClassElementSpec.groovy index 5bc72bec618..af75321e4ea 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/ClassElementSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/ClassElementSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.visitor -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.ast.groovy.TypeElementVisitorStart import io.micronaut.inject.ast.ClassElement import io.micronaut.inject.ast.ElementModifier diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/CustomVisitorSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/CustomVisitorSpec.groovy index 6a00f6b8b18..9146dcfdac3 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/CustomVisitorSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/CustomVisitorSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.visitor -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.ast.groovy.utils.AstAnnotationUtils class CustomVisitorSpec extends AbstractBeanDefinitionSpec { diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/ElementAnnotateSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/ElementAnnotateSpec.groovy index 0efcd098d44..cf5a2cf2665 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/ElementAnnotateSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/ElementAnnotateSpec.groovy @@ -1,8 +1,7 @@ package io.micronaut.inject.visitor -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.ast.groovy.TypeElementVisitorStart -import io.micronaut.ast.groovy.TypeElementVisitorTransform import io.micronaut.core.annotation.AnnotationValueBuilder import io.micronaut.core.annotation.Introspected import io.micronaut.inject.BeanDefinition diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/InterfaceWithGenerics.java b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/InterfaceWithGenerics.java index ff2b745ee8a..69b543244b0 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/InterfaceWithGenerics.java +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/InterfaceWithGenerics.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.Optional; diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/IntroductionVisitorSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/IntroductionVisitorSpec.groovy index 5d03505d487..fb7620ef55e 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/IntroductionVisitorSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/IntroductionVisitorSpec.groovy @@ -1,10 +1,8 @@ package io.micronaut.inject.visitor -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.ast.groovy.TypeElementVisitorStart -import io.micronaut.inject.BeanDefinition import io.micronaut.inject.ast.ClassElement -import io.micronaut.inject.ast.MethodElement import io.micronaut.inject.writer.BeanDefinitionVisitor import spock.util.environment.RestoreSystemProperties diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/PropertyElementSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/PropertyElementSpec.groovy index bc61d1693c5..aa34c683672 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/PropertyElementSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/visitor/PropertyElementSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.inject.visitor -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.ast.groovy.TypeElementVisitorStart import io.micronaut.http.annotation.Get diff --git a/inject-groovy/src/test/groovy/io/micronaut/validation/ValidatedParseSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/validation/ValidatedParseSpec.groovy index 33f48261959..0f69cb62e8d 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/validation/ValidatedParseSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/validation/ValidatedParseSpec.groovy @@ -1,6 +1,6 @@ package io.micronaut.validation -import io.micronaut.AbstractBeanDefinitionSpec +import io.micronaut.ast.transform.test.AbstractBeanDefinitionSpec import io.micronaut.aop.Around import io.micronaut.core.beans.BeanIntrospection import io.micronaut.inject.ProxyBeanDefinition diff --git a/inject-java-test/build.gradle b/inject-java-test/build.gradle index c4e39346cc3..e4602ac1c66 100644 --- a/inject-java-test/build.gradle +++ b/inject-java-test/build.gradle @@ -2,7 +2,9 @@ dependencies { annotationProcessor project(":inject-java") api project(":inject-java") - api "com.google.testing.compile:compile-testing:0.19" +// api "com.google.testing.compile:compile-testing:0.19", { +// exclude group:'com.google.truth', module:'truth' +// } api dependencyModuleVersion("groovy", "groovy") api(dependencyVersion("spock")) { exclude module:'groovy-all' diff --git a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/AbstractTypeElementSpec.groovy b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/AbstractTypeElementSpec.groovy index beb993751dd..f2e27c7be6c 100644 --- a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/AbstractTypeElementSpec.groovy +++ b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/AbstractTypeElementSpec.groovy @@ -15,12 +15,11 @@ */ package io.micronaut.annotation.processing.test -import com.google.testing.compile.JavaFileObjects import com.sun.tools.javac.model.JavacElements import com.sun.tools.javac.processing.JavacProcessingEnvironment import com.sun.tools.javac.util.Context -import edu.umd.cs.findbugs.annotations.NonNull -import edu.umd.cs.findbugs.annotations.Nullable +import io.micronaut.core.annotation.NonNull +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import io.micronaut.annotation.processing.AnnotationUtils import io.micronaut.annotation.processing.GenericUtils diff --git a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/InMemoryJavaFileManager.java b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/InMemoryJavaFileManager.java index 58898358667..8365a650e09 100644 --- a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/InMemoryJavaFileManager.java +++ b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/InMemoryJavaFileManager.java @@ -15,35 +15,29 @@ */ package io.micronaut.annotation.processing.test; -import com.google.common.base.MoreObjects; -import com.google.common.base.Optional; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableList; -import com.google.common.io.ByteSource; import javax.tools.*; import javax.tools.JavaFileObject.Kind; import java.io.*; import java.net.URI; -import java.nio.charset.Charset; -import java.util.Map.Entry; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; +import java.util.function.BiFunction; +import java.util.function.Function; /** * A file manager implementation that stores all output in memory. * + * NOTE: Forked from Google Compile Testing Project + * * @author Gregory Kick */ @SuppressWarnings("all") final class InMemoryJavaFileManager extends ForwardingJavaFileManager { - private final LoadingCache inMemoryFileObjects = - CacheBuilder.newBuilder().build(new CacheLoader() { - @Override - public JavaFileObject load(URI key) { - return new InMemoryJavaFileManager.InMemoryJavaFileObject(key); - } - }); + private final Map inMemoryFileObjects = new LinkedHashMap<>(); InMemoryJavaFileManager(JavaFileManager fileManager) { super(fileManager); @@ -85,8 +79,13 @@ public boolean isSameFile(FileObject a, FileObject b) { public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException { if (location.isOutputLocation()) { - return inMemoryFileObjects.getIfPresent( - uriForFileObject(location, packageName, relativeName)); + final URI uri = uriForFileObject(location, packageName, relativeName); + return inMemoryFileObjects.computeIfPresent(uri, new BiFunction() { + @Override + public JavaFileObject apply(URI uri, JavaFileObject javaFileObject) { + return new InMemoryJavaFileManager.InMemoryJavaFileObject(uri); + } + }); } else { return super.getFileForInput(location, packageName, relativeName); } @@ -96,7 +95,13 @@ public FileObject getFileForInput(Location location, String packageName, public JavaFileObject getJavaFileForInput(Location location, String className, Kind kind) throws IOException { if (location.isOutputLocation()) { - return inMemoryFileObjects.getIfPresent(uriForJavaFileObject(location, className, kind)); + final URI uri = uriForJavaFileObject(location, className, kind); + return inMemoryFileObjects.computeIfPresent(uri, new BiFunction() { + @Override + public JavaFileObject apply(URI uri, JavaFileObject javaFileObject) { + return new InMemoryJavaFileManager.InMemoryJavaFileObject(uri); + } + }); } else { return super.getJavaFileForInput(location, className, kind); } @@ -106,35 +111,34 @@ public JavaFileObject getJavaFileForInput(Location location, String className, K public FileObject getFileForOutput(Location location, String packageName, String relativeName, FileObject sibling) throws IOException { URI uri = uriForFileObject(location, packageName, relativeName); - return inMemoryFileObjects.getUnchecked(uri); + return inMemoryFileObjects.computeIfAbsent(uri, new Function() { + @Override + public JavaFileObject apply(URI uri) { + return new InMemoryJavaFileManager.InMemoryJavaFileObject(uri); + } + }); } @Override public JavaFileObject getJavaFileForOutput(Location location, String className, final Kind kind, FileObject sibling) throws IOException { URI uri = uriForJavaFileObject(location, className, kind); - return inMemoryFileObjects.getUnchecked(uri); - } - - ImmutableList getGeneratedSources() { - ImmutableList.Builder result = ImmutableList.builder(); - for (Entry entry : inMemoryFileObjects.asMap().entrySet()) { - if (entry.getKey().getPath().startsWith("/" + StandardLocation.SOURCE_OUTPUT.name()) - && (entry.getValue().getKind() == Kind.SOURCE)) { - result.add(entry.getValue()); + return inMemoryFileObjects.computeIfAbsent(uri, new Function() { + @Override + public JavaFileObject apply(URI uri) { + return new InMemoryJavaFileManager.InMemoryJavaFileObject(uri); } - } - return result.build(); + }); } - ImmutableList getOutputFiles() { - return ImmutableList.copyOf(inMemoryFileObjects.asMap().values()); + Iterable getOutputFiles() { + return Collections.unmodifiableCollection(inMemoryFileObjects.values()); } private static final class InMemoryJavaFileObject extends SimpleJavaFileObject implements JavaFileObject { private long lastModified = 0L; - private Optional data = Optional.absent(); + private Optional data = Optional.empty(); InMemoryJavaFileObject(URI uri) { super(uri, deduceKind(uri)); @@ -143,7 +147,7 @@ private static final class InMemoryJavaFileObject extends SimpleJavaFileObject @Override public InputStream openInputStream() throws IOException { if (data.isPresent()) { - return data.get().openStream(); + return new ByteArrayInputStream(data.get()); } else { throw new FileNotFoundException(); } @@ -154,27 +158,23 @@ public OutputStream openOutputStream() throws IOException { return new ByteArrayOutputStream() { @Override public void close() throws IOException { + final byte[] bytes = toByteArray(); + data = Optional.of(bytes); super.close(); - data = Optional.of(ByteSource.wrap(toByteArray())); - lastModified = System.currentTimeMillis(); } }; } @Override public Reader openReader(boolean ignoreEncodingErrors) throws IOException { - if (data.isPresent()) { - return data.get().asCharSource(Charset.defaultCharset()).openStream(); - } else { - throw new FileNotFoundException(); - } + return new InputStreamReader(openInputStream(), StandardCharsets.UTF_8); } @Override public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { if (data.isPresent()) { - return data.get().asCharSource(Charset.defaultCharset()).read(); + return new String(data.get(), StandardCharsets.UTF_8); } else { throw new FileNotFoundException(); } @@ -186,8 +186,8 @@ public Writer openWriter() throws IOException { @Override public void close() throws IOException { super.close(); - data = - Optional.of(ByteSource.wrap(toString().getBytes(Charset.defaultCharset()))); + final byte[] bytes = toString().getBytes(StandardCharsets.UTF_8); + data = Optional.of(bytes); lastModified = System.currentTimeMillis(); } }; @@ -200,17 +200,17 @@ public long getLastModified() { @Override public boolean delete() { - this.data = Optional.absent(); + this.data = Optional.empty(); this.lastModified = 0L; return true; } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("uri", toUri()) - .add("kind", kind) - .toString(); + return "InMemoryJavaFileObject{" + + "uri=" + uri + + ", kind=" + kind + + '}'; } } diff --git a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/JavaFileObjects.java b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/JavaFileObjects.java new file mode 100644 index 00000000000..56027838efd --- /dev/null +++ b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/JavaFileObjects.java @@ -0,0 +1,146 @@ +/* + * Copyright 2017-2020 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.micronaut.annotation.processing.test; + + +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import java.io.*; +import java.net.URI; +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.Objects; + +import static javax.tools.JavaFileObject.Kind.SOURCE; + +/** + * A utility class for creating {@link JavaFileObject} instances. + * + * @author Gregory Kick + */ +final class JavaFileObjects { + private JavaFileObjects() { } + + /** + * Creates a {@link JavaFileObject} with a path corresponding to the {@code fullyQualifiedName} + * containing the give {@code source}. The returned object will always be read-only and have the + * {@link javax.tools.JavaFileObject.Kind#SOURCE} {@linkplain JavaFileObject#getKind() kind}. + * + *

Note that this method makes no attempt to verify that the name matches the contents of the + * source and compilation errors may result if they do not match. + * + * @param fullyQualifiedName the fully qualified name + * @param source The source + * @return the java file object + */ + static JavaFileObject forSourceString(String fullyQualifiedName, String source) { + Objects.requireNonNull(fullyQualifiedName); + if (fullyQualifiedName.startsWith("package ")) { + throw new IllegalArgumentException( + String.format("fullyQualifiedName starts with \"package\" (%s). Did you forget to " + + "specify the name and specify just the source text?", fullyQualifiedName)); + } + return new StringSourceJavaFileObject(fullyQualifiedName, Objects.requireNonNull(source)); + } + + /** + * Behaves exactly like {@link #forSourceString}, but joins lines so that multi-line source + * strings may omit the newline characters. For example: 

   {@code
+     *
+     *   JavaFileObjects.forSourceLines("example.HelloWorld",
+     *       "package example;",
+     *       "",
+     *       "final class HelloWorld {",
+     *       "  void sayHello() {",
+     *       "    System.out.println(\"hello!\");",
+     *       "  }",
+     *       "}");
+     *   }
+ * + * @param fullyQualifiedName the fully qualified name + * @param lines The source + * @return The java file object + */ + static JavaFileObject forSourceLines(String fullyQualifiedName, String... lines) { + return forSourceLines(fullyQualifiedName, Arrays.asList(lines)); + } + + /** + * An overload of {@code #forSourceLines} that takes an {@code Iterable}. + * + * @param fullyQualifiedName the fully qualified name + * @param lines The source + * @return The java file object + **/ + static JavaFileObject forSourceLines(String fullyQualifiedName, Iterable lines) { + return forSourceString(fullyQualifiedName, String.join("\n", lines)); + } + + /** + * in-memory source file object. + */ + private static final class StringSourceJavaFileObject extends SimpleJavaFileObject { + final String source; + final long lastModified; + + /** + * Default constructor. + * @param fullyQualifiedName the fully qualified name + * @param source The source + */ + StringSourceJavaFileObject(String fullyQualifiedName, String source) { + super(createUri(fullyQualifiedName), SOURCE); + this.source = source; + this.lastModified = System.currentTimeMillis(); + } + + private static URI createUri(String fullyQualifiedClassName) { + return URI.create(fullyQualifiedClassName.replace('.', '/') + + SOURCE.extension); + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return source; + } + + @Override + public OutputStream openOutputStream() { + throw new IllegalStateException(); + } + + @Override + public InputStream openInputStream() { + return new ByteArrayInputStream(source.getBytes(Charset.defaultCharset())); + } + + @Override + public Writer openWriter() { + throw new IllegalStateException(); + } + + @Override + public Reader openReader(boolean ignoreEncodingErrors) { + return new StringReader(source); + } + + @Override + public long getLastModified() { + return lastModified; + } + } + +} diff --git a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/JavaParser.java b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/JavaParser.java index dca12f5c9df..9bcc8982cd3 100644 --- a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/JavaParser.java +++ b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/JavaParser.java @@ -15,14 +15,13 @@ */ package io.micronaut.annotation.processing.test; -import com.google.testing.compile.JavaFileObjects; import com.sun.source.util.JavacTask; import com.sun.tools.javac.api.JavacTool; import com.sun.tools.javac.util.Context; import io.micronaut.annotation.processing.*; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.util.CollectionUtils; import spock.util.environment.Jvm; @@ -39,6 +38,7 @@ /** * Utility for parsing Java code. + * NOTE: Forked from Google Compile Testing Project * * @author graemerocher * @since 1.1 diff --git a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/Parser.java b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/Parser.java index e6622b571ee..6ae3c778621 100644 --- a/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/Parser.java +++ b/inject-java-test/src/main/groovy/io/micronaut/annotation/processing/test/Parser.java @@ -15,26 +15,21 @@ */ package io.micronaut.annotation.processing.test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableListMultimap; -import com.google.testing.compile.JavaFileObjects; -import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.ErroneousTree; import com.sun.source.tree.Tree; import com.sun.source.util.TreeScanner; -import com.sun.source.util.Trees; import javax.lang.model.element.Element; -import javax.tools.Diagnostic; import javax.tools.JavaFileObject; import java.io.File; -import java.util.Collections; - -import static com.google.common.base.MoreObjects.firstNonNull; import static java.lang.Boolean.TRUE; -/** Methods to parse Java source files. */ +/** + * Methods to parse Java source files. + * NOTE: Forked from Google Compile Testing Project + * + **/ @SuppressWarnings("all") public final class Parser { @@ -47,7 +42,7 @@ public Boolean visitErroneous(ErroneousTree node, Boolean p) { @Override public Boolean scan(Iterable nodes, Boolean p) { - for (Tree node : firstNonNull(nodes, Collections.emptyList())) { + for (Tree node : nodes) { if (isTrue(scan(node, p))) { return true; } @@ -122,44 +117,4 @@ private static boolean isTrue(Boolean p) { return TRUE.equals(p); } - /** - * The diagnostic, parse trees, and {@link Trees} instance for a parse task. - * - *

Note: It is possible for the {@link Trees} instance contained within a {@code ParseResult} - * to be invalidated by a call to {@link com.sun.tools.javac.api.JavacTaskImpl#cleanup()}. Though - * we do not currently expose the {@link com.sun.source.util.JavacTask} used to create a {@code ParseResult} to {@code - * cleanup()} calls on its underlying implementation, this should be acknowledged as an - * implementation detail that could cause unexpected behavior when making calls to methods in - * {@link Trees}. - */ - public static final class ParseResult { - - - private final ImmutableListMultimap> - diagnostics; - private final ImmutableList compilationUnits; - private final Trees trees; - - ParseResult( - ImmutableListMultimap> diagnostics, - Iterable compilationUnits, - Trees trees) { - this.trees = trees; - this.compilationUnits = ImmutableList.copyOf(compilationUnits); - this.diagnostics = diagnostics; - } - - public ImmutableListMultimap> diagnosticsByKind() { - return diagnostics; - } - - public Iterable compilationUnits() { - return compilationUnits; - } - - public Trees trees() { - return trees; - } - - } } diff --git a/inject-java-test/src/test/groovy/io/micronaut/inject/annotation/ToTransformRetentionTransformer.java b/inject-java-test/src/test/groovy/io/micronaut/inject/annotation/ToTransformRetentionTransformer.java index a60d70f7224..52a94017184 100644 --- a/inject-java-test/src/test/groovy/io/micronaut/inject/annotation/ToTransformRetentionTransformer.java +++ b/inject-java-test/src/test/groovy/io/micronaut/inject/annotation/ToTransformRetentionTransformer.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.AnnotationValue; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.lang.annotation.RetentionPolicy; import java.util.Collections; diff --git a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/AllClassesVisitor.java b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/AllClassesVisitor.java index 6e8d98e1146..131b42d1907 100644 --- a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/AllClassesVisitor.java +++ b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/AllClassesVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.inject.ast.ClassElement; import io.micronaut.inject.ast.FieldElement; import io.micronaut.inject.ast.MethodElement; diff --git a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/NonNullBean.java b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/NonNullBean.java index 45d44f0f01e..27b84107136 100644 --- a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/NonNullBean.java +++ b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/NonNullBean.java @@ -1,6 +1,6 @@ package io.micronaut.inject.visitor.beans; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Creator; import io.micronaut.core.annotation.Introspected; diff --git a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/NullabilityBean.java b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/NullabilityBean.java index 4b1f0de4c7f..82f34ef2b86 100644 --- a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/NullabilityBean.java +++ b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/NullabilityBean.java @@ -1,6 +1,6 @@ package io.micronaut.inject.visitor.beans; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Introspected; @Introspected diff --git a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/TestEntityAnnotationMapper.java b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/TestEntityAnnotationMapper.java index df1a6afce01..2f2daca0744 100644 --- a/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/TestEntityAnnotationMapper.java +++ b/inject-java-test/src/test/groovy/io/micronaut/inject/visitor/beans/TestEntityAnnotationMapper.java @@ -21,7 +21,7 @@ import io.micronaut.inject.annotation.NamedAnnotationMapper; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.List; diff --git a/inject-java/build.gradle b/inject-java/build.gradle index 8e18c966877..d59e311cc55 100644 --- a/inject-java/build.gradle +++ b/inject-java/build.gradle @@ -7,12 +7,12 @@ dependencies { } compileOnly dependencyVersion("validation") - testImplementation 'com.github.spotbugs:spotbugs-annotations:4.1.2' testImplementation project(':aop') testAnnotationProcessor project(":inject-java") testImplementation project(":inject-test-utils") testImplementation project(":runtime") testImplementation dependencyVersion("rxjava2") + testImplementation dependencyVersion("spotbugs") testImplementation "org.hibernate:hibernate-core:5.4.27.Final" testImplementation "junit:junit:4.13.1" testImplementation "com.google.testing.compile:compile-testing:0.19" diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/AbstractInjectAnnotationProcessor.java b/inject-java/src/main/java/io/micronaut/annotation/processing/AbstractInjectAnnotationProcessor.java index 9f572abf5f8..3eddd164242 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/AbstractInjectAnnotationProcessor.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/AbstractInjectAnnotationProcessor.java @@ -20,7 +20,7 @@ import io.micronaut.core.convert.value.MutableConvertibleValuesMap; import io.micronaut.core.util.CollectionUtils; import io.micronaut.inject.annotation.AbstractAnnotationMetadataBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Filer; import javax.annotation.processing.Messager; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/AnnotationProcessingOutputVisitor.java b/inject-java/src/main/java/io/micronaut/annotation/processing/AnnotationProcessingOutputVisitor.java index 525b0d81dc8..739f013a3a4 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/AnnotationProcessingOutputVisitor.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/AnnotationProcessingOutputVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.annotation.processing; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.util.ArrayUtils; import io.micronaut.inject.writer.AbstractClassWriterOutputVisitor; import io.micronaut.inject.writer.ClassGenerationException; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/AnnotationUtils.java b/inject-java/src/main/java/io/micronaut/annotation/processing/AnnotationUtils.java index d3fcb41e6c7..050555fa459 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/AnnotationUtils.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/AnnotationUtils.java @@ -27,7 +27,7 @@ import io.micronaut.inject.annotation.AnnotatedElementValidator; import io.micronaut.inject.annotation.AbstractAnnotationMetadataBuilder; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.annotation.processing.Filer; import javax.annotation.processing.Messager; import javax.annotation.processing.ProcessingEnvironment; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java b/inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java index be0ffb66ab8..0f76b9dabd0 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java @@ -15,8 +15,8 @@ */ package io.micronaut.annotation.processing; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.annotation.processing.visitor.JavaElementFactory; import io.micronaut.annotation.processing.visitor.JavaMethodElement; import io.micronaut.annotation.processing.visitor.JavaVisitorContext; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/GenericUtils.java b/inject-java/src/main/java/io/micronaut/annotation/processing/GenericUtils.java index 6cc86e4d91c..08896ee0922 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/GenericUtils.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/GenericUtils.java @@ -15,8 +15,8 @@ */ package io.micronaut.annotation.processing; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Internal; import io.micronaut.core.util.CollectionUtils; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/JavaAnnotationMetadataBuilder.java b/inject-java/src/main/java/io/micronaut/annotation/processing/JavaAnnotationMetadataBuilder.java index e9c707246c6..2aba748fa68 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/JavaAnnotationMetadataBuilder.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/JavaAnnotationMetadataBuilder.java @@ -26,8 +26,8 @@ import io.micronaut.inject.processing.JavaModelUtils; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.annotation.processing.Messager; import javax.lang.model.element.*; import javax.lang.model.type.ArrayType; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/JavaConfigurationMetadataBuilder.java b/inject-java/src/main/java/io/micronaut/annotation/processing/JavaConfigurationMetadataBuilder.java index 1633105bdf9..39f51bf52ef 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/JavaConfigurationMetadataBuilder.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/JavaConfigurationMetadataBuilder.java @@ -15,7 +15,7 @@ */ package io.micronaut.annotation.processing; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.annotation.processing.visitor.JavaClassElement; import io.micronaut.context.annotation.ConfigurationReader; import io.micronaut.context.annotation.EachProperty; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/ModelUtils.java b/inject-java/src/main/java/io/micronaut/annotation/processing/ModelUtils.java index cc265cca8a6..b99acc2fb30 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/ModelUtils.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/ModelUtils.java @@ -15,7 +15,7 @@ */ package io.micronaut.annotation.processing; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Creator; import io.micronaut.core.annotation.Internal; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/TypeElementVisitorProcessor.java b/inject-java/src/main/java/io/micronaut/annotation/processing/TypeElementVisitorProcessor.java index c7a3dc51536..5911e0caef7 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/TypeElementVisitorProcessor.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/TypeElementVisitorProcessor.java @@ -30,7 +30,7 @@ import io.micronaut.inject.processing.JavaModelUtils; import io.micronaut.inject.visitor.TypeElementVisitor; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedOptions; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/AbstractJavaElement.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/AbstractJavaElement.java index 22caf4f6c37..38d0057f854 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/AbstractJavaElement.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/AbstractJavaElement.java @@ -25,7 +25,7 @@ import io.micronaut.inject.ast.ClassElement; import io.micronaut.inject.ast.MemberElement; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.inject.ast.ParameterElement; import io.micronaut.inject.ast.PrimitiveElement; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaClassElement.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaClassElement.java index 0da69cd9fcd..2fe27c1c5e5 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaClassElement.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaClassElement.java @@ -15,7 +15,7 @@ */ package io.micronaut.annotation.processing.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.annotation.processing.AnnotationUtils; import io.micronaut.annotation.processing.ModelUtils; import io.micronaut.annotation.processing.PublicMethodVisitor; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaElementFactory.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaElementFactory.java index cc3a1831f08..5f32af2d875 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaElementFactory.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaElementFactory.java @@ -15,8 +15,8 @@ */ package io.micronaut.annotation.processing.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.inject.ast.*; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaFieldElement.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaFieldElement.java index 4d467a3fbfb..442c59c9ac0 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaFieldElement.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaFieldElement.java @@ -20,7 +20,7 @@ import io.micronaut.inject.ast.ClassElement; import io.micronaut.inject.ast.FieldElement; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaMethodElement.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaMethodElement.java index 937c9fedb39..b064994a8d7 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaMethodElement.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaMethodElement.java @@ -23,7 +23,7 @@ import io.micronaut.inject.ast.MethodElement; import io.micronaut.inject.ast.ParameterElement; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.inject.ast.PrimitiveElement; import javax.lang.model.element.*; @@ -208,7 +208,8 @@ protected ClassElement returnType(Map> info) { return mirrorToClassElement(tm, visitorContext, info, true); } } - return mirrorToClassElement(executableElement.getReturnType(), visitorContext, info, true); + final TypeMirror returnType = executableElement.getReturnType(); + return mirrorToClassElement(returnType, visitorContext, info, true); } private static boolean sameType(String type, DeclaredType dt) { diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaParameterElement.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaParameterElement.java index 476cb3e6d2a..9fb6b4057f2 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaParameterElement.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaParameterElement.java @@ -20,7 +20,7 @@ import io.micronaut.inject.ast.ClassElement; import io.micronaut.inject.ast.ParameterElement; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.lang.model.element.VariableElement; import javax.lang.model.type.TypeMirror; import java.util.Map; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaPropertyElement.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaPropertyElement.java index fe0344f8148..b3836413b97 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaPropertyElement.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaPropertyElement.java @@ -20,7 +20,7 @@ import io.micronaut.inject.ast.ClassElement; import io.micronaut.inject.ast.PropertyElement; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaVisitorContext.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaVisitorContext.java index 730d94db45c..0db5f2b421e 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaVisitorContext.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaVisitorContext.java @@ -15,8 +15,8 @@ */ package io.micronaut.annotation.processing.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.annotation.processing.AnnotationProcessingOutputVisitor; import io.micronaut.annotation.processing.AnnotationUtils; import io.micronaut.annotation.processing.GenericUtils; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaVoidElement.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaVoidElement.java index 857985cdbc8..8e64f13d62c 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaVoidElement.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/JavaVoidElement.java @@ -15,7 +15,7 @@ */ package io.micronaut.annotation.processing.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.AnnotationMetadataDelegate; import io.micronaut.core.annotation.Internal; diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/LoadedVisitor.java b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/LoadedVisitor.java index 881eb9b4ec1..51ed45f9b88 100644 --- a/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/LoadedVisitor.java +++ b/inject-java/src/main/java/io/micronaut/annotation/processing/visitor/LoadedVisitor.java @@ -22,7 +22,7 @@ import io.micronaut.core.reflect.GenericTypeUtils; import io.micronaut.inject.visitor.TypeElementVisitor; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.*; import javax.lang.model.type.TypeMirror; diff --git a/inject-java/src/test/groovy/io/micronaut/annotation/NullabilityAnnotationsSpec.groovy b/inject-java/src/test/groovy/io/micronaut/annotation/NullabilityAnnotationsSpec.groovy new file mode 100644 index 00000000000..ab52fcdf67a --- /dev/null +++ b/inject-java/src/test/groovy/io/micronaut/annotation/NullabilityAnnotationsSpec.groovy @@ -0,0 +1,33 @@ +package io.micronaut.annotation + +import io.micronaut.inject.AbstractTypeElementSpec +import io.micronaut.inject.ast.ElementQuery +import io.micronaut.inject.ast.MethodElement + +import javax.lang.model.element.TypeElement + +class NullabilityAnnotationsSpec extends AbstractTypeElementSpec { + + void "test map nullable annotation for #packageName"() { + given: + def element = buildClassElement(""" +package test; +import ${packageName}.*; +@javax.inject.Singleton +class Test { + @Nullable + String nullableMethod(@Nullable String test) { + return null; + } +} +""") + def nullableMethod = element.getEnclosedElement(ElementQuery.ALL_METHODS.named({ String st -> st == 'nullableMethod' })).get() + + expect: + nullableMethod.isNullable() + nullableMethod.parameters[0].isNullable() + + where: + packageName << ["io.micronaut.core.annotation", "javax.annotation", "org.jetbrains.annotations", "edu.umd.cs.findbugs.annotations"] + } +} diff --git a/inject-java/src/test/groovy/io/micronaut/inject/AbstractTypeElementSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/AbstractTypeElementSpec.groovy index b546c0fefab..b279da9679e 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/AbstractTypeElementSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/AbstractTypeElementSpec.groovy @@ -18,7 +18,7 @@ package io.micronaut.inject import com.sun.tools.javac.model.JavacElements import com.sun.tools.javac.processing.JavacProcessingEnvironment import com.sun.tools.javac.util.Context -import edu.umd.cs.findbugs.annotations.NonNull +import io.micronaut.core.annotation.NonNull import groovy.transform.CompileStatic import io.micronaut.annotation.processing.AnnotationUtils import io.micronaut.annotation.processing.GenericUtils diff --git a/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationMapperSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationMapperSpec.groovy index 3f0ea2bb773..ad313a1e0ca 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationMapperSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationMapperSpec.groovy @@ -1,7 +1,7 @@ package io.micronaut.inject.annotation -import edu.umd.cs.findbugs.annotations.NonNull +import io.micronaut.core.annotation.NonNull import io.micronaut.context.annotation.ConfigurationInject import io.micronaut.core.annotation.AnnotationValue import io.micronaut.core.annotation.Creator diff --git a/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationMetadataWriterSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationMetadataWriterSpec.groovy index 94c5e28f706..13c6e762561 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationMetadataWriterSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationMetadataWriterSpec.groovy @@ -47,7 +47,7 @@ class AnnotationMetadataWriterSpec extends AbstractTypeElementSpec { AnnotationMetadata metadata = buildMethodAnnotationMetadata('''\ package test; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; class Test { @Nullable diff --git a/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationRemapperSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationRemapperSpec.groovy index b26b662be5c..d51a2e1aeac 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationRemapperSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/annotation/AnnotationRemapperSpec.groovy @@ -1,7 +1,7 @@ package io.micronaut.inject.annotation -import edu.umd.cs.findbugs.annotations.NonNull -import edu.umd.cs.findbugs.annotations.Nullable +import io.micronaut.core.annotation.NonNull +import io.micronaut.core.annotation.Nullable import io.micronaut.core.annotation.AnnotationMetadata import io.micronaut.core.annotation.AnnotationUtil import io.micronaut.inject.AbstractTypeElementSpec @@ -13,7 +13,7 @@ class AnnotationRemapperSpec extends AbstractTypeElementSpec { AnnotationMetadata metadata = buildMethodArgumentAnnotationMetadata(''' package test; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @javax.inject.Singleton class Test { @@ -35,7 +35,7 @@ class Test { AnnotationMetadata metadata = buildMethodArgumentAnnotationMetadata(''' package test; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; @javax.inject.Singleton class Test { @@ -57,12 +57,12 @@ class Test { def definition = buildBeanDefinition('test.Test', ''' package test; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; @javax.inject.Singleton class Test { @io.micronaut.context.annotation.Executable - void test(@NonNull String one, @edu.umd.cs.findbugs.annotations.Nullable String two) { + void test(@NonNull String one, @io.micronaut.core.annotation.Nullable String two) { } } diff --git a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/inheritance/ParentEachPropsCtor.java b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/inheritance/ParentEachPropsCtor.java index 3a918c79fd9..ba0ab3052f2 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/inheritance/ParentEachPropsCtor.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/inheritance/ParentEachPropsCtor.java @@ -19,7 +19,7 @@ import io.micronaut.context.annotation.EachProperty; import io.micronaut.context.annotation.Parameter; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @EachProperty("teams") public class ParentEachPropsCtor { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/nullableinjection/B.java b/inject-java/src/test/groovy/io/micronaut/inject/constructor/nullableinjection/B.java index 140ca5a0ed3..cb4a4287117 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/nullableinjection/B.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/nullableinjection/B.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.constructor.nullableinjection; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; public class B { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/context/EagerInitFactory.java b/inject-java/src/test/groovy/io/micronaut/inject/context/EagerInitFactory.java index adbf632eab7..cce5afc3052 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/context/EagerInitFactory.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/context/EagerInitFactory.java @@ -1,6 +1,6 @@ package io.micronaut.inject.context; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.Bean; import io.micronaut.context.annotation.Factory; import io.micronaut.context.exceptions.DisabledBeanException; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/DProcessor.java b/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/DProcessor.java index 18c2e19c30c..2d5f7969e97 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/DProcessor.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/DProcessor.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.factory.nullreturn; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.EachBean; import io.micronaut.context.exceptions.DisabledBeanException; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullableDProcessor.java b/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullableDProcessor.java index f504d3d050c..ca4d981f9cd 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullableDProcessor.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullableDProcessor.java @@ -17,7 +17,7 @@ import io.micronaut.context.annotation.EachBean; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.concurrent.atomic.AtomicInteger; @EachBean(D.class) diff --git a/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullableFactory.java b/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullableFactory.java index 4875eae614c..7b1bca39262 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullableFactory.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/factory/nullreturn/NullableFactory.java @@ -17,7 +17,7 @@ import io.micronaut.context.annotation.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.condition.Condition; import io.micronaut.context.condition.ConditionContext; import io.micronaut.context.exceptions.DisabledBeanException; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/factory/parameterizedfactory/D.java b/inject-java/src/test/groovy/io/micronaut/inject/factory/parameterizedfactory/D.java index a26496ce602..b631318fa76 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/factory/parameterizedfactory/D.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/factory/parameterizedfactory/D.java @@ -18,7 +18,7 @@ import io.micronaut.context.annotation.Parameter; import io.micronaut.context.annotation.Prototype; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; @Prototype diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/nullableinjection/B.java b/inject-java/src/test/groovy/io/micronaut/inject/field/nullableinjection/B.java index 654e60cca2f..e9609219334 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/nullableinjection/B.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/nullableinjection/B.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.field.nullableinjection; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; public class B { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/nullableinjection/D.java b/inject-java/src/test/groovy/io/micronaut/inject/field/nullableinjection/D.java index dfb3643a50b..4f725515a12 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/nullableinjection/D.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/nullableinjection/D.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.field.nullableinjection; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Provider; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/foreach/SomeConfiguration.java b/inject-java/src/test/groovy/io/micronaut/inject/foreach/SomeConfiguration.java index dfba255bddd..24070f35ce1 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/foreach/SomeConfiguration.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/foreach/SomeConfiguration.java @@ -18,7 +18,7 @@ import io.micronaut.context.annotation.EachProperty; import io.micronaut.context.annotation.Parameter; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @EachProperty("someconf") public class SomeConfiguration { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/method/nullableinjection/B.java b/inject-java/src/test/groovy/io/micronaut/inject/method/nullableinjection/B.java index a89a35c5258..333d184a897 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/method/nullableinjection/B.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/method/nullableinjection/B.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.method.nullableinjection; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/property/ConstructorPropertyInject.java b/inject-java/src/test/groovy/io/micronaut/inject/property/ConstructorPropertyInject.java index a03b2a4a2c9..5bbf99cbe97 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/property/ConstructorPropertyInject.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/property/ConstructorPropertyInject.java @@ -18,7 +18,7 @@ import io.micronaut.context.annotation.Property; import io.micronaut.core.convert.format.MapFormat; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; import java.util.Map; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/property/FieldPropertyInject.java b/inject-java/src/test/groovy/io/micronaut/inject/property/FieldPropertyInject.java index 7d78d450bc8..67f8cff3a78 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/property/FieldPropertyInject.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/property/FieldPropertyInject.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.property; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.Property; import io.micronaut.core.convert.format.MapFormat; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/property/MethodPropertyInject.java b/inject-java/src/test/groovy/io/micronaut/inject/property/MethodPropertyInject.java index 36fc912b126..caf3f94f29c 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/property/MethodPropertyInject.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/property/MethodPropertyInject.java @@ -18,7 +18,7 @@ import io.micronaut.context.annotation.Property; import io.micronaut.core.convert.format.MapFormat; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; import java.util.Map; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/provider/EachBeanProvider.java b/inject-java/src/test/groovy/io/micronaut/inject/provider/EachBeanProvider.java index d6140af3917..adea15a6f34 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/provider/EachBeanProvider.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/provider/EachBeanProvider.java @@ -1,6 +1,6 @@ package io.micronaut.inject.provider; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.EachBean; import io.micronaut.context.annotation.Parameter; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/provider/ErrorEachBeanProvider.java b/inject-java/src/test/groovy/io/micronaut/inject/provider/ErrorEachBeanProvider.java index b15344a6518..3d676538df3 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/provider/ErrorEachBeanProvider.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/provider/ErrorEachBeanProvider.java @@ -1,6 +1,6 @@ package io.micronaut.inject.provider; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.EachBean; import io.micronaut.context.annotation.Parameter; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/provider/Seats.java b/inject-java/src/test/groovy/io/micronaut/inject/provider/Seats.java index 95ed2151262..7af07947445 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/provider/Seats.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/provider/Seats.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.provider; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import org.atinject.tck.auto.Drivers; import org.atinject.tck.auto.Seat; import org.atinject.tck.auto.Tire; diff --git a/inject-java/src/test/groovy/io/micronaut/inject/value/nullablevalue/A.java b/inject-java/src/test/groovy/io/micronaut/inject/value/nullablevalue/A.java index a31953d9d62..3a2323d4293 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/value/nullablevalue/A.java +++ b/inject-java/src/test/groovy/io/micronaut/inject/value/nullablevalue/A.java @@ -17,7 +17,7 @@ import io.micronaut.context.annotation.Value; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/inject-java/src/test/groovy/io/micronaut/visitors/InterfaceWithGenerics.java b/inject-java/src/test/groovy/io/micronaut/visitors/InterfaceWithGenerics.java index e9ee3ade0f1..4e9f7fffcf9 100644 --- a/inject-java/src/test/groovy/io/micronaut/visitors/InterfaceWithGenerics.java +++ b/inject-java/src/test/groovy/io/micronaut/visitors/InterfaceWithGenerics.java @@ -15,7 +15,7 @@ */ package io.micronaut.visitors; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.Optional; diff --git a/inject/src/main/java/io/micronaut/context/AbstractBeanContextConditional.java b/inject/src/main/java/io/micronaut/context/AbstractBeanContextConditional.java index 86fb8894706..d47f86c4d71 100644 --- a/inject/src/main/java/io/micronaut/context/AbstractBeanContextConditional.java +++ b/inject/src/main/java/io/micronaut/context/AbstractBeanContextConditional.java @@ -15,7 +15,7 @@ */ package io.micronaut.context; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.Requires; import io.micronaut.context.condition.Condition; import io.micronaut.context.condition.Failure; @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Abstract implementation of the {@link BeanContextConditional} interface. diff --git a/inject/src/main/java/io/micronaut/context/AbstractBeanDefinition.java b/inject/src/main/java/io/micronaut/context/AbstractBeanDefinition.java index 4529c32d0e7..44a0baeab46 100644 --- a/inject/src/main/java/io/micronaut/context/AbstractBeanDefinition.java +++ b/inject/src/main/java/io/micronaut/context/AbstractBeanDefinition.java @@ -38,8 +38,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Scope; diff --git a/inject/src/main/java/io/micronaut/context/AbstractBeanResolutionContext.java b/inject/src/main/java/io/micronaut/context/AbstractBeanResolutionContext.java index e2ba738af3b..3dbd454e639 100644 --- a/inject/src/main/java/io/micronaut/context/AbstractBeanResolutionContext.java +++ b/inject/src/main/java/io/micronaut/context/AbstractBeanResolutionContext.java @@ -22,8 +22,8 @@ import io.micronaut.core.type.Argument; import io.micronaut.inject.*; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.*; /** diff --git a/inject/src/main/java/io/micronaut/context/AbstractExecutable.java b/inject/src/main/java/io/micronaut/context/AbstractExecutable.java index 059065811ba..51c932c09cd 100644 --- a/inject/src/main/java/io/micronaut/context/AbstractExecutable.java +++ b/inject/src/main/java/io/micronaut/context/AbstractExecutable.java @@ -22,7 +22,7 @@ import io.micronaut.core.type.Executable; import io.micronaut.core.util.ArrayUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Objects; diff --git a/inject/src/main/java/io/micronaut/context/AbstractExecutableMethod.java b/inject/src/main/java/io/micronaut/context/AbstractExecutableMethod.java index 3312890474a..ef478781c5e 100644 --- a/inject/src/main/java/io/micronaut/context/AbstractExecutableMethod.java +++ b/inject/src/main/java/io/micronaut/context/AbstractExecutableMethod.java @@ -15,7 +15,7 @@ */ package io.micronaut.context; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.env.Environment; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Internal; @@ -26,7 +26,7 @@ import io.micronaut.inject.ExecutableMethod; import io.micronaut.inject.annotation.AbstractEnvironmentAnnotationMetadata; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/inject/src/main/java/io/micronaut/context/AbstractMessageSource.java b/inject/src/main/java/io/micronaut/context/AbstractMessageSource.java index 95d8e3b7e6d..f7286ac9370 100644 --- a/inject/src/main/java/io/micronaut/context/AbstractMessageSource.java +++ b/inject/src/main/java/io/micronaut/context/AbstractMessageSource.java @@ -17,7 +17,7 @@ import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Locale; import java.util.Objects; diff --git a/inject/src/main/java/io/micronaut/context/ApplicationContext.java b/inject/src/main/java/io/micronaut/context/ApplicationContext.java index 39fb2378178..f366da1bc16 100644 --- a/inject/src/main/java/io/micronaut/context/ApplicationContext.java +++ b/inject/src/main/java/io/micronaut/context/ApplicationContext.java @@ -25,8 +25,8 @@ import io.micronaut.core.value.PropertyResolver; import org.jetbrains.annotations.NotNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Collections; import java.util.Map; import java.util.function.Consumer; diff --git a/inject/src/main/java/io/micronaut/context/ApplicationContextBuilder.java b/inject/src/main/java/io/micronaut/context/ApplicationContextBuilder.java index d4cc164ae25..21163ee1b1a 100644 --- a/inject/src/main/java/io/micronaut/context/ApplicationContextBuilder.java +++ b/inject/src/main/java/io/micronaut/context/ApplicationContextBuilder.java @@ -19,8 +19,8 @@ import io.micronaut.context.env.PropertySource; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; import java.lang.annotation.Annotation; diff --git a/inject/src/main/java/io/micronaut/context/ApplicationContextConfiguration.java b/inject/src/main/java/io/micronaut/context/ApplicationContextConfiguration.java index c31c4aa3970..4afae70e37d 100644 --- a/inject/src/main/java/io/micronaut/context/ApplicationContextConfiguration.java +++ b/inject/src/main/java/io/micronaut/context/ApplicationContextConfiguration.java @@ -18,8 +18,8 @@ import io.micronaut.core.convert.ConversionService; import io.micronaut.core.io.scan.ClassPathResourceLoader; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Collections; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/context/BeanContext.java b/inject/src/main/java/io/micronaut/context/BeanContext.java index 7773144b5a7..0a811215d70 100644 --- a/inject/src/main/java/io/micronaut/context/BeanContext.java +++ b/inject/src/main/java/io/micronaut/context/BeanContext.java @@ -22,8 +22,8 @@ import io.micronaut.inject.validation.BeanDefinitionValidator; import org.jetbrains.annotations.NotNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Map; import java.util.Objects; import java.util.Optional; diff --git a/inject/src/main/java/io/micronaut/context/BeanContextConfiguration.java b/inject/src/main/java/io/micronaut/context/BeanContextConfiguration.java index 3f38367db41..9ba1d0942c2 100644 --- a/inject/src/main/java/io/micronaut/context/BeanContextConfiguration.java +++ b/inject/src/main/java/io/micronaut/context/BeanContextConfiguration.java @@ -15,7 +15,7 @@ */ package io.micronaut.context; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.ConfigurationReader; import javax.inject.Singleton; diff --git a/inject/src/main/java/io/micronaut/context/BeanDefinitionDelegate.java b/inject/src/main/java/io/micronaut/context/BeanDefinitionDelegate.java index db7e38a6c75..4ddf8d35cc4 100644 --- a/inject/src/main/java/io/micronaut/context/BeanDefinitionDelegate.java +++ b/inject/src/main/java/io/micronaut/context/BeanDefinitionDelegate.java @@ -15,8 +15,8 @@ */ package io.micronaut.context; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.Primary; import io.micronaut.context.exceptions.BeanInstantiationException; import io.micronaut.context.exceptions.NoSuchBeanException; diff --git a/inject/src/main/java/io/micronaut/context/BeanDefinitionRegistry.java b/inject/src/main/java/io/micronaut/context/BeanDefinitionRegistry.java index 1c7eedc65c9..58251e66d2e 100644 --- a/inject/src/main/java/io/micronaut/context/BeanDefinitionRegistry.java +++ b/inject/src/main/java/io/micronaut/context/BeanDefinitionRegistry.java @@ -21,8 +21,8 @@ import io.micronaut.inject.BeanDefinition; import io.micronaut.inject.BeanDefinitionReference; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Collection; import java.util.Optional; diff --git a/inject/src/main/java/io/micronaut/context/BeanLocator.java b/inject/src/main/java/io/micronaut/context/BeanLocator.java index 25f4e7dbb1a..6a5903fbe42 100644 --- a/inject/src/main/java/io/micronaut/context/BeanLocator.java +++ b/inject/src/main/java/io/micronaut/context/BeanLocator.java @@ -17,8 +17,8 @@ import io.micronaut.core.reflect.InstantiationUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.inject.BeanDefinition; import java.util.Collection; diff --git a/inject/src/main/java/io/micronaut/context/BeanResolutionContext.java b/inject/src/main/java/io/micronaut/context/BeanResolutionContext.java index 79e0d7d0e49..fbaee6796d0 100644 --- a/inject/src/main/java/io/micronaut/context/BeanResolutionContext.java +++ b/inject/src/main/java/io/micronaut/context/BeanResolutionContext.java @@ -20,7 +20,7 @@ import io.micronaut.core.value.ValueResolver; import io.micronaut.inject.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Deque; import java.util.Optional; diff --git a/inject/src/main/java/io/micronaut/context/DefaultApplicationContext.java b/inject/src/main/java/io/micronaut/context/DefaultApplicationContext.java index d31be63b4d9..08851445f83 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultApplicationContext.java +++ b/inject/src/main/java/io/micronaut/context/DefaultApplicationContext.java @@ -33,8 +33,8 @@ import io.micronaut.inject.BeanDefinitionReference; import io.micronaut.inject.qualifiers.Qualifiers; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Provider; import java.util.*; diff --git a/inject/src/main/java/io/micronaut/context/DefaultApplicationContextBuilder.java b/inject/src/main/java/io/micronaut/context/DefaultApplicationContextBuilder.java index 0d1a7f4f5d9..7ffb81e5e46 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultApplicationContextBuilder.java +++ b/inject/src/main/java/io/micronaut/context/DefaultApplicationContextBuilder.java @@ -15,8 +15,8 @@ */ package io.micronaut.context; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.env.CommandLinePropertySource; import io.micronaut.context.env.Environment; import io.micronaut.context.env.PropertySource; diff --git a/inject/src/main/java/io/micronaut/context/DefaultBeanContext.java b/inject/src/main/java/io/micronaut/context/DefaultBeanContext.java index 37a9060c7e8..287d880267c 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultBeanContext.java +++ b/inject/src/main/java/io/micronaut/context/DefaultBeanContext.java @@ -51,8 +51,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Provider; import javax.inject.Scope; diff --git a/inject/src/main/java/io/micronaut/context/DefaultBeanResolutionContext.java b/inject/src/main/java/io/micronaut/context/DefaultBeanResolutionContext.java index 0667d860cc1..356f5fc4128 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultBeanResolutionContext.java +++ b/inject/src/main/java/io/micronaut/context/DefaultBeanResolutionContext.java @@ -19,7 +19,7 @@ import io.micronaut.inject.BeanDefinition; import io.micronaut.inject.BeanIdentifier; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/inject/src/main/java/io/micronaut/context/DefaultConditionContext.java b/inject/src/main/java/io/micronaut/context/DefaultConditionContext.java index b63f0248946..cfe5cc3db7f 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultConditionContext.java +++ b/inject/src/main/java/io/micronaut/context/DefaultConditionContext.java @@ -15,13 +15,13 @@ */ package io.micronaut.context; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.condition.ConditionContext; import io.micronaut.context.condition.Failure; import io.micronaut.core.annotation.AnnotationMetadataProvider; import io.micronaut.core.annotation.Internal; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.value.PropertyResolver; import io.micronaut.inject.BeanDefinition; diff --git a/inject/src/main/java/io/micronaut/context/DefaultConstructorInjectionPoint.java b/inject/src/main/java/io/micronaut/context/DefaultConstructorInjectionPoint.java index df92e0750c2..35d0b38e65f 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultConstructorInjectionPoint.java +++ b/inject/src/main/java/io/micronaut/context/DefaultConstructorInjectionPoint.java @@ -26,7 +26,7 @@ import io.micronaut.inject.annotation.AbstractEnvironmentAnnotationMetadata; import io.micronaut.inject.annotation.DefaultAnnotationMetadata; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.lang.reflect.Constructor; import java.util.Arrays; import java.util.Objects; diff --git a/inject/src/main/java/io/micronaut/context/DefaultFieldInjectionPoint.java b/inject/src/main/java/io/micronaut/context/DefaultFieldInjectionPoint.java index 64a7c25a8fb..0fd5bd79d1c 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultFieldInjectionPoint.java +++ b/inject/src/main/java/io/micronaut/context/DefaultFieldInjectionPoint.java @@ -26,7 +26,7 @@ import io.micronaut.inject.annotation.AbstractEnvironmentAnnotationMetadata; import io.micronaut.inject.annotation.DefaultAnnotationMetadata; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.Objects; diff --git a/inject/src/main/java/io/micronaut/context/DefaultMessageContext.java b/inject/src/main/java/io/micronaut/context/DefaultMessageContext.java index 98bc9c32618..65b693f417a 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultMessageContext.java +++ b/inject/src/main/java/io/micronaut/context/DefaultMessageContext.java @@ -17,8 +17,8 @@ import io.micronaut.core.annotation.Internal; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Collections; import java.util.Locale; import java.util.Map; diff --git a/inject/src/main/java/io/micronaut/context/DefaultMethodConstructorInjectionPoint.java b/inject/src/main/java/io/micronaut/context/DefaultMethodConstructorInjectionPoint.java index 8cbbc34e4bd..8f5f5d5e058 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultMethodConstructorInjectionPoint.java +++ b/inject/src/main/java/io/micronaut/context/DefaultMethodConstructorInjectionPoint.java @@ -21,7 +21,7 @@ import io.micronaut.inject.BeanDefinition; import io.micronaut.inject.ConstructorInjectionPoint; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** * A {@link ConstructorInjectionPoint} that invokes a method without relying on reflection. diff --git a/inject/src/main/java/io/micronaut/context/DefaultMethodInjectionPoint.java b/inject/src/main/java/io/micronaut/context/DefaultMethodInjectionPoint.java index 3a1b34c3299..1d24c3c2d96 100644 --- a/inject/src/main/java/io/micronaut/context/DefaultMethodInjectionPoint.java +++ b/inject/src/main/java/io/micronaut/context/DefaultMethodInjectionPoint.java @@ -23,7 +23,7 @@ import io.micronaut.inject.BeanDefinition; import io.micronaut.inject.MethodInjectionPoint; import io.micronaut.inject.annotation.AbstractEnvironmentAnnotationMetadata; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import java.lang.reflect.Method; diff --git a/inject/src/main/java/io/micronaut/context/EnvironmentAwareArgument.java b/inject/src/main/java/io/micronaut/context/EnvironmentAwareArgument.java index 1a83f57883b..0a4231124e0 100644 --- a/inject/src/main/java/io/micronaut/context/EnvironmentAwareArgument.java +++ b/inject/src/main/java/io/micronaut/context/EnvironmentAwareArgument.java @@ -22,7 +22,7 @@ import io.micronaut.inject.annotation.AbstractEnvironmentAnnotationMetadata; import io.micronaut.inject.annotation.DefaultAnnotationMetadata; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** * An argument that is aware of the environment to resolve property placeholders diff --git a/inject/src/main/java/io/micronaut/context/LifeCycle.java b/inject/src/main/java/io/micronaut/context/LifeCycle.java index 33185975184..f03d767e3c7 100644 --- a/inject/src/main/java/io/micronaut/context/LifeCycle.java +++ b/inject/src/main/java/io/micronaut/context/LifeCycle.java @@ -15,7 +15,7 @@ */ package io.micronaut.context; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.io.Closeable; /** diff --git a/inject/src/main/java/io/micronaut/context/MessageSource.java b/inject/src/main/java/io/micronaut/context/MessageSource.java index 52cec464ab9..58a7281dff2 100644 --- a/inject/src/main/java/io/micronaut/context/MessageSource.java +++ b/inject/src/main/java/io/micronaut/context/MessageSource.java @@ -19,8 +19,8 @@ import io.micronaut.core.annotation.Indexed; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; import java.util.Collections; import java.util.Locale; diff --git a/inject/src/main/java/io/micronaut/context/ReflectionFieldInjectionPoint.java b/inject/src/main/java/io/micronaut/context/ReflectionFieldInjectionPoint.java index 3509e7f12e9..0d78936daec 100644 --- a/inject/src/main/java/io/micronaut/context/ReflectionFieldInjectionPoint.java +++ b/inject/src/main/java/io/micronaut/context/ReflectionFieldInjectionPoint.java @@ -21,7 +21,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.inject.BeanDefinition; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** * A field injection point invoked via reflection. diff --git a/inject/src/main/java/io/micronaut/context/ReflectionMethodConstructorInjectionPoint.java b/inject/src/main/java/io/micronaut/context/ReflectionMethodConstructorInjectionPoint.java index 2391d1c50a3..b9c172a4aa8 100644 --- a/inject/src/main/java/io/micronaut/context/ReflectionMethodConstructorInjectionPoint.java +++ b/inject/src/main/java/io/micronaut/context/ReflectionMethodConstructorInjectionPoint.java @@ -22,7 +22,7 @@ import io.micronaut.inject.BeanDefinition; import io.micronaut.inject.ConstructorInjectionPoint; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** *

Calls a method that constructs the object.

diff --git a/inject/src/main/java/io/micronaut/context/ReflectionMethodInjectionPoint.java b/inject/src/main/java/io/micronaut/context/ReflectionMethodInjectionPoint.java index fb7694180b8..890e4e0afd8 100644 --- a/inject/src/main/java/io/micronaut/context/ReflectionMethodInjectionPoint.java +++ b/inject/src/main/java/io/micronaut/context/ReflectionMethodInjectionPoint.java @@ -21,7 +21,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.inject.BeanDefinition; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** * Represents an injection point for a method that requires reflection. diff --git a/inject/src/main/java/io/micronaut/context/StaticMessageSource.java b/inject/src/main/java/io/micronaut/context/StaticMessageSource.java index 6e6440fc79c..9cc85349702 100644 --- a/inject/src/main/java/io/micronaut/context/StaticMessageSource.java +++ b/inject/src/main/java/io/micronaut/context/StaticMessageSource.java @@ -18,7 +18,7 @@ import io.micronaut.core.util.ArgumentUtils; import io.micronaut.core.util.StringUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Locale; import java.util.Map; import java.util.Optional; diff --git a/inject/src/main/java/io/micronaut/context/condition/ConditionContext.java b/inject/src/main/java/io/micronaut/context/condition/ConditionContext.java index 7b73140d0c3..2b344a788e1 100644 --- a/inject/src/main/java/io/micronaut/context/condition/ConditionContext.java +++ b/inject/src/main/java/io/micronaut/context/condition/ConditionContext.java @@ -20,7 +20,7 @@ import io.micronaut.context.BeanResolutionContext; import io.micronaut.core.annotation.AnnotationMetadataProvider; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.value.PropertyResolver; import java.util.Collections; diff --git a/inject/src/main/java/io/micronaut/context/env/DefaultEnvironment.java b/inject/src/main/java/io/micronaut/context/env/DefaultEnvironment.java index 0209c984c83..b10d26ad1e3 100644 --- a/inject/src/main/java/io/micronaut/context/env/DefaultEnvironment.java +++ b/inject/src/main/java/io/micronaut/context/env/DefaultEnvironment.java @@ -15,8 +15,8 @@ */ package io.micronaut.context.env; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.ApplicationContextConfiguration; import io.micronaut.context.exceptions.ConfigurationException; import io.micronaut.core.convert.ConversionContext; diff --git a/inject/src/main/java/io/micronaut/context/env/DefaultPropertyPlaceholderResolver.java b/inject/src/main/java/io/micronaut/context/env/DefaultPropertyPlaceholderResolver.java index 56376699278..37b6b9fb035 100644 --- a/inject/src/main/java/io/micronaut/context/env/DefaultPropertyPlaceholderResolver.java +++ b/inject/src/main/java/io/micronaut/context/env/DefaultPropertyPlaceholderResolver.java @@ -21,7 +21,7 @@ import io.micronaut.core.util.StringUtils; import io.micronaut.core.value.PropertyResolver; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/context/env/Environment.java b/inject/src/main/java/io/micronaut/context/env/Environment.java index 63bf09c6926..af193a228e5 100644 --- a/inject/src/main/java/io/micronaut/context/env/Environment.java +++ b/inject/src/main/java/io/micronaut/context/env/Environment.java @@ -25,7 +25,7 @@ import io.micronaut.core.value.PropertyResolver; import io.micronaut.inject.BeanConfiguration; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.Collection; diff --git a/inject/src/main/java/io/micronaut/context/env/EnvironmentPropertySource.java b/inject/src/main/java/io/micronaut/context/env/EnvironmentPropertySource.java index 62fd3dafcbe..edcadbacd7d 100644 --- a/inject/src/main/java/io/micronaut/context/env/EnvironmentPropertySource.java +++ b/inject/src/main/java/io/micronaut/context/env/EnvironmentPropertySource.java @@ -15,7 +15,7 @@ */ package io.micronaut.context.env; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.HashMap; import java.util.Iterator; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/context/env/PropertyPlaceholderResolver.java b/inject/src/main/java/io/micronaut/context/env/PropertyPlaceholderResolver.java index 588a0763157..e853148cb0c 100644 --- a/inject/src/main/java/io/micronaut/context/env/PropertyPlaceholderResolver.java +++ b/inject/src/main/java/io/micronaut/context/env/PropertyPlaceholderResolver.java @@ -17,7 +17,7 @@ import io.micronaut.context.exceptions.ConfigurationException; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Optional; /** diff --git a/inject/src/main/java/io/micronaut/context/env/PropertySourcePropertyResolver.java b/inject/src/main/java/io/micronaut/context/env/PropertySourcePropertyResolver.java index 8836f41cea4..5c5210b424b 100644 --- a/inject/src/main/java/io/micronaut/context/env/PropertySourcePropertyResolver.java +++ b/inject/src/main/java/io/micronaut/context/env/PropertySourcePropertyResolver.java @@ -33,8 +33,8 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; diff --git a/inject/src/main/java/io/micronaut/context/event/ApplicationEventPublisher.java b/inject/src/main/java/io/micronaut/context/event/ApplicationEventPublisher.java index b0fe0873c51..9d4303a2d3c 100644 --- a/inject/src/main/java/io/micronaut/context/event/ApplicationEventPublisher.java +++ b/inject/src/main/java/io/micronaut/context/event/ApplicationEventPublisher.java @@ -15,7 +15,7 @@ */ package io.micronaut.context.event; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; diff --git a/inject/src/main/java/io/micronaut/context/i18n/ResourceBundleMessageSource.java b/inject/src/main/java/io/micronaut/context/i18n/ResourceBundleMessageSource.java index 3a4888acad5..059f119624f 100644 --- a/inject/src/main/java/io/micronaut/context/i18n/ResourceBundleMessageSource.java +++ b/inject/src/main/java/io/micronaut/context/i18n/ResourceBundleMessageSource.java @@ -21,8 +21,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/inject/src/main/java/io/micronaut/inject/ArgumentBeanType.java b/inject/src/main/java/io/micronaut/inject/ArgumentBeanType.java index 9571390ed0f..9cdbfbda235 100644 --- a/inject/src/main/java/io/micronaut/inject/ArgumentBeanType.java +++ b/inject/src/main/java/io/micronaut/inject/ArgumentBeanType.java @@ -15,14 +15,14 @@ */ package io.micronaut.inject; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.BeanContext; import io.micronaut.context.BeanResolutionContext; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.type.Argument; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Map; /** diff --git a/inject/src/main/java/io/micronaut/inject/ArgumentInjectionPoint.java b/inject/src/main/java/io/micronaut/inject/ArgumentInjectionPoint.java index 3834183403a..df268e39453 100644 --- a/inject/src/main/java/io/micronaut/inject/ArgumentInjectionPoint.java +++ b/inject/src/main/java/io/micronaut/inject/ArgumentInjectionPoint.java @@ -17,7 +17,7 @@ import io.micronaut.core.type.Argument; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * An injection point for a method or constructor argument. diff --git a/inject/src/main/java/io/micronaut/inject/BeanContextConditional.java b/inject/src/main/java/io/micronaut/inject/BeanContextConditional.java index 8afe924d0e3..d7bb2e71375 100644 --- a/inject/src/main/java/io/micronaut/inject/BeanContextConditional.java +++ b/inject/src/main/java/io/micronaut/inject/BeanContextConditional.java @@ -15,10 +15,10 @@ */ package io.micronaut.inject; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.BeanContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.BeanResolutionContext; /** diff --git a/inject/src/main/java/io/micronaut/inject/BeanDefinition.java b/inject/src/main/java/io/micronaut/inject/BeanDefinition.java index 8b18f3fe097..6d9d055e75c 100644 --- a/inject/src/main/java/io/micronaut/inject/BeanDefinition.java +++ b/inject/src/main/java/io/micronaut/inject/BeanDefinition.java @@ -15,8 +15,8 @@ */ package io.micronaut.inject; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.BeanContext; import io.micronaut.context.BeanResolutionContext; import io.micronaut.context.Qualifier; diff --git a/inject/src/main/java/io/micronaut/inject/DelegatingBeanDefinition.java b/inject/src/main/java/io/micronaut/inject/DelegatingBeanDefinition.java index d09a3a4e856..88793dce546 100644 --- a/inject/src/main/java/io/micronaut/inject/DelegatingBeanDefinition.java +++ b/inject/src/main/java/io/micronaut/inject/DelegatingBeanDefinition.java @@ -15,13 +15,13 @@ */ package io.micronaut.inject; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.BeanContext; import io.micronaut.context.BeanResolutionContext; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.type.Argument; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.Collection; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/inject/ExecutionHandle.java b/inject/src/main/java/io/micronaut/inject/ExecutionHandle.java index 09ee8a72223..612a43c3861 100644 --- a/inject/src/main/java/io/micronaut/inject/ExecutionHandle.java +++ b/inject/src/main/java/io/micronaut/inject/ExecutionHandle.java @@ -20,7 +20,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.core.type.ReturnType; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.reflect.Method; /** diff --git a/inject/src/main/java/io/micronaut/inject/InjectionPoint.java b/inject/src/main/java/io/micronaut/inject/InjectionPoint.java index 097a7aab56c..62fbb1988f5 100644 --- a/inject/src/main/java/io/micronaut/inject/InjectionPoint.java +++ b/inject/src/main/java/io/micronaut/inject/InjectionPoint.java @@ -17,7 +17,7 @@ import io.micronaut.core.annotation.AnnotationMetadataProvider; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * An injection point as a point in a class definition where dependency injection is required. diff --git a/inject/src/main/java/io/micronaut/inject/MethodExecutionHandle.java b/inject/src/main/java/io/micronaut/inject/MethodExecutionHandle.java index c0c9be5ec09..b252cbedb81 100644 --- a/inject/src/main/java/io/micronaut/inject/MethodExecutionHandle.java +++ b/inject/src/main/java/io/micronaut/inject/MethodExecutionHandle.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Represents an execution handle that invokes a method. diff --git a/inject/src/main/java/io/micronaut/inject/MethodReference.java b/inject/src/main/java/io/micronaut/inject/MethodReference.java index 56a25cba75c..0116de9a028 100644 --- a/inject/src/main/java/io/micronaut/inject/MethodReference.java +++ b/inject/src/main/java/io/micronaut/inject/MethodReference.java @@ -20,7 +20,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.core.type.ReturnType; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/inject/src/main/java/io/micronaut/inject/ValidatedBeanDefinition.java b/inject/src/main/java/io/micronaut/inject/ValidatedBeanDefinition.java index 3f032ae3f68..54967b05de2 100644 --- a/inject/src/main/java/io/micronaut/inject/ValidatedBeanDefinition.java +++ b/inject/src/main/java/io/micronaut/inject/ValidatedBeanDefinition.java @@ -20,8 +20,8 @@ import io.micronaut.core.type.Argument; import io.micronaut.inject.validation.BeanDefinitionValidator; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; /** * A bean definition that is validated with javax.validation. diff --git a/inject/src/main/java/io/micronaut/inject/annotation/AbstractAnnotationMetadata.java b/inject/src/main/java/io/micronaut/inject/annotation/AbstractAnnotationMetadata.java index cf194d7496b..25ddffa534e 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/AbstractAnnotationMetadata.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/AbstractAnnotationMetadata.java @@ -23,8 +23,8 @@ import io.micronaut.core.util.ArgumentUtils; import io.micronaut.core.util.CollectionUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/AbstractAnnotationMetadataBuilder.java b/inject/src/main/java/io/micronaut/inject/annotation/AbstractAnnotationMetadataBuilder.java index 57986ccef44..9a30b2c6ac2 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/AbstractAnnotationMetadataBuilder.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/AbstractAnnotationMetadataBuilder.java @@ -27,8 +27,8 @@ import io.micronaut.core.value.OptionalValues; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Scope; import java.lang.annotation.Annotation; import java.lang.annotation.RetentionPolicy; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/AbstractEnvironmentAnnotationMetadata.java b/inject/src/main/java/io/micronaut/inject/annotation/AbstractEnvironmentAnnotationMetadata.java index a72aac6040d..b8a5609bd31 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/AbstractEnvironmentAnnotationMetadata.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/AbstractEnvironmentAnnotationMetadata.java @@ -15,8 +15,8 @@ */ package io.micronaut.inject.annotation; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.env.Environment; import io.micronaut.context.env.PropertyPlaceholderResolver; import io.micronaut.core.annotation.AnnotationMetadata; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/AnnotatedElementValidator.java b/inject/src/main/java/io/micronaut/inject/annotation/AnnotatedElementValidator.java index 42a04beda11..757b2539c61 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/AnnotatedElementValidator.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/AnnotatedElementValidator.java @@ -17,8 +17,8 @@ import io.micronaut.core.annotation.AnnotatedElement; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Set; /** diff --git a/inject/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataHierarchy.java b/inject/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataHierarchy.java index b54f1e75cf3..a7ed6472e71 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataHierarchy.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataHierarchy.java @@ -17,13 +17,11 @@ import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.AnnotationValue; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.type.Argument; import io.micronaut.core.util.ArrayUtils; import io.micronaut.core.value.OptionalValues; -import org.jetbrains.annotations.NotNull; - -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.annotation.Annotation; import java.util.*; import java.util.function.Function; @@ -689,7 +687,7 @@ public Optional getValue(@NonNull String annotation, @NonNull String memb return Optional.empty(); } - @NotNull + @NonNull @Override public Iterator iterator() { return ArrayUtils.reverseIterator(hierarchy); diff --git a/inject/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataSupport.java b/inject/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataSupport.java index ed89f16a917..3b2e1884b33 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataSupport.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataSupport.java @@ -22,8 +22,8 @@ import io.micronaut.core.reflect.ReflectionUtils; import io.micronaut.core.util.StringUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.*; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/AnnotationRemapper.java b/inject/src/main/java/io/micronaut/inject/annotation/AnnotationRemapper.java index 59ece837539..5979b167fa4 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/AnnotationRemapper.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/AnnotationRemapper.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.AnnotationValue; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.List; /** @@ -31,7 +31,7 @@ * * *

Useful for supporting multiple annotation sets that reside in different package namespaces, however are largely - * similar in function, for example {@code javax.annotation.Nullable} and {@code edu.umd.cs.findbugs.annotations.Nullable}. One can + * similar in function, for example {@code javax.annotation.Nullable} and {@code io.micronaut.core.annotation.Nullable}. One can * remap these to a single annotation internally at compilation time.

* * @author graemerocher diff --git a/inject/src/main/java/io/micronaut/inject/annotation/DefaultAnnotationMetadata.java b/inject/src/main/java/io/micronaut/inject/annotation/DefaultAnnotationMetadata.java index 5592355e99f..2cf809480d6 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/DefaultAnnotationMetadata.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/DefaultAnnotationMetadata.java @@ -26,8 +26,8 @@ import io.micronaut.core.util.StringUtils; import io.micronaut.core.value.OptionalValues; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.lang.annotation.Repeatable; import java.lang.annotation.RetentionPolicy; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/EnvironmentAnnotationMetadata.java b/inject/src/main/java/io/micronaut/inject/annotation/EnvironmentAnnotationMetadata.java index 950564a7c1d..ae2cd3948d2 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/EnvironmentAnnotationMetadata.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/EnvironmentAnnotationMetadata.java @@ -19,8 +19,8 @@ import io.micronaut.core.annotation.Internal; import io.micronaut.core.type.Argument; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.util.*; import java.util.function.Function; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/PackageRenameRemapper.java b/inject/src/main/java/io/micronaut/inject/annotation/PackageRenameRemapper.java index be349367056..2824cc8614c 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/PackageRenameRemapper.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/PackageRenameRemapper.java @@ -19,7 +19,7 @@ import io.micronaut.core.naming.NameUtils; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Collections; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/internal/CoreNullabilityAnnotationRemapper.java b/inject/src/main/java/io/micronaut/inject/annotation/internal/CoreNullabilityAnnotationRemapper.java new file mode 100644 index 00000000000..976dfc824d2 --- /dev/null +++ b/inject/src/main/java/io/micronaut/inject/annotation/internal/CoreNullabilityAnnotationRemapper.java @@ -0,0 +1,57 @@ +/* + * Copyright 2017-2021 original authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.micronaut.inject.annotation.internal; + +import io.micronaut.core.annotation.AnnotationUtil; +import io.micronaut.core.annotation.AnnotationValue; +import io.micronaut.core.annotation.Internal; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.naming.NameUtils; +import io.micronaut.inject.annotation.AnnotationRemapper; +import io.micronaut.inject.visitor.VisitorContext; + +import java.util.Collections; +import java.util.List; + +/** + * A remapper that remaps findbugs annotations to javax.annotation which are represented internally. + * + * @author graemerocher + * @since 1.2.0 + */ +@Internal +public class CoreNullabilityAnnotationRemapper implements AnnotationRemapper { + @Override + @NonNull + public String getPackageName() { + return "io.micronaut.core.annotation"; + } + + @Override + @NonNull public List> remap(AnnotationValue annotation, VisitorContext visitorContext) { + String simpleName = NameUtils.getSimpleName(annotation.getAnnotationName()); + if ("nullable".equalsIgnoreCase(simpleName)) { + return Collections.singletonList( + AnnotationValue.builder(AnnotationUtil.NULLABLE).build() + ); + } else if ("nonnull".equalsIgnoreCase(simpleName)) { + return Collections.singletonList( + AnnotationValue.builder(AnnotationUtil.NON_NULL).build() + ); + } + return Collections.singletonList(annotation); + } +} diff --git a/inject/src/main/java/io/micronaut/inject/annotation/internal/FindBugsRemapper.java b/inject/src/main/java/io/micronaut/inject/annotation/internal/FindBugsRemapper.java index 369b910ce0c..07aee0fc843 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/internal/FindBugsRemapper.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/internal/FindBugsRemapper.java @@ -22,7 +22,7 @@ import io.micronaut.inject.annotation.AnnotationRemapper; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Collections; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/internal/KotlinNotNullMapper.java b/inject/src/main/java/io/micronaut/inject/annotation/internal/KotlinNotNullMapper.java index 32ba0f74579..8a3517db68c 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/internal/KotlinNotNullMapper.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/internal/KotlinNotNullMapper.java @@ -19,7 +19,7 @@ import io.micronaut.inject.annotation.NamedAnnotationTransformer; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/inject/annotation/internal/KotlinNullableMapper.java b/inject/src/main/java/io/micronaut/inject/annotation/internal/KotlinNullableMapper.java index ad00a764739..c697125258e 100644 --- a/inject/src/main/java/io/micronaut/inject/annotation/internal/KotlinNullableMapper.java +++ b/inject/src/main/java/io/micronaut/inject/annotation/internal/KotlinNullableMapper.java @@ -19,7 +19,7 @@ import io.micronaut.inject.annotation.NamedAnnotationTransformer; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/inject/ast/ClassElement.java b/inject/src/main/java/io/micronaut/inject/ast/ClassElement.java index 75584488e4d..0572432794b 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/ClassElement.java +++ b/inject/src/main/java/io/micronaut/inject/ast/ClassElement.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.Internal; import io.micronaut.core.naming.NameUtils; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import org.jetbrains.annotations.NotNull; import java.util.*; diff --git a/inject/src/main/java/io/micronaut/inject/ast/Element.java b/inject/src/main/java/io/micronaut/inject/ast/Element.java index 9a019c0014f..03a43596123 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/Element.java +++ b/inject/src/main/java/io/micronaut/inject/ast/Element.java @@ -20,7 +20,7 @@ import io.micronaut.core.annotation.AnnotationValueBuilder; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.Optional; import java.util.function.Consumer; diff --git a/inject/src/main/java/io/micronaut/inject/ast/ElementFactory.java b/inject/src/main/java/io/micronaut/inject/ast/ElementFactory.java index 92879568b81..0b7cfd9a5f0 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/ElementFactory.java +++ b/inject/src/main/java/io/micronaut/inject/ast/ElementFactory.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.ast; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; /** diff --git a/inject/src/main/java/io/micronaut/inject/ast/ElementQuery.java b/inject/src/main/java/io/micronaut/inject/ast/ElementQuery.java index 97822eea114..ecea3f4174a 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/ElementQuery.java +++ b/inject/src/main/java/io/micronaut/inject/ast/ElementQuery.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.ast; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/inject/ast/MethodElement.java b/inject/src/main/java/io/micronaut/inject/ast/MethodElement.java index ca9567e2aa5..5a7c1e56acd 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/MethodElement.java +++ b/inject/src/main/java/io/micronaut/inject/ast/MethodElement.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.ast; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.util.ArrayUtils; import org.jetbrains.annotations.NotNull; diff --git a/inject/src/main/java/io/micronaut/inject/ast/ParameterElement.java b/inject/src/main/java/io/micronaut/inject/ast/ParameterElement.java index e49edb57077..afb3feff9f9 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/ParameterElement.java +++ b/inject/src/main/java/io/micronaut/inject/ast/ParameterElement.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Objects; diff --git a/inject/src/main/java/io/micronaut/inject/ast/PrimitiveElement.java b/inject/src/main/java/io/micronaut/inject/ast/PrimitiveElement.java index c23619cae17..7335e468503 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/PrimitiveElement.java +++ b/inject/src/main/java/io/micronaut/inject/ast/PrimitiveElement.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.ast; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; public final class PrimitiveElement implements ArrayableClassElement { diff --git a/inject/src/main/java/io/micronaut/inject/ast/PropertyElement.java b/inject/src/main/java/io/micronaut/inject/ast/PropertyElement.java index db5d161e858..4f7c4291b64 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/PropertyElement.java +++ b/inject/src/main/java/io/micronaut/inject/ast/PropertyElement.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Optional; /** diff --git a/inject/src/main/java/io/micronaut/inject/ast/TypedElement.java b/inject/src/main/java/io/micronaut/inject/ast/TypedElement.java index 9f517b45d40..ea2233b8950 100644 --- a/inject/src/main/java/io/micronaut/inject/ast/TypedElement.java +++ b/inject/src/main/java/io/micronaut/inject/ast/TypedElement.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.ast; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * An element that has an underlying type. diff --git a/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanIntrospectionWriter.java b/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanIntrospectionWriter.java index b9f97defa08..86a486f2c1b 100644 --- a/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanIntrospectionWriter.java +++ b/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanIntrospectionWriter.java @@ -36,8 +36,8 @@ import org.objectweb.asm.commons.GeneratorAdapter; import org.objectweb.asm.commons.Method; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.io.IOException; import java.io.OutputStream; diff --git a/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanMethodWriter.java b/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanMethodWriter.java index 240b0637f31..100f60389a3 100644 --- a/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanMethodWriter.java +++ b/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanMethodWriter.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.beans.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Internal; import io.micronaut.core.beans.AbstractBeanMethod; diff --git a/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanPropertyWriter.java b/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanPropertyWriter.java index 2546eb6aa3f..7992953df96 100644 --- a/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanPropertyWriter.java +++ b/inject/src/main/java/io/micronaut/inject/beans/visitor/BeanPropertyWriter.java @@ -35,8 +35,8 @@ import org.objectweb.asm.commons.GeneratorAdapter; import org.objectweb.asm.commons.Method; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.io.IOException; import java.io.OutputStream; import java.util.*; diff --git a/inject/src/main/java/io/micronaut/inject/beans/visitor/EntityIntrospectedAnnotationMapper.java b/inject/src/main/java/io/micronaut/inject/beans/visitor/EntityIntrospectedAnnotationMapper.java index d745e3487a5..8fcb0340ec8 100644 --- a/inject/src/main/java/io/micronaut/inject/beans/visitor/EntityIntrospectedAnnotationMapper.java +++ b/inject/src/main/java/io/micronaut/inject/beans/visitor/EntityIntrospectedAnnotationMapper.java @@ -21,7 +21,7 @@ import io.micronaut.inject.annotation.NamedAnnotationMapper; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/inject/beans/visitor/IntrospectedTypeElementVisitor.java b/inject/src/main/java/io/micronaut/inject/beans/visitor/IntrospectedTypeElementVisitor.java index a4408d33f58..2047c39c51f 100644 --- a/inject/src/main/java/io/micronaut/inject/beans/visitor/IntrospectedTypeElementVisitor.java +++ b/inject/src/main/java/io/micronaut/inject/beans/visitor/IntrospectedTypeElementVisitor.java @@ -29,8 +29,8 @@ import io.micronaut.inject.visitor.VisitorContext; import io.micronaut.inject.writer.ClassGenerationException; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.io.IOException; import java.util.*; diff --git a/inject/src/main/java/io/micronaut/inject/beans/visitor/JsonCreatorAnnotationMapper.java b/inject/src/main/java/io/micronaut/inject/beans/visitor/JsonCreatorAnnotationMapper.java index 6eed4a86567..f60d40c20c3 100644 --- a/inject/src/main/java/io/micronaut/inject/beans/visitor/JsonCreatorAnnotationMapper.java +++ b/inject/src/main/java/io/micronaut/inject/beans/visitor/JsonCreatorAnnotationMapper.java @@ -20,7 +20,7 @@ import io.micronaut.inject.annotation.NamedAnnotationMapper; import io.micronaut.inject.visitor.VisitorContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.List; diff --git a/inject/src/main/java/io/micronaut/inject/beans/visitor/MappedSuperClassIntrospectionMapper.java b/inject/src/main/java/io/micronaut/inject/beans/visitor/MappedSuperClassIntrospectionMapper.java index 0de1bc01c19..5c40c687c5d 100644 --- a/inject/src/main/java/io/micronaut/inject/beans/visitor/MappedSuperClassIntrospectionMapper.java +++ b/inject/src/main/java/io/micronaut/inject/beans/visitor/MappedSuperClassIntrospectionMapper.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.beans.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Handle mapped super class. diff --git a/inject/src/main/java/io/micronaut/inject/configuration/ConfigurationMetadataBuilder.java b/inject/src/main/java/io/micronaut/inject/configuration/ConfigurationMetadataBuilder.java index abff87c42be..4099430ffa8 100644 --- a/inject/src/main/java/io/micronaut/inject/configuration/ConfigurationMetadataBuilder.java +++ b/inject/src/main/java/io/micronaut/inject/configuration/ConfigurationMetadataBuilder.java @@ -19,8 +19,8 @@ import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.naming.NameUtils; import io.micronaut.core.util.CollectionUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.inject.ast.Element; import java.io.IOException; diff --git a/inject/src/main/java/io/micronaut/inject/qualifiers/TypeAnnotationQualifier.java b/inject/src/main/java/io/micronaut/inject/qualifiers/TypeAnnotationQualifier.java index 0393eee9ccd..5bbe979d2ad 100644 --- a/inject/src/main/java/io/micronaut/inject/qualifiers/TypeAnnotationQualifier.java +++ b/inject/src/main/java/io/micronaut/inject/qualifiers/TypeAnnotationQualifier.java @@ -20,7 +20,7 @@ import io.micronaut.core.annotation.Internal; import io.micronaut.inject.BeanType; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/inject/src/main/java/io/micronaut/inject/util/KotlinExecutableMethodUtils.java b/inject/src/main/java/io/micronaut/inject/util/KotlinExecutableMethodUtils.java index abcdc527f46..1b1bc6c5a55 100644 --- a/inject/src/main/java/io/micronaut/inject/util/KotlinExecutableMethodUtils.java +++ b/inject/src/main/java/io/micronaut/inject/util/KotlinExecutableMethodUtils.java @@ -20,7 +20,7 @@ import io.micronaut.inject.ExecutableMethod; import kotlin.Unit; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import static io.micronaut.core.util.KotlinUtils.KOTLIN_COROUTINES_SUPPORTED; diff --git a/inject/src/main/java/io/micronaut/inject/validation/BeanDefinitionValidator.java b/inject/src/main/java/io/micronaut/inject/validation/BeanDefinitionValidator.java index e37c2266f78..9094454e031 100644 --- a/inject/src/main/java/io/micronaut/inject/validation/BeanDefinitionValidator.java +++ b/inject/src/main/java/io/micronaut/inject/validation/BeanDefinitionValidator.java @@ -21,8 +21,8 @@ import io.micronaut.inject.BeanDefinition; import io.micronaut.inject.InjectionPoint; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; /** * Interface to integrate bean validation into the construction of beans within the {@link io.micronaut.context.BeanContext}. diff --git a/inject/src/main/java/io/micronaut/inject/visitor/TypeElementVisitor.java b/inject/src/main/java/io/micronaut/inject/visitor/TypeElementVisitor.java index d19833f9bd6..83d4698c7af 100644 --- a/inject/src/main/java/io/micronaut/inject/visitor/TypeElementVisitor.java +++ b/inject/src/main/java/io/micronaut/inject/visitor/TypeElementVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Experimental; import io.micronaut.core.order.Ordered; import io.micronaut.core.reflect.GenericTypeUtils; diff --git a/inject/src/main/java/io/micronaut/inject/visitor/VisitorContext.java b/inject/src/main/java/io/micronaut/inject/visitor/VisitorContext.java index 349654cc5f0..cec0c315dd4 100644 --- a/inject/src/main/java/io/micronaut/inject/visitor/VisitorContext.java +++ b/inject/src/main/java/io/micronaut/inject/visitor/VisitorContext.java @@ -15,8 +15,8 @@ */ package io.micronaut.inject.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Experimental; import io.micronaut.core.convert.value.MutableConvertibleValues; import io.micronaut.inject.ast.ClassElement; diff --git a/inject/src/main/java/io/micronaut/inject/writer/AbstractAnnotationMetadataWriter.java b/inject/src/main/java/io/micronaut/inject/writer/AbstractAnnotationMetadataWriter.java index 39b8be28497..0ae7e495a71 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/AbstractAnnotationMetadataWriter.java +++ b/inject/src/main/java/io/micronaut/inject/writer/AbstractAnnotationMetadataWriter.java @@ -27,7 +27,7 @@ import org.objectweb.asm.Type; import org.objectweb.asm.commons.GeneratorAdapter; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.HashMap; import java.util.Map; diff --git a/inject/src/main/java/io/micronaut/inject/writer/AbstractClassFileWriter.java b/inject/src/main/java/io/micronaut/inject/writer/AbstractClassFileWriter.java index 272b4171c99..e5eb9ef8cfe 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/AbstractClassFileWriter.java +++ b/inject/src/main/java/io/micronaut/inject/writer/AbstractClassFileWriter.java @@ -15,8 +15,8 @@ */ package io.micronaut.inject.writer; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Generated; import io.micronaut.core.annotation.Internal; diff --git a/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionVisitor.java b/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionVisitor.java index c8715677532..e7f881ae683 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionVisitor.java +++ b/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionVisitor.java @@ -21,8 +21,8 @@ import io.micronaut.inject.configuration.ConfigurationMetadataBuilder; import org.objectweb.asm.Type; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.io.File; import java.io.IOException; diff --git a/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java b/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java index 1c901152e2a..5547943f88b 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java +++ b/inject/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.writer; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.AbstractBeanDefinition; import io.micronaut.context.AbstractParametrizedBeanDefinition; import io.micronaut.context.BeanContext; diff --git a/inject/src/main/java/io/micronaut/inject/writer/ClassWriterOutputVisitor.java b/inject/src/main/java/io/micronaut/inject/writer/ClassWriterOutputVisitor.java index 4d623a26c7c..f11f69218db 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/ClassWriterOutputVisitor.java +++ b/inject/src/main/java/io/micronaut/inject/writer/ClassWriterOutputVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.writer; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.inject.ast.Element; import java.io.IOException; diff --git a/inject/src/main/java/io/micronaut/inject/writer/ConfigBuilderState.java b/inject/src/main/java/io/micronaut/inject/writer/ConfigBuilderState.java index 2b84dda8b1d..879ae558758 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/ConfigBuilderState.java +++ b/inject/src/main/java/io/micronaut/inject/writer/ConfigBuilderState.java @@ -21,8 +21,6 @@ import io.micronaut.inject.configuration.ConfigurationMetadataBuilder; import org.objectweb.asm.Type; -import javax.annotation.concurrent.Immutable; - /** * Stores data to be used when visiting a configuration builder method. * @@ -30,7 +28,6 @@ * @author Graeme Rocher * @since 1.0 */ -@Immutable @Internal class ConfigBuilderState { diff --git a/inject/src/main/java/io/micronaut/inject/writer/DirectoryClassWriterOutputVisitor.java b/inject/src/main/java/io/micronaut/inject/writer/DirectoryClassWriterOutputVisitor.java index 3a0d2156006..d3d677e6faa 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/DirectoryClassWriterOutputVisitor.java +++ b/inject/src/main/java/io/micronaut/inject/writer/DirectoryClassWriterOutputVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.writer; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Internal; import io.micronaut.inject.ast.Element; diff --git a/inject/src/main/java/io/micronaut/inject/writer/ExecutableMethodWriter.java b/inject/src/main/java/io/micronaut/inject/writer/ExecutableMethodWriter.java index 2d0355b18a3..34d058a7550 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/ExecutableMethodWriter.java +++ b/inject/src/main/java/io/micronaut/inject/writer/ExecutableMethodWriter.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.writer; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.AbstractExecutableMethod; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Internal; diff --git a/inject/src/main/java/io/micronaut/inject/writer/OriginatingElements.java b/inject/src/main/java/io/micronaut/inject/writer/OriginatingElements.java index 8846e7a55ef..4368739566b 100644 --- a/inject/src/main/java/io/micronaut/inject/writer/OriginatingElements.java +++ b/inject/src/main/java/io/micronaut/inject/writer/OriginatingElements.java @@ -15,7 +15,7 @@ */ package io.micronaut.inject.writer; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.inject.ast.Element; /** diff --git a/inject/src/main/resources/META-INF/services/io.micronaut.inject.annotation.AnnotationRemapper b/inject/src/main/resources/META-INF/services/io.micronaut.inject.annotation.AnnotationRemapper index af60793bd09..a4346c7f4be 100644 --- a/inject/src/main/resources/META-INF/services/io.micronaut.inject.annotation.AnnotationRemapper +++ b/inject/src/main/resources/META-INF/services/io.micronaut.inject.annotation.AnnotationRemapper @@ -1 +1,2 @@ -io.micronaut.inject.annotation.internal.FindBugsRemapper \ No newline at end of file +io.micronaut.inject.annotation.internal.FindBugsRemapper +io.micronaut.inject.annotation.internal.CoreNullabilityAnnotationRemapper \ No newline at end of file diff --git a/management/src/main/java/io/micronaut/management/endpoint/EndpointDefaultConfiguration.java b/management/src/main/java/io/micronaut/management/endpoint/EndpointDefaultConfiguration.java index 64c1695d9c8..afb97784ea6 100644 --- a/management/src/main/java/io/micronaut/management/endpoint/EndpointDefaultConfiguration.java +++ b/management/src/main/java/io/micronaut/management/endpoint/EndpointDefaultConfiguration.java @@ -15,7 +15,7 @@ */ package io.micronaut.management.endpoint; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.annotation.ConfigurationProperties; import io.micronaut.core.util.StringUtils; diff --git a/management/src/main/java/io/micronaut/management/endpoint/health/HealthEndpoint.java b/management/src/main/java/io/micronaut/management/endpoint/health/HealthEndpoint.java index 8f90aa91cb7..95e182db3c1 100644 --- a/management/src/main/java/io/micronaut/management/endpoint/health/HealthEndpoint.java +++ b/management/src/main/java/io/micronaut/management/endpoint/health/HealthEndpoint.java @@ -29,7 +29,7 @@ import io.micronaut.management.health.indicator.annotation.Liveness; import io.reactivex.Single; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import java.security.Principal; import java.util.Arrays; diff --git a/management/src/main/java/io/micronaut/management/endpoint/loggers/LoggersEndpoint.java b/management/src/main/java/io/micronaut/management/endpoint/loggers/LoggersEndpoint.java index 6bcc78c27e1..10c30fb2e30 100644 --- a/management/src/main/java/io/micronaut/management/endpoint/loggers/LoggersEndpoint.java +++ b/management/src/main/java/io/micronaut/management/endpoint/loggers/LoggersEndpoint.java @@ -21,7 +21,7 @@ import io.micronaut.management.endpoint.EndpointConfiguration; import io.reactivex.Single; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.NotBlank; import java.util.Map; diff --git a/management/src/main/java/io/micronaut/management/endpoint/loggers/ManagedLoggingSystem.java b/management/src/main/java/io/micronaut/management/endpoint/loggers/ManagedLoggingSystem.java index 28a6ddacc16..93b816114b2 100644 --- a/management/src/main/java/io/micronaut/management/endpoint/loggers/ManagedLoggingSystem.java +++ b/management/src/main/java/io/micronaut/management/endpoint/loggers/ManagedLoggingSystem.java @@ -15,7 +15,7 @@ */ package io.micronaut.management.endpoint.loggers; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.validation.constraints.NotBlank; import java.util.Collection; diff --git a/management/src/main/java/io/micronaut/management/endpoint/loggers/impl/Log4jLoggingSystem.java b/management/src/main/java/io/micronaut/management/endpoint/loggers/impl/Log4jLoggingSystem.java index e7db23a97a7..77600783dd9 100644 --- a/management/src/main/java/io/micronaut/management/endpoint/loggers/impl/Log4jLoggingSystem.java +++ b/management/src/main/java/io/micronaut/management/endpoint/loggers/impl/Log4jLoggingSystem.java @@ -15,7 +15,7 @@ */ package io.micronaut.management.endpoint.loggers.impl; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Replaces; import io.micronaut.context.annotation.Requires; import io.micronaut.logging.LogLevel; diff --git a/management/src/main/java/io/micronaut/management/endpoint/loggers/impl/LogbackLoggingSystem.java b/management/src/main/java/io/micronaut/management/endpoint/loggers/impl/LogbackLoggingSystem.java index e43b3f139ce..ee40f7dfaf6 100644 --- a/management/src/main/java/io/micronaut/management/endpoint/loggers/impl/LogbackLoggingSystem.java +++ b/management/src/main/java/io/micronaut/management/endpoint/loggers/impl/LogbackLoggingSystem.java @@ -18,7 +18,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Replaces; import io.micronaut.context.annotation.Requires; import io.micronaut.logging.LogLevel; diff --git a/management/src/main/java/io/micronaut/management/endpoint/processors/AbstractEndpointRouteBuilder.java b/management/src/main/java/io/micronaut/management/endpoint/processors/AbstractEndpointRouteBuilder.java index 01619fc8494..b83e783b63f 100644 --- a/management/src/main/java/io/micronaut/management/endpoint/processors/AbstractEndpointRouteBuilder.java +++ b/management/src/main/java/io/micronaut/management/endpoint/processors/AbstractEndpointRouteBuilder.java @@ -32,7 +32,7 @@ import io.micronaut.management.endpoint.annotation.Selector; import io.micronaut.web.router.DefaultRouteBuilder; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.lang.annotation.Annotation; import java.util.Map; import java.util.Optional; diff --git a/management/src/main/java/io/micronaut/management/endpoint/refresh/RefreshEndpoint.java b/management/src/main/java/io/micronaut/management/endpoint/refresh/RefreshEndpoint.java index 24c21ca32ef..570237977a8 100644 --- a/management/src/main/java/io/micronaut/management/endpoint/refresh/RefreshEndpoint.java +++ b/management/src/main/java/io/micronaut/management/endpoint/refresh/RefreshEndpoint.java @@ -21,7 +21,7 @@ import io.micronaut.management.endpoint.annotation.Write; import io.micronaut.runtime.context.scope.refresh.RefreshEvent; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Map; import java.util.Set; diff --git a/management/src/main/java/io/micronaut/management/health/indicator/jdbc/JdbcIndicator.java b/management/src/main/java/io/micronaut/management/health/indicator/jdbc/JdbcIndicator.java index 6a54c4bcdda..8855e467c05 100644 --- a/management/src/main/java/io/micronaut/management/health/indicator/jdbc/JdbcIndicator.java +++ b/management/src/main/java/io/micronaut/management/health/indicator/jdbc/JdbcIndicator.java @@ -16,6 +16,7 @@ package io.micronaut.management.health.indicator.jdbc; import io.micronaut.context.annotation.Requires; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.async.publisher.AsyncSingleResultPublisher; import io.micronaut.core.util.StringUtils; import io.micronaut.health.HealthStatus; @@ -28,7 +29,6 @@ import io.reactivex.Flowable; import org.reactivestreams.Publisher; -import javax.annotation.Nullable; import javax.inject.Named; import javax.inject.Singleton; import javax.sql.DataSource; diff --git a/management/src/test/groovy/io/micronaut/management/endpoint/EndpointRouteSpec.groovy b/management/src/test/groovy/io/micronaut/management/endpoint/EndpointRouteSpec.groovy index f8b6755f73d..92bb53fe62b 100644 --- a/management/src/test/groovy/io/micronaut/management/endpoint/EndpointRouteSpec.groovy +++ b/management/src/test/groovy/io/micronaut/management/endpoint/EndpointRouteSpec.groovy @@ -16,6 +16,7 @@ package io.micronaut.management.endpoint import io.micronaut.context.ApplicationContext +import io.micronaut.core.annotation.Nullable import io.micronaut.management.endpoint.annotation.Delete import io.micronaut.management.endpoint.annotation.Endpoint import io.micronaut.management.endpoint.annotation.Read @@ -27,7 +28,6 @@ import spock.lang.Shared import spock.lang.Specification import spock.lang.Unroll -import javax.annotation.Nullable import java.security.Principal import static io.micronaut.http.HttpMethod.* diff --git a/router/src/main/java/io/micronaut/web/router/AbstractRouteMatch.java b/router/src/main/java/io/micronaut/web/router/AbstractRouteMatch.java index d9d40b2eb28..a1736ad3d7c 100644 --- a/router/src/main/java/io/micronaut/web/router/AbstractRouteMatch.java +++ b/router/src/main/java/io/micronaut/web/router/AbstractRouteMatch.java @@ -15,7 +15,7 @@ */ package io.micronaut.web.router; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.bind.ArgumentBinder; import io.micronaut.core.bind.annotation.Bindable; @@ -35,7 +35,7 @@ import io.micronaut.inject.MethodExecutionHandle; import io.micronaut.web.router.exceptions.UnsatisfiedRouteException; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.reflect.Method; import java.util.*; import java.util.function.Predicate; diff --git a/router/src/main/java/io/micronaut/web/router/AnnotatedFilterRouteBuilder.java b/router/src/main/java/io/micronaut/web/router/AnnotatedFilterRouteBuilder.java index 28d472b020b..911d327ac5a 100644 --- a/router/src/main/java/io/micronaut/web/router/AnnotatedFilterRouteBuilder.java +++ b/router/src/main/java/io/micronaut/web/router/AnnotatedFilterRouteBuilder.java @@ -15,7 +15,7 @@ */ package io.micronaut.web.router; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.BeanContext; import io.micronaut.context.ExecutionHandleLocator; import io.micronaut.context.processor.BeanDefinitionProcessor; diff --git a/router/src/main/java/io/micronaut/web/router/BasicObjectRouteMatch.java b/router/src/main/java/io/micronaut/web/router/BasicObjectRouteMatch.java index e3ce558015b..3e14dc25594 100644 --- a/router/src/main/java/io/micronaut/web/router/BasicObjectRouteMatch.java +++ b/router/src/main/java/io/micronaut/web/router/BasicObjectRouteMatch.java @@ -20,7 +20,7 @@ import io.micronaut.http.HttpRequest; import io.micronaut.http.MediaType; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.*; import java.util.function.Function; diff --git a/router/src/main/java/io/micronaut/web/router/BeanDefinitionFilterRoute.java b/router/src/main/java/io/micronaut/web/router/BeanDefinitionFilterRoute.java index d770e1d2bd1..b70e1d4c6f6 100644 --- a/router/src/main/java/io/micronaut/web/router/BeanDefinitionFilterRoute.java +++ b/router/src/main/java/io/micronaut/web/router/BeanDefinitionFilterRoute.java @@ -15,7 +15,7 @@ */ package io.micronaut.web.router; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.BeanLocator; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.Internal; diff --git a/router/src/main/java/io/micronaut/web/router/DefaultFilterRoute.java b/router/src/main/java/io/micronaut/web/router/DefaultFilterRoute.java index 95fbfb77a3c..08d5148faa8 100644 --- a/router/src/main/java/io/micronaut/web/router/DefaultFilterRoute.java +++ b/router/src/main/java/io/micronaut/web/router/DefaultFilterRoute.java @@ -15,7 +15,7 @@ */ package io.micronaut.web.router; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.AnnotationMetadata; import io.micronaut.core.annotation.AnnotationMetadataResolver; import io.micronaut.core.util.*; diff --git a/router/src/main/java/io/micronaut/web/router/DefaultRouteBuilder.java b/router/src/main/java/io/micronaut/web/router/DefaultRouteBuilder.java index 6d4846d3aa6..5b4f923b292 100644 --- a/router/src/main/java/io/micronaut/web/router/DefaultRouteBuilder.java +++ b/router/src/main/java/io/micronaut/web/router/DefaultRouteBuilder.java @@ -15,8 +15,8 @@ */ package io.micronaut.web.router; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.ApplicationContext; import io.micronaut.context.BeanLocator; import io.micronaut.context.ExecutionHandleLocator; diff --git a/router/src/main/java/io/micronaut/web/router/DefaultRouter.java b/router/src/main/java/io/micronaut/web/router/DefaultRouter.java index e512ff3beab..e1f75504537 100644 --- a/router/src/main/java/io/micronaut/web/router/DefaultRouter.java +++ b/router/src/main/java/io/micronaut/web/router/DefaultRouter.java @@ -28,8 +28,8 @@ import io.micronaut.http.uri.UriMatchTemplate; import io.micronaut.web.router.exceptions.RoutingException; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; import java.net.URI; diff --git a/router/src/main/java/io/micronaut/web/router/RouteBuilder.java b/router/src/main/java/io/micronaut/web/router/RouteBuilder.java index 98b71353eb3..3ca27d4135e 100644 --- a/router/src/main/java/io/micronaut/web/router/RouteBuilder.java +++ b/router/src/main/java/io/micronaut/web/router/RouteBuilder.java @@ -31,8 +31,8 @@ import io.micronaut.inject.ExecutableMethod; import io.micronaut.inject.ProxyBeanDefinition; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.List; import java.util.Set; import java.util.function.Supplier; diff --git a/router/src/main/java/io/micronaut/web/router/RouteMatch.java b/router/src/main/java/io/micronaut/web/router/RouteMatch.java index d98ea870b4d..9abb0bde86b 100644 --- a/router/src/main/java/io/micronaut/web/router/RouteMatch.java +++ b/router/src/main/java/io/micronaut/web/router/RouteMatch.java @@ -15,7 +15,7 @@ */ package io.micronaut.web.router; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.type.Argument; import io.micronaut.core.type.ReturnType; import io.micronaut.http.HttpRequest; diff --git a/router/src/main/java/io/micronaut/web/router/Router.java b/router/src/main/java/io/micronaut/web/router/Router.java index 89db56b08c2..04e0ad35a54 100644 --- a/router/src/main/java/io/micronaut/web/router/Router.java +++ b/router/src/main/java/io/micronaut/web/router/Router.java @@ -20,8 +20,8 @@ import io.micronaut.http.HttpStatus; import io.micronaut.http.filter.HttpFilter; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.net.URI; import java.util.List; import java.util.Optional; diff --git a/router/src/main/java/io/micronaut/web/router/StatusRoute.java b/router/src/main/java/io/micronaut/web/router/StatusRoute.java index d26ee77ad9b..2d9658b4555 100644 --- a/router/src/main/java/io/micronaut/web/router/StatusRoute.java +++ b/router/src/main/java/io/micronaut/web/router/StatusRoute.java @@ -19,7 +19,7 @@ import io.micronaut.http.HttpStatus; import io.micronaut.http.MediaType; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Optional; import java.util.function.Predicate; diff --git a/router/src/main/java/io/micronaut/web/router/UriRoute.java b/router/src/main/java/io/micronaut/web/router/UriRoute.java index 10a605558f4..5926bec810d 100644 --- a/router/src/main/java/io/micronaut/web/router/UriRoute.java +++ b/router/src/main/java/io/micronaut/web/router/UriRoute.java @@ -21,7 +21,7 @@ import io.micronaut.http.uri.UriMatchTemplate; import io.micronaut.http.uri.UriMatcher; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.net.URI; import java.util.Optional; import java.util.function.Predicate; diff --git a/router/src/main/java/io/micronaut/web/router/filter/FilteredRouter.java b/router/src/main/java/io/micronaut/web/router/filter/FilteredRouter.java index 7e37cef82c6..6b3fd5868c5 100644 --- a/router/src/main/java/io/micronaut/web/router/filter/FilteredRouter.java +++ b/router/src/main/java/io/micronaut/web/router/filter/FilteredRouter.java @@ -24,8 +24,8 @@ import io.micronaut.web.router.UriRoute; import io.micronaut.web.router.UriRouteMatch; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.List; import java.util.Optional; import java.util.Set; diff --git a/router/src/main/java/io/micronaut/web/router/naming/ConfigurableUriNamingStrategy.java b/router/src/main/java/io/micronaut/web/router/naming/ConfigurableUriNamingStrategy.java index 86f6981b18b..aea019ee873 100644 --- a/router/src/main/java/io/micronaut/web/router/naming/ConfigurableUriNamingStrategy.java +++ b/router/src/main/java/io/micronaut/web/router/naming/ConfigurableUriNamingStrategy.java @@ -22,7 +22,7 @@ import io.micronaut.core.naming.conventions.PropertyConvention; import io.micronaut.inject.BeanDefinition; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.inject.Singleton; /** diff --git a/router/src/main/java/io/micronaut/web/router/naming/HyphenatedUriNamingStrategy.java b/router/src/main/java/io/micronaut/web/router/naming/HyphenatedUriNamingStrategy.java index 6f0512833b1..ceadd7fc45b 100644 --- a/router/src/main/java/io/micronaut/web/router/naming/HyphenatedUriNamingStrategy.java +++ b/router/src/main/java/io/micronaut/web/router/naming/HyphenatedUriNamingStrategy.java @@ -24,7 +24,7 @@ import io.micronaut.inject.BeanDefinition; import io.micronaut.web.router.RouteBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.inject.Singleton; /** diff --git a/router/src/main/java/io/micronaut/web/router/resource/StaticResourceConfiguration.java b/router/src/main/java/io/micronaut/web/router/resource/StaticResourceConfiguration.java index 323787e5d50..7985e9e2290 100644 --- a/router/src/main/java/io/micronaut/web/router/resource/StaticResourceConfiguration.java +++ b/router/src/main/java/io/micronaut/web/router/resource/StaticResourceConfiguration.java @@ -24,7 +24,7 @@ import io.micronaut.core.util.Toggleable; import io.micronaut.http.context.ServerContextPathProvider; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/router/src/main/java/io/micronaut/web/router/version/DefaultVersionProvider.java b/router/src/main/java/io/micronaut/web/router/version/DefaultVersionProvider.java index e0c66213eca..a26b90c9638 100644 --- a/router/src/main/java/io/micronaut/web/router/version/DefaultVersionProvider.java +++ b/router/src/main/java/io/micronaut/web/router/version/DefaultVersionProvider.java @@ -15,7 +15,7 @@ */ package io.micronaut.web.router.version; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Defines a provider of a default Version. diff --git a/router/src/main/java/io/micronaut/web/router/version/RouteVersionFilter.java b/router/src/main/java/io/micronaut/web/router/version/RouteVersionFilter.java index f0101381fea..68ebe8215e6 100644 --- a/router/src/main/java/io/micronaut/web/router/version/RouteVersionFilter.java +++ b/router/src/main/java/io/micronaut/web/router/version/RouteVersionFilter.java @@ -15,7 +15,7 @@ */ package io.micronaut.web.router.version; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Requires; import io.micronaut.core.util.ArgumentUtils; import io.micronaut.core.version.annotation.Version; @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; import java.util.List; import java.util.Objects; diff --git a/router/src/main/java/io/micronaut/web/router/version/RoutesVersioningConfiguration.java b/router/src/main/java/io/micronaut/web/router/version/RoutesVersioningConfiguration.java index 88013f3cbd4..bc7de420e20 100644 --- a/router/src/main/java/io/micronaut/web/router/version/RoutesVersioningConfiguration.java +++ b/router/src/main/java/io/micronaut/web/router/version/RoutesVersioningConfiguration.java @@ -20,7 +20,7 @@ import io.micronaut.core.util.StringUtils; import io.micronaut.core.util.Toggleable; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.util.Optional; diff --git a/runtime-osx/src/main/java/io/micronaut/scheduling/io/watch/osx/MacOsWatchThread.java b/runtime-osx/src/main/java/io/micronaut/scheduling/io/watch/osx/MacOsWatchThread.java index aca4f26de28..6459e93d7fd 100644 --- a/runtime-osx/src/main/java/io/micronaut/scheduling/io/watch/osx/MacOsWatchThread.java +++ b/runtime-osx/src/main/java/io/micronaut/scheduling/io/watch/osx/MacOsWatchThread.java @@ -27,7 +27,7 @@ import io.micronaut.scheduling.io.watch.FileWatchCondition; import io.micronaut.scheduling.io.watch.FileWatchConfiguration; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.inject.Singleton; import java.io.IOException; import java.nio.file.Path; diff --git a/runtime/src/main/java/io/micronaut/discovery/DefaultServiceInstanceIdGenerator.java b/runtime/src/main/java/io/micronaut/discovery/DefaultServiceInstanceIdGenerator.java index 27fdf835da6..a4be449b8bc 100644 --- a/runtime/src/main/java/io/micronaut/discovery/DefaultServiceInstanceIdGenerator.java +++ b/runtime/src/main/java/io/micronaut/discovery/DefaultServiceInstanceIdGenerator.java @@ -18,7 +18,7 @@ import io.micronaut.context.env.Environment; import io.micronaut.runtime.server.EmbeddedServerInstance; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.inject.Singleton; import java.util.Optional; import java.util.StringJoiner; diff --git a/runtime/src/main/java/io/micronaut/discovery/ServiceInstanceIdGenerator.java b/runtime/src/main/java/io/micronaut/discovery/ServiceInstanceIdGenerator.java index 2a2f9f0d38d..92ff2ead201 100644 --- a/runtime/src/main/java/io/micronaut/discovery/ServiceInstanceIdGenerator.java +++ b/runtime/src/main/java/io/micronaut/discovery/ServiceInstanceIdGenerator.java @@ -17,7 +17,7 @@ import io.micronaut.context.env.Environment; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Interface for generating IDs for {@link ServiceInstance}. diff --git a/runtime/src/main/java/io/micronaut/discovery/StaticServiceInstanceList.java b/runtime/src/main/java/io/micronaut/discovery/StaticServiceInstanceList.java index bb9f1821f2c..da40535e0a6 100644 --- a/runtime/src/main/java/io/micronaut/discovery/StaticServiceInstanceList.java +++ b/runtime/src/main/java/io/micronaut/discovery/StaticServiceInstanceList.java @@ -15,7 +15,7 @@ */ package io.micronaut.discovery; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.health.HealthStatus; import java.net.URI; diff --git a/runtime/src/main/java/io/micronaut/discovery/registration/RegistrationConfiguration.java b/runtime/src/main/java/io/micronaut/discovery/registration/RegistrationConfiguration.java index 7e62ccd61e1..be5e1bdd601 100644 --- a/runtime/src/main/java/io/micronaut/discovery/registration/RegistrationConfiguration.java +++ b/runtime/src/main/java/io/micronaut/discovery/registration/RegistrationConfiguration.java @@ -17,7 +17,7 @@ import io.micronaut.core.util.Toggleable; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.Optional; diff --git a/runtime/src/main/java/io/micronaut/health/HealthStatus.java b/runtime/src/main/java/io/micronaut/health/HealthStatus.java index d72e6608d85..9c9078c4a95 100644 --- a/runtime/src/main/java/io/micronaut/health/HealthStatus.java +++ b/runtime/src/main/java/io/micronaut/health/HealthStatus.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.micronaut.core.annotation.Introspected; -import javax.annotation.concurrent.Immutable; import javax.validation.constraints.NotNull; import java.util.Optional; @@ -29,7 +28,6 @@ * @author Graeme Rocher * @since 1.0 */ -@Immutable @Introspected public class HealthStatus implements Comparable { diff --git a/runtime/src/main/java/io/micronaut/jackson/JacksonConfiguration.java b/runtime/src/main/java/io/micronaut/jackson/JacksonConfiguration.java index 7861c6c6b50..308f45c90c9 100644 --- a/runtime/src/main/java/io/micronaut/jackson/JacksonConfiguration.java +++ b/runtime/src/main/java/io/micronaut/jackson/JacksonConfiguration.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.type.TypeFactory; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.ConfigurationProperties; import io.micronaut.core.annotation.Experimental; import io.micronaut.core.annotation.TypeHint; diff --git a/runtime/src/main/java/io/micronaut/jackson/ObjectMapperFactory.java b/runtime/src/main/java/io/micronaut/jackson/ObjectMapperFactory.java index 0f103d4b33f..a064b49dad6 100644 --- a/runtime/src/main/java/io/micronaut/jackson/ObjectMapperFactory.java +++ b/runtime/src/main/java/io/micronaut/jackson/ObjectMapperFactory.java @@ -26,7 +26,7 @@ import io.micronaut.context.annotation.*; import io.micronaut.core.reflect.GenericTypeUtils; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.util.StringUtils; import javax.inject.Inject; diff --git a/runtime/src/main/java/io/micronaut/jackson/codec/JsonMediaTypeCodec.java b/runtime/src/main/java/io/micronaut/jackson/codec/JsonMediaTypeCodec.java index 78583eb327b..da8a4f1d5fd 100644 --- a/runtime/src/main/java/io/micronaut/jackson/codec/JsonMediaTypeCodec.java +++ b/runtime/src/main/java/io/micronaut/jackson/codec/JsonMediaTypeCodec.java @@ -21,7 +21,7 @@ import io.micronaut.http.codec.CodecConfiguration; import io.micronaut.runtime.ApplicationConfiguration; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/runtime/src/main/java/io/micronaut/jackson/codec/JsonStreamMediaTypeCodec.java b/runtime/src/main/java/io/micronaut/jackson/codec/JsonStreamMediaTypeCodec.java index beec7709d37..52c9d15f2c8 100644 --- a/runtime/src/main/java/io/micronaut/jackson/codec/JsonStreamMediaTypeCodec.java +++ b/runtime/src/main/java/io/micronaut/jackson/codec/JsonStreamMediaTypeCodec.java @@ -21,7 +21,7 @@ import io.micronaut.http.codec.CodecConfiguration; import io.micronaut.runtime.ApplicationConfiguration; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/runtime/src/main/java/io/micronaut/jackson/parser/JacksonProcessor.java b/runtime/src/main/java/io/micronaut/jackson/parser/JacksonProcessor.java index 4aedd8b1c10..95aa7d0fc48 100644 --- a/runtime/src/main/java/io/micronaut/jackson/parser/JacksonProcessor.java +++ b/runtime/src/main/java/io/micronaut/jackson/parser/JacksonProcessor.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.io.IOException; import java.util.Optional; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/runtime/src/main/java/io/micronaut/reactive/rxjava2/RxInstrumenterFactory.java b/runtime/src/main/java/io/micronaut/reactive/rxjava2/RxInstrumenterFactory.java index 21a49c4b437..f5e4c01e393 100644 --- a/runtime/src/main/java/io/micronaut/reactive/rxjava2/RxInstrumenterFactory.java +++ b/runtime/src/main/java/io/micronaut/reactive/rxjava2/RxInstrumenterFactory.java @@ -23,7 +23,7 @@ import io.micronaut.scheduling.instrument.ReactiveInvocationInstrumenterFactory; import io.reactivex.Flowable; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; import java.util.ArrayList; import java.util.List; diff --git a/runtime/src/main/java/io/micronaut/retry/RetryState.java b/runtime/src/main/java/io/micronaut/retry/RetryState.java index 10a423efbc1..11858c5b875 100644 --- a/runtime/src/main/java/io/micronaut/retry/RetryState.java +++ b/runtime/src/main/java/io/micronaut/retry/RetryState.java @@ -15,7 +15,7 @@ */ package io.micronaut.retry; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.time.Duration; import java.util.Optional; import java.util.OptionalDouble; diff --git a/runtime/src/main/java/io/micronaut/retry/intercept/CircuitBreakerRetry.java b/runtime/src/main/java/io/micronaut/retry/intercept/CircuitBreakerRetry.java index 9d382d62f31..62587ab6872 100644 --- a/runtime/src/main/java/io/micronaut/retry/intercept/CircuitBreakerRetry.java +++ b/runtime/src/main/java/io/micronaut/retry/intercept/CircuitBreakerRetry.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.time.Duration; import java.util.Optional; import java.util.OptionalDouble; diff --git a/runtime/src/main/java/io/micronaut/runtime/Micronaut.java b/runtime/src/main/java/io/micronaut/runtime/Micronaut.java index 6b3e83ccd61..75c61a61974 100644 --- a/runtime/src/main/java/io/micronaut/runtime/Micronaut.java +++ b/runtime/src/main/java/io/micronaut/runtime/Micronaut.java @@ -15,8 +15,8 @@ */ package io.micronaut.runtime; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.ApplicationContext; import io.micronaut.context.ApplicationContextBuilder; import io.micronaut.context.DefaultApplicationContextBuilder; diff --git a/runtime/src/main/java/io/micronaut/runtime/context/CompositeMessageSource.java b/runtime/src/main/java/io/micronaut/runtime/context/CompositeMessageSource.java index 0bbe118c7e8..c13ddb8ae84 100644 --- a/runtime/src/main/java/io/micronaut/runtime/context/CompositeMessageSource.java +++ b/runtime/src/main/java/io/micronaut/runtime/context/CompositeMessageSource.java @@ -21,8 +21,8 @@ import io.micronaut.core.order.OrderUtil; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import java.util.Collection; import java.util.Collections; import java.util.Optional; diff --git a/runtime/src/main/java/io/micronaut/runtime/http/codec/TextPlainCodec.java b/runtime/src/main/java/io/micronaut/runtime/http/codec/TextPlainCodec.java index f984157dd6e..f8fd3ca3c8b 100644 --- a/runtime/src/main/java/io/micronaut/runtime/http/codec/TextPlainCodec.java +++ b/runtime/src/main/java/io/micronaut/runtime/http/codec/TextPlainCodec.java @@ -28,7 +28,7 @@ import io.micronaut.http.codec.MediaTypeCodec; import io.micronaut.runtime.ApplicationConfiguration; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/runtime/src/main/java/io/micronaut/runtime/http/scope/RequestCustomScope.java b/runtime/src/main/java/io/micronaut/runtime/http/scope/RequestCustomScope.java index dd72b18c56b..02f6a5a1665 100644 --- a/runtime/src/main/java/io/micronaut/runtime/http/scope/RequestCustomScope.java +++ b/runtime/src/main/java/io/micronaut/runtime/http/scope/RequestCustomScope.java @@ -15,7 +15,7 @@ */ package io.micronaut.runtime.http.scope; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.context.BeanContext; import io.micronaut.context.BeanResolutionContext; import io.micronaut.context.LifeCycle; @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.inject.Provider; import javax.inject.Singleton; import java.util.Map; diff --git a/runtime/src/main/java/io/micronaut/scheduling/DefaultTaskExceptionHandler.java b/runtime/src/main/java/io/micronaut/scheduling/DefaultTaskExceptionHandler.java index 38f65347a5a..f715d418792 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/DefaultTaskExceptionHandler.java +++ b/runtime/src/main/java/io/micronaut/scheduling/DefaultTaskExceptionHandler.java @@ -19,8 +19,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; /** diff --git a/runtime/src/main/java/io/micronaut/scheduling/TaskScheduler.java b/runtime/src/main/java/io/micronaut/scheduling/TaskScheduler.java index 2d1a3d01e20..f14e54828d3 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/TaskScheduler.java +++ b/runtime/src/main/java/io/micronaut/scheduling/TaskScheduler.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.time.Duration; import java.util.concurrent.Callable; import java.util.concurrent.ScheduledFuture; diff --git a/runtime/src/main/java/io/micronaut/scheduling/executor/ExecutorConfiguration.java b/runtime/src/main/java/io/micronaut/scheduling/executor/ExecutorConfiguration.java index 2a38021d083..f3c4f790af1 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/executor/ExecutorConfiguration.java +++ b/runtime/src/main/java/io/micronaut/scheduling/executor/ExecutorConfiguration.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling.executor; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.Min; import java.util.Optional; diff --git a/runtime/src/main/java/io/micronaut/scheduling/executor/UserExecutorConfiguration.java b/runtime/src/main/java/io/micronaut/scheduling/executor/UserExecutorConfiguration.java index b1fde2812bb..35ac940b0b2 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/executor/UserExecutorConfiguration.java +++ b/runtime/src/main/java/io/micronaut/scheduling/executor/UserExecutorConfiguration.java @@ -15,12 +15,12 @@ */ package io.micronaut.scheduling.executor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.EachProperty; import io.micronaut.context.annotation.Parameter; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.validation.constraints.Min; diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/Instrumentation.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/Instrumentation.java index 1774735ec4f..c4ea95390de 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/Instrumentation.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/Instrumentation.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling.instrument; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Experimental; /** diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedExecutor.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedExecutor.java index 55e0f7f5c3a..1ac81d87bf5 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedExecutor.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedExecutor.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling.instrument; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Experimental; import java.util.concurrent.Executor; diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedExecutorService.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedExecutorService.java index 8254360dada..0ccc5296070 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedExecutorService.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedExecutorService.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling.instrument; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Collection; import java.util.List; import java.util.concurrent.*; diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedScheduledExecutorService.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedScheduledExecutorService.java index a04c2e9c127..81911301f6b 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedScheduledExecutorService.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/InstrumentedScheduledExecutorService.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling.instrument; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.concurrent.Callable; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/InvocationInstrumenter.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/InvocationInstrumenter.java index 935e2544c36..cd2e5666bcc 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/InvocationInstrumenter.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/InvocationInstrumenter.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.Experimental; import io.micronaut.core.util.CollectionUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Collection; import java.util.concurrent.Callable; diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/InvocationInstrumenterFactory.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/InvocationInstrumenterFactory.java index 77569103067..7cab4a0aacd 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/InvocationInstrumenterFactory.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/InvocationInstrumenterFactory.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling.instrument; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.Experimental; import io.micronaut.core.annotation.Indexed; diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/MultipleInvocationInstrumenter.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/MultipleInvocationInstrumenter.java index 68c82d590f7..7c61d7047be 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/MultipleInvocationInstrumenter.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/MultipleInvocationInstrumenter.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling.instrument; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/NoopInstrumentation.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/NoopInstrumentation.java index beec90f3404..3983b8de55e 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/NoopInstrumentation.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/NoopInstrumentation.java @@ -15,7 +15,7 @@ */ package io.micronaut.scheduling.instrument; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * This implementation does no instrumentation. diff --git a/runtime/src/main/java/io/micronaut/scheduling/instrument/ReactiveInvocationInstrumenterFactory.java b/runtime/src/main/java/io/micronaut/scheduling/instrument/ReactiveInvocationInstrumenterFactory.java index c82fb3f776b..f7b7474d8d1 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/instrument/ReactiveInvocationInstrumenterFactory.java +++ b/runtime/src/main/java/io/micronaut/scheduling/instrument/ReactiveInvocationInstrumenterFactory.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.Experimental; import io.micronaut.core.annotation.Indexed; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** * An factory interface for reactive invocation instrumentation, factory method decides if instrumentation is needed. diff --git a/runtime/src/main/java/io/micronaut/scheduling/io/watch/DefaultWatchThread.java b/runtime/src/main/java/io/micronaut/scheduling/io/watch/DefaultWatchThread.java index 8c145a18201..08a937c463b 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/io/watch/DefaultWatchThread.java +++ b/runtime/src/main/java/io/micronaut/scheduling/io/watch/DefaultWatchThread.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Singleton; diff --git a/runtime/src/main/java/io/micronaut/scheduling/io/watch/FileWatchConfiguration.java b/runtime/src/main/java/io/micronaut/scheduling/io/watch/FileWatchConfiguration.java index 3d76b237334..01e52d23f8e 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/io/watch/FileWatchConfiguration.java +++ b/runtime/src/main/java/io/micronaut/scheduling/io/watch/FileWatchConfiguration.java @@ -20,7 +20,7 @@ import io.micronaut.core.util.ArgumentUtils; import io.micronaut.core.util.Toggleable; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.nio.file.Path; import java.nio.file.Paths; import java.time.Duration; diff --git a/runtime/src/main/java/io/micronaut/scheduling/io/watch/event/FileChangedEvent.java b/runtime/src/main/java/io/micronaut/scheduling/io/watch/event/FileChangedEvent.java index b2284883d3b..cb4b2e4a895 100644 --- a/runtime/src/main/java/io/micronaut/scheduling/io/watch/event/FileChangedEvent.java +++ b/runtime/src/main/java/io/micronaut/scheduling/io/watch/event/FileChangedEvent.java @@ -18,8 +18,7 @@ import io.micronaut.context.event.ApplicationEvent; import io.micronaut.core.util.ArgumentUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.annotation.concurrent.Immutable; +import io.micronaut.core.annotation.NonNull; import java.nio.file.Path; import java.nio.file.WatchEvent; @@ -30,7 +29,6 @@ * @since 1.1.0 * @see io.micronaut.scheduling.io.watch.FileWatchConfiguration */ -@Immutable public class FileChangedEvent extends ApplicationEvent { private final Path path; private final WatchEventType eventType; diff --git a/runtime/src/test/groovy/io/micronaut/support/InMemoryJavaFileManager.java b/runtime/src/test/groovy/io/micronaut/support/InMemoryJavaFileManager.java deleted file mode 100644 index c9501f33dda..00000000000 --- a/runtime/src/test/groovy/io/micronaut/support/InMemoryJavaFileManager.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * Copyright 2017-2020 original authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.micronaut.support; - -import com.google.common.base.MoreObjects; -import com.google.common.base.Optional; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableList; -import com.google.common.io.ByteSource; - -import java.io.ByteArrayOutputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.io.StringWriter; -import java.io.Writer; -import java.net.URI; -import java.nio.charset.Charset; -import java.util.Map.Entry; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardLocation; - -/** - * A file manager implementation that stores all output in memory. - * - * @author Gregory Kick - */ -final class InMemoryJavaFileManager extends ForwardingJavaFileManager { - private final LoadingCache inMemoryFileObjects = - CacheBuilder.newBuilder().build(new CacheLoader() { - @Override - public JavaFileObject load(URI key) { - return new InMemoryJavaFileManager.InMemoryJavaFileObject(key); - } - }); - - InMemoryJavaFileManager(JavaFileManager fileManager) { - super(fileManager); - } - - private static URI uriForFileObject(Location location, String packageName, String relativeName) { - StringBuilder uri = new StringBuilder("mem:///").append(location.getName()).append('/'); - if (!packageName.isEmpty()) { - uri.append(packageName.replace('.', '/')).append('/'); - } - uri.append(relativeName); - return URI.create(uri.toString()); - } - - private static URI uriForJavaFileObject(Location location, String className, Kind kind) { - return URI.create( - "mem:///" + location.getName() + '/' + className.replace('.', '/') + kind.extension); - } - - @Override - public boolean isSameFile(FileObject a, FileObject b) { - /* This check is less strict than what is typically done by the normal compiler file managers - * (e.g. JavacFileManager), but is actually the moral equivalent of what most of the - * implementations do anyway. We use this check rather than just delegating to the compiler's - * file manager because file objects for tests generally cause IllegalArgumentExceptions. */ - return a.toUri().equals(b.toUri()); - } - - @Override - public FileObject getFileForInput(Location location, String packageName, - String relativeName) throws IOException { - if (location.isOutputLocation()) { - return inMemoryFileObjects.getIfPresent( - uriForFileObject(location, packageName, relativeName)); - } else { - return super.getFileForInput(location, packageName, relativeName); - } - } - - @Override - public JavaFileObject getJavaFileForInput(Location location, String className, Kind kind) - throws IOException { - if (location.isOutputLocation()) { - return inMemoryFileObjects.getIfPresent(uriForJavaFileObject(location, className, kind)); - } else { - return super.getJavaFileForInput(location, className, kind); - } - } - - @Override - public FileObject getFileForOutput(Location location, String packageName, - String relativeName, FileObject sibling) throws IOException { - URI uri = uriForFileObject(location, packageName, relativeName); - return inMemoryFileObjects.getUnchecked(uri); - } - - @Override - public JavaFileObject getJavaFileForOutput(Location location, String className, final Kind kind, - FileObject sibling) throws IOException { - URI uri = uriForJavaFileObject(location, className, kind); - return inMemoryFileObjects.getUnchecked(uri); - } - - ImmutableList getGeneratedSources() { - ImmutableList.Builder result = ImmutableList.builder(); - for (Entry entry : inMemoryFileObjects.asMap().entrySet()) { - if (entry.getKey().getPath().startsWith("/" + StandardLocation.SOURCE_OUTPUT.name()) - && (entry.getValue().getKind() == Kind.SOURCE)) { - result.add(entry.getValue()); - } - } - return result.build(); - } - - ImmutableList getOutputFiles() { - return ImmutableList.copyOf(inMemoryFileObjects.asMap().values()); - } - - private static final class InMemoryJavaFileObject extends SimpleJavaFileObject - implements JavaFileObject { - private long lastModified = 0L; - private Optional data = Optional.absent(); - - InMemoryJavaFileObject(URI uri) { - super(uri, deduceKind(uri)); - } - - @Override - public InputStream openInputStream() throws IOException { - if (data.isPresent()) { - return data.get().openStream(); - } else { - throw new FileNotFoundException(); - } - } - - @Override - public OutputStream openOutputStream() throws IOException { - return new ByteArrayOutputStream() { - @Override - public void close() throws IOException { - super.close(); - data = Optional.of(ByteSource.wrap(toByteArray())); - lastModified = System.currentTimeMillis(); - } - }; - } - - @Override - public Reader openReader(boolean ignoreEncodingErrors) throws IOException { - if (data.isPresent()) { - return data.get().asCharSource(Charset.defaultCharset()).openStream(); - } else { - throw new FileNotFoundException(); - } - } - - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) - throws IOException { - if (data.isPresent()) { - return data.get().asCharSource(Charset.defaultCharset()).read(); - } else { - throw new FileNotFoundException(); - } - } - - @Override - public Writer openWriter() throws IOException { - return new StringWriter() { - @Override - public void close() throws IOException { - super.close(); - data = - Optional.of(ByteSource.wrap(toString().getBytes(Charset.defaultCharset()))); - lastModified = System.currentTimeMillis(); - } - }; - } - - @Override - public long getLastModified() { - return lastModified; - } - - @Override - public boolean delete() { - this.data = Optional.absent(); - this.lastModified = 0L; - return true; - } - - @Override - public String toString() { - return MoreObjects.toStringHelper(this) - .add("uri", toUri()) - .add("kind", kind) - .toString(); - } - } - - - static Kind deduceKind(URI uri) { - String path = uri.getPath(); - for (Kind kind : Kind.values()) { - if (path.endsWith(kind.extension)) { - return kind; - } - } - return Kind.OTHER; - } -} diff --git a/runtime/src/test/groovy/io/micronaut/support/Parser.java b/runtime/src/test/groovy/io/micronaut/support/Parser.java deleted file mode 100644 index 5a7eb475cf5..00000000000 --- a/runtime/src/test/groovy/io/micronaut/support/Parser.java +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright 2017-2020 original authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.micronaut.support; - -import static com.google.common.base.MoreObjects.firstNonNull; -import static java.lang.Boolean.TRUE; -import static java.nio.charset.StandardCharsets.UTF_8; -import static java.util.function.Predicate.isEqual; -import static javax.tools.Diagnostic.Kind.ERROR; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Multimaps; -import com.google.testing.compile.JavaFileObjects; -import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.ErroneousTree; -import com.sun.source.tree.Tree; -import com.sun.source.util.JavacTask; -import com.sun.source.util.TreeScanner; -import com.sun.source.util.Trees; -import com.sun.tools.javac.api.JavacTool; -import com.sun.tools.javac.util.Context; -import io.micronaut.annotation.processing.PackageConfigurationInjectProcessor; -import io.micronaut.annotation.processing.BeanDefinitionInjectProcessor; - -import java.io.File; -import java.io.IOException; -import java.util.*; -import javax.annotation.processing.Processor; -import javax.lang.model.element.Element; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.ToolProvider; - -/** Methods to parse Java source files. */ -public final class Parser { - /** - * Parses {@code sources} into {@linkplain CompilationUnitTree compilation units}. This method - * does not compile the sources. - */ - public static Iterable parseLines(String className, String... lines) { - return parse(JavaFileObjects.forSourceLines(className.replace('.', File.separatorChar) + ".java", lines)); - } - - /** - * Parses {@code sources} into {@linkplain CompilationUnitTree compilation units}. This method - * does not compile the sources. - */ - public static Iterable generate(String className, String code) { - return generate(JavaFileObjects.forSourceString(className, code)); - } - /** - * Parses {@code sources} into {@linkplain CompilationUnitTree compilation units}. This method - * does not compile the sources. - */ - public static Iterable parse(JavaFileObject... sources) { - JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); - DiagnosticCollector diagnosticCollector = new DiagnosticCollector<>(); - InMemoryJavaFileManager fileManager = - new InMemoryJavaFileManager( - compiler.getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8)); - Context context = new Context(); - JavacTask task = - ((JavacTool) compiler) - .getTask( - null, // explicitly use the default because old javac logs some output on stderr - fileManager, - diagnosticCollector, - ImmutableSet.of(), - ImmutableSet.of(), - Arrays.asList(sources), - context); - try { - task.parse(); - return task.analyze(); - } catch (IOException e) { - throw new RuntimeException(e); - } - finally { - List> diagnostics = diagnosticCollector.getDiagnostics(); - for (Diagnostic diagnostic : diagnostics) { - System.err.println(diagnostic); - } - } - } - - /** - * Parses {@code sources} into {@linkplain CompilationUnitTree compilation units}. This method - * does not compile the sources. - */ - public static Iterable generate(JavaFileObject... sources) { - JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); - DiagnosticCollector diagnosticCollector = new DiagnosticCollector<>(); - InMemoryJavaFileManager fileManager = - new InMemoryJavaFileManager( - compiler.getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8)); - Context context = new Context(); - JavacTask task = - ((JavacTool) compiler) - .getTask( - null, // explicitly use the default because old javac logs some output on stderr - fileManager, - diagnosticCollector, - ImmutableSet.of(), - ImmutableSet.of(), - Arrays.asList(sources), - context); - try { - - List processors = new ArrayList<>(); - processors.add(new PackageConfigurationInjectProcessor()); - processors.add(new BeanDefinitionInjectProcessor()); - task.setProcessors(processors); - task.generate(); - - List> diagnostics = diagnosticCollector.getDiagnostics(); - StringBuilder error = new StringBuilder(); - for (Diagnostic diagnostic : diagnostics) { - if( diagnostic.getKind() == Diagnostic.Kind.ERROR ) { - error.append(diagnostic); - } - } - if(error.length() > 0) { - throw new RuntimeException(error.toString()); - } - return fileManager.getOutputFiles(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * Returns {@code true} if the tree contains at least one {@linkplain ErroneousTree "erroneous"} - * node. - */ - public static boolean hasErrorNode(Tree tree) { - return isTrue(HAS_ERRONEOUS_NODE.scan(tree, false)); - } - - private static final TreeScanner HAS_ERRONEOUS_NODE = - new TreeScanner() { - @Override - public Boolean visitErroneous(ErroneousTree node, Boolean p) { - return true; - } - - @Override - public Boolean scan(Iterable nodes, Boolean p) { - for (Tree node : firstNonNull(nodes, ImmutableList.of())) { - if (isTrue(scan(node, p))) { - return true; - } - } - return p; - } - - @Override - public Boolean scan(Tree tree, Boolean p) { - return isTrue(p) ? p : super.scan(tree, p); - } - - @Override - public Boolean reduce(Boolean r1, Boolean r2) { - return isTrue(r1) || isTrue(r2); - } - }; - - private static boolean isTrue(Boolean p) { - return TRUE.equals(p); - } - - /** - * The diagnostic, parse trees, and {@link Trees} instance for a parse task. - * - *

Note: It is possible for the {@link Trees} instance contained within a {@code ParseResult} - * to be invalidated by a call to {@link com.sun.tools.javac.api.JavacTaskImpl#cleanup()}. Though - * we do not currently expose the {@link JavacTask} used to create a {@code ParseResult} to {@code - * cleanup()} calls on its underlying implementation, this should be acknowledged as an - * implementation detail that could cause unexpected behavior when making calls to methods in - * {@link Trees}. - */ - public static final class ParseResult { - private final ImmutableListMultimap> - diagnostics; - private final ImmutableList compilationUnits; - private final Trees trees; - - ParseResult( - ImmutableListMultimap> diagnostics, - Iterable compilationUnits, - Trees trees) { - this.trees = trees; - this.compilationUnits = ImmutableList.copyOf(compilationUnits); - this.diagnostics = diagnostics; - } - - public ImmutableListMultimap> - diagnosticsByKind() { - return diagnostics; - } - - public Iterable compilationUnits() { - return compilationUnits; - } - - public Trees trees() { - return trees; - } - } -} \ No newline at end of file diff --git a/session/src/main/java/io/micronaut/session/InMemorySession.java b/session/src/main/java/io/micronaut/session/InMemorySession.java index d2bd2b71dca..6ddcdb6d05e 100644 --- a/session/src/main/java/io/micronaut/session/InMemorySession.java +++ b/session/src/main/java/io/micronaut/session/InMemorySession.java @@ -18,7 +18,7 @@ import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.convert.value.MutableConvertibleValues; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.time.Duration; import java.time.Instant; import java.util.Collection; diff --git a/session/src/main/java/io/micronaut/session/Session.java b/session/src/main/java/io/micronaut/session/Session.java index fedd09e0bbe..a12e7a699e2 100644 --- a/session/src/main/java/io/micronaut/session/Session.java +++ b/session/src/main/java/io/micronaut/session/Session.java @@ -17,7 +17,7 @@ import io.micronaut.core.convert.value.MutableConvertibleValues; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.time.Duration; import java.time.Instant; import java.util.Optional; diff --git a/session/src/main/java/io/micronaut/session/SessionConfiguration.java b/session/src/main/java/io/micronaut/session/SessionConfiguration.java index c09d097a8a8..671251d31c4 100644 --- a/session/src/main/java/io/micronaut/session/SessionConfiguration.java +++ b/session/src/main/java/io/micronaut/session/SessionConfiguration.java @@ -18,7 +18,7 @@ import io.micronaut.context.annotation.ConfigurationProperties; import io.micronaut.scheduling.TaskExecutors; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/session/src/main/java/io/micronaut/session/http/SessionLocaleResolver.java b/session/src/main/java/io/micronaut/session/http/SessionLocaleResolver.java index bbc55ef218c..e0719aa4491 100644 --- a/session/src/main/java/io/micronaut/session/http/SessionLocaleResolver.java +++ b/session/src/main/java/io/micronaut/session/http/SessionLocaleResolver.java @@ -15,7 +15,7 @@ */ package io.micronaut.session.http; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Requires; import io.micronaut.http.HttpRequest; import io.micronaut.http.server.HttpServerConfiguration; diff --git a/session/src/test/groovy/io/micronaut/session/docs/ShoppingController.java b/session/src/test/groovy/io/micronaut/session/docs/ShoppingController.java index 9d6bbcfcb72..341bdcbab3b 100644 --- a/session/src/test/groovy/io/micronaut/session/docs/ShoppingController.java +++ b/session/src/test/groovy/io/micronaut/session/docs/ShoppingController.java @@ -20,7 +20,7 @@ import io.micronaut.session.Session; import io.micronaut.session.annotation.SessionValue; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.NotBlank; // end::imports[] diff --git a/session/src/test/groovy/io/micronaut/session/http/SessionBindingSpec.groovy b/session/src/test/groovy/io/micronaut/session/http/SessionBindingSpec.groovy index 4ce613654d3..7f0fd86ffac 100644 --- a/session/src/test/groovy/io/micronaut/session/http/SessionBindingSpec.groovy +++ b/session/src/test/groovy/io/micronaut/session/http/SessionBindingSpec.groovy @@ -17,6 +17,7 @@ package io.micronaut.session.http import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Requires +import io.micronaut.core.annotation.Nullable import io.micronaut.http.HttpHeaders import io.micronaut.http.HttpRequest import io.micronaut.http.HttpResponse @@ -29,7 +30,6 @@ import io.micronaut.session.annotation.SessionValue import io.reactivex.Flowable import spock.lang.Specification -import javax.annotation.Nullable /** * @author Graeme Rocher diff --git a/src/main/docs/guide/introduction/whatsNew.adoc b/src/main/docs/guide/introduction/whatsNew.adoc index 39da7620788..34ec7b4fbdd 100644 --- a/src/main/docs/guide/introduction/whatsNew.adoc +++ b/src/main/docs/guide/introduction/whatsNew.adoc @@ -2,88 +2,11 @@ Micronaut {version} includes the following changes: === Core Features -==== Banner +==== Core Nullability Annotations -A new customizable banner is now displayed when the application starts up. See <<_micronaut_banner, Micronaut Banner>> for more information. +With the future of JSR-305 unclear and issues with regards to the module system with existing solutions, Micronaut 2.4 replaces Spotbugs with core nullability annotations: ann:core.annotation.Nullable[] and ann:core.annotation.NotNull[]. -==== Compatibility with GraalVM 21.0.0 - -This release is compatible with the latest GraalVM 21.0.0 release, updating and testing all modules against the latest version of native image. - -==== Improved Support for Records - -Java 14+ Records can now be used to define <>. By default when `@ConfigurationProperties` is used on a `record`, configuration injection is applied. For example: - -[source,java] ----- -package example; -import io.micronaut.context.annotation.*; -import javax.validation.constraints.*; - -@ConfigurationProperties("example") -record Example(@Min(20) int num, String name) { -} ----- - -==== Bean Introspections Now Support Execution Handles - -A api:core.beans.BeanIntrospection[] can now declare methods that should generate reflection free execution handles. This feature allows calling other methods (besides setters) on introspections without using reflection. - -==== Improved Support for Copy Constructors and Immutable Types - -An immutable api:core.beans.BeanIntrospection[] (like Java Records as mentioned above) requires different handling when you need to create a new instance with a particular property modified. A typical pattern for this is to construct a new instance passing all the existing values plus the modified value (see for example https://projectlombok.org/features/With[Lombok's @With]). - -Micronaut's Bean Introspections now support this pattern. For example: - -[source,java] ----- -val introspection = BeanIntrospection.getIntrospection(Example.java); -Example example = introspection.instantiate(10, "Test"); -assertEquals(10, example.num()); -example = introspection.getRequiredProperty("num", int.class) - .withValue(example, 20); -assertEquals(20, example.num()); ----- - -The new `withValue` method will automatically create a new instance populating the existing properties and returning the instance. - -Micronaut will at compilation time compute an efficient copy-constructor approach that will only return a new instance if the value changes. - -=== HTTP Features - -==== Locale Resolution - -A new interface api:http.server.util.HttpLocaleResolver[] has been introduced to support resolving a locale from a given request in multiple ways. A `java.util.Locale` object can now be a parameter to controller and client methods to automatically bind the locale to/from the request. See <> for more information. - -==== Host Resolution - -It is now possible to validate a resolved host against a list regular expressions patterns. See <> for more information. - -=== Cloud Features - -==== New CI/CD Deployment Workflows for Github Actions in Launch - -https://micronaut.io/launch/[Micronaut Launch] has been updated to include CI/CD workflows to deploy to common container based Cloud environments including Oracle Cloud Function, Azure Container Instance and Google Cloud Run. - -Combined with the ability to https://www.youtube.com/watch?v=X4AKGf1TlXM[Push to Github] this makes it a breeze to setup Micronaut applications to be deployed to the Cloud. - -==== Google Cloud Secret Manager - -Thanks to a contribution by https://github.com/viniciusccarvalho[Vinicius Carvalho], https://micronaut-projects.github.io/micronaut-gcp/latest/guide/#introduction[Micronaut GCP] supports https://micronaut-projects.github.io/micronaut-gcp/latest/guide/#secretManager[distributed configuration via Google Cloud Secret Manager]. - -=== Micronaut JMS - -A new https://micronaut-projects.github.io/micronaut-jms/1.0.x/guide/[Micronaut JMS module] (currently in preview) to support JMS messaging including ActiveMQ and Amazon SQS has been added with full support for GraalVM native image. See the https://micronaut-projects.github.io/micronaut-jms/1.0.x/guide/[Micronaut JMS documentation] for more information. - -=== Other improvements - -While Micronaut has always followed the https://semver.org/[Semantic Versioning] principles, our non-stable versioning didn't match the specification. For example, our snapshots were versioned as `1.2.3.BUILD-SNAPSHOT` as opposed to `1.2.3-SNAPSHOT`. - -Since Micronaut 2.3, all our artifacts' non-stable versions will be like: - -* Snapshots: `1.2.3-SNAPSHOT`. -* Milestones: `1.2.3-M1`, `1.2.3-M2`, etc. -* Release candidates: `1.2.3-RC1`, `1.2.3-RC2`, etc. +You should use this annotations in your code, or if you prefer Spotbugs add it to your classpath as necessary. === Module Upgrades diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/docs/http/client/bind/annotation/MetadataClientArgumentBinder.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/docs/http/client/bind/annotation/MetadataClientArgumentBinder.groovy index 753a41378df..340d7cda3f7 100644 --- a/test-suite-groovy/src/test/groovy/io/micronaut/docs/http/client/bind/annotation/MetadataClientArgumentBinder.groovy +++ b/test-suite-groovy/src/test/groovy/io/micronaut/docs/http/client/bind/annotation/MetadataClientArgumentBinder.groovy @@ -1,6 +1,6 @@ package io.micronaut.docs.http.client.bind.annotation -import edu.umd.cs.findbugs.annotations.NonNull +import io.micronaut.core.annotation.NonNull //tag::clazz[] import io.micronaut.core.convert.ArgumentConversionContext diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.groovy index 7bdaa346c61..eecf614b445 100644 --- a/test-suite-groovy/src/test/groovy/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.groovy +++ b/test-suite-groovy/src/test/groovy/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.groovy @@ -1,7 +1,7 @@ package io.micronaut.docs.http.client.bind.type //tag::clazz[] -import edu.umd.cs.findbugs.annotations.NonNull +import io.micronaut.core.annotation.NonNull import io.micronaut.core.convert.ArgumentConversionContext import io.micronaut.core.type.Argument import io.micronaut.http.MutableHttpRequest diff --git a/test-suite-groovy/src/test/groovy/io/micronaut/docs/ioc/validation/custom/DurationPatternValidator.groovy b/test-suite-groovy/src/test/groovy/io/micronaut/docs/ioc/validation/custom/DurationPatternValidator.groovy index f888cb4ed2f..23d7abf8d1d 100644 --- a/test-suite-groovy/src/test/groovy/io/micronaut/docs/ioc/validation/custom/DurationPatternValidator.groovy +++ b/test-suite-groovy/src/test/groovy/io/micronaut/docs/ioc/validation/custom/DurationPatternValidator.groovy @@ -17,8 +17,8 @@ package io.micronaut.docs.ioc.validation.custom // tag::imports[] -import edu.umd.cs.findbugs.annotations.NonNull -import edu.umd.cs.findbugs.annotations.Nullable +import io.micronaut.core.annotation.NonNull +import io.micronaut.core.annotation.Nullable import io.micronaut.core.annotation.AnnotationValue import io.micronaut.validation.validator.constraints.* // end::imports[] diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.kt index c0d0b478efd..c86b1e23942 100644 --- a/test-suite-kotlin/src/test/kotlin/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.kt +++ b/test-suite-kotlin/src/test/kotlin/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.kt @@ -9,16 +9,18 @@ import io.micronaut.http.client.bind.TypedClientArgumentRequestBinder import javax.inject.Singleton @Singleton -class MetadataClientArgumentBinder : TypedClientArgumentRequestBinder { +class MetadataClientArgumentBinder : TypedClientArgumentRequestBinder { - override fun argumentType(): Argument { + override fun argumentType(): Argument { return Argument.of(Metadata::class.java) } - override fun bind(context: ArgumentConversionContext, - uriContext: ClientRequestUriContext, - value: Metadata, - request: MutableHttpRequest<*>) { + override fun bind( + context: ArgumentConversionContext, + uriContext: ClientRequestUriContext, + value: Metadata, + request: MutableHttpRequest<*> + ) { request.header("X-Metadata-Version", value.version.toString()) request.header("X-Metadata-Deployment-Id", value.deploymentId.toString()) } diff --git a/test-suite/src/main/java/example/micronaut/inject/visitor/AnnotatingVisitor.java b/test-suite/src/main/java/example/micronaut/inject/visitor/AnnotatingVisitor.java index 7b58e3dc2d6..5a6ce9df4fa 100644 --- a/test-suite/src/main/java/example/micronaut/inject/visitor/AnnotatingVisitor.java +++ b/test-suite/src/main/java/example/micronaut/inject/visitor/AnnotatingVisitor.java @@ -15,7 +15,7 @@ */ package example.micronaut.inject.visitor; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.version.annotation.Version; import io.micronaut.inject.ast.ClassElement; import io.micronaut.inject.ast.ConstructorElement; diff --git a/test-suite/src/test/groovy/io/micronaut/docs/aop/validation/ValidatedWithJavaxAnnoationNonNullSpec.groovy b/test-suite/src/test/groovy/io/micronaut/docs/aop/validation/ValidatedWithJavaxAnnoationNonNullSpec.groovy index 00041931af1..67f991432df 100644 --- a/test-suite/src/test/groovy/io/micronaut/docs/aop/validation/ValidatedWithJavaxAnnoationNonNullSpec.groovy +++ b/test-suite/src/test/groovy/io/micronaut/docs/aop/validation/ValidatedWithJavaxAnnoationNonNullSpec.groovy @@ -15,7 +15,7 @@ */ package io.micronaut.docs.aop.validation -import edu.umd.cs.findbugs.annotations.NonNull +import io.micronaut.core.annotation.NonNull import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Requires import io.micronaut.context.env.Environment diff --git a/test-suite/src/test/java/io/micronaut/docs/config/immutable/EngineConfig.java b/test-suite/src/test/java/io/micronaut/docs/config/immutable/EngineConfig.java index 0cdb9d3a56e..51d442525e4 100644 --- a/test-suite/src/test/java/io/micronaut/docs/config/immutable/EngineConfig.java +++ b/test-suite/src/test/java/io/micronaut/docs/config/immutable/EngineConfig.java @@ -19,7 +19,7 @@ // tag::imports[] import io.micronaut.context.annotation.*; import io.micronaut.core.bind.annotation.Bindable; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.*; import java.util.Optional; // end::imports[] diff --git a/test-suite/src/test/java/io/micronaut/docs/http/client/bind/annotation/MetadataClientArgumentBinder.java b/test-suite/src/test/java/io/micronaut/docs/http/client/bind/annotation/MetadataClientArgumentBinder.java index 7cf95b1e7b8..9aeb12ba065 100644 --- a/test-suite/src/test/java/io/micronaut/docs/http/client/bind/annotation/MetadataClientArgumentBinder.java +++ b/test-suite/src/test/java/io/micronaut/docs/http/client/bind/annotation/MetadataClientArgumentBinder.java @@ -1,7 +1,7 @@ package io.micronaut.docs.http.client.bind.annotation; //tag::clazz[] -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.naming.NameUtils; import io.micronaut.core.util.StringUtils; diff --git a/test-suite/src/test/java/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.java b/test-suite/src/test/java/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.java index 113d6ae00a4..a0b07c2643e 100644 --- a/test-suite/src/test/java/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.java +++ b/test-suite/src/test/java/io/micronaut/docs/http/client/bind/type/MetadataClientArgumentBinder.java @@ -1,7 +1,7 @@ package io.micronaut.docs.http.client.bind.type; //tag::clazz[] -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.convert.ArgumentConversionContext; import io.micronaut.core.type.Argument; import io.micronaut.http.MutableHttpRequest; diff --git a/test-suite/src/test/java/io/micronaut/docs/ioc/validation/custom/DurationPatternValidator.java b/test-suite/src/test/java/io/micronaut/docs/ioc/validation/custom/DurationPatternValidator.java index 87997ced7a1..945a50e6d50 100644 --- a/test-suite/src/test/java/io/micronaut/docs/ioc/validation/custom/DurationPatternValidator.java +++ b/test-suite/src/test/java/io/micronaut/docs/ioc/validation/custom/DurationPatternValidator.java @@ -16,8 +16,8 @@ package io.micronaut.docs.ioc.validation.custom; // tag::imports[] -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.core.annotation.AnnotationValue; import io.micronaut.validation.validator.constraints.*; // end::imports[] diff --git a/test-suite/src/test/java/io/micronaut/docs/server/binding/BindingController.java b/test-suite/src/test/java/io/micronaut/docs/server/binding/BindingController.java index 597d817a238..1449d9bac56 100644 --- a/test-suite/src/test/java/io/micronaut/docs/server/binding/BindingController.java +++ b/test-suite/src/test/java/io/micronaut/docs/server/binding/BindingController.java @@ -21,7 +21,7 @@ import io.micronaut.http.annotation.Get; import io.micronaut.http.annotation.Header; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import java.time.ZonedDateTime; import java.util.Arrays; import java.util.List; diff --git a/test-suite/src/test/java/io/micronaut/docs/server/binding/BookmarkController.java b/test-suite/src/test/java/io/micronaut/docs/server/binding/BookmarkController.java index 9f452c0e74f..085f73fc05f 100644 --- a/test-suite/src/test/java/io/micronaut/docs/server/binding/BookmarkController.java +++ b/test-suite/src/test/java/io/micronaut/docs/server/binding/BookmarkController.java @@ -20,7 +20,7 @@ import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Get; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.Valid; // end::imports[] diff --git a/test-suite/src/test/java/io/micronaut/docs/server/binding/PaginationCommand.java b/test-suite/src/test/java/io/micronaut/docs/server/binding/PaginationCommand.java index b15e8e7ff5c..89ee288c516 100644 --- a/test-suite/src/test/java/io/micronaut/docs/server/binding/PaginationCommand.java +++ b/test-suite/src/test/java/io/micronaut/docs/server/binding/PaginationCommand.java @@ -17,7 +17,7 @@ import io.micronaut.core.annotation.Introspected; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.Pattern; import javax.validation.constraints.Positive; import javax.validation.constraints.PositiveOrZero; diff --git a/test-suite/src/test/java/io/micronaut/docs/session/ShoppingController.java b/test-suite/src/test/java/io/micronaut/docs/session/ShoppingController.java index 4e30032d958..8a0d71c8adc 100644 --- a/test-suite/src/test/java/io/micronaut/docs/session/ShoppingController.java +++ b/test-suite/src/test/java/io/micronaut/docs/session/ShoppingController.java @@ -23,7 +23,7 @@ import io.micronaut.session.Session; import io.micronaut.session.annotation.SessionValue; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.NotBlank; // end::imports[] diff --git a/tracing/src/main/java/io/micronaut/tracing/brave/AsyncReporterConfiguration.java b/tracing/src/main/java/io/micronaut/tracing/brave/AsyncReporterConfiguration.java index e9fef1cf945..47315d299ca 100644 --- a/tracing/src/main/java/io/micronaut/tracing/brave/AsyncReporterConfiguration.java +++ b/tracing/src/main/java/io/micronaut/tracing/brave/AsyncReporterConfiguration.java @@ -22,7 +22,7 @@ import zipkin2.reporter.ReporterMetrics; import zipkin2.reporter.Sender; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; /** diff --git a/tracing/src/main/java/io/micronaut/tracing/brave/BraveTracerConfiguration.java b/tracing/src/main/java/io/micronaut/tracing/brave/BraveTracerConfiguration.java index 771f034f526..9135ccdb888 100644 --- a/tracing/src/main/java/io/micronaut/tracing/brave/BraveTracerConfiguration.java +++ b/tracing/src/main/java/io/micronaut/tracing/brave/BraveTracerConfiguration.java @@ -32,7 +32,7 @@ import io.micronaut.runtime.ApplicationConfiguration; import io.micronaut.tracing.brave.sender.HttpClientSender; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; /** diff --git a/tracing/src/main/java/io/micronaut/tracing/brave/BraveTracerFactory.java b/tracing/src/main/java/io/micronaut/tracing/brave/BraveTracerFactory.java index 92714d49420..60f6b0b8246 100644 --- a/tracing/src/main/java/io/micronaut/tracing/brave/BraveTracerFactory.java +++ b/tracing/src/main/java/io/micronaut/tracing/brave/BraveTracerFactory.java @@ -26,7 +26,7 @@ import zipkin2.reporter.AsyncReporter; import zipkin2.reporter.Reporter; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; /** diff --git a/tracing/src/main/java/io/micronaut/tracing/instrument/http/OpenTracingClientFilter.java b/tracing/src/main/java/io/micronaut/tracing/instrument/http/OpenTracingClientFilter.java index 896f33a48a9..cc886c8555d 100644 --- a/tracing/src/main/java/io/micronaut/tracing/instrument/http/OpenTracingClientFilter.java +++ b/tracing/src/main/java/io/micronaut/tracing/instrument/http/OpenTracingClientFilter.java @@ -31,7 +31,7 @@ import io.opentracing.propagation.Format; import org.reactivestreams.Publisher; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * An HTTP client instrumentation filter that uses Open Tracing. diff --git a/tracing/src/main/java/io/micronaut/tracing/instrument/http/OpenTracingServerFilter.java b/tracing/src/main/java/io/micronaut/tracing/instrument/http/OpenTracingServerFilter.java index 3dd8184deb9..e47c2faeac4 100644 --- a/tracing/src/main/java/io/micronaut/tracing/instrument/http/OpenTracingServerFilter.java +++ b/tracing/src/main/java/io/micronaut/tracing/instrument/http/OpenTracingServerFilter.java @@ -15,7 +15,7 @@ */ package io.micronaut.tracing.instrument.http; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Requires; import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpResponse; diff --git a/tracing/src/main/java/io/micronaut/tracing/instrument/hystrix/TracingHystrixConcurrentStrategy.java b/tracing/src/main/java/io/micronaut/tracing/instrument/hystrix/TracingHystrixConcurrentStrategy.java index 3cc250df158..21080753fe6 100644 --- a/tracing/src/main/java/io/micronaut/tracing/instrument/hystrix/TracingHystrixConcurrentStrategy.java +++ b/tracing/src/main/java/io/micronaut/tracing/instrument/hystrix/TracingHystrixConcurrentStrategy.java @@ -27,7 +27,7 @@ import io.micronaut.scheduling.instrument.InvocationInstrumenter; import io.micronaut.tracing.instrument.util.TracingInvocationInstrumenterFactory; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Callable; diff --git a/tracing/src/main/java/io/micronaut/tracing/instrument/util/TracingInvocationInstrumenterFactory.java b/tracing/src/main/java/io/micronaut/tracing/instrument/util/TracingInvocationInstrumenterFactory.java index 9f80e55de54..966460962d2 100644 --- a/tracing/src/main/java/io/micronaut/tracing/instrument/util/TracingInvocationInstrumenterFactory.java +++ b/tracing/src/main/java/io/micronaut/tracing/instrument/util/TracingInvocationInstrumenterFactory.java @@ -18,7 +18,7 @@ import io.micronaut.core.annotation.Experimental; import io.micronaut.scheduling.instrument.InvocationInstrumenter; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; /** * An factory interface for tracing invocation instrumentation, factory method decides if instrumentation is needed. diff --git a/tracing/src/main/java/io/micronaut/tracing/instrument/util/TracingPublisher.java b/tracing/src/main/java/io/micronaut/tracing/instrument/util/TracingPublisher.java index 9748cad0041..c8c6332e7ea 100644 --- a/tracing/src/main/java/io/micronaut/tracing/instrument/util/TracingPublisher.java +++ b/tracing/src/main/java/io/micronaut/tracing/instrument/util/TracingPublisher.java @@ -26,7 +26,7 @@ import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.Optional; diff --git a/tracing/src/main/java/io/micronaut/tracing/interceptor/TraceInterceptor.java b/tracing/src/main/java/io/micronaut/tracing/interceptor/TraceInterceptor.java index a7d31d40d56..8dfb8f85c8f 100644 --- a/tracing/src/main/java/io/micronaut/tracing/interceptor/TraceInterceptor.java +++ b/tracing/src/main/java/io/micronaut/tracing/interceptor/TraceInterceptor.java @@ -34,7 +34,7 @@ import io.opentracing.Tracer; import io.opentracing.log.Fields; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import org.reactivestreams.Publisher; import javax.inject.Singleton; diff --git a/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerConfiguration.java b/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerConfiguration.java index d7143730a93..b9148509059 100644 --- a/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerConfiguration.java +++ b/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerConfiguration.java @@ -24,7 +24,7 @@ import io.micronaut.core.util.Toggleable; import io.micronaut.runtime.ApplicationConfiguration; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import static io.jaegertracing.Configuration.JAEGER_SERVICE_NAME; diff --git a/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerTracerFactory.java b/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerTracerFactory.java index 7e0a335aa2c..3f4c90cf4c8 100644 --- a/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerTracerFactory.java +++ b/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerTracerFactory.java @@ -25,7 +25,7 @@ import io.opentracing.Tracer; import io.opentracing.util.GlobalTracer; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/validation/build.gradle b/validation/build.gradle index 96602d7c17b..a6d27958217 100644 --- a/validation/build.gradle +++ b/validation/build.gradle @@ -7,7 +7,8 @@ dependencies { compileOnly dependencyVersion("gorm") compileOnly project(":http-server") - + + testImplementation dependencyVersion("spotbugs") testAnnotationProcessor project(":inject-java") testImplementation project(":inject") testImplementation project(":http-server-netty") diff --git a/validation/src/main/java/io/micronaut/validation/ValidatingInterceptor.java b/validation/src/main/java/io/micronaut/validation/ValidatingInterceptor.java index 7e73b7e7155..e40a9b5c487 100644 --- a/validation/src/main/java/io/micronaut/validation/ValidatingInterceptor.java +++ b/validation/src/main/java/io/micronaut/validation/ValidatingInterceptor.java @@ -15,7 +15,7 @@ */ package io.micronaut.validation; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import io.micronaut.aop.InterceptPhase; import io.micronaut.aop.InterceptedMethod; import io.micronaut.aop.MethodInterceptor; diff --git a/validation/src/main/java/io/micronaut/validation/async/AsyncTypeElementVisitor.java b/validation/src/main/java/io/micronaut/validation/async/AsyncTypeElementVisitor.java index ca82f7a25e4..0a5376e37d1 100644 --- a/validation/src/main/java/io/micronaut/validation/async/AsyncTypeElementVisitor.java +++ b/validation/src/main/java/io/micronaut/validation/async/AsyncTypeElementVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.validation.async; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Internal; import io.micronaut.core.async.publisher.Publishers; import io.micronaut.inject.ast.ClassElement; diff --git a/validation/src/main/java/io/micronaut/validation/executable/ExecutableVisitor.java b/validation/src/main/java/io/micronaut/validation/executable/ExecutableVisitor.java index d2ba940c820..c1e03459381 100644 --- a/validation/src/main/java/io/micronaut/validation/executable/ExecutableVisitor.java +++ b/validation/src/main/java/io/micronaut/validation/executable/ExecutableVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.validation.executable; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.annotation.Executable; import io.micronaut.core.annotation.Internal; import io.micronaut.inject.ast.MethodElement; diff --git a/validation/src/main/java/io/micronaut/validation/internal/InternalApiTypeElementVisitor.java b/validation/src/main/java/io/micronaut/validation/internal/InternalApiTypeElementVisitor.java index ff57a48c24b..698c0802cd8 100644 --- a/validation/src/main/java/io/micronaut/validation/internal/InternalApiTypeElementVisitor.java +++ b/validation/src/main/java/io/micronaut/validation/internal/InternalApiTypeElementVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.validation.internal; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.annotation.Experimental; import io.micronaut.core.annotation.Internal; import io.micronaut.inject.ast.*; diff --git a/validation/src/main/java/io/micronaut/validation/routes/RouteParameterElement.java b/validation/src/main/java/io/micronaut/validation/routes/RouteParameterElement.java index b0d5cac8cd4..d1f406b94a8 100644 --- a/validation/src/main/java/io/micronaut/validation/routes/RouteParameterElement.java +++ b/validation/src/main/java/io/micronaut/validation/routes/RouteParameterElement.java @@ -21,7 +21,7 @@ import io.micronaut.inject.ast.ClassElement; import io.micronaut.inject.ast.ParameterElement; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; /** * Models a route parameter. diff --git a/validation/src/main/java/io/micronaut/validation/routes/RouteValidationVisitor.java b/validation/src/main/java/io/micronaut/validation/routes/RouteValidationVisitor.java index 403e6b5d3fb..3be8de9b15a 100644 --- a/validation/src/main/java/io/micronaut/validation/routes/RouteValidationVisitor.java +++ b/validation/src/main/java/io/micronaut/validation/routes/RouteValidationVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.validation.routes; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.context.env.DefaultPropertyPlaceholderResolver; import io.micronaut.context.env.DefaultPropertyPlaceholderResolver.RawSegment; import io.micronaut.context.env.DefaultPropertyPlaceholderResolver.Segment; diff --git a/validation/src/main/java/io/micronaut/validation/validator/DefaultAnnotatedElementValidator.java b/validation/src/main/java/io/micronaut/validation/validator/DefaultAnnotatedElementValidator.java index 9c89d461a44..79aa7dcb1e4 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/DefaultAnnotatedElementValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/DefaultAnnotatedElementValidator.java @@ -25,7 +25,7 @@ import io.micronaut.validation.validator.constraints.ConstraintValidator; import io.micronaut.validation.validator.constraints.DefaultConstraintValidators; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.HashMap; diff --git a/validation/src/main/java/io/micronaut/validation/validator/DefaultValidator.java b/validation/src/main/java/io/micronaut/validation/validator/DefaultValidator.java index b2319de8501..a692fce0498 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/DefaultValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/DefaultValidator.java @@ -15,8 +15,8 @@ */ package io.micronaut.validation.validator; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import io.micronaut.aop.Intercepted; import io.micronaut.context.BeanResolutionContext; import io.micronaut.context.ExecutionHandleLocator; diff --git a/validation/src/main/java/io/micronaut/validation/validator/DefaultValidatorConfiguration.java b/validation/src/main/java/io/micronaut/validation/validator/DefaultValidatorConfiguration.java index 048711b75a1..b7a0ff9c576 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/DefaultValidatorConfiguration.java +++ b/validation/src/main/java/io/micronaut/validation/validator/DefaultValidatorConfiguration.java @@ -25,8 +25,8 @@ import io.micronaut.validation.validator.extractors.ValueExtractorRegistry; import io.micronaut.validation.validator.messages.DefaultValidationMessages; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.validation.*; import javax.validation.Validator; diff --git a/validation/src/main/java/io/micronaut/validation/validator/ExecutableMethodValidator.java b/validation/src/main/java/io/micronaut/validation/validator/ExecutableMethodValidator.java index f4d6112fe02..7c63b34259d 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/ExecutableMethodValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/ExecutableMethodValidator.java @@ -20,8 +20,8 @@ import io.micronaut.core.type.MutableArgumentValue; import io.micronaut.inject.ExecutableMethod; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.executable.ExecutableValidator; diff --git a/validation/src/main/java/io/micronaut/validation/validator/ReactiveValidator.java b/validation/src/main/java/io/micronaut/validation/validator/ReactiveValidator.java index 25874e46acc..31b36a414a2 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/ReactiveValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/ReactiveValidator.java @@ -17,7 +17,7 @@ import org.reactivestreams.Publisher; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import java.util.concurrent.CompletionStage; /** diff --git a/validation/src/main/java/io/micronaut/validation/validator/Validator.java b/validation/src/main/java/io/micronaut/validation/validator/Validator.java index d25ba43a56a..368118614a3 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/Validator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/Validator.java @@ -17,8 +17,8 @@ import io.micronaut.core.beans.BeanIntrospection; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.validation.Constraint; import javax.validation.ConstraintViolation; diff --git a/validation/src/main/java/io/micronaut/validation/validator/ValidatorConfiguration.java b/validation/src/main/java/io/micronaut/validation/validator/ValidatorConfiguration.java index b559dd18830..e8f1d534a7d 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/ValidatorConfiguration.java +++ b/validation/src/main/java/io/micronaut/validation/validator/ValidatorConfiguration.java @@ -20,8 +20,7 @@ import io.micronaut.validation.validator.constraints.ConstraintValidatorRegistry; import io.micronaut.validation.validator.extractors.ValueExtractorRegistry; -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.annotation.concurrent.Immutable; +import io.micronaut.core.annotation.NonNull; import javax.validation.ClockProvider; import javax.validation.TraversableResolver; @@ -31,7 +30,6 @@ * @author graemerocher * @since 1.2 */ -@Immutable public interface ValidatorConfiguration { /** diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/AbstractPatternValidator.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/AbstractPatternValidator.java index ee213a4068e..3abff3a0f63 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/AbstractPatternValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/AbstractPatternValidator.java @@ -17,7 +17,7 @@ import io.micronaut.core.annotation.AnnotationValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.validation.ValidationException; import javax.validation.constraints.Pattern; import java.lang.annotation.Annotation; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidator.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidator.java index 01fda88329e..74442f80351 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidator.java @@ -18,10 +18,8 @@ import io.micronaut.core.annotation.AnnotationValue; import io.micronaut.core.annotation.Indexed; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; -import javax.annotation.concurrent.Immutable; -import javax.annotation.concurrent.ThreadSafe; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.validation.ClockProvider; import javax.validation.Constraint; import java.lang.annotation.Annotation; @@ -35,8 +33,6 @@ * @param The annotation type * @param The supported validation types */ -@Immutable -@ThreadSafe @Indexed(ConstraintValidator.class) @FunctionalInterface public interface ConstraintValidator extends javax.validation.ConstraintValidator { diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidatorContext.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidatorContext.java index 82fff85a323..e01f4c7f85e 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidatorContext.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidatorContext.java @@ -15,8 +15,8 @@ */ package io.micronaut.validation.validator.constraints; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.validation.ClockProvider; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidatorRegistry.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidatorRegistry.java index 7839896f927..57993963dcf 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidatorRegistry.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/ConstraintValidatorRegistry.java @@ -15,7 +15,7 @@ */ package io.micronaut.validation.validator.constraints; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.validation.ValidationException; import java.lang.annotation.Annotation; import java.util.Optional; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMaxValidator.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMaxValidator.java index d133d3dcf21..c8b06af51d7 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMaxValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMaxValidator.java @@ -18,8 +18,8 @@ import io.micronaut.core.annotation.AnnotationValue; import io.micronaut.core.convert.ConversionService; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.validation.ValidationException; import javax.validation.constraints.DecimalMax; import java.math.BigDecimal; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMinValidator.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMinValidator.java index 857c15ffd33..6802b85635f 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMinValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/DecimalMinValidator.java @@ -18,8 +18,8 @@ import io.micronaut.core.annotation.AnnotationValue; import io.micronaut.core.convert.ConversionService; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.validation.ValidationException; import javax.validation.constraints.DecimalMin; import java.math.BigDecimal; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/DefaultConstraintValidators.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/DefaultConstraintValidators.java index a0a4918ff0d..32199b7c5f0 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/DefaultConstraintValidators.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/DefaultConstraintValidators.java @@ -30,8 +30,8 @@ import io.micronaut.inject.qualifiers.Qualifiers; import io.micronaut.inject.qualifiers.TypeArgumentQualifier; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; import javax.validation.ValidationException; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/DigitsValidator.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/DigitsValidator.java index 22285cd1be3..2ec463c351f 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/DigitsValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/DigitsValidator.java @@ -17,8 +17,8 @@ import io.micronaut.core.annotation.AnnotationValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.Digits; import java.math.BigDecimal; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/EmailValidator.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/EmailValidator.java index 8dc4f650cc1..87fa92d2789 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/EmailValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/EmailValidator.java @@ -23,8 +23,8 @@ import io.micronaut.core.annotation.AnnotationValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; import javax.validation.constraints.Email; import java.util.regex.Matcher; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/PatternValidator.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/PatternValidator.java index 89da68f1ce3..b7456e4baee 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/PatternValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/PatternValidator.java @@ -17,8 +17,8 @@ import io.micronaut.core.annotation.AnnotationValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Singleton; import javax.validation.constraints.Pattern; diff --git a/validation/src/main/java/io/micronaut/validation/validator/constraints/SizeValidator.java b/validation/src/main/java/io/micronaut/validation/validator/constraints/SizeValidator.java index 8b61cbf77d5..41790b5acfd 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/constraints/SizeValidator.java +++ b/validation/src/main/java/io/micronaut/validation/validator/constraints/SizeValidator.java @@ -17,8 +17,8 @@ import io.micronaut.core.annotation.AnnotationValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.Size; /** diff --git a/validation/src/main/java/io/micronaut/validation/validator/extractors/DefaultValueExtractors.java b/validation/src/main/java/io/micronaut/validation/validator/extractors/DefaultValueExtractors.java index 0f038a20ef6..e57dc348f05 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/extractors/DefaultValueExtractors.java +++ b/validation/src/main/java/io/micronaut/validation/validator/extractors/DefaultValueExtractors.java @@ -24,8 +24,8 @@ import io.micronaut.core.util.ArrayUtils; import io.micronaut.core.util.CollectionUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.core.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; import javax.validation.valueextraction.UnwrapByDefault; diff --git a/validation/src/main/java/io/micronaut/validation/validator/extractors/ValueExtractorRegistry.java b/validation/src/main/java/io/micronaut/validation/validator/extractors/ValueExtractorRegistry.java index e18ddda68c2..bc20c94b5fd 100644 --- a/validation/src/main/java/io/micronaut/validation/validator/extractors/ValueExtractorRegistry.java +++ b/validation/src/main/java/io/micronaut/validation/validator/extractors/ValueExtractorRegistry.java @@ -15,7 +15,7 @@ */ package io.micronaut.validation.validator.extractors; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import javax.validation.ValidationException; import javax.validation.valueextraction.ValueExtractor; import java.util.Optional; diff --git a/validation/src/main/java/io/micronaut/validation/websocket/WebSocketVisitor.java b/validation/src/main/java/io/micronaut/validation/websocket/WebSocketVisitor.java index a2760f411c3..a8cf3e72de8 100644 --- a/validation/src/main/java/io/micronaut/validation/websocket/WebSocketVisitor.java +++ b/validation/src/main/java/io/micronaut/validation/websocket/WebSocketVisitor.java @@ -15,7 +15,7 @@ */ package io.micronaut.validation.websocket; -import edu.umd.cs.findbugs.annotations.NonNull; +import io.micronaut.core.annotation.NonNull; import io.micronaut.core.bind.annotation.Bindable; import io.micronaut.core.util.ArrayUtils; import io.micronaut.core.util.CollectionUtils; diff --git a/validation/src/test/groovy/io/micronaut/validation/BookmarkController.java b/validation/src/test/groovy/io/micronaut/validation/BookmarkController.java index a1f9c2c29d7..8b32567103f 100644 --- a/validation/src/test/groovy/io/micronaut/validation/BookmarkController.java +++ b/validation/src/test/groovy/io/micronaut/validation/BookmarkController.java @@ -19,7 +19,7 @@ import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Get; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.Valid; import javax.validation.constraints.Pattern; import javax.validation.constraints.Positive; diff --git a/validation/src/test/groovy/io/micronaut/validation/PaginationCommand.java b/validation/src/test/groovy/io/micronaut/validation/PaginationCommand.java index f5701226cae..44bd807f223 100644 --- a/validation/src/test/groovy/io/micronaut/validation/PaginationCommand.java +++ b/validation/src/test/groovy/io/micronaut/validation/PaginationCommand.java @@ -17,7 +17,7 @@ import io.micronaut.core.annotation.Introspected; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; import javax.validation.constraints.Pattern; import javax.validation.constraints.Positive; import javax.validation.constraints.PositiveOrZero; diff --git a/validation/src/test/groovy/io/micronaut/validation/executable/NullablePrimitiveSpec.groovy b/validation/src/test/groovy/io/micronaut/validation/executable/NullablePrimitiveSpec.groovy index f5a85d32a6f..d99ab738254 100644 --- a/validation/src/test/groovy/io/micronaut/validation/executable/NullablePrimitiveSpec.groovy +++ b/validation/src/test/groovy/io/micronaut/validation/executable/NullablePrimitiveSpec.groovy @@ -47,7 +47,7 @@ class NullablePrimitiveSpec extends AbstractTypeElementSpec { output.contains(warning) where: - annotation << ['@javax.annotation.Nullable', '@edu.umd.cs.findbugs.annotations.Nullable'] + annotation << ['@javax.annotation.Nullable', '@io.micronaut.core.annotation.Nullable', '@edu.umd.cs.findbugs.annotations.Nullable'] } @Unroll @@ -75,7 +75,7 @@ class NullablePrimitiveSpec extends AbstractTypeElementSpec { !output.contains(warning) where: - annotation << ['@javax.annotation.Nullable', '@edu.umd.cs.findbugs.annotations.Nullable'] + annotation << ['@javax.annotation.Nullable', '@io.micronaut.core.annotation.Nullable', '@edu.umd.cs.findbugs.annotations.Nullable'] } @Unroll @@ -98,7 +98,7 @@ class NullablePrimitiveSpec extends AbstractTypeElementSpec { !output.contains(warning) where: - annotation << ['@javax.annotation.Nullable', '@edu.umd.cs.findbugs.annotations.Nullable'] + annotation << ['@javax.annotation.Nullable', '@io.micronaut.core.annotation.Nullable', '@edu.umd.cs.findbugs.annotations.Nullable'] } } diff --git a/validation/src/test/groovy/io/micronaut/validation/routes/MissingParameterRuleSpec.groovy b/validation/src/test/groovy/io/micronaut/validation/routes/MissingParameterRuleSpec.groovy index 6407c301097..bdfee3cf36b 100644 --- a/validation/src/test/groovy/io/micronaut/validation/routes/MissingParameterRuleSpec.groovy +++ b/validation/src/test/groovy/io/micronaut/validation/routes/MissingParameterRuleSpec.groovy @@ -283,7 +283,7 @@ class Foo { package test; import io.micronaut.http.annotation.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @Controller("/foo") class Foo { diff --git a/validation/src/test/groovy/io/micronaut/validation/routes/NullableParameterRuleSpec.groovy b/validation/src/test/groovy/io/micronaut/validation/routes/NullableParameterRuleSpec.groovy index f2f55553745..38426feb8ab 100644 --- a/validation/src/test/groovy/io/micronaut/validation/routes/NullableParameterRuleSpec.groovy +++ b/validation/src/test/groovy/io/micronaut/validation/routes/NullableParameterRuleSpec.groovy @@ -26,7 +26,7 @@ class NullableParameterRuleSpec extends AbstractTypeElementSpec { package test; import io.micronaut.http.annotation.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @Controller("/foo") class Foo { @@ -163,7 +163,7 @@ class Foo { package test; import io.micronaut.http.annotation.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @Controller("/foo") class Foo { @@ -187,7 +187,7 @@ class Foo { package test; import io.micronaut.http.annotation.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @Controller("/foo") class Foo { @@ -209,7 +209,7 @@ class Foo { package test; import io.micronaut.http.annotation.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @Controller("/foo") class Foo { @@ -273,7 +273,7 @@ class Foo { package test; import io.micronaut.http.annotation.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @Controller("/foo") class Foo { @@ -315,7 +315,7 @@ class Foo { package test; import io.micronaut.http.annotation.*; -import edu.umd.cs.findbugs.annotations.Nullable; +import io.micronaut.core.annotation.Nullable; @Controller("/foo") class Foo {