From 14be0553d0cfc0b84d623388f97fbd0ce408cb87 Mon Sep 17 00:00:00 2001 From: Isaac Wen <76772867+isaacwen@users.noreply.github.com> Date: Mon, 20 Mar 2023 10:04:26 -0400 Subject: [PATCH] Moving all license comments to the first line (#4656) * changes for GL-4023 * changes for GL-4023 * changes for GL-4023 * changes for GL-4023 * changes for GL-4023 * changes for GL-4023 --------- Co-authored-by: isaacwen --- hapi-deployable-pom/pom.xml | 1 + .../ca/uhn/fhir/android/AndroidMarker.java | 3 +- .../main/java/ca/uhn/fhir/IHapiBootOrder.java | 3 +- .../BaseRuntimeChildDatatypeDefinition.java | 3 +- .../context/BaseRuntimeChildDefinition.java | 3 +- .../BaseRuntimeDeclaredChildDefinition.java | 3 +- ...BaseRuntimeElementCompositeDefinition.java | 3 +- .../context/BaseRuntimeElementDefinition.java | 3 +- .../fhir/context/ComboSearchParamType.java | 3 +- .../fhir/context/ConfigurationException.java | 3 +- .../java/ca/uhn/fhir/context/FhirContext.java | 39 +++++++++---------- .../ca/uhn/fhir/context/FhirVersionEnum.java | 3 +- .../fhir/context/IFhirValidatorFactory.java | 3 +- .../context/IRuntimeDatatypeDefinition.java | 9 ++--- .../ca/uhn/fhir/context/ModelScanner.java | 3 +- .../ca/uhn/fhir/context/ParserOptions.java | 3 +- .../fhir/context/PerformanceOptionsEnum.java | 3 +- .../ca/uhn/fhir/context/RuntimeChildAny.java | 3 +- .../context/RuntimeChildChoiceDefinition.java | 3 +- ...ChildCompositeBoundDatatypeDefinition.java | 3 +- ...ntimeChildCompositeDatatypeDefinition.java | 3 +- .../RuntimeChildContainedResources.java | 3 +- ...ntimeChildDeclaredExtensionDefinition.java | 4 +- .../context/RuntimeChildDirectResource.java | 3 +- .../ca/uhn/fhir/context/RuntimeChildExt.java | 3 +- .../fhir/context/RuntimeChildExtension.java | 3 +- .../RuntimeChildNarrativeDefinition.java | 3 +- ...dPrimitiveBoundCodeDatatypeDefinition.java | 3 +- ...ntimeChildPrimitiveDatatypeDefinition.java | 3 +- ...rimitiveEnumerationDatatypeDefinition.java | 3 +- .../RuntimeChildResourceBlockDefinition.java | 3 +- .../RuntimeChildResourceDefinition.java | 3 +- ...imeChildUndeclaredExtensionDefinition.java | 3 +- .../RuntimeCompositeDatatypeDefinition.java | 3 +- .../RuntimeElemContainedResourceList.java | 3 +- .../RuntimeElemContainedResources.java | 3 +- .../context/RuntimeElementDirectResource.java | 3 +- .../context/RuntimeExtensionDtDefinition.java | 3 +- .../context/RuntimeIdDatatypeDefinition.java | 3 +- .../RuntimePrimitiveDatatypeDefinition.java | 3 +- ...ePrimitiveDatatypeNarrativeDefinition.java | 3 +- ...rimitiveDatatypeXhtmlHl7OrgDefinition.java | 3 +- .../RuntimeResourceBlockDefinition.java | 7 ++-- .../context/RuntimeResourceDefinition.java | 3 +- .../uhn/fhir/context/RuntimeSearchParam.java | 39 +++++++++---------- .../fhir/context/api/AddProfileTagEnum.java | 7 ++-- .../fhir/context/api/BundleInclusionRule.java | 3 +- .../fhir/context/phonetic/ApacheEncoder.java | 3 +- .../context/phonetic/IPhoneticEncoder.java | 3 +- .../fhir/context/phonetic/NumericEncoder.java | 3 +- .../context/phonetic/PhoneticEncoderEnum.java | 3 +- .../support/ConceptValidationOptions.java | 3 +- .../DefaultProfileValidationSupport.java | 3 +- .../context/support/IValidationSupport.java | 3 +- .../support/TranslateConceptResult.java | 3 +- .../support/TranslateConceptResults.java | 3 +- .../support/ValidationSupportContext.java | 3 +- .../support/ValueSetExpansionOptions.java | 3 +- .../fhirpath/FhirPathExecutionException.java | 3 +- .../java/ca/uhn/fhir/fhirpath/IFhirPath.java | 3 +- .../fhirpath/IFhirPathEvaluationContext.java | 3 +- .../java/ca/uhn/fhir/i18n/HapiErrorCode.java | 3 +- .../java/ca/uhn/fhir/i18n/HapiLocalizer.java | 39 +++++++++---------- .../src/main/java/ca/uhn/fhir/i18n/Msg.java | 3 +- .../ca/uhn/fhir/interceptor/api/Hook.java | 3 +- .../uhn/fhir/interceptor/api/HookParams.java | 3 +- .../api/IAnonymousInterceptor.java | 3 +- .../api/IBaseInterceptorBroadcaster.java | 3 +- .../api/IBaseInterceptorService.java | 3 +- .../api/IInterceptorBroadcaster.java | 3 +- .../interceptor/api/IInterceptorService.java | 3 +- .../uhn/fhir/interceptor/api/IPointcut.java | 3 +- .../uhn/fhir/interceptor/api/Interceptor.java | 3 +- .../ca/uhn/fhir/interceptor/api/Pointcut.java | 3 +- .../executor/BaseInterceptorService.java | 3 +- .../executor/InterceptorService.java | 3 +- .../model/PartitionIdRequestDetails.java | 3 +- .../interceptor/model/RequestPartitionId.java | 3 +- .../TransactionWriteOperationsDetails.java | 3 +- .../ca/uhn/fhir/model/api/BaseElement.java | 3 +- .../model/api/BaseIdentifiableElement.java | 3 +- .../ca/uhn/fhir/model/api/BasePrimitive.java | 3 +- .../ca/uhn/fhir/model/api/ExtensionDt.java | 3 +- .../fhir/model/api/IBoundCodeableConcept.java | 3 +- .../ca/uhn/fhir/model/api/ICodingEnum.java | 3 +- .../fhir/model/api/ICompositeDatatype.java | 7 ++-- .../uhn/fhir/model/api/ICompositeElement.java | 3 +- .../java/ca/uhn/fhir/model/api/IDatatype.java | 7 ++-- .../java/ca/uhn/fhir/model/api/IElement.java | 7 ++-- .../ca/uhn/fhir/model/api/IExtension.java | 3 +- .../ca/uhn/fhir/model/api/IFhirVersion.java | 3 +- .../fhir/model/api/IIdentifiableElement.java | 3 +- .../ca/uhn/fhir/model/api/IModelJson.java | 3 +- .../fhir/model/api/IPrimitiveDatatype.java | 3 +- .../fhir/model/api/IQueryParameterAnd.java | 7 ++-- .../uhn/fhir/model/api/IQueryParameterOr.java | 7 ++-- .../fhir/model/api/IQueryParameterType.java | 11 +++--- .../java/ca/uhn/fhir/model/api/IResource.java | 7 ++-- .../ca/uhn/fhir/model/api/IResourceBlock.java | 3 +- .../fhir/model/api/IStreamingDatatype.java | 3 +- .../api/ISupportsUndeclaredExtensions.java | 3 +- .../fhir/model/api/IValueSetEnumBinder.java | 3 +- .../java/ca/uhn/fhir/model/api/Include.java | 21 +++++----- .../ca/uhn/fhir/model/api/PagingIterator.java | 3 +- .../model/api/ResourceMetadataKeyEnum.java | 3 +- .../model/api/StorageResponseCodeEnum.java | 3 +- .../main/java/ca/uhn/fhir/model/api/Tag.java | 4 +- .../java/ca/uhn/fhir/model/api/TagList.java | 3 +- .../fhir/model/api/TemporalPrecisionEnum.java | 3 +- .../fhir/model/api/annotation/Binding.java | 3 +- .../uhn/fhir/model/api/annotation/Block.java | 3 +- .../uhn/fhir/model/api/annotation/Child.java | 3 +- .../fhir/model/api/annotation/ChildOrder.java | 3 +- .../model/api/annotation/Compartment.java | 3 +- .../model/api/annotation/DatatypeDef.java | 3 +- .../model/api/annotation/Description.java | 3 +- .../model/api/annotation/ExampleSupplier.java | 3 +- .../fhir/model/api/annotation/Extension.java | 3 +- .../model/api/annotation/PasswordField.java | 3 +- .../model/api/annotation/ResourceDef.java | 3 +- .../api/annotation/SearchParamDefinition.java | 3 +- .../model/api/annotation/SimpleSetter.java | 3 +- .../model/base/composite/BaseCodingDt.java | 3 +- .../model/base/composite/BaseContainedDt.java | 17 ++++---- .../model/base/composite/BaseHumanNameDt.java | 3 +- .../base/composite/BaseIdentifierDt.java | 3 +- .../model/base/composite/BaseNarrativeDt.java | 17 ++++---- .../model/base/composite/BaseQuantityDt.java | 3 +- .../composite/BaseResourceReferenceDt.java | 3 +- .../model/base/resource/BaseConformance.java | 3 +- .../base/resource/BaseOperationOutcome.java | 3 +- .../base/resource/BaseSecurityEvent.java | 3 +- .../base/resource/ResourceMetadataMap.java | 3 +- .../fhir/model/primitive/Base64BinaryDt.java | 3 +- .../fhir/model/primitive/BaseDateTimeDt.java | 3 +- .../uhn/fhir/model/primitive/BooleanDt.java | 3 +- .../uhn/fhir/model/primitive/BoundCodeDt.java | 11 +++--- .../ca/uhn/fhir/model/primitive/CodeDt.java | 4 +- .../ca/uhn/fhir/model/primitive/DateDt.java | 7 ++-- .../uhn/fhir/model/primitive/DateTimeDt.java | 3 +- .../uhn/fhir/model/primitive/DecimalDt.java | 3 +- .../ca/uhn/fhir/model/primitive/IdDt.java | 39 +++++++++---------- .../uhn/fhir/model/primitive/InstantDt.java | 3 +- .../uhn/fhir/model/primitive/IntegerDt.java | 3 +- .../uhn/fhir/model/primitive/MarkdownDt.java | 3 +- .../ca/uhn/fhir/model/primitive/OidDt.java | 3 +- .../fhir/model/primitive/PositiveIntDt.java | 3 +- .../ca/uhn/fhir/model/primitive/StringDt.java | 3 +- .../ca/uhn/fhir/model/primitive/TimeDt.java | 3 +- .../fhir/model/primitive/UnsignedIntDt.java | 3 +- .../ca/uhn/fhir/model/primitive/UriDt.java | 3 +- .../ca/uhn/fhir/model/primitive/XhtmlDt.java | 3 +- .../valueset/BundleEntrySearchModeEnum.java | 4 +- .../BundleEntryTransactionMethodEnum.java | 5 +-- .../fhir/model/valueset/BundleTypeEnum.java | 4 +- .../ca/uhn/fhir/model/view/ViewGenerator.java | 3 +- .../BaseThymeleafNarrativeGenerator.java | 3 +- .../CustomThymeleafNarrativeGenerator.java | 3 +- .../DefaultThymeleafNarrativeGenerator.java | 3 +- .../fhir/narrative/INarrativeGenerator.java | 3 +- .../narrative2/BaseNarrativeGenerator.java | 3 +- .../fhir/narrative2/INarrativeTemplate.java | 3 +- .../INarrativeTemplateManifest.java | 3 +- .../fhir/narrative2/NarrativeTemplate.java | 3 +- .../narrative2/NarrativeTemplateManifest.java | 3 +- .../narrative2/NullNarrativeGenerator.java | 3 +- .../uhn/fhir/narrative2/TemplateTypeEnum.java | 3 +- .../java/ca/uhn/fhir/parser/BaseParser.java | 3 +- .../uhn/fhir/parser/DataFormatException.java | 3 +- .../uhn/fhir/parser/ErrorHandlerAdapter.java | 9 ++--- .../ca/uhn/fhir/parser/IJsonLikeParser.java | 3 +- .../main/java/ca/uhn/fhir/parser/IParser.java | 3 +- .../uhn/fhir/parser/IParserErrorHandler.java | 9 ++--- .../java/ca/uhn/fhir/parser/JsonParser.java | 3 +- .../uhn/fhir/parser/LenientErrorHandler.java | 15 ++++--- .../java/ca/uhn/fhir/parser/NDJsonParser.java | 3 +- .../ca/uhn/fhir/parser/ParseErrorHandler.java | 3 +- .../ca/uhn/fhir/parser/ParseLocation.java | 3 +- .../java/ca/uhn/fhir/parser/ParserState.java | 3 +- .../java/ca/uhn/fhir/parser/RDFParser.java | 3 +- .../uhn/fhir/parser/StrictErrorHandler.java | 15 ++++--- .../java/ca/uhn/fhir/parser/XmlParser.java | 3 +- .../fhir/parser/json/BaseJsonLikeArray.java | 3 +- .../fhir/parser/json/BaseJsonLikeObject.java | 7 ++-- .../fhir/parser/json/BaseJsonLikeWriter.java | 13 +++---- .../parser/json/jackson/JacksonStructure.java | 3 +- .../parser/json/jackson/JacksonWriter.java | 3 +- .../fhir/parser/path/EncodeContextPath.java | 3 +- .../parser/path/EncodeContextPathElement.java | 3 +- .../ca/uhn/fhir/rest/annotation/AddTags.java | 3 +- .../java/ca/uhn/fhir/rest/annotation/At.java | 3 +- .../rest/annotation/ConditionalUrlParam.java | 3 +- .../ca/uhn/fhir/rest/annotation/Count.java | 3 +- .../ca/uhn/fhir/rest/annotation/Create.java | 3 +- .../ca/uhn/fhir/rest/annotation/Delete.java | 3 +- .../uhn/fhir/rest/annotation/DeleteTags.java | 3 +- .../ca/uhn/fhir/rest/annotation/Destroy.java | 13 +++---- .../ca/uhn/fhir/rest/annotation/Elements.java | 3 +- .../ca/uhn/fhir/rest/annotation/GetPage.java | 3 +- .../ca/uhn/fhir/rest/annotation/GraphQL.java | 3 +- .../rest/annotation/GraphQLQueryBody.java | 3 +- .../fhir/rest/annotation/GraphQLQueryUrl.java | 3 +- .../ca/uhn/fhir/rest/annotation/History.java | 3 +- .../ca/uhn/fhir/rest/annotation/IdParam.java | 3 +- .../fhir/rest/annotation/IncludeParam.java | 3 +- .../uhn/fhir/rest/annotation/Initialize.java | 13 +++---- .../ca/uhn/fhir/rest/annotation/Metadata.java | 3 +- .../ca/uhn/fhir/rest/annotation/Offset.java | 3 +- .../uhn/fhir/rest/annotation/Operation.java | 3 +- .../fhir/rest/annotation/OperationParam.java | 3 +- .../fhir/rest/annotation/OptionalParam.java | 7 ++-- .../uhn/fhir/rest/annotation/PageIdParam.java | 3 +- .../ca/uhn/fhir/rest/annotation/Patch.java | 7 ++-- .../ca/uhn/fhir/rest/annotation/RawParam.java | 3 +- .../ca/uhn/fhir/rest/annotation/Read.java | 4 +- .../fhir/rest/annotation/RequiredParam.java | 7 ++-- .../fhir/rest/annotation/ResourceParam.java | 3 +- .../ca/uhn/fhir/rest/annotation/Search.java | 3 +- .../uhn/fhir/rest/annotation/ServerBase.java | 3 +- .../ca/uhn/fhir/rest/annotation/Since.java | 3 +- .../ca/uhn/fhir/rest/annotation/Sort.java | 3 +- .../uhn/fhir/rest/annotation/Transaction.java | 4 +- .../rest/annotation/TransactionParam.java | 4 +- .../ca/uhn/fhir/rest/annotation/Update.java | 3 +- .../ca/uhn/fhir/rest/annotation/Validate.java | 4 +- .../ca/uhn/fhir/rest/api/BundleLinks.java | 3 +- .../fhir/rest/api/CacheControlDirective.java | 3 +- .../java/ca/uhn/fhir/rest/api/Constants.java | 3 +- .../fhir/rest/api/DeleteCascadeModeEnum.java | 3 +- .../ca/uhn/fhir/rest/api/EncodingEnum.java | 3 +- .../fhir/rest/api/IResourceSupportedSvc.java | 3 +- .../api/IVersionSpecificBundleFactory.java | 3 +- .../api/InterceptorInvocationTimingEnum.java | 3 +- .../ca/uhn/fhir/rest/api/MethodOutcome.java | 3 +- .../ca/uhn/fhir/rest/api/PatchTypeEnum.java | 3 +- .../uhn/fhir/rest/api/PreferHandlingEnum.java | 3 +- .../ca/uhn/fhir/rest/api/PreferHeader.java | 3 +- .../uhn/fhir/rest/api/PreferReturnEnum.java | 3 +- .../uhn/fhir/rest/api/QualifiedParamList.java | 21 +++++----- .../rest/api/RequestFormatParamStyleEnum.java | 3 +- .../ca/uhn/fhir/rest/api/RequestTypeEnum.java | 3 +- .../fhir/rest/api/RestOperationTypeEnum.java | 4 +- .../rest/api/RestSearchParameterTypeEnum.java | 4 +- .../rest/api/SearchContainedModeEnum.java | 3 +- .../ca/uhn/fhir/rest/api/SearchStyleEnum.java | 3 +- .../fhir/rest/api/SearchTotalModeEnum.java | 3 +- .../ca/uhn/fhir/rest/api/SortOrderEnum.java | 3 +- .../java/ca/uhn/fhir/rest/api/SortSpec.java | 11 +++--- .../ca/uhn/fhir/rest/api/SummaryEnum.java | 3 +- .../uhn/fhir/rest/api/ValidationModeEnum.java | 11 +++--- .../fhir/rest/client/api/BaseHttpRequest.java | 3 +- .../ca/uhn/fhir/rest/client/api/Header.java | 3 +- .../fhir/rest/client/api/HttpClientUtil.java | 3 +- .../fhir/rest/client/api/IBasicClient.java | 3 +- .../rest/client/api/IClientInterceptor.java | 3 +- .../fhir/rest/client/api/IGenericClient.java | 3 +- .../uhn/fhir/rest/client/api/IHttpClient.java | 3 +- .../fhir/rest/client/api/IHttpRequest.java | 3 +- .../fhir/rest/client/api/IHttpResponse.java | 3 +- .../fhir/rest/client/api/IRestfulClient.java | 21 +++++----- .../client/api/IRestfulClientFactory.java | 3 +- .../client/api/ServerValidationModeEnum.java | 3 +- .../fhir/rest/client/api/UrlSourceEnum.java | 3 +- .../FhirClientConnectionException.java | 3 +- ...ClientInappropriateForServerException.java | 3 +- .../exceptions/InvalidResponseException.java | 3 +- .../exceptions/NonFhirResponseException.java | 3 +- .../fhir/rest/gclient/BaseClientParam.java | 3 +- .../rest/gclient/CompositeClientParam.java | 3 +- .../fhir/rest/gclient/CompositeCriterion.java | 4 +- .../fhir/rest/gclient/DateClientParam.java | 7 ++-- .../ca/uhn/fhir/rest/gclient/IBaseOn.java | 3 +- .../ca/uhn/fhir/rest/gclient/IBaseQuery.java | 13 +++---- .../fhir/rest/gclient/IClientExecutable.java | 19 +++++---- .../fhir/rest/gclient/ICompositeWithLeft.java | 3 +- .../ca/uhn/fhir/rest/gclient/ICreate.java | 7 ++-- .../uhn/fhir/rest/gclient/ICreateTyped.java | 3 +- .../fhir/rest/gclient/ICreateWithQuery.java | 3 +- .../rest/gclient/ICreateWithQueryTyped.java | 3 +- .../ca/uhn/fhir/rest/gclient/ICriterion.java | 3 +- .../fhir/rest/gclient/ICriterionInternal.java | 7 ++-- .../ca/uhn/fhir/rest/gclient/IDelete.java | 9 ++--- .../uhn/fhir/rest/gclient/IDeleteTyped.java | 3 +- .../fhir/rest/gclient/IDeleteWithQuery.java | 3 +- .../rest/gclient/IDeleteWithQueryTyped.java | 3 +- .../rest/gclient/IFetchConformanceTyped.java | 3 +- .../gclient/IFetchConformanceUntyped.java | 3 +- .../ca/uhn/fhir/rest/gclient/IGetPage.java | 3 +- .../uhn/fhir/rest/gclient/IGetPageTyped.java | 3 +- .../fhir/rest/gclient/IGetPageUntyped.java | 3 +- .../ca/uhn/fhir/rest/gclient/IHistory.java | 3 +- .../uhn/fhir/rest/gclient/IHistoryTyped.java | 3 +- .../fhir/rest/gclient/IHistoryUntyped.java | 3 +- .../java/ca/uhn/fhir/rest/gclient/IMeta.java | 7 ++-- .../rest/gclient/IMetaAddOrDeleteSourced.java | 3 +- .../gclient/IMetaAddOrDeleteUnsourced.java | 3 +- .../fhir/rest/gclient/IMetaGetUnsourced.java | 3 +- .../ca/uhn/fhir/rest/gclient/IOperation.java | 8 ++-- .../uhn/fhir/rest/gclient/IOperationOn.java | 3 +- .../rest/gclient/IOperationProcessMsg.java | 13 +++---- .../gclient/IOperationProcessMsgMode.java | 18 ++++----- .../fhir/rest/gclient/IOperationTyped.java | 3 +- .../fhir/rest/gclient/IOperationUnnamed.java | 3 +- .../fhir/rest/gclient/IOperationUntyped.java | 7 ++-- .../gclient/IOperationUntypedWithInput.java | 3 +- ...ationUntypedWithInputAndPartialOutput.java | 3 +- .../java/ca/uhn/fhir/rest/gclient/IParam.java | 3 +- .../java/ca/uhn/fhir/rest/gclient/IPatch.java | 3 +- .../fhir/rest/gclient/IPatchExecutable.java | 3 +- .../uhn/fhir/rest/gclient/IPatchWithBody.java | 7 ++-- .../fhir/rest/gclient/IPatchWithQuery.java | 3 +- .../rest/gclient/IPatchWithQueryTyped.java | 3 +- .../java/ca/uhn/fhir/rest/gclient/IQuery.java | 27 +++++++------ .../java/ca/uhn/fhir/rest/gclient/IRead.java | 7 ++-- .../fhir/rest/gclient/IReadExecutable.java | 3 +- .../fhir/rest/gclient/IReadIfNoneMatch.java | 3 +- .../ca/uhn/fhir/rest/gclient/IReadTyped.java | 3 +- .../java/ca/uhn/fhir/rest/gclient/ISort.java | 3 +- .../uhn/fhir/rest/gclient/ITransaction.java | 3 +- .../fhir/rest/gclient/ITransactionTyped.java | 3 +- .../uhn/fhir/rest/gclient/IUntypedQuery.java | 3 +- .../ca/uhn/fhir/rest/gclient/IUpdate.java | 3 +- .../fhir/rest/gclient/IUpdateExecutable.java | 3 +- .../uhn/fhir/rest/gclient/IUpdateTyped.java | 3 +- .../fhir/rest/gclient/IUpdateWithQuery.java | 3 +- .../rest/gclient/IUpdateWithQueryTyped.java | 3 +- .../ca/uhn/fhir/rest/gclient/IValidate.java | 3 +- .../fhir/rest/gclient/IValidateUntyped.java | 7 ++-- .../fhir/rest/gclient/NumberClientParam.java | 7 ++-- .../rest/gclient/QuantityClientParam.java | 4 +- .../fhir/rest/gclient/QuantityCriterion.java | 15 ++++--- .../rest/gclient/ReferenceClientParam.java | 21 +++++----- .../fhir/rest/gclient/SpecialClientParam.java | 3 +- .../fhir/rest/gclient/StringClientParam.java | 3 +- .../fhir/rest/gclient/StringCriterion.java | 23 ++++++----- .../fhir/rest/gclient/TokenClientParam.java | 21 +++++----- .../uhn/fhir/rest/gclient/TokenCriterion.java | 13 +++---- .../uhn/fhir/rest/gclient/UriClientParam.java | 3 +- .../uhn/fhir/rest/param/BaseAndListParam.java | 3 +- .../uhn/fhir/rest/param/BaseOrListParam.java | 3 +- .../ca/uhn/fhir/rest/param/BaseParam.java | 3 +- .../fhir/rest/param/BaseParamWithPrefix.java | 3 +- .../rest/param/CompositeAndListParam.java | 9 ++--- .../fhir/rest/param/CompositeOrListParam.java | 9 ++--- .../uhn/fhir/rest/param/CompositeParam.java | 3 +- .../uhn/fhir/rest/param/DateAndListParam.java | 7 ++-- .../uhn/fhir/rest/param/DateOrListParam.java | 7 ++-- .../ca/uhn/fhir/rest/param/DateParam.java | 3 +- .../uhn/fhir/rest/param/DateRangeParam.java | 39 +++++++++---------- .../uhn/fhir/rest/param/HasAndListParam.java | 7 ++-- .../uhn/fhir/rest/param/HasOrListParam.java | 7 ++-- .../java/ca/uhn/fhir/rest/param/HasParam.java | 19 +++++---- .../param/HistorySearchDateRangeParam.java | 3 +- .../rest/param/HistorySearchStyleEnum.java | 3 +- .../uhn/fhir/rest/param/InternalCodingDt.java | 3 +- .../fhir/rest/param/NumberAndListParam.java | 7 ++-- .../fhir/rest/param/NumberOrListParam.java | 7 ++-- .../ca/uhn/fhir/rest/param/NumberParam.java | 4 +- .../uhn/fhir/rest/param/ParamPrefixEnum.java | 3 +- .../ca/uhn/fhir/rest/param/ParameterUtil.java | 39 +++++++++---------- .../uhn/fhir/rest/param/QualifierDetails.java | 3 +- .../fhir/rest/param/QuantityAndListParam.java | 7 ++-- .../fhir/rest/param/QuantityOrListParam.java | 7 ++-- .../ca/uhn/fhir/rest/param/QuantityParam.java | 3 +- .../rest/param/ReferenceAndListParam.java | 7 ++-- .../fhir/rest/param/ReferenceOrListParam.java | 7 ++-- .../uhn/fhir/rest/param/ReferenceParam.java | 3 +- .../fhir/rest/param/SpecialAndListParam.java | 7 ++-- .../fhir/rest/param/SpecialOrListParam.java | 7 ++-- .../ca/uhn/fhir/rest/param/SpecialParam.java | 3 +- .../fhir/rest/param/StringAndListParam.java | 9 ++--- .../fhir/rest/param/StringOrListParam.java | 7 ++-- .../ca/uhn/fhir/rest/param/StringParam.java | 3 +- .../fhir/rest/param/TokenAndListParam.java | 7 ++-- .../uhn/fhir/rest/param/TokenOrListParam.java | 17 ++++---- .../ca/uhn/fhir/rest/param/TokenParam.java | 3 +- .../fhir/rest/param/TokenParamModifier.java | 3 +- .../uhn/fhir/rest/param/UriAndListParam.java | 7 ++-- .../uhn/fhir/rest/param/UriOrListParam.java | 7 ++-- .../java/ca/uhn/fhir/rest/param/UriParam.java | 4 +- .../rest/param/UriParamQualifierEnum.java | 3 +- .../fhir/rest/param/binder/BaseBinder.java | 3 +- .../param/binder/BaseJavaPrimitiveBinder.java | 3 +- .../rest/param/binder/CalendarBinder.java | 3 +- .../rest/param/binder/CollectionBinder.java | 3 +- .../fhir/rest/param/binder/DateBinder.java | 3 +- .../param/binder/FhirPrimitiveBinder.java | 3 +- .../fhir/rest/param/binder/IParamBinder.java | 3 +- .../param/binder/QueryParameterAndBinder.java | 3 +- .../param/binder/QueryParameterOrBinder.java | 3 +- .../binder/QueryParameterTypeBinder.java | 3 +- .../fhir/rest/param/binder/StringBinder.java | 3 +- .../exceptions/AuthenticationException.java | 9 ++--- .../BaseServerResponseException.java | 27 +++++++------ .../ForbiddenOperationException.java | 13 +++---- .../exceptions/InternalErrorException.java | 13 +++---- .../exceptions/InvalidRequestException.java | 13 +++---- .../exceptions/MethodNotAllowedException.java | 19 +++++---- .../NotImplementedOperationException.java | 13 +++---- .../exceptions/NotModifiedException.java | 13 +++---- .../exceptions/PayloadTooLargeException.java | 11 +++--- .../PreconditionFailedException.java | 3 +- .../exceptions/ResourceGoneException.java | 3 +- .../exceptions/ResourceNotFoundException.java | 3 +- .../ResourceVersionConflictException.java | 3 +- .../ResourceVersionNotSpecifiedException.java | 3 +- .../UnclassifiedServerFailureException.java | 11 +++--- .../UnprocessableEntityException.java | 3 +- .../ca/uhn/fhir/store/IAuditDataStore.java | 7 ++-- .../uhn/fhir/system/HapiSystemProperties.java | 3 +- .../java/ca/uhn/fhir/tls/BaseStoreInfo.java | 3 +- .../java/ca/uhn/fhir/tls/KeyStoreInfo.java | 3 +- .../java/ca/uhn/fhir/tls/KeyStoreType.java | 3 +- .../main/java/ca/uhn/fhir/tls/PathType.java | 3 +- .../ca/uhn/fhir/tls/TlsAuthentication.java | 3 +- .../java/ca/uhn/fhir/tls/TrustStoreInfo.java | 3 +- .../main/java/ca/uhn/fhir/util/ArrayUtil.java | 3 +- .../main/java/ca/uhn/fhir/util/AsyncUtil.java | 3 +- .../java/ca/uhn/fhir/util/AttachmentUtil.java | 3 +- .../BaseUnrecoverableRuntimeException.java | 3 +- .../java/ca/uhn/fhir/util/BinaryUtil.java | 3 +- .../java/ca/uhn/fhir/util/BundleBuilder.java | 3 +- .../java/ca/uhn/fhir/util/BundleUtil.java | 39 +++++++++---------- .../java/ca/uhn/fhir/util/ClasspathUtil.java | 3 +- .../java/ca/uhn/fhir/util/CollectionUtil.java | 3 +- .../ca/uhn/fhir/util/CompositionBuilder.java | 3 +- .../util/CountingAndLimitingInputStream.java | 3 +- .../java/ca/uhn/fhir/util/CoverageIgnore.java | 3 +- .../java/ca/uhn/fhir/util/DatatypeUtil.java | 3 +- .../java/ca/uhn/fhir/util/DateRangeUtil.java | 3 +- .../main/java/ca/uhn/fhir/util/DateUtils.java | 3 +- .../java/ca/uhn/fhir/util/ElementUtil.java | 3 +- .../ca/uhn/fhir/util/ExtensionConstants.java | 3 +- .../java/ca/uhn/fhir/util/ExtensionUtil.java | 3 +- .../java/ca/uhn/fhir/util/FhirTerser.java | 39 +++++++++---------- .../util/FhirVersionIndependentConcept.java | 3 +- .../main/java/ca/uhn/fhir/util/FileUtil.java | 3 +- .../java/ca/uhn/fhir/util/HapiExtensions.java | 3 +- .../main/java/ca/uhn/fhir/util/ICallable.java | 3 +- .../java/ca/uhn/fhir/util/IModelVisitor.java | 3 +- .../java/ca/uhn/fhir/util/IModelVisitor2.java | 3 +- .../main/java/ca/uhn/fhir/util/IoUtil.java | 3 +- .../main/java/ca/uhn/fhir/util/JsonUtil.java | 3 +- .../main/java/ca/uhn/fhir/util/LogUtil.java | 3 +- .../src/main/java/ca/uhn/fhir/util/Logs.java | 3 +- .../ca/uhn/fhir/util/MessageSupplier.java | 3 +- .../main/java/ca/uhn/fhir/util/MetaUtil.java | 3 +- .../ca/uhn/fhir/util/MultimapCollector.java | 3 +- .../util/NonPrettyPrintWriterWrapper.java | 3 +- .../uhn/fhir/util/NumericParamRangeUtil.java | 3 +- .../java/ca/uhn/fhir/util/ObjectUtil.java | 15 ++++--- .../uhn/fhir/util/OperationOutcomeUtil.java | 3 +- .../java/ca/uhn/fhir/util/ParametersUtil.java | 3 +- .../ca/uhn/fhir/util/PhoneticEncoderUtil.java | 3 +- .../fhir/util/PrettyPrintWriterWrapper.java | 3 +- .../util/PrimitiveTypeEqualsPredicate.java | 3 +- .../fhir/util/PropertyModifyingHelper.java | 3 +- .../main/java/ca/uhn/fhir/util/ProxyUtil.java | 3 +- .../java/ca/uhn/fhir/util/ReflectionUtil.java | 3 +- .../uhn/fhir/util/ResourceReferenceInfo.java | 3 +- .../java/ca/uhn/fhir/util/ResourceUtil.java | 3 +- .../ca/uhn/fhir/util/SearchParameterUtil.java | 3 +- .../main/java/ca/uhn/fhir/util/StopWatch.java | 23 ++++++----- .../java/ca/uhn/fhir/util/StringUtil.java | 3 +- .../ca/uhn/fhir/util/SubscriptionUtil.java | 33 ++++++++-------- .../java/ca/uhn/fhir/util/TerserUtil.java | 3 +- .../ca/uhn/fhir/util/TerserUtilHelper.java | 3 +- .../main/java/ca/uhn/fhir/util/TestUtil.java | 3 +- .../ca/uhn/fhir/util/TimeoutException.java | 3 +- .../java/ca/uhn/fhir/util/TimeoutManager.java | 3 +- .../ca/uhn/fhir/util/UrlPathTokenizer.java | 3 +- .../main/java/ca/uhn/fhir/util/UrlUtil.java | 39 +++++++++---------- .../java/ca/uhn/fhir/util/ValidateUtil.java | 3 +- .../java/ca/uhn/fhir/util/VersionEnum.java | 3 +- .../java/ca/uhn/fhir/util/VersionUtil.java | 3 +- .../ca/uhn/fhir/util/XmlDetectionUtil.java | 3 +- .../main/java/ca/uhn/fhir/util/XmlUtil.java | 3 +- .../fhir/util/bundle/BundleEntryMutator.java | 3 +- .../fhir/util/bundle/BundleEntryParts.java | 3 +- .../util/bundle/EntryListAccumulator.java | 3 +- .../util/bundle/ModifiableBundleEntry.java | 3 +- .../util/bundle/SearchBundleEntryParts.java | 3 +- .../fhir/util/jar/DependencyLogFactory.java | 9 ++--- .../uhn/fhir/util/jar/DependencyLogImpl.java | 3 +- .../ca/uhn/fhir/util/jar/IDependencyLog.java | 3 +- .../java/ca/uhn/fhir/util/rdf/RDFUtil.java | 3 +- .../validation/BaseValidationContext.java | 3 +- .../ca/uhn/fhir/validation/FhirValidator.java | 3 +- .../validation/IInstanceValidatorModule.java | 3 +- .../uhn/fhir/validation/IResourceLoader.java | 3 +- .../fhir/validation/IValidationContext.java | 7 ++-- .../uhn/fhir/validation/IValidatorModule.java | 9 ++--- .../ca/uhn/fhir/validation/LSInputImpl.java | 3 +- .../fhir/validation/ResultSeverityEnum.java | 3 +- .../fhir/validation/SchemaBaseValidator.java | 3 +- .../validation/SingleValidationMessage.java | 3 +- .../fhir/validation/ValidationContext.java | 33 ++++++++-------- .../ValidationFailureException.java | 3 +- .../fhir/validation/ValidationOptions.java | 3 +- .../uhn/fhir/validation/ValidationResult.java | 3 +- .../schematron/SchematronBaseValidator.java | 3 +- .../schematron/SchematronProvider.java | 3 +- .../fhir/instance/model/api/IAnyResource.java | 9 ++--- .../instance/model/api/IBackboneElement.java | 3 +- .../hl7/fhir/instance/model/api/IBase.java | 9 ++--- .../model/api/IBaseBackboneElement.java | 7 ++-- .../fhir/instance/model/api/IBaseBinary.java | 3 +- .../model/api/IBaseBooleanDatatype.java | 3 +- .../fhir/instance/model/api/IBaseBundle.java | 3 +- .../fhir/instance/model/api/IBaseCoding.java | 3 +- .../instance/model/api/IBaseConformance.java | 3 +- .../instance/model/api/IBaseDatatype.java | 7 ++-- .../model/api/IBaseDatatypeElement.java | 3 +- .../model/api/IBaseDecimalDatatype.java | 3 +- .../fhir/instance/model/api/IBaseElement.java | 3 +- .../instance/model/api/IBaseEnumFactory.java | 7 ++-- .../instance/model/api/IBaseEnumeration.java | 5 +-- .../instance/model/api/IBaseExtension.java | 3 +- .../instance/model/api/IBaseFhirEnum.java | 3 +- .../model/api/IBaseHasExtensions.java | 3 +- .../model/api/IBaseHasModifierExtensions.java | 3 +- .../model/api/IBaseIntegerDatatype.java | 3 +- .../instance/model/api/IBaseLongDatatype.java | 3 +- .../instance/model/api/IBaseMetaType.java | 3 +- .../model/api/IBaseOperationOutcome.java | 3 +- .../instance/model/api/IBaseParameters.java | 3 +- .../instance/model/api/IBaseReference.java | 3 +- .../instance/model/api/IBaseResource.java | 21 +++++----- .../fhir/instance/model/api/IBaseXhtml.java | 3 +- .../instance/model/api/ICompositeType.java | 5 +-- .../instance/model/api/IDomainResource.java | 3 +- .../hl7/fhir/instance/model/api/IIdType.java | 7 ++-- .../fhir/instance/model/api/INarrative.java | 3 +- .../instance/model/api/IPrimitiveType.java | 5 +-- ...tractImportExportCsvConceptMapCommand.java | 3 +- .../src/main/java/ca/uhn/fhir/cli/App.java | 3 +- .../main/java/ca/uhn/fhir/cli/BaseApp.java | 3 +- .../cli/BaseClearMigrationLockCommand.java | 3 +- .../java/ca/uhn/fhir/cli/BaseCommand.java | 3 +- .../cli/BaseFlywayMigrateDatabaseCommand.java | 3 +- .../cli/BaseRequestGeneratingCommand.java | 3 +- .../ca/uhn/fhir/cli/BulkImportCommand.java | 3 +- .../uhn/fhir/cli/CommandFailureException.java | 3 +- .../ca/uhn/fhir/cli/CreatePackageCommand.java | 3 +- .../ca/uhn/fhir/cli/ExampleDataUploader.java | 3 +- .../cli/ExportConceptMapToCsvCommand.java | 3 +- .../cli/HapiClearMigrationLockCommand.java | 3 +- .../cli/HapiFlywayMigrateDatabaseCommand.java | 3 +- .../cli/ImportCsvToConceptMapCommand.java | 3 +- .../cli/LoadingValidationSupportDstu2.java | 3 +- .../cli/LoadingValidationSupportDstu3.java | 3 +- .../fhir/cli/LoadingValidationSupportR4.java | 3 +- .../java/ca/uhn/fhir/cli/LogbackUtil.java | 3 +- .../fhir/cli/ReindexTerminologyCommand.java | 3 +- .../ca/uhn/fhir/cli/RunServerCommand.java | 3 +- .../cli/ToggleSearchParametersCommand.java | 3 +- .../fhir/cli/UploadTerminologyCommand.java | 3 +- .../java/ca/uhn/fhir/cli/ValidateCommand.java | 3 +- .../uhn/fhir/cli/ValidationDataUploader.java | 3 +- .../cli/ValidationSupportChainCreator.java | 3 +- .../fhir/cli/WebsocketSubscribeCommand.java | 3 +- .../HapiFhirCliRestfulClientFactory.java | 3 +- .../ca/uhn/fhir/jpa/demo/CommonConfig.java | 3 +- .../ca/uhn/fhir/jpa/demo/ContextHolder.java | 3 +- .../uhn/fhir/jpa/demo/FhirServerConfig.java | 3 +- .../fhir/jpa/demo/FhirServerConfigDstu3.java | 3 +- .../uhn/fhir/jpa/demo/FhirServerConfigR4.java | 3 +- .../uhn/fhir/jpa/demo/FhirTesterConfig.java | 3 +- .../ca/uhn/fhir/jpa/demo/JpaServerDemo.java | 3 +- .../okhttp/client/OkHttpRestfulClient.java | 3 +- .../client/OkHttpRestfulClientFactory.java | 15 ++++--- .../okhttp/client/OkHttpRestfulRequest.java | 33 ++++++++-------- .../okhttp/client/OkHttpRestfulResponse.java | 25 ++++++------ .../uhn/fhir/okhttp/utils/UrlStringUtils.java | 4 +- .../rest/client/apache/ApacheHttpClient.java | 3 +- .../rest/client/apache/ApacheHttpRequest.java | 3 +- .../client/apache/ApacheHttpResponse.java | 4 +- .../apache/ApacheRestfulClientFactory.java | 3 +- .../rest/client/apache/BaseHttpClient.java | 3 +- .../client/apache/GZipContentInterceptor.java | 3 +- .../rest/client/apache/ResourceEntity.java | 3 +- .../uhn/fhir/rest/client/impl/BaseClient.java | 3 +- .../client/impl/BaseHttpClientInvocation.java | 3 +- .../rest/client/impl/BaseHttpResponse.java | 3 +- .../client/impl/ClientInvocationHandler.java | 3 +- .../impl/ClientInvocationHandlerFactory.java | 3 +- .../fhir/rest/client/impl/GenericClient.java | 3 +- .../client/impl/HttpBasicAuthInterceptor.java | 35 ++++++++--------- .../client/impl/RestfulClientFactory.java | 3 +- .../AdditionalRequestHeadersInterceptor.java | 3 +- .../interceptor/BasicAuthInterceptor.java | 3 +- .../BearerTokenAuthInterceptor.java | 3 +- .../interceptor/CapturingInterceptor.java | 3 +- .../client/interceptor/CookieInterceptor.java | 3 +- .../client/interceptor/InterceptorOrders.java | 3 +- .../interceptor/LoggingInterceptor.java | 3 +- .../SimpleRequestHeaderInterceptor.java | 7 ++-- .../ThreadLocalCapturingInterceptor.java | 3 +- .../UrlTenantSelectionInterceptor.java | 3 +- .../interceptor/UserInfoInterceptor.java | 3 +- .../fhir/rest/client/method/AtParameter.java | 3 +- .../BaseHttpClientInvocationWithContents.java | 3 +- .../rest/client/method/BaseMethodBinding.java | 3 +- .../BaseOutcomeReturningMethodBinding.java | 3 +- ...indingWithResourceIdButNoResourceBody.java | 3 +- ...turningMethodBindingWithResourceParam.java | 3 +- .../client/method/BaseQueryParameter.java | 35 ++++++++--------- .../BaseResourceReturningMethodBinding.java | 3 +- .../client/method/ConditionalParamBinder.java | 3 +- .../method/ConformanceMethodBinding.java | 3 +- .../rest/client/method/CountParameter.java | 3 +- .../client/method/CreateMethodBinding.java | 9 ++--- .../client/method/DeleteMethodBinding.java | 3 +- .../rest/client/method/ElementsParameter.java | 4 +- .../client/method/HistoryMethodBinding.java | 4 +- .../method/HttpDeleteClientInvocation.java | 3 +- .../method/HttpGetClientInvocation.java | 3 +- .../method/HttpPatchClientInvocation.java | 3 +- .../method/HttpPostClientInvocation.java | 3 +- .../method/HttpPutClientInvocation.java | 3 +- .../method/HttpSimpleGetClientInvocation.java | 3 +- .../client/method/IClientResponseHandler.java | 3 +- .../IClientResponseHandlerHandlesBinary.java | 3 +- .../fhir/rest/client/method/IParameter.java | 3 +- .../rest/client/method/IRestfulHeader.java | 3 +- .../rest/client/method/IncludeParameter.java | 3 +- .../fhir/rest/client/method/MethodUtil.java | 39 +++++++++---------- .../rest/client/method/NullParameter.java | 3 +- .../rest/client/method/OffsetParameter.java | 3 +- .../client/method/OperationMethodBinding.java | 3 +- .../client/method/OperationParameter.java | 3 +- .../rest/client/method/PageMethodBinding.java | 3 +- .../client/method/PatchMethodBinding.java | 3 +- .../client/method/PatchTypeParameter.java | 3 +- .../rest/client/method/RawParamsParmeter.java | 3 +- .../rest/client/method/ReadMethodBinding.java | 3 +- .../rest/client/method/ResourceParameter.java | 3 +- .../client/method/SearchMethodBinding.java | 3 +- .../rest/client/method/SearchParameter.java | 4 +- .../client/method/SinceOrAtParameter.java | 3 +- .../rest/client/method/SinceParameter.java | 3 +- .../rest/client/method/SortParameter.java | 4 +- .../client/method/SummaryEnumParameter.java | 3 +- .../method/TransactionMethodBinding.java | 3 +- .../client/method/TransactionParameter.java | 3 +- .../client/method/UpdateMethodBinding.java | 3 +- .../ValidateMethodBindingDstu2Plus.java | 3 +- .../rest/client/tls/TlsAuthenticationSvc.java | 3 +- .../canonical/VersionCanonicalizer.java | 3 +- .../VersionedApiConverterInterceptor.java | 3 +- .../NullVersionConverterAdvisor10_30.java | 3 +- .../NullVersionConverterAdvisor10_40.java | 3 +- .../NullVersionConverterAdvisor10_50.java | 3 +- .../src/main/java/ChangelogMigrator.java | 1 - .../fhir/docs/AuthorizationInterceptors.java | 3 +- .../AuthorizingTesterUiClientFactory.java | 3 +- .../hapi/fhir/docs/BundleBuilderExamples.java | 3 +- .../ca/uhn/hapi/fhir/docs/BundleFetcher.java | 3 +- .../ca/uhn/hapi/fhir/docs/ClientExamples.java | 3 +- .../fhir/docs/ClientTransactionExamples.java | 3 +- .../hapi/fhir/docs/CompleteExampleClient.java | 3 +- .../hapi/fhir/docs/ConsentInterceptors.java | 3 +- .../uhn/hapi/fhir/docs/ConverterExamples.java | 3 +- .../java/ca/uhn/hapi/fhir/docs/Copier.java | 3 +- .../CreateCompositionAndGenerateDocument.java | 3 +- .../uhn/hapi/fhir/docs/CustomObservation.java | 3 +- .../ca/uhn/hapi/fhir/docs/Dstu2Examples.java | 3 +- .../uhn/hapi/fhir/docs/ExampleProviders.java | 3 +- .../hapi/fhir/docs/ExampleRestfulClient.java | 3 +- .../hapi/fhir/docs/ExampleRestfulServlet.java | 3 +- .../uhn/hapi/fhir/docs/ExtensionsDstu2.java | 3 +- .../uhn/hapi/fhir/docs/ExtensionsDstu3.java | 3 +- .../uhn/hapi/fhir/docs/FhirContextIntro.java | 3 +- .../ca/uhn/hapi/fhir/docs/FhirDataModel.java | 3 +- .../uhn/hapi/fhir/docs/FhirTesterConfig.java | 3 +- .../hapi/fhir/docs/GenericClientExample.java | 3 +- .../uhn/hapi/fhir/docs/GenomicsUploader.java | 3 +- .../java/ca/uhn/hapi/fhir/docs/HttpProxy.java | 3 +- .../ca/uhn/hapi/fhir/docs/IRestfulClient.java | 3 +- .../uhn/hapi/fhir/docs/IncludesExamples.java | 3 +- .../ca/uhn/hapi/fhir/docs/Interceptors.java | 3 +- .../ca/uhn/hapi/fhir/docs/JaxRsClient.java | 3 +- .../fhir/docs/JaxRsConformanceProvider.java | 3 +- .../fhir/docs/JaxRsPatientRestProvider.java | 3 +- .../ca/uhn/hapi/fhir/docs/Multitenancy.java | 3 +- .../java/ca/uhn/hapi/fhir/docs/MyPatient.java | 3 +- .../ca/uhn/hapi/fhir/docs/MyPatientUse.java | 3 +- .../java/ca/uhn/hapi/fhir/docs/Narrative.java | 3 +- .../hapi/fhir/docs/NarrativeGenerator.java | 3 +- .../hapi/fhir/docs/PagingPatientProvider.java | 3 +- .../ca/uhn/hapi/fhir/docs/PagingServer.java | 3 +- .../java/ca/uhn/hapi/fhir/docs/Parser.java | 3 +- .../uhn/hapi/fhir/docs/PartitionExamples.java | 3 +- .../ca/uhn/hapi/fhir/docs/PatchExamples.java | 3 +- .../ca/uhn/hapi/fhir/docs/QuickUsage.java | 3 +- ...positoryValidatingInterceptorExamples.java | 3 +- .../fhir/docs/RequestCounterInterceptor.java | 3 +- .../docs/RequestExceptionInterceptor.java | 3 +- .../ca/uhn/hapi/fhir/docs/ResourceRefs.java | 3 +- .../RestfulObservationResourceProvider.java | 3 +- .../docs/RestfulPatientResourceProvider.java | 3 +- .../RestfulPatientResourceProviderMore.java | 3 +- .../hapi/fhir/docs/SecurityInterceptors.java | 3 +- .../hapi/fhir/docs/ServerETagExamples.java | 3 +- .../fhir/docs/ServerExceptionsExample.java | 3 +- .../hapi/fhir/docs/ServerInterceptors.java | 3 +- .../fhir/docs/ServerMetadataExamples.java | 3 +- .../uhn/hapi/fhir/docs/ServerOperations.java | 3 +- .../uhn/hapi/fhir/docs/ServletExamples.java | 3 +- .../ca/uhn/hapi/fhir/docs/TagsExamples.java | 3 +- .../uhn/hapi/fhir/docs/ValidateDirectory.java | 3 +- .../uhn/hapi/fhir/docs/ValidatorExamples.java | 3 +- .../fhir/docs/ValidatorExamplesDstu3.java | 3 +- .../customtype/CustomCompositeExtension.java | 3 +- .../fhir/docs/customtype/CustomDatatype.java | 3 +- .../fhir/docs/customtype/CustomResource.java | 3 +- .../fhir/docs/customtype/CustomUsage.java | 3 +- .../docs/interceptor/MyTestInterceptor.java | 3 +- ...meModifierMdmPreProcessingInterceptor.java | 3 +- .../interceptor/TagTrimmingInterceptor.java | 3 +- .../fhir/jaxrs/client/JaxRsHttpClient.java | 3 +- .../fhir/jaxrs/client/JaxRsHttpRequest.java | 3 +- .../fhir/jaxrs/client/JaxRsHttpResponse.java | 7 ++-- .../client/JaxRsRestfulClientFactory.java | 3 +- .../server/AbstractJaxRsBundleProvider.java | 3 +- .../AbstractJaxRsConformanceProvider.java | 3 +- .../server/AbstractJaxRsPageProvider.java | 3 +- .../jaxrs/server/AbstractJaxRsProvider.java | 6 +-- .../server/AbstractJaxRsResourceProvider.java | 3 +- .../JaxRsExceptionInterceptor.java | 3 +- .../interceptor/JaxRsResponseException.java | 3 +- .../server/util/JaxRsMethodBindings.java | 3 +- .../fhir/jaxrs/server/util/JaxRsRequest.java | 3 +- .../fhir/jaxrs/server/util/JaxRsResponse.java | 39 +++++++++---------- ...ocalContainerEntityManagerFactoryBean.java | 3 +- .../ca/uhn/fhir/jpa/model/sched/HapiJob.java | 3 +- .../fhir/jpa/model/sched/IHapiScheduler.java | 3 +- .../jpa/model/sched/IHasScheduledJobs.java | 3 +- .../jpa/model/sched/ISchedulerService.java | 3 +- .../model/sched/ScheduledJobDefinition.java | 3 +- .../sched/AutowiringSpringBeanJobFactory.java | 3 +- .../uhn/fhir/jpa/sched/BaseHapiScheduler.java | 3 +- .../jpa/sched/BaseSchedulerServiceImpl.java | 3 +- .../jpa/sched/ClusteredHapiScheduler.java | 3 +- .../uhn/fhir/jpa/sched/HapiNullScheduler.java | 3 +- .../jpa/sched/HapiSchedulerServiceImpl.java | 3 +- .../fhir/jpa/sched/LocalHapiScheduler.java | 3 +- .../util/DerbyTenSevenHapiFhirDialect.java | 3 +- .../java/ca/uhn/fhir/jpa/util/TestUtil.java | 3 +- .../uhn/fhir/jpa/batch2/JpaBatch2Config.java | 3 +- .../jpa/batch2/JpaJobPersistenceImpl.java | 3 +- .../DatabaseBlobBinaryStorageSvcImpl.java | 3 +- .../bulk/export/job/BulkExportJobConfig.java | 3 +- ...BulkDataExportJobSchedulingHelperImpl.java | 3 +- .../export/svc/JpaBulkExportProcessor.java | 3 +- .../bulk/imprt/svc/BulkDataImportSvcImpl.java | 3 +- .../jpa/cache/ResourceVersionSvcDaoImpl.java | 3 +- .../fhir/jpa/config/Batch2SupportConfig.java | 3 +- .../jpa/config/BeanPostProcessorConfig.java | 3 +- .../jpa/config/FhirContextDstu2Config.java | 3 +- .../config/HapiFhirHibernateJpaDialect.java | 3 +- .../ca/uhn/fhir/jpa/config/HapiJpaConfig.java | 3 +- .../config/HibernatePropertiesProvider.java | 3 +- .../fhir/jpa/config/JpaBulkExportConfig.java | 3 +- .../ca/uhn/fhir/jpa/config/JpaConfig.java | 39 +++++++++---------- .../uhn/fhir/jpa/config/JpaDstu2Config.java | 31 +++++++-------- .../fhir/jpa/config/PackageLoaderConfig.java | 3 +- .../ca/uhn/fhir/jpa/config/SearchConfig.java | 3 +- .../jpa/config/ValidationSupportConfig.java | 3 +- .../config/dstu3/FhirContextDstu3Config.java | 3 +- .../fhir/jpa/config/dstu3/JpaDstu3Config.java | 39 +++++++++---------- .../jpa/config/r4/FhirContextR4Config.java | 3 +- .../uhn/fhir/jpa/config/r4/JpaR4Config.java | 39 +++++++++---------- .../jpa/config/r4b/FhirContextR4BConfig.java | 3 +- .../uhn/fhir/jpa/config/r4b/JpaR4BConfig.java | 39 +++++++++---------- .../jpa/config/r5/FhirContextR5Config.java | 3 +- .../uhn/fhir/jpa/config/r5/JpaR5Config.java | 39 +++++++++---------- ...cDataSourceConnectionPoolInfoProvider.java | 3 +- .../util/ConnectionPoolInfoProvider.java | 3 +- .../util/HapiEntityManagerFactoryUtil.java | 3 +- .../util/IConnectionPoolInfoProvider.java | 3 +- .../config/util/ResourceCountCacheUtil.java | 3 +- .../util/ValidationSupportConfigUtil.java | 3 +- .../ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java | 39 +++++++++---------- .../fhir/jpa/dao/BaseHapiFhirResourceDao.java | 3 +- .../fhir/jpa/dao/BaseHapiFhirSystemDao.java | 39 +++++++++---------- .../ca/uhn/fhir/jpa/dao/EncodedResource.java | 3 +- .../dao/FhirResourceDaoSubscriptionDstu2.java | 3 +- .../uhn/fhir/jpa/dao/FhirSystemDaoDstu2.java | 3 +- .../fhir/jpa/dao/FulltextSearchSvcImpl.java | 3 +- .../ca/uhn/fhir/jpa/dao/HistoryBuilder.java | 3 +- .../fhir/jpa/dao/HistoryBuilderFactory.java | 3 +- .../uhn/fhir/jpa/dao/IFulltextSearchSvc.java | 3 +- .../fhir/jpa/dao/IHSearchEventListener.java | 3 +- .../jpa/dao/IJpaStorageResourceParser.java | 3 +- .../ca/uhn/fhir/jpa/dao/IndexedParam.java | 3 +- ...JpaPersistedResourceValidationSupport.java | 3 +- .../ca/uhn/fhir/jpa/dao/JpaResourceDao.java | 3 +- .../fhir/jpa/dao/JpaResourceDaoBundle.java | 3 +- .../jpa/dao/JpaResourceDaoCodeSystem.java | 3 +- .../jpa/dao/JpaResourceDaoComposition.java | 3 +- .../jpa/dao/JpaResourceDaoConceptMap.java | 3 +- .../fhir/jpa/dao/JpaResourceDaoEncounter.java | 3 +- .../jpa/dao/JpaResourceDaoObservation.java | 3 +- .../fhir/jpa/dao/JpaResourceDaoPatient.java | 3 +- .../dao/JpaResourceDaoSearchParameter.java | 29 +++++++------- .../JpaResourceDaoStructureDefinition.java | 17 ++++---- .../fhir/jpa/dao/JpaResourceDaoValueSet.java | 3 +- .../jpa/dao/JpaStorageResourceParser.java | 3 +- .../dao/ObservationLastNIndexPersistSvc.java | 3 +- .../uhn/fhir/jpa/dao/TolerantJsonParser.java | 3 +- .../fhir/jpa/dao/TransactionProcessor.java | 3 +- ...ansactionProcessorVersionAdapterDstu2.java | 3 +- .../data/IBatch2JobInstanceRepository.java | 3 +- .../dao/data/IBatch2WorkChunkRepository.java | 3 +- .../jpa/dao/data/IBinaryStorageEntityDao.java | 3 +- .../fhir/jpa/dao/data/IBulkExportJobDao.java | 27 +++++++------ .../fhir/jpa/dao/data/IBulkImportJobDao.java | 23 ++++++----- .../jpa/dao/data/IBulkImportJobFileDao.java | 21 +++++----- .../uhn/fhir/jpa/dao/data/IForcedIdDao.java | 26 ++++++------- .../jpa/dao/data/IHapiFhirJpaRepository.java | 3 +- .../jpa/dao/data/IMdmLinkJpaRepository.java | 3 +- .../uhn/fhir/jpa/dao/data/INpmPackageDao.java | 17 ++++---- .../jpa/dao/data/INpmPackageVersionDao.java | 21 +++++----- .../data/INpmPackageVersionResourceDao.java | 19 +++++---- .../uhn/fhir/jpa/dao/data/IPartitionDao.java | 17 ++++---- .../data/IResourceHistoryProvenanceDao.java | 15 ++++--- .../dao/data/IResourceHistoryTableDao.java | 23 ++++++----- .../jpa/dao/data/IResourceHistoryTagDao.java | 19 +++++---- .../IResourceIndexedComboStringUniqueDao.java | 3 +- ...esourceIndexedComboTokensNonUniqueDao.java | 3 +- .../IResourceIndexedSearchParamCoordsDao.java | 3 +- .../IResourceIndexedSearchParamDateDao.java | 3 +- .../IResourceIndexedSearchParamNumberDao.java | 3 +- ...ResourceIndexedSearchParamQuantityDao.java | 3 +- ...dexedSearchParamQuantityNormalizedDao.java | 3 +- .../IResourceIndexedSearchParamStringDao.java | 3 +- .../IResourceIndexedSearchParamTokenDao.java | 3 +- .../IResourceIndexedSearchParamUriDao.java | 7 ++-- .../fhir/jpa/dao/data/IResourceLinkDao.java | 3 +- .../jpa/dao/data/IResourceReindexJobDao.java | 25 ++++++------ .../jpa/dao/data/IResourceSearchUrlDao.java | 3 +- .../jpa/dao/data/IResourceSearchViewDao.java | 7 ++-- .../fhir/jpa/dao/data/IResourceTableDao.java | 35 ++++++++--------- .../fhir/jpa/dao/data/IResourceTagDao.java | 7 ++-- .../ca/uhn/fhir/jpa/dao/data/ISearchDao.java | 27 +++++++------ .../fhir/jpa/dao/data/ISearchIncludeDao.java | 3 +- .../jpa/dao/data/ISearchParamPresentDao.java | 21 +++++----- .../fhir/jpa/dao/data/ISearchResultDao.java | 25 ++++++------ .../jpa/dao/data/ISubscriptionTableDao.java | 3 +- .../fhir/jpa/dao/data/ITagDefinitionDao.java | 3 +- .../fhir/jpa/dao/data/ITermCodeSystemDao.java | 3 +- .../dao/data/ITermCodeSystemVersionDao.java | 21 +++++----- .../fhir/jpa/dao/data/ITermConceptDao.java | 27 +++++++------ .../dao/data/ITermConceptDesignationDao.java | 15 ++++--- .../fhir/jpa/dao/data/ITermConceptMapDao.java | 25 ++++++------ .../jpa/dao/data/ITermConceptMapGroupDao.java | 15 ++++--- .../data/ITermConceptMapGroupElementDao.java | 15 ++++--- .../ITermConceptMapGroupElementTargetDao.java | 15 ++++--- .../data/ITermConceptParentChildLinkDao.java | 19 +++++---- .../jpa/dao/data/ITermConceptPropertyDao.java | 15 ++++--- .../jpa/dao/data/ITermValueSetConceptDao.java | 3 +- .../ITermValueSetConceptDesignationDao.java | 3 +- .../dao/data/ITermValueSetConceptViewDao.java | 21 +++++----- .../ITermValueSetConceptViewOracleDao.java | 3 +- .../fhir/jpa/dao/data/ITermValueSetDao.java | 3 +- .../jpa/dao/data/custom/IForcedIdDaoImpl.java | 3 +- .../jpa/dao/data/custom/IForcedIdQueries.java | 9 ++--- .../FhirResourceDaoSubscriptionDstu3.java | 3 +- .../jpa/dao/dstu3/FhirSystemDaoDstu3.java | 3 +- .../dao/expunge/ExpungeEverythingService.java | 3 +- .../expunge/JpaResourceExpungeService.java | 3 +- .../jpa/dao/expunge/ResourceForeignKey.java | 3 +- .../dao/expunge/ResourceTableFKProvider.java | 3 +- .../dao/index/DaoSearchParamSynchronizer.java | 3 +- .../fhir/jpa/dao/index/IdHelperService.java | 3 +- ...rchParamWithInlineReferencesExtractor.java | 3 +- .../jpa/dao/mdm/JpaMdmLinkImplFactory.java | 3 +- .../jpa/dao/mdm/MdmExpansionCacheSvc.java | 3 +- .../fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java | 3 +- .../jpa/dao/predicate/SearchFilterParser.java | 3 +- .../jpa/dao/predicate/SearchFuzzUtil.java | 3 +- .../dao/r4/FhirResourceDaoSubscriptionR4.java | 3 +- .../uhn/fhir/jpa/dao/r4/FhirSystemDaoR4.java | 3 +- .../r4b/FhirResourceDaoSubscriptionR4B.java | 3 +- .../fhir/jpa/dao/r4b/FhirSystemDaoR4B.java | 3 +- ...TransactionProcessorVersionAdapterR4B.java | 3 +- .../dao/r5/FhirResourceDaoSubscriptionR5.java | 3 +- .../uhn/fhir/jpa/dao/r5/FhirSystemDaoR5.java | 3 +- .../TransactionProcessorVersionAdapterR5.java | 3 +- .../search/ExtendedHSearchClauseBuilder.java | 3 +- .../search/ExtendedHSearchIndexExtractor.java | 3 +- .../ExtendedHSearchResourceProjection.java | 3 +- .../search/ExtendedHSearchSearchBuilder.java | 3 +- .../HSearchCompositeSearchIndexDataImpl.java | 3 +- .../jpa/dao/search/HSearchSortHelperImpl.java | 3 +- .../jpa/dao/search/IHSearchSortHelper.java | 3 +- .../fhir/jpa/dao/search/LastNAggregation.java | 3 +- .../fhir/jpa/dao/search/LastNOperation.java | 3 +- .../uhn/fhir/jpa/dao/search/PathContext.java | 3 +- .../ResourceNotFoundInIndexException.java | 3 +- .../SearchScrollQueryExecutorAdaptor.java | 3 +- .../uhn/fhir/jpa/dao/search/TermHelper.java | 3 +- .../uhn/fhir/jpa/dao/search/package-info.java | 38 +++++++++--------- .../delete/DeleteConflictFinderService.java | 3 +- .../jpa/delete/DeleteConflictOutcome.java | 3 +- .../jpa/delete/DeleteConflictService.java | 3 +- .../delete/ThreadSafeResourceDeleterSvc.java | 3 +- .../batch2/DeleteExpungeSqlBuilder.java | 3 +- .../delete/batch2/DeleteExpungeSvcImpl.java | 3 +- .../jpa/entity/Batch2JobInstanceEntity.java | 3 +- .../jpa/entity/Batch2WorkChunkEntity.java | 3 +- .../entity/BulkExportCollectionEntity.java | 3 +- .../BulkExportCollectionFileEntity.java | 3 +- .../fhir/jpa/entity/BulkExportJobEntity.java | 3 +- .../fhir/jpa/entity/BulkImportJobEntity.java | 3 +- .../jpa/entity/BulkImportJobFileEntity.java | 3 +- .../jpa/entity/HapiFhirEnversRevision.java | 3 +- .../jpa/entity/ITermValueSetConceptView.java | 3 +- .../java/ca/uhn/fhir/jpa/entity/MdmLink.java | 3 +- .../uhn/fhir/jpa/entity/PartitionEntity.java | 3 +- .../jpa/entity/ResourceReindexJobEntity.java | 3 +- .../fhir/jpa/entity/ResourceSearchView.java | 3 +- .../java/ca/uhn/fhir/jpa/entity/Search.java | 39 +++++++++---------- .../ca/uhn/fhir/jpa/entity/SearchInclude.java | 3 +- .../ca/uhn/fhir/jpa/entity/SearchResult.java | 3 +- .../uhn/fhir/jpa/entity/SearchTypeEnum.java | 3 +- .../fhir/jpa/entity/SubscriptionTable.java | 3 +- .../uhn/fhir/jpa/entity/TermCodeSystem.java | 3 +- .../jpa/entity/TermCodeSystemVersion.java | 3 +- .../ca/uhn/fhir/jpa/entity/TermConcept.java | 3 +- .../jpa/entity/TermConceptDesignation.java | 3 +- .../uhn/fhir/jpa/entity/TermConceptMap.java | 3 +- .../fhir/jpa/entity/TermConceptMapGroup.java | 3 +- .../entity/TermConceptMapGroupElement.java | 3 +- .../TermConceptMapGroupElementTarget.java | 3 +- .../entity/TermConceptParentChildLink.java | 3 +- .../fhir/jpa/entity/TermConceptProperty.java | 3 +- .../jpa/entity/TermConceptPropertyBinder.java | 3 +- .../entity/TermConceptPropertyTypeEnum.java | 3 +- .../ca/uhn/fhir/jpa/entity/TermValueSet.java | 3 +- .../fhir/jpa/entity/TermValueSetConcept.java | 3 +- .../TermValueSetConceptDesignation.java | 3 +- .../jpa/entity/TermValueSetConceptView.java | 3 +- .../entity/TermValueSetConceptViewOracle.java | 3 +- .../TermValueSetPreExpansionStatusEnum.java | 3 +- .../esr/ExternallyStoredResourceAddress.java | 3 +- ...nallyStoredResourceAddressMetadataKey.java | 3 +- ...ternallyStoredResourceServiceRegistry.java | 3 +- .../esr/IExternallyStoredResourceService.java | 3 +- .../ca/uhn/fhir/jpa/esr/package-info.java | 30 +++++++------- .../GraphQLProviderWithIntrospection.java | 3 +- .../CascadingDeleteInterceptor.java | 3 +- .../ForceOffsetSearchModeInterceptor.java | 3 +- .../JpaConsentContextServices.java | 3 +- .../JpaPreResourceAccessDetails.java | 3 +- ...rentialIntegrityForDeletesInterceptor.java | 3 +- .../PerformanceTracingLoggingInterceptor.java | 3 +- ...actionConcurrencySemaphoreInterceptor.java | 3 +- .../tasks/HapiFhirJpaMigrationTasks.java | 3 +- .../jpa/model/cross/JpaResourceLookup.java | 3 +- .../packages/IHapiPackageCacheManager.java | 3 +- .../jpa/packages/IPackageInstallerSvc.java | 3 +- ...lementationGuideInstallationException.java | 3 +- .../fhir/jpa/packages/JpaPackageCache.java | 3 +- .../jpa/packages/NpmJpaValidationSupport.java | 3 +- .../jpa/packages/NpmPackageMetadataJson.java | 3 +- .../packages/NpmPackageSearchResultJson.java | 3 +- .../packages/PackageDeleteOutcomeJson.java | 3 +- .../packages/PackageInstallOutcomeJson.java | 3 +- .../jpa/packages/PackageInstallationSpec.java | 3 +- .../jpa/packages/PackageInstallerSvcImpl.java | 3 +- .../fhir/jpa/packages/PackageSearchSpec.java | 3 +- .../packages/PackageVersionComparator.java | 3 +- .../jpa/packages/loader/NpmPackageData.java | 3 +- .../jpa/packages/loader/PackageLoaderSvc.java | 3 +- .../loader/PackageResourceParsingSvc.java | 3 +- .../fhir/jpa/packages/util/PackageUtils.java | 3 +- .../jpa/partition/IPartitionLookupSvc.java | 3 +- .../jpa/partition/PartitionLookupSvcImpl.java | 3 +- .../PartitionManagementProvider.java | 3 +- .../partition/RequestPartitionHelperSvc.java | 3 +- .../BaseJpaResourceProviderCodeSystem.java | 3 +- .../BaseJpaResourceProviderComposition.java | 39 +++++++++---------- .../BaseJpaResourceProviderConceptMap.java | 3 +- .../BaseJpaResourceProviderEncounter.java | 35 ++++++++--------- ...BaseJpaResourceProviderEncounterDstu2.java | 3 +- .../BaseJpaResourceProviderObservation.java | 39 +++++++++---------- .../BaseJpaResourceProviderPatient.java | 39 +++++++++---------- ...paResourceProviderStructureDefinition.java | 35 ++++++++--------- .../jpa/provider/BaseJpaSystemProvider.java | 3 +- .../uhn/fhir/jpa/provider/DiffProvider.java | 3 +- .../JpaCapabilityStatementProvider.java | 3 +- .../provider/JpaConformanceProviderDstu2.java | 3 +- .../fhir/jpa/provider/JpaSystemProvider.java | 3 +- .../jpa/provider/ProcessMessageProvider.java | 3 +- .../provider/TerminologyUploaderProvider.java | 3 +- .../provider/ValueSetOperationProvider.java | 3 +- .../ValueSetOperationProviderDstu2.java | 3 +- .../dstu3/JpaConformanceProviderDstu3.java | 3 +- .../r4/IConsentExtensionProvider.java | 3 +- .../provider/r4/IMemberMatchConsentHook.java | 3 +- .../r4/MemberMatchR4ResourceProvider.java | 3 +- .../provider/r4/MemberMatcherR4Helper.java | 39 +++++++++---------- .../fhir/jpa/reindex/Batch2DaoSvcImpl.java | 3 +- .../search/DatabaseBackedPagingProvider.java | 3 +- .../DeferConceptIndexingRoutingBinder.java | 3 +- .../uhn/fhir/jpa/search/ExceptionService.java | 3 +- .../HapiHSearchAnalysisConfigurers.java | 3 +- .../jpa/search/IStaleSearchDeletingSvc.java | 3 +- .../jpa/search/ISynchronousSearchSvc.java | 3 +- .../search/PersistedJpaBundleProvider.java | 3 +- .../PersistedJpaBundleProviderFactory.java | 3 +- ...istedJpaSearchFirstPageBundleProvider.java | 3 +- .../fhir/jpa/search/ResourceSearchUrlSvc.java | 3 +- .../jpa/search/SearchCoordinatorSvcImpl.java | 3 +- .../jpa/search/SearchStrategyFactory.java | 3 +- .../SearchUrlJobMaintenanceSvcImpl.java | 3 +- .../search/StaleSearchDeletingSvcImpl.java | 3 +- .../jpa/search/SynchronousSearchSvcImpl.java | 3 +- .../fhir/jpa/search/WarmSearchDefinition.java | 3 +- .../autocomplete/RawElasticJsonBuilder.java | 3 +- .../TokenAutocompleteAggregation.java | 3 +- .../autocomplete/TokenAutocompleteHit.java | 3 +- .../autocomplete/TokenAutocompleteSearch.java | 3 +- .../ValueSetAutocompleteOptions.java | 3 +- .../ValueSetAutocompleteSearch.java | 3 +- .../jpa/search/autocomplete/package-info.java | 26 ++++++------- .../search/builder/ISearchQueryExecutor.java | 3 +- .../fhir/jpa/search/builder/QueryStack.java | 3 +- .../jpa/search/builder/SearchBuilder.java | 3 +- .../search/builder/SearchQueryExecutors.java | 3 +- .../StorageInterceptorHooksFacade.java | 3 +- .../models/MissingParameterQueryParams.java | 3 +- .../MissingQueryParameterPredicateParams.java | 3 +- .../models/PredicateBuilderCacheKey.java | 3 +- .../PredicateBuilderCacheLookupResult.java | 3 +- .../models/PredicateBuilderTypeEnum.java | 3 +- .../BaseJoiningPredicateBuilder.java | 3 +- .../predicate/BasePredicateBuilder.java | 3 +- .../BaseQuantityPredicateBuilder.java | 3 +- .../BaseSearchParamPredicateBuilder.java | 3 +- ...UniqueSearchParameterPredicateBuilder.java | 3 +- ...UniqueSearchParameterPredicateBuilder.java | 3 +- .../predicate/CoordsPredicateBuilder.java | 3 +- .../predicate/DatePredicateBuilder.java | 3 +- .../predicate/ForcedIdPredicateBuilder.java | 3 +- .../ICanMakeMissingParamPredicate.java | 3 +- .../predicate/NumberPredicateBuilder.java | 3 +- .../QuantityNormalizedPredicateBuilder.java | 3 +- .../predicate/QuantityPredicateBuilder.java | 3 +- .../predicate/ResourceIdPredicateBuilder.java | 3 +- .../ResourceLinkPredicateBuilder.java | 3 +- .../ResourceTablePredicateBuilder.java | 3 +- .../SearchParamPresentPredicateBuilder.java | 3 +- .../predicate/SourcePredicateBuilder.java | 3 +- .../predicate/StringPredicateBuilder.java | 3 +- .../predicate/TagPredicateBuilder.java | 3 +- .../predicate/TokenPredicateBuilder.java | 3 +- .../predicate/UriPredicateBuilder.java | 3 +- .../jpa/search/builder/sql/GeneratedSql.java | 3 +- .../builder/sql/PredicateBuilderFactory.java | 3 +- .../builder/sql/SearchQueryBuilder.java | 3 +- .../builder/sql/SearchQueryExecutor.java | 3 +- .../search/builder/sql/SqlObjectFactory.java | 3 +- .../builder/tasks/SearchContinuationTask.java | 3 +- .../jpa/search/builder/tasks/SearchTask.java | 3 +- .../builder/tasks/SearchTaskParameters.java | 3 +- .../cache/DatabaseSearchCacheSvcImpl.java | 3 +- .../DatabaseSearchResultCacheSvcImpl.java | 3 +- .../jpa/search/cache/ISearchCacheSvc.java | 3 +- .../search/cache/ISearchResultCacheSvc.java | 3 +- .../search/cache/SearchCacheStatusEnum.java | 3 +- ...asticsearchHibernatePropertiesBuilder.java | 3 +- .../IndexNamePrefixLayoutStrategy.java | 3 +- .../lastn/ElasticsearchRestClientFactory.java | 3 +- .../search/lastn/ElasticsearchSvcImpl.java | 3 +- .../jpa/search/lastn/IElasticsearchSvc.java | 3 +- .../fhir/jpa/search/lastn/json/CodeJson.java | 3 +- .../search/lastn/json/ObservationJson.java | 3 +- .../reindex/IResourceReindexingSvc.java | 3 +- .../jpa/search/reindex/ResourceReindexer.java | 3 +- .../reindex/ResourceReindexingSvcImpl.java | 3 +- .../jpa/search/warm/CacheWarmingSvcImpl.java | 3 +- .../jpa/search/warm/ICacheWarmingSvc.java | 3 +- .../fhir/jpa/sp/ISearchParamPresenceSvc.java | 3 +- .../jpa/sp/SearchParamPresenceSvcImpl.java | 3 +- .../term/BaseTermVersionAdapterSvcImpl.java | 3 +- .../ca/uhn/fhir/jpa/term/ExpansionFilter.java | 3 +- .../jpa/term/IValueSetConceptAccumulator.java | 3 +- .../fhir/jpa/term/IZipContentsHandler.java | 3 +- .../fhir/jpa/term/IZipContentsHandlerCsv.java | 3 +- .../fhir/jpa/term/LoadedFileDescriptors.java | 3 +- .../term/TermCodeSystemStorageSvcImpl.java | 3 +- .../uhn/fhir/jpa/term/TermConceptDaoSvc.java | 3 +- .../jpa/term/TermConceptMappingSvcImpl.java | 3 +- .../jpa/term/TermDeferredStorageSvcImpl.java | 3 +- .../uhn/fhir/jpa/term/TermLoaderSvcImpl.java | 39 +++++++++---------- .../ca/uhn/fhir/jpa/term/TermReadSvcImpl.java | 3 +- .../ca/uhn/fhir/jpa/term/TermReadSvcUtil.java | 3 +- .../fhir/jpa/term/TermReindexingSvcImpl.java | 3 +- .../jpa/term/TermVersionAdapterSvcDstu2.java | 3 +- .../jpa/term/TermVersionAdapterSvcDstu3.java | 3 +- .../jpa/term/TermVersionAdapterSvcR4.java | 3 +- .../jpa/term/TermVersionAdapterSvcR4B.java | 3 +- .../jpa/term/TermVersionAdapterSvcR5.java | 3 +- .../jpa/term/ValueSetConceptAccumulator.java | 3 +- ...ansionComponentWithConceptAccumulator.java | 3 +- .../term/api/ITermCodeSystemStorageSvc.java | 3 +- .../jpa/term/api/ITermConceptMappingSvc.java | 3 +- .../jpa/term/api/ITermDeferredStorageSvc.java | 3 +- .../uhn/fhir/jpa/term/api/ITermReadSvc.java | 39 +++++++++---------- .../fhir/jpa/term/api/ITermReindexingSvc.java | 3 +- .../jpa/term/api/ITermVersionAdapterSvc.java | 3 +- .../term/api/ReindexTerminologyResult.java | 3 +- .../term/api/TermCodeSystemDeleteJobSvc.java | 3 +- .../jpa/term/config/TermCodeSystemConfig.java | 3 +- .../fhir/jpa/term/custom/ConceptHandler.java | 3 +- .../jpa/term/custom/CustomTerminologySet.java | 3 +- .../jpa/term/custom/HierarchyHandler.java | 3 +- .../fhir/jpa/term/custom/PropertyHandler.java | 3 +- .../term/ex/ExpansionTooCostlyException.java | 3 +- .../uhn/fhir/jpa/term/icd10/Icd10Loader.java | 3 +- .../fhir/jpa/term/icd10cm/Icd10CmLoader.java | 3 +- .../fhir/jpa/term/loinc/BaseLoincHandler.java | 3 +- .../BaseLoincTop2000LabResultsHandler.java | 3 +- .../term/loinc/LoincAnswerListHandler.java | 3 +- .../loinc/LoincAnswerListLinkHandler.java | 3 +- .../loinc/LoincCodingPropertiesHandler.java | 3 +- .../term/loinc/LoincConsumerNameHandler.java | 3 +- .../loinc/LoincDocumentOntologyHandler.java | 3 +- .../jpa/term/loinc/LoincGroupFileHandler.java | 3 +- .../loinc/LoincGroupTermsFileHandler.java | 3 +- .../uhn/fhir/jpa/term/loinc/LoincHandler.java | 3 +- .../jpa/term/loinc/LoincHierarchyHandler.java | 3 +- .../LoincIeeeMedicalDeviceCodeHandler.java | 3 +- .../LoincImagingDocumentCodeHandler.java | 3 +- .../loinc/LoincLinguisticVariantHandler.java | 27 +++++++------ .../loinc/LoincLinguisticVariantsHandler.java | 21 +++++----- .../jpa/term/loinc/LoincMapToHandler.java | 3 +- .../loinc/LoincParentGroupFileHandler.java | 3 +- .../fhir/jpa/term/loinc/LoincPartHandler.java | 3 +- .../jpa/term/loinc/LoincPartLinkHandler.java | 3 +- .../LoincPartRelatedCodeMappingHandler.java | 3 +- .../term/loinc/LoincRsnaPlaybookHandler.java | 3 +- .../LoincTop2000LabResultsSiHandler.java | 3 +- .../LoincTop2000LabResultsUsHandler.java | 3 +- .../loinc/LoincUniversalOrderSetHandler.java | 3 +- .../term/loinc/LoincUploadPropertiesEnum.java | 3 +- .../loinc/LoincXmlFileZipContentsHandler.java | 3 +- .../jpa/term/loinc/PartTypeAndPartName.java | 3 +- .../jpa/term/snomedct/SctHandlerConcept.java | 3 +- .../term/snomedct/SctHandlerDescription.java | 3 +- .../term/snomedct/SctHandlerRelationship.java | 3 +- .../ca/uhn/fhir/jpa/util/AddRemoveCount.java | 3 +- .../ca/uhn/fhir/jpa/util/BaseIterator.java | 3 +- .../ca/uhn/fhir/jpa/util/CoordCalculator.java | 3 +- .../java/ca/uhn/fhir/jpa/util/Counter.java | 3 +- .../ca/uhn/fhir/jpa/util/JobInstanceUtil.java | 3 +- .../jpa/util/JpaHapiTransactionService.java | 3 +- .../java/ca/uhn/fhir/jpa/util/LogicUtil.java | 7 ++-- .../ca/uhn/fhir/jpa/util/MethodRequest.java | 3 +- .../jpa/util/PersistenceContextProvider.java | 3 +- .../ca/uhn/fhir/jpa/util/QueryChunker.java | 3 +- .../fhir/jpa/util/QueryParameterUtils.java | 3 +- .../fhir/jpa/util/RegexpGsonBuilderUtil.java | 3 +- .../uhn/fhir/jpa/util/ResourceCountCache.java | 3 +- .../jpa/util/ScrollableResultsIterator.java | 3 +- .../util/SearchParameterMapCalculator.java | 3 +- .../uhn/fhir/jpa/util/SpringObjectCaster.java | 5 +-- ...quireManualActivationInterceptorDstu2.java | 37 +++++++++--------- ...quireManualActivationInterceptorDstu3.java | 37 +++++++++--------- ...sRequireManualActivationInterceptorR4.java | 37 +++++++++--------- .../jpa/util/jsonpatch/JsonPatchUtils.java | 3 +- .../fhir/jpa/util/xmlpatch/XmlPatchUtils.java | 25 ++++++------ .../validation/JpaValidationSupportChain.java | 3 +- .../jpa/ips/api/IIpsGenerationStrategy.java | 3 +- .../ca/uhn/fhir/jpa/ips/api/IpsContext.java | 3 +- .../uhn/fhir/jpa/ips/api/IpsSectionEnum.java | 3 +- .../uhn/fhir/jpa/ips/api/SectionRegistry.java | 3 +- .../jpa/ips/generator/IIpsGeneratorSvc.java | 3 +- .../ips/generator/IpsGeneratorSvcImpl.java | 3 +- .../ips/provider/IpsOperationProvider.java | 3 +- .../DefaultIpsGenerationStrategy.java | 3 +- .../jpa/mdm/broker/MdmMessageHandler.java | 3 +- .../fhir/jpa/mdm/broker/MdmMessageKeySvc.java | 3 +- .../mdm/broker/MdmQueueConsumerLoader.java | 27 +++++++------ .../fhir/jpa/mdm/config/MdmCommonConfig.java | 3 +- .../jpa/mdm/config/MdmConsumerConfig.java | 3 +- .../ca/uhn/fhir/jpa/mdm/config/MdmLoader.java | 3 +- .../jpa/mdm/config/MdmSubmitterConfig.java | 3 +- .../jpa/mdm/config/MdmSubscriptionLoader.java | 3 +- .../uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java | 3 +- .../mdm/svc/GoldenResourceMergerSvcImpl.java | 3 +- .../mdm/svc/GoldenResourceSearchSvcImpl.java | 3 +- .../jpa/mdm/svc/IMdmModelConverterSvc.java | 3 +- .../jpa/mdm/svc/MdmControllerSvcImpl.java | 3 +- .../fhir/jpa/mdm/svc/MdmEidUpdateService.java | 3 +- .../jpa/mdm/svc/MdmLinkCreateSvcImpl.java | 3 +- .../jpa/mdm/svc/MdmLinkQuerySvcImplSvc.java | 3 +- .../uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java | 3 +- .../jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java | 3 +- .../jpa/mdm/svc/MdmMatchFinderSvcImpl.java | 3 +- .../uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java | 3 +- .../jpa/mdm/svc/MdmModelConverterSvcImpl.java | 3 +- .../fhir/jpa/mdm/svc/MdmResourceDaoSvc.java | 3 +- .../jpa/mdm/svc/MdmResourceFilteringSvc.java | 3 +- .../jpa/mdm/svc/MdmSurvivorshipSvcImpl.java | 3 +- .../svc/candidate/BaseCandidateFinder.java | 3 +- .../jpa/mdm/svc/candidate/CandidateList.java | 3 +- .../mdm/svc/candidate/CandidateSearcher.java | 3 +- .../svc/candidate/CandidateStrategyEnum.java | 3 +- .../svc/candidate/FindCandidateByEidSvc.java | 3 +- .../candidate/FindCandidateByExampleSvc.java | 3 +- .../svc/candidate/FindCandidateByLinkSvc.java | 3 +- .../MatchedGoldenResourceCandidate.java | 3 +- .../MdmCandidateSearchCriteriaBuilderSvc.java | 3 +- .../svc/candidate/MdmCandidateSearchSvc.java | 3 +- .../MdmGoldenResourceFindingSvc.java | 3 +- .../candidate/TooManyCandidatesException.java | 3 +- .../fhir/jpa/mdm/util/MdmPartitionHelper.java | 3 +- .../jpa/model/config/PartitionSettings.java | 3 +- .../model/cross/IBasePersistedResource.java | 3 +- .../fhir/jpa/model/cross/IResourceLookup.java | 3 +- .../ca/uhn/fhir/jpa/model/dao/JpaPid.java | 3 +- .../jpa/model/dialect/HapiFhirH2Dialect.java | 3 +- .../dialect/HapiFhirPostgres94Dialect.java | 3 +- .../dialect/HapiSequenceStyleGenerator.java | 3 +- .../model/dialect/ISequenceValueMassager.java | 3 +- .../jpa/model/entity/BaseHasResource.java | 3 +- .../jpa/model/entity/BasePartitionable.java | 3 +- .../jpa/model/entity/BaseResourceIndex.java | 3 +- .../BaseResourceIndexedSearchParam.java | 3 +- ...aseResourceIndexedSearchParamQuantity.java | 3 +- .../ca/uhn/fhir/jpa/model/entity/BaseTag.java | 3 +- .../jpa/model/entity/BinaryStorageEntity.java | 3 +- .../uhn/fhir/jpa/model/entity/ForcedId.java | 3 +- .../jpa/model/entity/IBaseResourceEntity.java | 3 +- .../IResourceIndexComboSearchParameter.java | 3 +- .../entity/NormalizedQuantitySearchLevel.java | 3 +- .../jpa/model/entity/NpmPackageEntity.java | 3 +- .../model/entity/NpmPackageVersionEntity.java | 3 +- .../NpmPackageVersionResourceEntity.java | 3 +- .../entity/PartitionablePartitionId.java | 3 +- .../model/entity/ResourceEncodingEnum.java | 3 +- .../ResourceHistoryProvenanceEntity.java | 3 +- .../model/entity/ResourceHistoryTable.java | 3 +- .../jpa/model/entity/ResourceHistoryTag.java | 3 +- .../ResourceIndexedComboStringUnique.java | 3 +- .../ResourceIndexedComboTokenNonUnique.java | 3 +- .../ResourceIndexedSearchParamCoords.java | 3 +- .../ResourceIndexedSearchParamDate.java | 3 +- .../ResourceIndexedSearchParamNumber.java | 3 +- .../ResourceIndexedSearchParamQuantity.java | 3 +- ...eIndexedSearchParamQuantityNormalized.java | 3 +- .../ResourceIndexedSearchParamString.java | 3 +- .../ResourceIndexedSearchParamToken.java | 3 +- .../entity/ResourceIndexedSearchParamUri.java | 3 +- .../fhir/jpa/model/entity/ResourceLink.java | 3 +- .../model/entity/ResourceSearchUrlEntity.java | 3 +- .../fhir/jpa/model/entity/ResourceTable.java | 3 +- .../fhir/jpa/model/entity/ResourceTag.java | 3 +- .../entity/SearchParamPresentEntity.java | 3 +- .../jpa/model/entity/StorageSettings.java | 3 +- .../fhir/jpa/model/entity/TagDefinition.java | 3 +- .../fhir/jpa/model/entity/TagTypeEnum.java | 3 +- .../search/CompositeSearchIndexData.java | 3 +- .../jpa/model/search/DateSearchIndexData.java | 3 +- .../search/ExtendedHSearchIndexData.java | 3 +- .../jpa/model/search/HSearchElementCache.java | 3 +- .../jpa/model/search/HSearchIndexWriter.java | 3 +- .../model/search/QuantitySearchIndexData.java | 3 +- .../search/ResourceTableRoutingBinder.java | 3 +- .../search/SearchParamTextPropertyBinder.java | 3 +- .../search/StorageProcessingMessage.java | 3 +- .../fhir/jpa/model/util/CodeSystemHash.java | 3 +- .../uhn/fhir/jpa/model/util/JpaConstants.java | 3 +- .../fhir/jpa/model/util/UcumServiceUtil.java | 3 +- .../model/ReadPartitionIdRequestDetails.java | 3 +- .../fhir/jpa/cache/IResourceChangeEvent.java | 3 +- .../jpa/cache/IResourceChangeListener.java | 3 +- .../cache/IResourceChangeListenerCache.java | 3 +- ...IResourceChangeListenerCacheRefresher.java | 3 +- .../IResourceChangeListenerRegistry.java | 3 +- .../fhir/jpa/cache/IResourceVersionSvc.java | 3 +- .../fhir/jpa/cache/ResourceChangeEvent.java | 3 +- .../cache/ResourceChangeListenerCache.java | 3 +- .../ResourceChangeListenerCacheFactory.java | 3 +- ...ourceChangeListenerCacheRefresherImpl.java | 3 +- .../ResourceChangeListenerRegistryImpl.java | 3 +- ...urceChangeListenerRegistryInterceptor.java | 3 +- .../fhir/jpa/cache/ResourceChangeResult.java | 3 +- .../jpa/cache/ResourcePersistentIdMap.java | 3 +- .../fhir/jpa/cache/ResourceVersionCache.java | 3 +- .../fhir/jpa/cache/ResourceVersionMap.java | 3 +- .../partition/IRequestPartitionHelperSvc.java | 3 +- .../fhir/jpa/searchparam/MatchUrlService.java | 3 +- .../jpa/searchparam/ResourceMetaParams.java | 3 +- .../fhir/jpa/searchparam/ResourceSearch.java | 3 +- .../jpa/searchparam/SearchParamConstants.java | 3 +- .../jpa/searchparam/SearchParameterMap.java | 39 +++++++++---------- .../searchparam/config/SearchParamConfig.java | 3 +- .../extractor/BaseSearchParamExtractor.java | 3 +- .../CrossPartitionReferenceDetails.java | 3 +- .../extractor/GeopointNormalizer.java | 3 +- .../extractor/IResourceLinkResolver.java | 3 +- .../extractor/ISearchParamExtractor.java | 5 +-- .../extractor/LogicalReferenceHelper.java | 3 +- .../jpa/searchparam/extractor/PathAndRef.java | 3 +- .../ResourceIndexedSearchParamComposite.java | 3 +- .../ResourceIndexedSearchParams.java | 5 +-- .../extractor/SearchParamExtractorDstu2.java | 3 +- .../extractor/SearchParamExtractorDstu3.java | 3 +- .../extractor/SearchParamExtractorR4.java | 3 +- .../extractor/SearchParamExtractorR4B.java | 3 +- .../extractor/SearchParamExtractorR5.java | 3 +- .../SearchParamExtractorService.java | 3 +- .../StringTrimmingTrimmerMatcher.java | 3 +- .../AuthorizationSearchParamMatcher.java | 3 +- .../matcher/InMemoryMatchResult.java | 3 +- .../matcher/InMemoryResourceMatcher.java | 3 +- .../matcher/IndexedSearchParamExtractor.java | 3 +- .../matcher/SearchParamMatcher.java | 3 +- .../nickname/NicknameInterceptor.java | 3 +- .../jpa/searchparam/nickname/NicknameMap.java | 3 +- .../jpa/searchparam/nickname/NicknameSvc.java | 3 +- .../SearchableHashMapResourceProvider.java | 3 +- .../registry/ISearchParamProvider.java | 3 +- .../ISearchParamRegistryController.java | 3 +- .../registry/JpaSearchParamCache.java | 3 +- .../registry/ReadOnlySearchParamCache.java | 3 +- .../registry/RuntimeSearchParamCache.java | 3 +- .../registry/SearchParamRegistryImpl.java | 3 +- .../SearchParameterCanonicalizer.java | 3 +- .../fhir/jpa/searchparam/retry/Retrier.java | 3 +- .../searchparam/util/Dstu3DistanceHelper.java | 3 +- .../jpa/searchparam/util/JpaParamUtil.java | 3 +- .../util/LastNParameterHelper.java | 3 +- .../util/SearchParameterHelper.java | 3 +- .../jpa/searchparam/util/SourceParam.java | 13 +++---- .../api/ISubscriptionMessageKeySvc.java | 3 +- .../channel/models/BaseChannelParameters.java | 3 +- .../models/ProducingChannelParameters.java | 3 +- .../models/ReceivingChannelParameters.java | 3 +- .../ISubscriptionDeliveryChannelNamer.java | 3 +- .../SubscriptionChannelCache.java | 3 +- .../SubscriptionChannelRegistry.java | 3 +- .../SubscriptionChannelWithHandlers.java | 3 +- .../SubscriptionDeliveryChannelNamer.java | 3 +- .../SubscriptionDeliveryHandlerFactory.java | 3 +- .../config/SubscriptionProcessorConfig.java | 3 +- .../config/WebsocketDispatcherConfig.java | 3 +- .../BaseSubscriptionDeliverySubscriber.java | 3 +- .../match/deliver/email/EmailDetails.java | 3 +- .../match/deliver/email/EmailSenderImpl.java | 3 +- .../match/deliver/email/IEmailSender.java | 3 +- ...SubscriptionDeliveringEmailSubscriber.java | 3 +- ...bscriptionDeliveringMessageSubscriber.java | 3 +- ...scriptionDeliveringRestHookSubscriber.java | 3 +- .../SubscriptionWebsocketHandler.java | 3 +- .../WebsocketConnectionValidator.java | 3 +- .../WebsocketValidationResponse.java | 3 +- ...mpositeInMemoryDaoSubscriptionMatcher.java | 3 +- .../matching/DaoSubscriptionMatcher.java | 3 +- .../matching/ISubscriptionMatcher.java | 3 +- .../matching/InMemorySubscriptionMatcher.java | 3 +- .../SubscriptionStrategyEvaluator.java | 3 +- ...aseSubscriberForSubscriptionResources.java | 3 +- .../MatchingQueueSubscriberLoader.java | 35 ++++++++--------- .../SubscriptionActivatingSubscriber.java | 3 +- .../SubscriptionCriteriaParser.java | 3 +- .../SubscriptionMatchingSubscriber.java | 39 +++++++++---------- .../SubscriptionRegisteringSubscriber.java | 3 +- .../match/registry/ActiveSubscription.java | 3 +- .../registry/ActiveSubscriptionCache.java | 3 +- .../match/registry/SubscriptionLoader.java | 3 +- .../match/registry/SubscriptionRegistry.java | 3 +- .../model/config/SubscriptionModelConfig.java | 3 +- .../fhir/jpa/subscription/package-info.java | 24 ++++++------ .../config/SubscriptionSubmitterConfig.java | 3 +- .../SubscriptionMatcherInterceptor.java | 39 +++++++++---------- .../SubscriptionSubmitInterceptorLoader.java | 3 +- .../SubscriptionValidatingInterceptor.java | 3 +- .../SubscriptionTriggeringSvcImpl.java | 3 +- .../util/SubscriptionDebugLogInterceptor.java | 3 +- .../subscription/util/SubscriptionUtil.java | 3 +- .../ca/uhn/fhir/jpa/dao/DaoTestUtils.java | 3 +- .../ca/uhn/fhir/jpa/dao/TestDaoSearch.java | 3 +- ...PartitionInterceptorReadAllPartitions.java | 3 +- ...nterceptorReadPartitionsBasedOnScopes.java | 3 +- .../uhn/fhir/jpa/packages/FakeNpmServlet.java | 3 +- .../provider/BaseResourceProviderR4Test.java | 3 +- .../jpa/provider/GraphQLProviderTestUtil.java | 3 +- .../jpa/provider/ServerConfiguration.java | 3 +- .../r4/BaseResourceProviderR4Test.java | 3 +- .../CompositeSearchParameterTestCases.java | 3 +- .../QuantitySearchParameterTestCases.java | 3 +- .../jpa/subscription/CountingInterceptor.java | 3 +- .../jpa/subscription/NotificationServlet.java | 3 +- .../subscription/SocketImplementation.java | 4 +- ...SystemDeleteJobSvcWithUniTestFailures.java | 3 +- .../ca/uhn/fhir/jpa/term/TermTestUtil.java | 3 +- .../fhir/jpa/term/ZipCollectionBuilder.java | 3 +- .../uhn/fhir/jpa/test/BaseJpaDstu3Test.java | 3 +- .../ca/uhn/fhir/jpa/test/BaseJpaR4Test.java | 3 +- .../ca/uhn/fhir/jpa/test/BaseJpaTest.java | 3 +- .../BaseValueSetHSearchExpansionR4Test.java | 3 +- .../ca/uhn/fhir/jpa/test/Batch2JobHelper.java | 3 +- .../jpa/test/PatientReindexTestHelper.java | 3 +- .../PreventDanglingInterceptorsExtension.java | 3 +- .../BlockLargeNumbersOfParamsListener.java | 3 +- .../jpa/test/config/ConnectionWrapper.java | 3 +- .../fhir/jpa/test/config/DelayListener.java | 3 +- .../config/MandatoryTransactionListener.java | 3 +- .../fhir/jpa/test/config/TestDstu2Config.java | 3 +- .../fhir/jpa/test/config/TestDstu3Config.java | 3 +- .../TestElasticsearchContainerHelper.java | 3 +- .../test/config/TestHSearchAddInConfig.java | 3 +- .../fhir/jpa/test/config/TestJPAConfig.java | 3 +- .../fhir/jpa/test/config/TestR4BConfig.java | 3 +- .../fhir/jpa/test/config/TestR4Config.java | 3 +- .../test/config/TestR4WithDelayConfig.java | 3 +- .../fhir/jpa/test/config/TestR5Config.java | 3 +- ...scriptionDeliveringRestHookSubscriber.java | 3 +- .../jpa/test/util/SubscriptionTestUtil.java | 3 +- .../test/util/TestHSearchEventDispatcher.java | 3 +- .../jpa/util/CoordCalculatorTestUtil.java | 3 +- .../ForceSynchronousSearchInterceptor.java | 3 +- .../uhn/fhir/jpa/util/ValueSetTestUtil.java | 3 +- .../jpa/util/WebsocketSubscriptionClient.java | 3 +- .../mdm/api/IGoldenResourceMergerSvc.java | 3 +- .../fhir/mdm/api/IMdmChannelSubmitterSvc.java | 3 +- .../uhn/fhir/mdm/api/IMdmControllerSvc.java | 3 +- .../java/ca/uhn/fhir/mdm/api/IMdmLink.java | 3 +- .../uhn/fhir/mdm/api/IMdmLinkCreateSvc.java | 3 +- .../uhn/fhir/mdm/api/IMdmLinkExpandSvc.java | 3 +- .../ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java | 3 +- .../java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java | 3 +- .../uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java | 3 +- .../uhn/fhir/mdm/api/IMdmMatchFinderSvc.java | 3 +- .../uhn/fhir/mdm/api/IMdmRuleValidator.java | 3 +- .../ca/uhn/fhir/mdm/api/IMdmSettings.java | 3 +- .../ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java | 3 +- .../fhir/mdm/api/IMdmSurvivorshipService.java | 3 +- .../ca/uhn/fhir/mdm/api/MatchedTarget.java | 3 +- .../ca/uhn/fhir/mdm/api/MdmConstants.java | 3 +- .../ca/uhn/fhir/mdm/api/MdmLinkEvent.java | 3 +- .../java/ca/uhn/fhir/mdm/api/MdmLinkJson.java | 3 +- .../uhn/fhir/mdm/api/MdmLinkSourceEnum.java | 3 +- .../uhn/fhir/mdm/api/MdmMatchEvaluation.java | 3 +- .../ca/uhn/fhir/mdm/api/MdmMatchOutcome.java | 3 +- .../uhn/fhir/mdm/api/MdmMatchResultEnum.java | 3 +- .../mdm/api/MdmQuerySearchParameters.java | 3 +- .../mdm/api/paging/MdmPageLinkBuilder.java | 3 +- .../fhir/mdm/api/paging/MdmPageLinkTuple.java | 3 +- .../fhir/mdm/api/paging/MdmPageRequest.java | 3 +- .../java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java | 3 +- .../uhn/fhir/mdm/dao/IMdmLinkImplFactory.java | 3 +- .../ca/uhn/fhir/mdm/dao/MdmLinkFactory.java | 3 +- .../interceptor/IMdmStorageInterceptor.java | 3 +- .../MdmSearchExpandingInterceptor.java | 3 +- .../interceptor/MdmStorageInterceptor.java | 3 +- .../ca/uhn/fhir/mdm/model/CanonicalEID.java | 3 +- .../ca/uhn/fhir/mdm/model/MdmPidTuple.java | 3 +- .../fhir/mdm/model/MdmTransactionContext.java | 3 +- .../fhir/mdm/provider/BaseMdmProvider.java | 3 +- .../mdm/provider/MdmControllerHelper.java | 3 +- .../fhir/mdm/provider/MdmControllerUtil.java | 3 +- .../mdm/provider/MdmProviderDstu3Plus.java | 3 +- .../fhir/mdm/provider/MdmProviderLoader.java | 3 +- .../mdm/rules/config/MdmRuleValidator.java | 3 +- .../fhir/mdm/rules/config/MdmSettings.java | 3 +- .../mdm/rules/json/MdmFieldMatchJson.java | 3 +- .../rules/json/MdmFilterSearchParamJson.java | 3 +- .../fhir/mdm/rules/json/MdmMatcherJson.java | 3 +- .../json/MdmResourceSearchParamJson.java | 3 +- .../uhn/fhir/mdm/rules/json/MdmRulesJson.java | 3 +- .../mdm/rules/json/MdmSimilarityJson.java | 3 +- .../mdm/rules/json/VectorMatchResultMap.java | 3 +- .../rules/matcher/BaseHapiStringMetric.java | 3 +- .../mdm/rules/matcher/EmptyFieldMatcher.java | 3 +- .../mdm/rules/matcher/ExtensionMatcher.java | 3 +- .../mdm/rules/matcher/HapiDateMatcher.java | 3 +- .../rules/matcher/HapiDateMatcherDstu3.java | 3 +- .../mdm/rules/matcher/HapiDateMatcherR4.java | 3 +- .../mdm/rules/matcher/HapiStringMatcher.java | 3 +- .../mdm/rules/matcher/IMdmFieldMatcher.java | 3 +- .../mdm/rules/matcher/IMdmStringMatcher.java | 3 +- .../mdm/rules/matcher/IdentifierMatcher.java | 3 +- .../mdm/rules/matcher/MdmMatcherEnum.java | 3 +- .../rules/matcher/MdmNameMatchModeEnum.java | 3 +- .../fhir/mdm/rules/matcher/NameMatcher.java | 3 +- .../mdm/rules/matcher/NicknameMatcher.java | 3 +- .../mdm/rules/matcher/NumericMatcher.java | 3 +- .../rules/matcher/PhoneticEncoderMatcher.java | 3 +- .../rules/matcher/SubstringStringMatcher.java | 3 +- .../similarity/HapiStringSimilarity.java | 3 +- .../rules/similarity/IMdmFieldSimilarity.java | 3 +- .../rules/similarity/MdmSimilarityEnum.java | 3 +- .../rules/svc/MdmResourceFieldMatcher.java | 3 +- .../mdm/rules/svc/MdmResourceMatcherSvc.java | 3 +- .../mdm/svc/MdmChannelSubmitterSvcImpl.java | 3 +- .../ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java | 3 +- .../ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java | 3 +- .../uhn/fhir/mdm/svc/MdmSearchParamSvc.java | 3 +- .../ca/uhn/fhir/mdm/svc/MdmSubmitSvcImpl.java | 3 +- .../java/ca/uhn/fhir/mdm/util/EIDHelper.java | 3 +- .../fhir/mdm/util/GoldenResourceHelper.java | 3 +- .../ca/uhn/fhir/mdm/util/IdentifierUtil.java | 3 +- .../ca/uhn/fhir/mdm/util/MdmResourceUtil.java | 3 +- .../ca/uhn/fhir/mdm/util/MessageHelper.java | 3 +- .../java/ca/uhn/fhir/mdm/util/NameUtil.java | 3 +- .../util/PrimitiveTypeEqualsPredicate.java | 3 +- .../fhir/rest/openapi/OpenApiInterceptor.java | 3 +- .../fhir/rest/api/server/BaseParseAction.java | 3 +- .../fhir/rest/api/server/IBundleProvider.java | 29 +++++++------- .../rest/api/server/IFhirVersionServer.java | 3 +- .../api/server/IPreResourceAccessDetails.java | 3 +- .../api/server/IPreResourceShowDetails.java | 3 +- .../rest/api/server/IRestfulResponse.java | 3 +- .../fhir/rest/api/server/IRestfulServer.java | 14 +++---- .../rest/api/server/IServerMethodBinding.java | 3 +- .../fhir/rest/api/server/RequestDetails.java | 39 +++++++++---------- .../fhir/rest/api/server/ResponseDetails.java | 3 +- .../SimplePreResourceAccessDetails.java | 3 +- .../server/SimplePreResourceShowDetails.java | 3 +- .../rest/api/server/SystemRequestDetails.java | 3 +- .../server/bulk/BulkDataExportOptions.java | 3 +- .../storage/BaseResourcePersistentId.java | 3 +- .../DeferredInterceptorBroadcasts.java | 3 +- .../storage/IDeleteExpungeJobSubmitter.java | 3 +- .../server/storage/IResourcePersistentId.java | 3 +- .../rest/api/server/storage/NotFoundPid.java | 3 +- .../server/storage/TransactionDetails.java | 3 +- .../server/ApacheProxyAddressStrategy.java | 3 +- .../fhir/rest/server/BasePagingProvider.java | 3 +- .../fhir/rest/server/BaseRestfulResponse.java | 3 +- .../ca/uhn/fhir/rest/server/Bindings.java | 3 +- .../server/BundleProviderWithNamedPages.java | 3 +- .../uhn/fhir/rest/server/BundleProviders.java | 3 +- .../CommonResourceSupertypeScanner.java | 3 +- .../uhn/fhir/rest/server/ETagSupportEnum.java | 3 +- .../fhir/rest/server/ElementsSupportEnum.java | 3 +- .../rest/server/FifoMemoryPagingProvider.java | 3 +- .../HardcodedServerAddressStrategy.java | 3 +- .../IDynamicSearchResourceProvider.java | 3 +- .../uhn/fhir/rest/server/IPagingProvider.java | 15 ++++--- .../fhir/rest/server/IResourceProvider.java | 3 +- .../rest/server/IRestfulServerDefaults.java | 19 +++++---- .../fhir/rest/server/IRestfulServerUtil.java | 3 +- .../rest/server/IServerAddressStrategy.java | 3 +- .../server/IServerConformanceProvider.java | 3 +- .../IncomingRequestAddressStrategy.java | 3 +- .../ca/uhn/fhir/rest/server/PageProvider.java | 3 +- .../uhn/fhir/rest/server/ResourceBinding.java | 3 +- .../uhn/fhir/rest/server/RestfulServer.java | 3 +- .../server/RestfulServerConfiguration.java | 3 +- .../fhir/rest/server/RestfulServerUtils.java | 3 +- .../rest/server/ServletRequestTracing.java | 3 +- .../rest/server/SimpleBundleProvider.java | 3 +- .../rest/server/TransactionLogMessages.java | 3 +- .../BanUnsupportedHttpMethodsInterceptor.java | 3 +- .../BaseResponseTerminologyInterceptor.java | 3 +- .../BaseValidatingInterceptor.java | 3 +- ...reResourceSourceFromHeaderInterceptor.java | 3 +- .../rest/server/interceptor/ConfigLoader.java | 3 +- .../server/interceptor/CorsInterceptor.java | 3 +- .../ExceptionHandlingInterceptor.java | 4 +- .../FhirPathFilterInterceptor.java | 3 +- .../interceptor/IServerInterceptor.java | 3 +- .../IServerOperationInterceptor.java | 3 +- .../InteractionBlockingInterceptor.java | 3 +- .../interceptor/InterceptorAdapter.java | 3 +- .../server/interceptor/InterceptorOrders.java | 3 +- .../interceptor/LoggingInterceptor.java | 39 +++++++++---------- .../RequestValidatingInterceptor.java | 3 +- .../ResponseHighlighterInterceptor.java | 39 +++++++++---------- .../ResponseSizeCapturingInterceptor.java | 3 +- ...rminologyDisplayPopulationInterceptor.java | 3 +- ...onseTerminologyTranslationInterceptor.java | 3 +- .../ResponseTerminologyTranslationSvc.java | 3 +- .../ResponseValidatingInterceptor.java | 3 +- .../SearchPreferHandlingInterceptor.java | 3 +- .../ServeMediaResourceRawInterceptor.java | 3 +- .../interceptor/ServerInterceptorUtil.java | 3 +- .../ServerOperationInterceptorAdapter.java | 3 +- .../StaticCapabilityStatementInterceptor.java | 3 +- .../ValidationResultEnrichingInterceptor.java | 3 +- .../VerboseLoggingInterceptor.java | 3 +- ...AdditionalCompartmentSearchParameters.java | 3 +- .../auth/AllowedCodeInValueSet.java | 3 +- .../interceptor/auth/AppliesTypeEnum.java | 3 +- .../auth/AuthorizationConstants.java | 3 +- .../auth/AuthorizationFlagsEnum.java | 3 +- .../auth/AuthorizationInterceptor.java | 3 +- .../interceptor/auth/AuthorizedList.java | 3 +- .../server/interceptor/auth/BaseRule.java | 3 +- .../interceptor/auth/ClassifierTypeEnum.java | 3 +- .../interceptor/auth/FhirQueryRuleTester.java | 3 +- .../server/interceptor/auth/IAuthRule.java | 3 +- .../interceptor/auth/IAuthRuleBuilder.java | 7 ++-- .../auth/IAuthRuleBuilderAppliesTo.java | 3 +- .../auth/IAuthRuleBuilderGraphQL.java | 3 +- .../auth/IAuthRuleBuilderOperation.java | 3 +- .../auth/IAuthRuleBuilderOperationNamed.java | 3 +- ...uthRuleBuilderOperationNamedAndScoped.java | 3 +- .../auth/IAuthRuleBuilderPatch.java | 3 +- .../auth/IAuthRuleBuilderRule.java | 3 +- .../auth/IAuthRuleBuilderRuleBulkExport.java | 3 +- ...thRuleBuilderRuleBulkExportWithTarget.java | 3 +- .../auth/IAuthRuleBuilderRuleConditional.java | 3 +- ...hRuleBuilderRuleConditionalClassifier.java | 3 +- .../auth/IAuthRuleBuilderRuleOp.java | 11 +++--- .../IAuthRuleBuilderRuleOpClassifier.java | 3 +- ...thRuleBuilderRuleOpClassifierFinished.java | 3 +- ...rRuleOpClassifierFinishedWithTenantId.java | 3 +- .../auth/IAuthRuleBuilderRuleOpDelete.java | 3 +- .../auth/IAuthRuleBuilderRuleTransaction.java | 3 +- .../IAuthRuleBuilderRuleTransactionOp.java | 3 +- .../IAuthRuleBuilderUpdateHistoryRewrite.java | 3 +- .../interceptor/auth/IAuthRuleFinished.java | 3 +- .../interceptor/auth/IAuthRuleTester.java | 3 +- .../IAuthorizationSearchParamMatcher.java | 3 +- .../server/interceptor/auth/IRuleApplier.java | 3 +- .../interceptor/auth/OperationRule.java | 3 +- .../server/interceptor/auth/PolicyEnum.java | 3 +- .../server/interceptor/auth/RuleBuilder.java | 3 +- .../interceptor/auth/RuleBulkExportImpl.java | 3 +- .../interceptor/auth/RuleImplConditional.java | 3 +- .../server/interceptor/auth/RuleImplOp.java | 39 +++++++++---------- .../interceptor/auth/RuleImplPatch.java | 3 +- .../auth/RuleImplUpdateHistoryRewrite.java | 3 +- .../server/interceptor/auth/RuleOpEnum.java | 3 +- .../server/interceptor/auth/RuleTarget.java | 3 +- .../auth/SearchNarrowingConsentService.java | 3 +- .../auth/SearchNarrowingInterceptor.java | 3 +- .../SearchParameterAndValueSetRuleImpl.java | 3 +- .../auth/TransactionAppliesToEnum.java | 3 +- .../consent/ConsentInterceptor.java | 3 +- .../consent/ConsentOperationStatusEnum.java | 3 +- .../interceptor/consent/ConsentOutcome.java | 3 +- .../consent/DelegatingConsentService.java | 3 +- .../consent/IConsentContextServices.java | 3 +- .../interceptor/consent/IConsentService.java | 3 +- .../consent/NullConsentContextServices.java | 3 +- .../consent/RuleFilteringConsentService.java | 3 +- .../RequestTenantPartitionInterceptor.java | 3 +- .../s13n/StandardizingInterceptor.java | 3 +- .../s13n/standardizers/EmailStandardizer.java | 3 +- .../standardizers/FirstNameStandardizer.java | 3 +- .../s13n/standardizers/IStandardizer.java | 3 +- .../standardizers/LastNameStandardizer.java | 3 +- .../s13n/standardizers/NoiseCharacters.java | 3 +- .../s13n/standardizers/PhoneStandardizer.java | 3 +- .../interceptor/s13n/standardizers/Range.java | 3 +- .../s13n/standardizers/TextStandardizer.java | 3 +- .../s13n/standardizers/TitleStandardizer.java | 3 +- ...lidationMessageSuppressingInterceptor.java | 3 +- .../address/AddressValidatingInterceptor.java | 3 +- .../address/AddressValidationException.java | 3 +- .../address/AddressValidationResult.java | 3 +- .../validation/address/IAddressValidator.java | 3 +- .../address/impl/BaseRestfulValidator.java | 3 +- .../address/impl/LoquateAddressValidator.java | 3 +- .../validation/fields/EmailValidator.java | 3 +- .../fields/FieldValidatingInterceptor.java | 3 +- .../validation/fields/IValidator.java | 3 +- .../validation/helpers/AddressHelper.java | 3 +- .../uhn/fhir/rest/server/mail/IMailSvc.java | 3 +- .../uhn/fhir/rest/server/mail/MailConfig.java | 3 +- .../ca/uhn/fhir/rest/server/mail/MailSvc.java | 3 +- .../server/messaging/BaseResourceMessage.java | 3 +- .../BaseResourceModifiedMessage.java | 3 +- .../server/messaging/IResourceMessage.java | 3 +- .../messaging/ResourceOperationMessage.java | 3 +- .../messaging/json/BaseJsonMessage.java | 3 +- .../messaging/json/HapiMessageHeaders.java | 3 +- .../json/ResourceOperationJsonMessage.java | 3 +- .../fhir/rest/server/method/AtParameter.java | 3 +- .../rest/server/method/BaseMethodBinding.java | 3 +- .../BaseOutcomeReturningMethodBinding.java | 3 +- ...indingWithResourceIdButNoResourceBody.java | 3 +- ...turningMethodBindingWithResourceParam.java | 9 ++--- .../server/method/BaseQueryParameter.java | 3 +- .../BaseResourceReturningMethodBinding.java | 39 +++++++++---------- .../server/method/ConditionalParamBinder.java | 3 +- .../method/ConformanceMethodBinding.java | 3 +- .../rest/server/method/CountParameter.java | 3 +- .../server/method/CreateMethodBinding.java | 9 ++--- .../server/method/DeleteMethodBinding.java | 3 +- .../rest/server/method/ElementsParameter.java | 3 +- .../server/method/GraphQLMethodBinding.java | 3 +- .../method/GraphQLQueryBodyParameter.java | 3 +- .../method/GraphQLQueryUrlParameter.java | 3 +- .../server/method/HistoryMethodBinding.java | 3 +- .../fhir/rest/server/method/IParameter.java | 3 +- .../rest/server/method/IRestfulHeader.java | 3 +- .../rest/server/method/IncludeParameter.java | 3 +- .../InterceptorBroadcasterParameter.java | 3 +- .../rest/server/method/MethodMatchEnum.java | 3 +- .../fhir/rest/server/method/MethodUtil.java | 3 +- .../rest/server/method/NullParameter.java | 3 +- .../rest/server/method/OffsetParameter.java | 3 +- .../server/method/OperationMethodBinding.java | 3 +- .../server/method/OperationParameter.java | 39 +++++++++---------- .../rest/server/method/PageMethodBinding.java | 3 +- .../server/method/PatchMethodBinding.java | 3 +- .../server/method/PatchTypeParameter.java | 9 ++--- .../server/method/RawParamsParameter.java | 3 +- .../rest/server/method/ReadMethodBinding.java | 3 +- .../method/RequestDetailsParameter.java | 3 +- .../rest/server/method/ResourceParameter.java | 3 +- .../method/SearchContainedModeParameter.java | 3 +- .../server/method/SearchMethodBinding.java | 3 +- .../rest/server/method/SearchParameter.java | 4 +- .../method/SearchTotalModeParameter.java | 21 +++++----- .../server/method/ServerBaseParamBinder.java | 3 +- .../method/ServletRequestParameter.java | 3 +- .../method/ServletResponseParameter.java | 3 +- .../server/method/SinceOrAtParameter.java | 3 +- .../rest/server/method/SinceParameter.java | 3 +- .../rest/server/method/SortParameter.java | 4 +- .../server/method/SummaryEnumParameter.java | 4 +- .../method/TransactionMethodBinding.java | 3 +- .../server/method/TransactionParameter.java | 3 +- .../server/method/UpdateMethodBinding.java | 8 ++-- .../ValidateMethodBindingDstu2Plus.java | 3 +- .../server/provider/BaseLastNProvider.java | 3 +- .../provider/HashMapResourceProvider.java | 3 +- .../IResourceProviderFactoryObserver.java | 3 +- .../server/provider/ProviderConstants.java | 3 +- .../provider/ResourceProviderFactory.java | 3 +- .../ServerCapabilityStatementProvider.java | 39 +++++++++---------- .../server/servlet/ServletRequestDetails.java | 3 +- .../servlet/ServletRestfulResponse.java | 3 +- .../servlet/ServletSubRequestDetails.java | 3 +- .../tenant/ITenantIdentificationStrategy.java | 3 +- .../UrlBaseTenantIdentificationStrategy.java | 3 +- ...BaseServerCapabilityStatementProvider.java | 3 +- .../util/CompositeInterceptorBroadcaster.java | 3 +- .../util/FhirContextSearchParamRegistry.java | 3 +- .../server/util/ICachedSearchDetails.java | 3 +- .../server/util/ISearchParamRegistry.java | 3 +- .../server/util/ITestingUiClientFactory.java | 3 +- .../server/util/ResourceSearchParams.java | 3 +- .../rest/server/util/ServletRequestUtil.java | 3 +- .../autoconfigure/FhirAutoConfiguration.java | 3 +- .../boot/autoconfigure/FhirProperties.java | 3 +- .../FhirRestfulServerCustomizer.java | 3 +- .../SampleApacheRestfulClientApplication.java | 3 +- .../SampleOkHttpRestfulClientApplication.java | 3 +- .../SampleJerseyRestfulServerApplication.java | 3 +- .../provider/PatientResourceProvider.java | 3 +- .../uhn/fhir/jpa/migrate/DriverTypeEnum.java | 39 +++++++++---------- .../jpa/migrate/HapiMigrationException.java | 3 +- .../fhir/jpa/migrate/HapiMigrationLock.java | 3 +- .../jpa/migrate/HapiMigrationStorageSvc.java | 3 +- .../ca/uhn/fhir/jpa/migrate/HapiMigrator.java | 3 +- .../jpa/migrate/IHapiMigrationCallback.java | 3 +- .../ca/uhn/fhir/jpa/migrate/JdbcUtils.java | 3 +- .../uhn/fhir/jpa/migrate/MigrationResult.java | 3 +- .../fhir/jpa/migrate/MigrationTaskList.java | 3 +- .../jpa/migrate/MigrationTaskSkipper.java | 3 +- .../uhn/fhir/jpa/migrate/SchemaMigrator.java | 3 +- .../jpa/migrate/dao/HapiMigrationDao.java | 3 +- .../migrate/dao/MigrationQueryBuilder.java | 3 +- .../migrate/entity/HapiMigrationEntity.java | 3 +- .../jpa/migrate/taskdef/AddColumnTask.java | 3 +- .../migrate/taskdef/AddForeignKeyTask.java | 3 +- .../migrate/taskdef/AddIdGeneratorTask.java | 3 +- .../jpa/migrate/taskdef/AddIndexTask.java | 3 +- .../migrate/taskdef/AddTableByColumnTask.java | 3 +- .../migrate/taskdef/AddTableRawSqlTask.java | 3 +- .../jpa/migrate/taskdef/ArbitrarySqlTask.java | 3 +- .../taskdef/BaseColumnCalculatorTask.java | 3 +- .../migrate/taskdef/BaseTableColumnTask.java | 3 +- .../taskdef/BaseTableColumnTypeTask.java | 3 +- .../jpa/migrate/taskdef/BaseTableTask.java | 3 +- .../fhir/jpa/migrate/taskdef/BaseTask.java | 3 +- .../migrate/taskdef/CalculateHashesTask.java | 3 +- .../taskdef/CalculateOrdinalDatesTask.java | 3 +- .../jpa/migrate/taskdef/ColumnTypeEnum.java | 3 +- .../ColumnTypeToDriverTypeToSqlType.java | 3 +- .../jpa/migrate/taskdef/DropColumnTask.java | 3 +- .../migrate/taskdef/DropForeignKeyTask.java | 3 +- .../migrate/taskdef/DropIdGeneratorTask.java | 3 +- .../jpa/migrate/taskdef/DropIndexTask.java | 3 +- .../jpa/migrate/taskdef/DropTableTask.java | 3 +- .../migrate/taskdef/ExecuteRawSqlTask.java | 3 +- .../migrate/taskdef/ForeignKeyContainer.java | 3 +- .../migrate/taskdef/InitializeSchemaTask.java | 3 +- .../jpa/migrate/taskdef/MetadataSource.java | 3 +- ...gratePostgresTextClobToBinaryClobTask.java | 3 +- .../jpa/migrate/taskdef/ModifyColumnTask.java | 3 +- .../uhn/fhir/jpa/migrate/taskdef/NopTask.java | 3 +- .../jpa/migrate/taskdef/RenameColumnTask.java | 3 +- .../jpa/migrate/taskdef/RenameIndexTask.java | 3 +- .../tasks/SchemaInitializationProvider.java | 3 +- .../migrate/tasks/api/BaseMigrationTasks.java | 3 +- .../fhir/jpa/migrate/tasks/api/Builder.java | 3 +- .../api/ISchemaInitializationProvider.java | 3 +- .../batch2/jobs/config/Batch2JobsConfig.java | 3 +- .../batch2/jobs/config/BatchCommonCtx.java | 3 +- .../batch2/jobs/export/BulkExportAppCtx.java | 3 +- .../export/BulkExportCreateReportStep.java | 3 +- .../BulkExportJobParametersValidator.java | 3 +- .../batch2/jobs/export/BulkExportUtil.java | 3 +- .../jobs/export/ExpandResourcesStep.java | 3 +- .../jobs/export/FetchResourceIdsStep.java | 3 +- .../batch2/jobs/export/WriteBinaryStep.java | 3 +- .../export/models/BulkExportBinaryFileId.java | 3 +- .../jobs/export/models/BulkExportJobBase.java | 3 +- .../models/BulkExportJobParameters.java | 3 +- .../export/models/ExpandedResourcesList.java | 3 +- .../jobs/export/models/ResourceIdList.java | 3 +- .../jobs/expunge/DeleteExpungeAppCtx.java | 3 +- .../expunge/DeleteExpungeJobParameters.java | 3 +- .../DeleteExpungeJobParametersValidator.java | 3 +- .../DeleteExpungeJobSubmitterImpl.java | 3 +- .../jobs/expunge/DeleteExpungeProvider.java | 3 +- .../jobs/expunge/DeleteExpungeStep.java | 3 +- .../BulkImportParameterValidator.java | 3 +- .../jobs/importpull/BulkImportPullConfig.java | 3 +- .../importpull/FetchPartitionedFilesStep.java | 3 +- .../ReadInResourcesFromFileStep.java | 3 +- .../importpull/WriteBundleForImportStep.java | 3 +- .../jobs/imprt/BulkDataImportProvider.java | 3 +- .../batch2/jobs/imprt/BulkImportAppCtx.java | 3 +- .../jobs/imprt/BulkImportFileServlet.java | 3 +- .../jobs/imprt/BulkImportJobParameters.java | 3 +- .../batch2/jobs/imprt/ConsumeFilesStep.java | 3 +- .../batch2/jobs/imprt/FetchFilesStep.java | 3 +- .../batch2/jobs/imprt/NdJsonFileJson.java | 3 +- .../batch2/jobs/imprt/ResourceOrderUtil.java | 3 +- .../batch2/jobs/models/BatchResourceId.java | 3 +- .../batch2/jobs/reindex/ReindexAppCtx.java | 3 +- .../jobs/reindex/ReindexJobParameters.java | 3 +- .../ReindexJobParametersValidator.java | 3 +- .../batch2/jobs/reindex/ReindexProvider.java | 3 +- .../fhir/batch2/jobs/reindex/ReindexStep.java | 3 +- .../jobs/services/Batch2JobRunnerImpl.java | 3 +- .../TermCodeSystemJobConfig.java | 3 +- .../DeleteCodeSystemCompletionHandler.java | 3 +- ...DeleteCodeSystemConceptsByVersionStep.java | 3 +- .../DeleteCodeSystemStep.java | 3 +- .../DeleteCodeSystemVersionStep.java | 3 +- .../ReadTermConceptVersionsStep.java | 3 +- ...odeSystemDeleteJobParametersValidator.java | 3 +- ...eteCodeSystemVersionCompletionHandler.java | 3 +- .../DeleteCodeSystemVersionFinalStep.java | 3 +- .../DeleteCodeSystemVersionFirstStep.java | 3 +- ...teCodeSystemVersionParameterValidator.java | 3 +- .../batch2/api/ChunkExecutionDetails.java | 3 +- .../fhir/batch2/api/IFirstJobStepWorker.java | 3 +- .../batch2/api/IJobCompletionHandler.java | 3 +- .../uhn/fhir/batch2/api/IJobCoordinator.java | 3 +- .../ca/uhn/fhir/batch2/api/IJobDataSink.java | 3 +- .../ca/uhn/fhir/batch2/api/IJobInstance.java | 3 +- .../batch2/api/IJobMaintenanceService.java | 3 +- .../batch2/api/IJobParametersValidator.java | 3 +- .../uhn/fhir/batch2/api/IJobPersistence.java | 3 +- .../uhn/fhir/batch2/api/IJobStepWorker.java | 3 +- .../fhir/batch2/api/ILastJobStepWorker.java | 3 +- .../api/IReductionStepExecutorService.java | 3 +- .../fhir/batch2/api/IReductionStepWorker.java | 3 +- .../batch2/api/IWorkChunkPersistence.java | 3 +- .../fhir/batch2/api/JobCompletionDetails.java | 3 +- .../api/JobExecutionFailedException.java | 3 +- .../batch2/api/JobOperationResultJson.java | 3 +- .../batch2/api/JobStepFailedException.java | 3 +- .../api/ReductionStepExecutionDetails.java | 17 ++++---- .../ca/uhn/fhir/batch2/api/RunOutcome.java | 3 +- .../fhir/batch2/api/StepExecutionDetails.java | 3 +- .../ca/uhn/fhir/batch2/api/VoidModel.java | 3 +- .../ca/uhn/fhir/batch2/api/package-info.java | 39 +++++++++---------- .../fhir/batch2/channel/BatchJobSender.java | 3 +- .../fhir/batch2/config/BaseBatch2Config.java | 3 +- .../batch2/config/Batch2JobRegisterer.java | 3 +- .../fhir/batch2/coordinator/BaseDataSink.java | 3 +- .../batch2/coordinator/BatchWorkChunk.java | 3 +- .../batch2/coordinator/FinalStepDataSink.java | 3 +- .../coordinator/JobCoordinatorImpl.java | 3 +- .../fhir/batch2/coordinator/JobDataSink.java | 3 +- .../coordinator/JobDefinitionRegistry.java | 3 +- .../JobParameterJsonValidator.java | 3 +- .../fhir/batch2/coordinator/JobQuerySvc.java | 3 +- .../batch2/coordinator/JobStepExecutor.java | 3 +- .../coordinator/JobStepExecutorFactory.java | 3 +- .../coordinator/JobStepExecutorOutput.java | 3 +- .../ReductionStepChunkProcessingResponse.java | 3 +- .../coordinator/ReductionStepDataSink.java | 3 +- .../ReductionStepExecutorServiceImpl.java | 3 +- .../fhir/batch2/coordinator/StepExecutor.java | 3 +- .../WorkChannelMessageHandler.java | 3 +- .../coordinator/WorkChunkProcessor.java | 3 +- .../batch2/jobs/chunk/ChunkRangeJson.java | 3 +- .../chunk/PartitionedUrlChunkRangeJson.java | 3 +- .../chunk/ResourceIdListWorkChunkJson.java | 3 +- .../fhir/batch2/jobs/chunk/TypedPidJson.java | 3 +- .../parameters/PartitionedJobParameters.java | 3 +- .../jobs/parameters/PartitionedUrl.java | 3 +- .../PartitionedUrlListJobParameters.java | 3 +- .../jobs/parameters/UrlListValidator.java | 3 +- .../jobs/parameters/UrlPartitioner.java | 3 +- .../jobs/step/GenerateRangeChunksStep.java | 3 +- .../batch2/jobs/step/IIdChunkProducer.java | 3 +- .../fhir/batch2/jobs/step/LoadIdsStep.java | 3 +- .../PartitionedUrlListIdChunkProducer.java | 3 +- .../batch2/jobs/step/ResourceIdListStep.java | 3 +- .../JobChunkProgressAccumulator.java | 3 +- .../maintenance/JobInstanceProcessor.java | 3 +- .../JobMaintenanceServiceImpl.java | 3 +- .../fhir/batch2/model/BaseWorkChunkEvent.java | 3 +- .../uhn/fhir/batch2/model/ChunkOutcome.java | 3 +- .../model/FetchJobInstancesRequest.java | 3 +- .../uhn/fhir/batch2/model/JobDefinition.java | 3 +- .../model/JobDefinitionReductionStep.java | 3 +- .../fhir/batch2/model/JobDefinitionStep.java | 3 +- .../ca/uhn/fhir/batch2/model/JobInstance.java | 3 +- .../batch2/model/JobInstanceStartRequest.java | 3 +- .../uhn/fhir/batch2/model/JobWorkCursor.java | 3 +- .../batch2/model/JobWorkNotification.java | 3 +- .../model/JobWorkNotificationJsonMessage.java | 3 +- .../ca/uhn/fhir/batch2/model/ListResult.java | 3 +- .../ca/uhn/fhir/batch2/model/StatusEnum.java | 3 +- .../ca/uhn/fhir/batch2/model/WorkChunk.java | 3 +- .../model/WorkChunkCompletionEvent.java | 3 +- .../uhn/fhir/batch2/model/WorkChunkData.java | 3 +- .../batch2/model/WorkChunkErrorEvent.java | 3 +- .../batch2/model/WorkChunkStatusEnum.java | 3 +- .../java/ca/uhn/fhir/batch2/package-info.java | 22 +++++------ .../batch2/progress/InstanceProgress.java | 3 +- .../JobInstanceProgressCalculator.java | 3 +- .../progress/JobInstanceStatusUpdater.java | 3 +- .../uhn/fhir/batch2/util/Batch2Constants.java | 3 +- .../CodeCacheResourceChangeListener.java | 3 +- .../CqlExceptionHandlingInterceptor.java | 3 +- .../CqlForkJoinWorkerThreadFactory.java | 3 +- .../ElmCacheResourceChangeListener.java | 3 +- .../ca/uhn/fhir/cr/common/HapiFhirDal.java | 3 +- .../cr/common/HapiFhirRetrieveProvider.java | 3 +- .../cr/common/HapiLibrarySourceProvider.java | 3 +- .../cr/common/HapiTerminologyProvider.java | 3 +- .../uhn/fhir/cr/common/IDaoRegistryUser.java | 3 +- .../fhir/cr/common/IDataProviderFactory.java | 3 +- .../uhn/fhir/cr/common/IFhirDalFactory.java | 3 +- .../fhir/cr/common/ILibraryLoaderFactory.java | 3 +- .../cr/common/ILibraryManagerFactory.java | 3 +- .../common/ILibrarySourceProviderFactory.java | 3 +- .../common/ITerminologyProviderFactory.java | 3 +- .../common/PreExpandedValidationSupport.java | 3 +- .../java/ca/uhn/fhir/cr/common/Searches.java | 3 +- .../cr/common/SupplementalDataConstants.java | 3 +- .../fhir/cr/common/TypedBundleProvider.java | 3 +- .../config/BaseClinicalReasoningConfig.java | 3 +- .../ca/uhn/fhir/cr/config/CrDstu3Config.java | 3 +- .../ca/uhn/fhir/cr/config/CrProperties.java | 3 +- .../uhn/fhir/cr/config/CrProviderFactory.java | 3 +- .../uhn/fhir/cr/config/CrProviderLoader.java | 3 +- .../ca/uhn/fhir/cr/config/CrR4Config.java | 3 +- .../PreExpandedValidationSupportLoader.java | 3 +- .../ISupplementalDataSearchParamUser.java | 3 +- .../measure/MeasureOperationsProvider.java | 3 +- .../fhir/cr/dstu3/measure/MeasureService.java | 3 +- .../r4/ISupplementalDataSearchParamUser.java | 3 +- .../r4/measure/MeasureOperationsProvider.java | 3 +- .../fhir/cr/r4/measure/MeasureService.java | 3 +- .../MdmSubmitterInterceptorLoader.java | 3 +- .../fhir/mdm/batch2/LoadGoldenIdsStep.java | 3 +- .../uhn/fhir/mdm/batch2/MdmBatch2Config.java | 3 +- .../fhir/mdm/batch2/MdmChunkRangeJson.java | 3 +- .../batch2/MdmGenerateRangeChunksStep.java | 3 +- .../fhir/mdm/batch2/MdmIdChunkProducer.java | 3 +- .../mdm/batch2/MdmJobDefinitionLoader.java | 3 +- .../fhir/mdm/batch2/clear/MdmClearAppCtx.java | 3 +- .../batch2/clear/MdmClearJobParameters.java | 3 +- .../clear/MdmClearJobParametersValidator.java | 3 +- .../fhir/mdm/batch2/clear/MdmClearStep.java | 3 +- .../MdmInflateAndSubmitResourcesStep.java | 3 +- .../mdm/batch2/submit/MdmSubmitAppCtx.java | 3 +- .../batch2/submit/MdmSubmitJobParameters.java | 3 +- .../MdmSubmitJobParametersValidator.java | 3 +- .../storage/test/BaseDateSearchDaoTests.java | 3 +- .../fhir/storage/test/DaoTestDataBuilder.java | 3 +- .../Batch2BulkImportPullJobParameters.java | 3 +- .../models/BulkImportFilePartitionResult.java | 3 +- .../importpull/models/BulkImportRecord.java | 3 +- .../models/JobInstanceFetchRequest.java | 3 +- ...kenParamFormatInvalidRequestException.java | 3 +- .../ca/uhn/fhir/jpa/api/IDaoRegistry.java | 3 +- .../jpa/api/config/JpaStorageSettings.java | 39 +++++++++---------- .../api/config/ThreadPoolFactoryConfig.java | 3 +- .../ca/uhn/fhir/jpa/api/dao/DaoRegistry.java | 3 +- .../java/ca/uhn/fhir/jpa/api/dao/IDao.java | 7 ++-- .../fhir/jpa/api/dao/IFhirResourceDao.java | 3 +- .../api/dao/IFhirResourceDaoCodeSystem.java | 35 ++++++++--------- .../api/dao/IFhirResourceDaoComposition.java | 23 ++++++----- .../api/dao/IFhirResourceDaoConceptMap.java | 3 +- .../api/dao/IFhirResourceDaoEncounter.java | 21 +++++----- .../api/dao/IFhirResourceDaoObservation.java | 17 ++++---- .../jpa/api/dao/IFhirResourceDaoPatient.java | 19 +++++---- .../dao/IFhirResourceDaoSearchParameter.java | 3 +- .../IFhirResourceDaoStructureDefinition.java | 7 ++-- .../api/dao/IFhirResourceDaoSubscription.java | 13 +++---- .../jpa/api/dao/IFhirResourceDaoValueSet.java | 3 +- .../uhn/fhir/jpa/api/dao/IFhirSystemDao.java | 3 +- .../java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java | 3 +- .../dao/MetadataKeyCurrentlyReindexing.java | 3 +- .../jpa/api/dao/MetadataKeyResourcePid.java | 3 +- .../api/dao/PatientEverythingParameters.java | 3 +- .../uhn/fhir/jpa/api/model/Batch2JobInfo.java | 3 +- .../api/model/Batch2JobOperationResult.java | 3 +- .../fhir/jpa/api/model/BulkExportJobInfo.java | 3 +- .../jpa/api/model/BulkExportJobResults.java | 3 +- .../jpa/api/model/BulkExportParameters.java | 3 +- .../fhir/jpa/api/model/DaoMethodOutcome.java | 3 +- .../fhir/jpa/api/model/DeleteConflict.java | 3 +- .../jpa/api/model/DeleteConflictList.java | 3 +- .../jpa/api/model/DeleteMethodOutcome.java | 3 +- .../fhir/jpa/api/model/ExpungeOptions.java | 3 +- .../fhir/jpa/api/model/ExpungeOutcome.java | 3 +- .../jpa/api/model/HistoryCountModeEnum.java | 3 +- .../jpa/api/model/LazyDaoMethodOutcome.java | 3 +- .../api/model/PersistentIdToForcedIdMap.java | 3 +- ...urceVersionConflictResolutionStrategy.java | 3 +- .../fhir/jpa/api/model/TranslationQuery.java | 3 +- .../jpa/api/model/TranslationRequest.java | 3 +- .../fhir/jpa/api/model/WarmCacheEntry.java | 3 +- .../fhir/jpa/api/pid/BaseResourcePidList.java | 3 +- .../jpa/api/pid/EmptyResourcePidList.java | 3 +- .../api/pid/HomogeneousResourcePidList.java | 3 +- .../fhir/jpa/api/pid/IResourcePidList.java | 3 +- .../jpa/api/pid/MixedResourcePidList.java | 3 +- .../jpa/api/pid/ResourcePidListBuilder.java | 3 +- .../fhir/jpa/api/pid/TypedResourcePid.java | 3 +- .../uhn/fhir/jpa/api/svc/IBatch2DaoSvc.java | 3 +- .../fhir/jpa/api/svc/IBatch2JobRunner.java | 3 +- .../fhir/jpa/api/svc/IDeleteExpungeSvc.java | 3 +- .../jpa/api/svc/IGoldenResourceSearchSvc.java | 3 +- .../fhir/jpa/api/svc/IIdHelperService.java | 3 +- .../jpa/api/svc/ISearchCoordinatorSvc.java | 3 +- .../ca/uhn/fhir/jpa/api/svc/ISearchSvc.java | 3 +- .../api/svc/ISearchUrlJobMaintenanceSvc.java | 3 +- .../batch/models/Batch2BaseJobParameters.java | 3 +- .../batch/models/Batch2JobStartResponse.java | 3 +- .../jpa/binary/api/IBinaryStorageSvc.java | 3 +- .../fhir/jpa/binary/api/IBinaryTarget.java | 3 +- .../fhir/jpa/binary/api/StoredDetails.java | 3 +- .../interceptor/BinaryStorageInterceptor.java | 3 +- .../binary/provider/BinaryAccessProvider.java | 3 +- .../binary/svc/BaseBinaryStorageSvcImpl.java | 3 +- .../binary/svc/NullBinaryStorageSvcImpl.java | 3 +- .../FilesystemBinaryStorageSvcImpl.java | 3 +- .../binstore/MemoryBinaryStorageSvcImpl.java | 3 +- .../IBulkDataExportJobSchedulingHelper.java | 3 +- .../bulk/export/api/IBulkExportProcessor.java | 3 +- .../export/model/BulkExportJobStatusEnum.java | 3 +- .../export/model/BulkExportResponseJson.java | 3 +- .../model/ExportPIDIteratorParameters.java | 3 +- .../provider/BulkDataExportProvider.java | 3 +- .../jpa/bulk/export/provider/JobInfo.java | 3 +- .../export/svc/BulkExportHelperService.java | 3 +- .../bulk/imprt/api/IBulkDataImportSvc.java | 3 +- .../bulk/imprt/model/ActivateJobResult.java | 3 +- .../imprt/model/BulkImportJobFileJson.java | 3 +- .../bulk/imprt/model/BulkImportJobJson.java | 3 +- .../imprt/model/BulkImportJobStatusEnum.java | 3 +- .../model/JobFileRowProcessingModeEnum.java | 3 +- .../imprt/model/ParsedBulkImportRecord.java | 3 +- .../ca/uhn/fhir/jpa/dao/BaseStorageDao.java | 3 +- .../fhir/jpa/dao/BaseStorageResourceDao.java | 3 +- .../jpa/dao/BaseTransactionProcessor.java | 3 +- .../ca/uhn/fhir/jpa/dao/DaoFailureUtil.java | 3 +- .../fhir/jpa/dao/DaoSearchParamProvider.java | 3 +- .../uhn/fhir/jpa/dao/EntriesToProcessMap.java | 3 +- .../java/ca/uhn/fhir/jpa/dao/GZipUtil.java | 3 +- .../ca/uhn/fhir/jpa/dao/IResultIterator.java | 3 +- .../ca/uhn/fhir/jpa/dao/ISearchBuilder.java | 3 +- .../fhir/jpa/dao/IStorageResourceParser.java | 3 +- .../ITransactionProcessorVersionAdapter.java | 3 +- .../uhn/fhir/jpa/dao/IdSubstitutionMap.java | 3 +- .../fhir/jpa/dao/MatchResourceUrlService.java | 3 +- .../fhir/jpa/dao/SearchBuilderFactory.java | 3 +- .../uhn/fhir/jpa/dao/ThreadPoolFactory.java | 3 +- ...ansactionProcessorVersionAdapterDstu3.java | 3 +- .../jpa/dao/expunge/ExpungeOperation.java | 3 +- .../fhir/jpa/dao/expunge/ExpungeService.java | 3 +- .../expunge/IExpungeEverythingService.java | 3 +- .../dao/expunge/IResourceExpungeService.java | 3 +- .../fhir/jpa/dao/expunge/PartitionRunner.java | 3 +- .../dao/index/DaoResourceLinkResolver.java | 3 +- .../TransactionProcessorVersionAdapterR4.java | 3 +- .../jpa/dao/tx/HapiTransactionService.java | 3 +- .../jpa/dao/tx/IHapiTransactionService.java | 3 +- ...onTransactionalHapiTransactionService.java | 3 +- .../SearchParameterDaoValidator.java | 3 +- .../fhir/jpa/delete/DeleteConflictUtil.java | 3 +- .../DaoRegistryGraphQLStorageServices.java | 3 +- .../uhn/fhir/jpa/graphql/GraphQLProvider.java | 3 +- .../PatientIdPartitionInterceptor.java | 3 +- ...questRetryVersionConflictsInterceptor.java | 3 +- .../interceptor/validation/BaseTypedRule.java | 3 +- .../validation/IRepositoryValidatingRule.java | 3 +- .../jpa/interceptor/validation/IRuleRoot.java | 3 +- .../RepositoryValidatingInterceptor.java | 3 +- .../RepositoryValidatingRuleBuilder.java | 3 +- .../validation/RequireValidationRule.java | 3 +- .../validation/RuleDisallowProfile.java | 3 +- .../RuleRequireProfileDeclaration.java | 3 +- .../model/search/SearchRuntimeDetails.java | 3 +- .../jpa/model/search/SearchStatusEnum.java | 3 +- .../BaseRequestPartitionHelperSvc.java | 3 +- .../java/ca/uhn/fhir/jpa/patch/FhirPatch.java | 3 +- .../ca/uhn/fhir/jpa/patch/JsonPatchUtils.java | 3 +- .../ca/uhn/fhir/jpa/patch/XmlPatchUtils.java | 29 +++++++------- .../fhir/jpa/provider/BaseJpaProvider.java | 39 +++++++++---------- .../jpa/provider/BaseJpaResourceProvider.java | 3 +- .../provider/BaseStorageSystemProvider.java | 3 +- .../DaoRegistryResourceSupportedSvc.java | 3 +- .../fhir/jpa/provider/IJpaSystemProvider.java | 3 +- .../SubscriptionTriggeringProvider.java | 3 +- .../uhn/fhir/jpa/search/SearchConstants.java | 3 +- .../fhir/jpa/search/reindex/BlockPolicy.java | 3 +- ...rchParamWithInlineReferencesExtractor.java | 3 +- ...rchParamWithInlineReferencesExtractor.java | 3 +- .../config/SearchParamSubmitterConfig.java | 3 +- .../SearchParamSubmitInterceptorLoader.java | 3 +- .../SearchParamValidatingInterceptor.java | 3 +- .../channel/api/BaseChannelSettings.java | 3 +- .../channel/api/ChannelConsumerSettings.java | 3 +- .../channel/api/ChannelProducerSettings.java | 3 +- .../channel/api/IChannelFactory.java | 3 +- .../channel/api/IChannelProducer.java | 3 +- .../channel/api/IChannelReceiver.java | 3 +- .../channel/api/IChannelSettings.java | 3 +- .../config/SubscriptionChannelConfig.java | 3 +- .../channel/impl/LinkedBlockingChannel.java | 3 +- .../impl/LinkedBlockingChannelFactory.java | 3 +- .../impl/RetryingMessageHandlerWrapper.java | 3 +- ...roadcastingSubscribableChannelWrapper.java | 3 +- .../channel/subscription/IChannelNamer.java | 3 +- .../SubscriptionChannelFactory.java | 3 +- .../matching/IResourceModifiedConsumer.java | 3 +- .../SubscriptionMatchingStrategy.java | 3 +- .../registry/SubscriptionCanonicalizer.java | 3 +- .../match/registry/SubscriptionConstants.java | 3 +- .../model/CanonicalSubscription.java | 3 +- .../CanonicalSubscriptionChannelType.java | 3 +- .../model/ChannelRetryConfiguration.java | 3 +- .../model/ResourceDeliveryJsonMessage.java | 3 +- .../model/ResourceDeliveryMessage.java | 3 +- .../model/ResourceModifiedJsonMessage.java | 3 +- .../model/ResourceModifiedMessage.java | 3 +- .../ISubscriptionTriggeringSvc.java | 3 +- .../uhn/fhir/jpa/term/UploadStatistics.java | 3 +- .../term/api/ITermCodeSystemDeleteJobSvc.java | 3 +- .../uhn/fhir/jpa/term/api/ITermLoaderSvc.java | 3 +- .../CodeSystemConceptsDeleteResult.java | 3 +- .../models/CodeSystemVersionPIDResult.java | 3 +- .../DeleteCodeSystemBaseParameters.java | 3 +- .../TermCodeSystemDeleteJobParameters.java | 3 +- ...mCodeSystemDeleteVersionJobParameters.java | 3 +- .../jpa/util/BaseCaptureQueriesListener.java | 3 +- .../ca/uhn/fhir/jpa/util/BulkExportUtils.java | 3 +- .../CircularQueueCaptureQueriesListener.java | 3 +- .../CurrentThreadCaptureQueriesListener.java | 3 +- .../fhir/jpa/util/JsonDateDeserializer.java | 3 +- .../uhn/fhir/jpa/util/JsonDateSerializer.java | 3 +- .../uhn/fhir/jpa/util/MemoryCacheService.java | 3 +- .../java/ca/uhn/fhir/jpa/util/SqlQuery.java | 3 +- .../ca/uhn/fhir/jpa/util/SqlQueryList.java | 3 +- .../jpa/validation/ResourceLoaderImpl.java | 3 +- .../jpa/validation/ValidationSettings.java | 3 +- .../validation/ValidatorPolicyAdvisor.java | 3 +- .../validation/ValidatorResourceFetcher.java | 3 +- .../main/java/ca/uhn/fhir/mdm/log/Logs.java | 3 +- .../util/Batch2JobDefinitionConstants.java | 3 +- .../ca/uhn/fhir/util/CanonicalIdentifier.java | 3 +- .../java/ca/uhn/fhir/util/ThreadPoolUtil.java | 3 +- .../dstu2016may/hapi/ctx/FhirDstu2_1.java | 3 +- .../rest/server/Dstu2_1BundleFactory.java | 3 +- .../server/ServerConformanceProvider.java | 39 +++++++++---------- .../ca/uhn/fhir/model/dstu2/FhirDstu2.java | 3 +- .../uhn/fhir/model/dstu2/FhirServerDstu2.java | 3 +- .../uhn/fhir/model/dstu2/composite/AgeDt.java | 11 +++--- .../composite/BoundCodeableConceptDt.java | 3 +- .../model/dstu2/composite/ContainedDt.java | 3 +- .../fhir/model/dstu2/composite/CountDt.java | 9 ++--- .../model/dstu2/composite/DistanceDt.java | 11 +++--- .../model/dstu2/composite/DurationDt.java | 9 ++--- .../fhir/model/dstu2/composite/MoneyDt.java | 9 ++--- .../model/dstu2/composite/NarrativeDt.java | 3 +- .../dstu2/composite/ResourceReferenceDt.java | 35 ++++++++--------- .../dstu2/composite/SimpleQuantityDt.java | 13 +++---- .../model/dstu2/resource/BaseResource.java | 15 ++++--- .../provider/dstu2/Dstu2BundleFactory.java | 3 +- .../dstu2/ServerConformanceProvider.java | 39 +++++++++---------- .../hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java | 3 +- .../hapi/rest/server/Dstu3BundleFactory.java | 3 +- .../ServerCapabilityStatementProvider.java | 39 +++++++++---------- .../dstu2hl7org/Dstu2Hl7OrgBundleFactory.java | 3 +- .../fhir/dstu2/hapi/ctx/FhirDstu2Hl7Org.java | 3 +- .../server/ServerConformanceProvider.java | 3 +- .../java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java | 3 +- .../r4/hapi/rest/server/R4BundleFactory.java | 3 +- .../org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java | 3 +- .../hapi/rest/server/R4BBundleFactory.java | 3 +- .../java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java | 3 +- .../r5/hapi/rest/server/R5BundleFactory.java | 3 +- .../jpa/conformance/DateSearchTestCase.java | 3 +- .../fhir/jpa/conformance/package-info.java | 14 +++---- .../auth/OperationRuleTestUtil.java | 3 +- .../fhir/system/HapiTestSystemProperties.java | 3 +- .../BaseFhirVersionParameterizedTest.java | 3 +- .../main/java/ca/uhn/fhir/test/BaseTest.java | 3 +- .../test/utilities/BaseRestServerHelper.java | 3 +- .../test/utilities/CustomMatchersUtil.java | 3 +- .../ca/uhn/fhir/test/utilities/HtmlUtil.java | 3 +- .../test/utilities/HttpClientExtension.java | 3 +- .../fhir/test/utilities/ITestDataBuilder.java | 3 +- .../ca/uhn/fhir/test/utilities/JettyUtil.java | 5 +-- .../LogbackLevelOverrideExtension.java | 3 +- .../fhir/test/utilities/LoggingExtension.java | 35 ++++++++--------- .../ca/uhn/fhir/test/utilities/ProxyUtil.java | 3 +- .../fhir/test/utilities/RangeTestHelper.java | 3 +- .../test/utilities/RequestDetailsHelper.java | 3 +- .../test/utilities/RestServerDstu3Helper.java | 3 +- .../test/utilities/RestServerR4Helper.java | 3 +- .../fhir/test/utilities/SearchTestUtil.java | 3 +- .../TlsAuthenticationTestHelper.java | 3 +- .../UnregisterScheduledProcessor.java | 3 +- .../docker/DockerRequiredCondition.java | 3 +- .../test/utilities/docker/RequiresDocker.java | 3 +- .../test/utilities/getMethodNameUtil.java | 3 +- .../jpa/JpaModelScannerAndVerifier.java | 3 +- .../server/BaseJettyServerExtension.java | 3 +- .../HashMapResourceProviderExtension.java | 3 +- .../server/HttpServletExtension.java | 3 +- .../utilities/server/MockServletUtil.java | 3 +- .../server/ResourceProviderExtension.java | 3 +- .../RestfulServerConfigurerExtension.java | 3 +- .../server/RestfulServerExtension.java | 3 +- ...gContextGrabbingTestExecutionListener.java | 3 +- ...TransactionCapturingProviderExtension.java | 3 +- .../test/concurrency/FhirObjectPrinter.java | 3 +- .../uhn/test/concurrency/IPointcutLatch.java | 3 +- .../test/concurrency/LatchTimedOutError.java | 3 +- .../test/concurrency/LockstepEnumPhaser.java | 3 +- .../uhn/test/concurrency/PointcutLatch.java | 3 +- .../util/LogbackCaptureTestExtension.java | 3 +- .../java/ca/uhn/fhir/to/util/WebUtil.java | 3 +- .../support/LocalFileValidationSupport.java | 3 +- .../support/ValidationConstants.java | 3 +- .../ca/uhn/fhir/model/dstu2/FhirDstu2.java | 3 +- .../uhn/fhir/model/dstu2/composite/AgeDt.java | 11 +++--- .../fhir/model/dstu2/composite/CountDt.java | 9 ++--- .../model/dstu2/composite/DistanceDt.java | 11 +++--- .../model/dstu2/composite/DurationDt.java | 9 ++--- .../fhir/model/dstu2/composite/MoneyDt.java | 9 ++--- .../dstu2/composite/SimpleQuantityDt.java | 13 +++---- .../uhn/fhir/model/dstu3/composite/AgeDt.java | 11 +++--- .../composite/BoundCodeableConceptDt.java | 3 +- .../model/dstu3/composite/ContainedDt.java | 3 +- .../fhir/model/dstu3/composite/CountDt.java | 9 ++--- .../model/dstu3/composite/DistanceDt.java | 11 +++--- .../model/dstu3/composite/DurationDt.java | 9 ++--- .../fhir/model/dstu3/composite/MoneyDt.java | 9 ++--- .../model/dstu3/composite/NarrativeDt.java | 35 ++++++++--------- .../dstu3/composite/ResourceReferenceDt.java | 35 ++++++++--------- .../dstu3/composite/SimpleQuantityDt.java | 11 +++--- .../ca/uhn/fhir/tinder/AbstractGenerator.java | 3 +- .../ca/uhn/fhir/tinder/GeneratorContext.java | 3 +- .../ca/uhn/fhir/tinder/VelocityHelper.java | 3 +- .../fhir/tinder/ant/TinderGeneratorTask.java | 3 +- .../org/hl7/fhir/instance/model/IBase.java | 3 +- .../fhir/instance/model/IBaseResource.java | 5 +-- .../org/hl7/fhir/instance/model/IIdType.java | 5 +-- 2277 files changed, 4321 insertions(+), 6568 deletions(-) diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml index dbedfafc2fc..9f1cea95131 100644 --- a/hapi-deployable-pom/pom.xml +++ b/hapi-deployable-pom/pom.xml @@ -213,6 +213,7 @@ process-sources + false apache_v2 true true diff --git a/hapi-fhir-android/src/main/java/ca/uhn/fhir/android/AndroidMarker.java b/hapi-fhir-android/src/main/java/ca/uhn/fhir/android/AndroidMarker.java index 9ad2683cd18..0d74e1638a2 100644 --- a/hapi-fhir-android/src/main/java/ca/uhn/fhir/android/AndroidMarker.java +++ b/hapi-fhir-android/src/main/java/ca/uhn/fhir/android/AndroidMarker.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.android; - /*- * #%L * HAPI FHIR - Android @@ -19,6 +17,7 @@ package ca.uhn.fhir.android; * limitations under the License. * #L% */ +package ca.uhn.fhir.android; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.okhttp.client.OkHttpRestfulClientFactory; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/IHapiBootOrder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/IHapiBootOrder.java index 27a2c5b3c82..179d57656f5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/IHapiBootOrder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/IHapiBootOrder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir; * limitations under the License. * #L% */ +package ca.uhn.fhir; /** * Spring bean initialization constants. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDatatypeDefinition.java index 1414418d693..824f409127d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDefinition.java index 8d9f9d0ee72..d82cf803395 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java index 1977ff33716..d9087fbe965 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementCompositeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementCompositeDefinition.java index 6f0b5fa3f77..2063773c4c2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementCompositeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementCompositeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.IBoundCodeableConcept; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java index 48190d0b13c..9fedc06e060 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.util.UrlUtil; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ComboSearchParamType.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ComboSearchParamType.java index edc852ba70e..19aaafbd6bb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ComboSearchParamType.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ComboSearchParamType.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; public enum ComboSearchParamType { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ConfigurationException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ConfigurationException.java index 6eac9013531..886ac415da6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ConfigurationException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ConfigurationException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; /** * Non-checked exception indicating that HAPI was unable to initialize due to diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java index d52a3f1dd58..1792577edbc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.context; import ca.uhn.fhir.context.api.AddProfileTagEnum; @@ -57,26 +76,6 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.Set; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * The FHIR context is the central starting point for the use of the HAPI FHIR API. It should be created once, and then * used as a factory for various other types of objects (parsers, clients, etc.). diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java index c1b3aea29c0..2b2533c800a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.IFhirVersion; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IFhirValidatorFactory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IFhirValidatorFactory.java index c5e90dd6da9..c0e35a4b5ed 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IFhirValidatorFactory.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IFhirValidatorFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.validation.FhirValidator; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IRuntimeDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IRuntimeDatatypeDefinition.java index 10334355b5b..2c385c2bab5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IRuntimeDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IRuntimeDatatypeDefinition.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.context; - -import org.hl7.fhir.instance.model.api.IBase; -import org.hl7.fhir.instance.model.api.IBaseDatatype; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import org.hl7.fhir.instance.model.api.IBaseDatatype; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; + +import org.hl7.fhir.instance.model.api.IBase; +import org.hl7.fhir.instance.model.api.IBaseDatatype; public interface IRuntimeDatatypeDefinition { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java index f00f666975b..fd69482fc64 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.context.RuntimeSearchParam.RuntimeSearchParamStatusEnum; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ParserOptions.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ParserOptions.java index 7b38539b1e4..351e02d00e4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ParserOptions.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ParserOptions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.parser.IParser; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/PerformanceOptionsEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/PerformanceOptionsEnum.java index 77612c06fef..856d554dafb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/PerformanceOptionsEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/PerformanceOptionsEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; /** * This enum contains options to be used for {@link FhirContext#setPerformanceOptions(PerformanceOptionsEnum...)} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildAny.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildAny.java index f4991daaa43..241076babe8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildAny.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildAny.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java index 07d1529231f..2a6f357805a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeBoundDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeBoundDatatypeDefinition.java index 3d0c01e9be5..3dc29e327ab 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeBoundDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeBoundDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeDatatypeDefinition.java index 862e54c95c6..55666d5de3b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildContainedResources.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildContainedResources.java index a748b01d9f4..3c9821fdf02 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildContainedResources.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildContainedResources.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java index 7f1e58fcacd..81f81a83cad 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; + import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.lang.reflect.Field; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDirectResource.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDirectResource.java index 95e3c56263e..c7aa3e384b7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDirectResource.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDirectResource.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; import java.util.Collections; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExt.java index be22c9b9032..3a38c6e2930 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import com.google.common.collect.Sets; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExtension.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExtension.java index 7a5dc2e80c0..902a0ed35d3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExtension.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; import java.util.Collections; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java index 85ef6b0d580..a0889b5cfe4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveBoundCodeDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveBoundCodeDatatypeDefinition.java index c8f58b838ff..b56696c2dfb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveBoundCodeDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveBoundCodeDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveDatatypeDefinition.java index 9cc991d4891..df760077a49 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveEnumerationDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveEnumerationDatatypeDefinition.java index 3128157177a..16c665cf585 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveEnumerationDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveEnumerationDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceBlockDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceBlockDefinition.java index 845198a0e22..54c543c0f94 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceBlockDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceBlockDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.lang.reflect.Field; import java.util.Collections; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceDefinition.java index 80bbb5817d0..47e0f738561 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java index bcf7c98029e..7a69e18c45d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.ExtensionDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java index 51a04718d43..7309d73fa60 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResourceList.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResourceList.java index 9770c469311..e8ad9eefc26 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResourceList.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResourceList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResources.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResources.java index 3ec8227c8dc..9ef2d9117bd 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResources.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResources.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.model.base.composite.BaseContainedDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElementDirectResource.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElementDirectResource.java index a2de0c5c6a0..4fadae7243e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElementDirectResource.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElementDirectResource.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeExtensionDtDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeExtensionDtDefinition.java index ee7a8f9f375..eb863d88c60 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeExtensionDtDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeExtensionDtDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.util.ArrayList; import java.util.Collections; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeIdDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeIdDatatypeDefinition.java index 645baa09b44..dce07479870 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeIdDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeIdDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java index 11b8f55f296..664e56d3b70 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeNarrativeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeNarrativeDefinition.java index bcab471bfb6..5c29d6a716e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeNarrativeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeNarrativeDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeXhtmlHl7OrgDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeXhtmlHl7OrgDefinition.java index 5ea622b722f..dbc81d960ca 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeXhtmlHl7OrgDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeXhtmlHl7OrgDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceBlockDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceBlockDefinition.java index a360cd5e653..693000f8dd8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceBlockDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceBlockDefinition.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.context; - -import java.util.Map; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.util.Map; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; + +import java.util.Map; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java index 73a089cc823..5e520ad95e2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context; * limitations under the License. * #L% */ +package ca.uhn.fhir.context; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.annotation.ResourceDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java index 1e3ef5f9624..2dc1220b4c9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.context; import ca.uhn.fhir.context.phonetic.IPhoneticEncoder; @@ -27,26 +46,6 @@ import java.util.StringTokenizer; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.trim; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class RuntimeSearchParam { private final IIdType myId; private final Set myBase; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/AddProfileTagEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/AddProfileTagEnum.java index 60144f2ef40..ed3b50af11e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/AddProfileTagEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/AddProfileTagEnum.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.context.api; - -import ca.uhn.fhir.context.FhirContext; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.context.FhirContext; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.api; + +import ca.uhn.fhir.context.FhirContext; /** * RESTful server behaviour for automatically adding profile tags when serializing resources diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/BundleInclusionRule.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/BundleInclusionRule.java index 2096aa459d0..e7e951996e6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/BundleInclusionRule.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/BundleInclusionRule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.api; import java.util.Set; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/ApacheEncoder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/ApacheEncoder.java index 084d96f9b49..a7517afb9ac 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/ApacheEncoder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/ApacheEncoder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.phonetic; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.phonetic; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.phonetic; import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.StringEncoder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/IPhoneticEncoder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/IPhoneticEncoder.java index b26f57612a9..d9d33b91d61 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/IPhoneticEncoder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/IPhoneticEncoder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.phonetic; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.phonetic; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.phonetic; public interface IPhoneticEncoder { String name(); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/NumericEncoder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/NumericEncoder.java index 863e3ad6896..2976bf30aa5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/NumericEncoder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/NumericEncoder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.phonetic; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.phonetic; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.phonetic; import com.google.common.base.CharMatcher; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/PhoneticEncoderEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/PhoneticEncoderEnum.java index e083ab3e4df..a49084a2cf9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/PhoneticEncoderEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/phonetic/PhoneticEncoderEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.phonetic; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.phonetic; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.phonetic; import ca.uhn.fhir.util.PhoneticEncoderUtil; import org.apache.commons.codec.language.Caverphone1; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ConceptValidationOptions.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ConceptValidationOptions.java index c4b4aed63b6..ee52d348bb0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ConceptValidationOptions.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ConceptValidationOptions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.support; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.support; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.support; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/DefaultProfileValidationSupport.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/DefaultProfileValidationSupport.java index 2c3de25b8fe..9f7e5bc42e2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/DefaultProfileValidationSupport.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/DefaultProfileValidationSupport.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.support; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.support; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.support; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/IValidationSupport.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/IValidationSupport.java index e19719532d1..af83d68646a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/IValidationSupport.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/IValidationSupport.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.support; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.support; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.support; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/TranslateConceptResult.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/TranslateConceptResult.java index a5d2b6a707b..54aae576eda 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/TranslateConceptResult.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/TranslateConceptResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.support; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.support; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.support; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/TranslateConceptResults.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/TranslateConceptResults.java index 5e1b913d242..bc01f6d0ae5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/TranslateConceptResults.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/TranslateConceptResults.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.support; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.support; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.support; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ValidationSupportContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ValidationSupportContext.java index 174102c6554..5d58193f844 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ValidationSupportContext.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ValidationSupportContext.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.support; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.support; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.support; import org.thymeleaf.util.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ValueSetExpansionOptions.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ValueSetExpansionOptions.java index 3a57d1f0114..c0bd0cb04c8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ValueSetExpansionOptions.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/ValueSetExpansionOptions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.context.support; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.context.support; * limitations under the License. * #L% */ +package ca.uhn.fhir.context.support; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/FhirPathExecutionException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/FhirPathExecutionException.java index 930d19a466c..ffdbb1334ba 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/FhirPathExecutionException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/FhirPathExecutionException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.fhirpath; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.fhirpath; * limitations under the License. * #L% */ +package ca.uhn.fhir.fhirpath; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/IFhirPath.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/IFhirPath.java index 66ed7fbf455..f3f5dfe64bc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/IFhirPath.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/IFhirPath.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.fhirpath; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.fhirpath; * limitations under the License. * #L% */ +package ca.uhn.fhir.fhirpath; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/IFhirPathEvaluationContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/IFhirPathEvaluationContext.java index b7feaf6d3bd..00b6abeab61 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/IFhirPathEvaluationContext.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/fhirpath/IFhirPathEvaluationContext.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.fhirpath; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.fhirpath; * limitations under the License. * #L% */ +package ca.uhn.fhir.fhirpath; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiErrorCode.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiErrorCode.java index b1737f6919f..ba58777a4bb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiErrorCode.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiErrorCode.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.i18n; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.i18n; * limitations under the License. * #L% */ +package ca.uhn.fhir.i18n; public final class HapiErrorCode { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java index ea0af9716fa..f3e39d32298 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.i18n; import ca.uhn.fhir.context.ConfigurationException; @@ -22,26 +41,6 @@ import static org.apache.commons.lang3.StringUtils.trim; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * This feature is not yet in its final state and should be considered an internal part of HAPI for now - use with caution */ diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java index 73aee42eb5e..e5d22645b0f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.i18n; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.i18n; * limitations under the License. * #L% */ +package ca.uhn.fhir.i18n; public final class Msg { private static final String ERROR_CODE_PREFIX = "HAPI"; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Hook.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Hook.java index 77e3235daa4..d0f611b155e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Hook.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Hook.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/HookParams.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/HookParams.java index e77f90de22f..d5bc090ddea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/HookParams.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/HookParams.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IAnonymousInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IAnonymousInterceptor.java index ea621fdbed8..b46b176c95d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IAnonymousInterceptor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IAnonymousInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; import com.google.common.annotations.VisibleForTesting; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IBaseInterceptorBroadcaster.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IBaseInterceptorBroadcaster.java index 8fbb5f92a78..7c37ca9aced 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IBaseInterceptorBroadcaster.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IBaseInterceptorBroadcaster.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; public interface IBaseInterceptorBroadcaster { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IBaseInterceptorService.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IBaseInterceptorService.java index c2c681ceb93..9457f9cdea7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IBaseInterceptorService.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IBaseInterceptorService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; import javax.annotation.Nullable; import java.util.Collection; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IInterceptorBroadcaster.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IInterceptorBroadcaster.java index df3177c5148..3fa8794a01e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IInterceptorBroadcaster.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IInterceptorBroadcaster.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; public interface IInterceptorBroadcaster extends IBaseInterceptorBroadcaster { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IInterceptorService.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IInterceptorService.java index 0c38c3d7d2d..2187cd47fe5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IInterceptorService.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IInterceptorService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; public interface IInterceptorService extends IBaseInterceptorService, IInterceptorBroadcaster { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IPointcut.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IPointcut.java index bf202534f4f..908b2897ad8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IPointcut.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/IPointcut.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; import javax.annotation.Nonnull; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Interceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Interceptor.java index 6fe6d73a60b..618a83f30da 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Interceptor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Interceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java index dd92309a50e..fbb3e1b0a05 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.api; import ca.uhn.fhir.model.base.resource.BaseOperationOutcome; import ca.uhn.fhir.rest.annotation.Read; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/BaseInterceptorService.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/BaseInterceptorService.java index 865fa2cb368..af3ac144c8d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/BaseInterceptorService.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/BaseInterceptorService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.executor; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.executor; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.executor; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/InterceptorService.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/InterceptorService.java index e73fd98c59a..a641a52da5c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/InterceptorService.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/InterceptorService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.executor; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.executor; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.executor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/PartitionIdRequestDetails.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/PartitionIdRequestDetails.java index ac4a7689ae5..fe5318ce3dc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/PartitionIdRequestDetails.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/PartitionIdRequestDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.model; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.model; public class PartitionIdRequestDetails { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java index c57720fae7d..a0ce6f22854 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.model; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.model; import ca.uhn.fhir.model.api.IModelJson; import ca.uhn.fhir.util.JsonUtil; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/TransactionWriteOperationsDetails.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/TransactionWriteOperationsDetails.java index 1b70c355119..345524cac99 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/TransactionWriteOperationsDetails.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/TransactionWriteOperationsDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.model; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.model; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java index 0f7956a899e..88b587a4764 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java index 4504d7defe3..f3161348e5c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.primitive.IdDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BasePrimitive.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BasePrimitive.java index da976d0fd20..a564281b3aa 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BasePrimitive.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BasePrimitive.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import java.io.Externalizable; import java.io.IOException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java index 1e034e84402..a02d5fba451 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java index 013eb0eaa61..ec1c657024e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import java.io.Serializable; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICodingEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICodingEnum.java index ea0ffd5446f..8e378dd745c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICodingEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICodingEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; public interface ICodingEnum { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeDatatype.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeDatatype.java index 371c06ec8de..d36b7b821b2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeDatatype.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeDatatype.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.model.api; - -import org.hl7.fhir.instance.model.api.ICompositeType; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.ICompositeType; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + +import org.hl7.fhir.instance.model.api.ICompositeType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java index ec68caa7bd5..8e90bc5f5c6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java index f37fa09883d..dd1b967563f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.model.api; - -import org.hl7.fhir.instance.model.api.IBaseDatatype; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBaseDatatype; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + +import org.hl7.fhir.instance.model.api.IBaseDatatype; public interface IDatatype extends IElement, IBaseDatatype { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IElement.java index 166ddada013..3ceb5fd01b6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IElement.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IElement.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.model.api; - -import org.hl7.fhir.instance.model.api.IBase; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBase; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + +import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IExtension.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IExtension.java index 872b440ab96..522ae2778f3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IExtension.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; public interface IExtension extends IResourceBlock { // nothing diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java index 525f5c16edc..7b6a76bfdce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import java.io.InputStream; import java.util.Date; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java index 4575556265e..5b02b6cdbae 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import ca.uhn.fhir.model.primitive.IdDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IModelJson.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IModelJson.java index d3a858f588f..886bd1a7715 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IModelJson.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IModelJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatype.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatype.java index 351064b6dc6..f2c02f285e3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatype.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatype.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterAnd.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterAnd.java index 7fbf78381e6..a387488538e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterAnd.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterAnd.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.model.api; - -import java.io.Serializable; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.io.Serializable; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + +import java.io.Serializable; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterOr.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterOr.java index e06310a63af..d9e6a9fd95d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterOr.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterOr.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.model.api; - -import java.io.Serializable; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.io.Serializable; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + +import java.io.Serializable; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterType.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterType.java index 826b60c5fce..216f1c67cbb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterType.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterType.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.api; - -import java.io.Serializable; - -import ca.uhn.fhir.context.FhirContext; - /* * #%L * HAPI FHIR - Core Library @@ -23,6 +17,11 @@ import ca.uhn.fhir.context.FhirContext; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + +import java.io.Serializable; + +import ca.uhn.fhir.context.FhirContext; public interface IQueryParameterType extends Serializable { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java index 5e8d59711bc..2e61b083550 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.model.api; - -import org.hl7.fhir.instance.model.api.IBaseMetaType; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBaseMetaType; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + +import org.hl7.fhir.instance.model.api.IBaseMetaType; import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.base.composite.BaseContainedDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResourceBlock.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResourceBlock.java index df8a1599f68..f7efaab473e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResourceBlock.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResourceBlock.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; public interface IResourceBlock extends ICompositeElement, IIdentifiableElement { // nothing yet diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IStreamingDatatype.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IStreamingDatatype.java index 4f15e2b2306..0d4018c91c1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IStreamingDatatype.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IStreamingDatatype.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ISupportsUndeclaredExtensions.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ISupportsUndeclaredExtensions.java index bb1a141f8b1..1af32fd40ce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ISupportsUndeclaredExtensions.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ISupportsUndeclaredExtensions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import org.hl7.fhir.instance.model.api.IBaseDatatype; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java index d80abc51ee6..904af055c36 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import java.io.Serializable; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Include.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Include.java index 2a9e81ceaac..6e27d5ea24a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Include.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Include.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.model.api; - -import ca.uhn.fhir.i18n.Msg; -import org.apache.commons.lang3.builder.ToStringBuilder; - -import java.io.Serializable; - -import static org.apache.commons.lang3.StringUtils.defaultString; -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR - Core Library @@ -28,6 +17,16 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + +import ca.uhn.fhir.i18n.Msg; +import org.apache.commons.lang3.builder.ToStringBuilder; + +import java.io.Serializable; + +import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; /** * Represents a FHIR resource path specification, e.g. Patient:name diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PagingIterator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PagingIterator.java index afc28b88ed1..201edf594d3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PagingIterator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PagingIterator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java index a4dd53ff6ce..b39f7f9c265 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.base.composite.BaseCodingDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/StorageResponseCodeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/StorageResponseCodeEnum.java index dea71fc8253..2f46ee889d0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/StorageResponseCodeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/StorageResponseCodeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; /** * This enum contains the allowable codes in the HAPI FHIR defined diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java index 9f9a20d15ee..5e8008435db 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; + import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.net.URI; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java index f273051e294..6fb7a125ffa 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.util.CoverageIgnore; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TemporalPrecisionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TemporalPrecisionEnum.java index 749f235bda7..0857d89c683 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TemporalPrecisionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TemporalPrecisionEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api; import java.util.Calendar; import java.util.Date; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Binding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Binding.java index d9ad46cb12b..1e3c2896eb8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Binding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Binding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Block.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Block.java index fb7900aa2b2..538a1b08caf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Block.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Block.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Child.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Child.java index 92e8fbdc523..54806d149c0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Child.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Child.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ChildOrder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ChildOrder.java index dcebcf8a650..08fa8806ffb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ChildOrder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ChildOrder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Compartment.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Compartment.java index dfe4e6a56b2..6b4152e0aa3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Compartment.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Compartment.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/DatatypeDef.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/DatatypeDef.java index f134db68998..a6100666b09 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/DatatypeDef.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/DatatypeDef.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Description.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Description.java index 960dcdb81b2..69430f3e171 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Description.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Description.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ExampleSupplier.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ExampleSupplier.java index 432d86d45d6..a298b4016e1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ExampleSupplier.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ExampleSupplier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Extension.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Extension.java index 8baa67cb144..5faa6f55879 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Extension.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Extension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/PasswordField.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/PasswordField.java index 5a9e995319e..7ff98ae3bf5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/PasswordField.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/PasswordField.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ResourceDef.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ResourceDef.java index 87c6d8bf212..2c1e5e2e468 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ResourceDef.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ResourceDef.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SearchParamDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SearchParamDefinition.java index 0c601f69c1c..5652baab524 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SearchParamDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SearchParamDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SimpleSetter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SimpleSetter.java index b99d4e49cac..e4325266ef8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SimpleSetter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SimpleSetter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.api.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.api.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseCodingDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseCodingDt.java index 45ac7ea10f6..e7396f2f527 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseCodingDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseCodingDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.composite; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.composite; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseContainedDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseContainedDt.java index d6a1875fcb3..50a72b68e93 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseContainedDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseContainedDt.java @@ -1,12 +1,3 @@ -package ca.uhn.fhir.model.base.composite; - -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.model.api.IDatatype; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.util.CoverageIgnore; - -import java.util.List; - /* * #%L * HAPI FHIR - Core Library @@ -26,6 +17,14 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.composite; + +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.util.CoverageIgnore; + +import java.util.List; public abstract class BaseContainedDt implements IDatatype { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java index 016efd0d555..3991550825b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.composite; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.composite; import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java index 32182ccdaa0..3b4a6fd8c90 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.composite; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.composite; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseNarrativeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseNarrativeDt.java index e68627fd55a..c5996bfb27b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseNarrativeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseNarrativeDt.java @@ -1,12 +1,3 @@ -package ca.uhn.fhir.model.base.composite; - -import org.hl7.fhir.instance.model.api.INarrative; - -import ca.uhn.fhir.model.api.BaseIdentifiableElement; -import ca.uhn.fhir.model.api.ICompositeDatatype; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.XhtmlDt; - /* * #%L * HAPI FHIR - Core Library @@ -26,6 +17,14 @@ import ca.uhn.fhir.model.primitive.XhtmlDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.composite; + +import org.hl7.fhir.instance.model.api.INarrative; + +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.primitive.BoundCodeDt; +import ca.uhn.fhir.model.primitive.XhtmlDt; /** * @param The narrative status enum type diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseQuantityDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseQuantityDt.java index ae8fd1b0cc4..f77a8ac95ca 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseQuantityDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseQuantityDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.composite; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.composite; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseResourceReferenceDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseResourceReferenceDt.java index a0431a2db44..b751beeb009 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseResourceReferenceDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseResourceReferenceDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.composite; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.composite; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseConformance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseConformance.java index 225ff1d9904..afde73ef3e5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseConformance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseConformance.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.resource; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.resource; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.resource; import org.hl7.fhir.instance.model.api.IBaseConformance; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java index d296ab0bb83..5f61c1505bb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.resource; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.resource; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.resource; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java index 79764384698..239f7737b3c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.resource; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.resource; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.resource; import ca.uhn.fhir.model.api.IResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/ResourceMetadataMap.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/ResourceMetadataMap.java index fd03f0a82cd..5a315b291af 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/ResourceMetadataMap.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/ResourceMetadataMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.base.resource; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.base.resource; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.base.resource; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/Base64BinaryDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/Base64BinaryDt.java index d7098bbb7eb..839dcf24db8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/Base64BinaryDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/Base64BinaryDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import org.apache.commons.codec.binary.Base64; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java index de7f83e028e..f29fbec0474 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.BasePrimitive; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BooleanDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BooleanDt.java index a9246720a24..7c1a4e43c98 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BooleanDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BooleanDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.BasePrimitive; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeDt.java index 02407a6b74a..8c3c1c77591 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeDt.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.primitive; - -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; - /* * #%L * HAPI FHIR - Core Library @@ -23,6 +17,11 @@ import java.io.ObjectOutput; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; + +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java index 1d48bbdb0f7..3e550d130d0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; + import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DateDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DateDt.java index af0ad21d7ac..c1da96788a5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DateDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DateDt.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.model.primitive; - -import java.util.Calendar; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.util.Calendar; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; + +import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DateTimeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DateTimeDt.java index cf14eefa367..e9c74ae8488 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DateTimeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DateTimeDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import java.util.Date; import java.util.TimeZone; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DecimalDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DecimalDt.java index bf3310f5867..b7d41dd2d59 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DecimalDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DecimalDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import java.math.BigDecimal; import java.math.MathContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java index c2a0d30c4fd..104ab6cdc47 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.i18n.Msg; @@ -22,26 +41,6 @@ import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * Represents the FHIR ID type. This is the actual resource ID, meaning the ID that will be used in RESTful URLs, Resource References, etc. to represent a specific instance of a resource. *

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/InstantDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/InstantDt.java index 33269bae055..d6cbdcdf0f7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/InstantDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/InstantDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import java.util.Calendar; import java.util.Date; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IntegerDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IntegerDt.java index c36611efadb..6da18bc6ad7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IntegerDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IntegerDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.BasePrimitive; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/MarkdownDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/MarkdownDt.java index 886c777438d..a8858f11d51 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/MarkdownDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/MarkdownDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.util.CoverageIgnore; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/OidDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/OidDt.java index 5d824745989..4dbd0c76e20 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/OidDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/OidDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/PositiveIntDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/PositiveIntDt.java index 8615d170a01..c807641c31b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/PositiveIntDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/PositiveIntDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.SimpleSetter; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/StringDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/StringDt.java index d7411fc4a31..6e04bdb3ca4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/StringDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/StringDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/TimeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/TimeDt.java index 6d3b0372d2d..8f3aefe2ff2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/TimeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/TimeDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/UnsignedIntDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/UnsignedIntDt.java index 8d0b24451d5..80a163bb35e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/UnsignedIntDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/UnsignedIntDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.SimpleSetter; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/UriDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/UriDt.java index 6a79f1f1415..199e7292880 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/UriDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/UriDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import java.net.URI; import java.net.URISyntaxException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/XhtmlDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/XhtmlDt.java index 50914e030b4..546ba247201 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/XhtmlDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/XhtmlDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.primitive; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.primitive; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.primitive; import ca.uhn.fhir.model.api.BasePrimitive; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntrySearchModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntrySearchModeEnum.java index 1aca0249cf2..b17a14dcf39 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntrySearchModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntrySearchModeEnum.java @@ -1,6 +1,3 @@ - -package ca.uhn.fhir.model.valueset; - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,7 @@ package ca.uhn.fhir.model.valueset; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.valueset; import java.util.HashMap; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntryTransactionMethodEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntryTransactionMethodEnum.java index a76cee3579f..b58070500f2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntryTransactionMethodEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntryTransactionMethodEnum.java @@ -1,6 +1,3 @@ - -package ca.uhn.fhir.model.valueset; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +18,8 @@ package ca.uhn.fhir.model.valueset; * #L% */ +package ca.uhn.fhir.model.valueset; + import java.util.HashMap; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleTypeEnum.java index 6ec9e75e27a..5b316802c4e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleTypeEnum.java @@ -1,6 +1,3 @@ - -package ca.uhn.fhir.model.valueset; - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,7 @@ package ca.uhn.fhir.model.valueset; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.valueset; import java.util.HashMap; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/view/ViewGenerator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/view/ViewGenerator.java index 8216167389f..f80d9354f29 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/view/ViewGenerator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/view/ViewGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.view; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.view; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.view; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java index b1f08cd6f04..86dc73286ec 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.fhirpath.IFhirPath; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/CustomThymeleafNarrativeGenerator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/CustomThymeleafNarrativeGenerator.java index 7d88cdf65b2..dd68463dc54 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/CustomThymeleafNarrativeGenerator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/CustomThymeleafNarrativeGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative; import ca.uhn.fhir.narrative2.NarrativeTemplateManifest; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGenerator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGenerator.java index 0aff3ad66b0..0742691dc18 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGenerator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative; import ca.uhn.fhir.narrative2.NarrativeTemplateManifest; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/INarrativeGenerator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/INarrativeGenerator.java index 754adf3c6e9..9b87a941be0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/INarrativeGenerator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/INarrativeGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/BaseNarrativeGenerator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/BaseNarrativeGenerator.java index 6319731ea26..f87bf3d7a24 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/BaseNarrativeGenerator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/BaseNarrativeGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative2; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative2; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative2; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/INarrativeTemplate.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/INarrativeTemplate.java index a6dd60b8ad2..8c5201399c9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/INarrativeTemplate.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/INarrativeTemplate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative2; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative2; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative2; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/INarrativeTemplateManifest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/INarrativeTemplateManifest.java index 5f7b2a9d582..dee8d60e71a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/INarrativeTemplateManifest.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/INarrativeTemplateManifest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative2; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative2; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative2; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NarrativeTemplate.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NarrativeTemplate.java index 688606d9f4d..ee515a012ee 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NarrativeTemplate.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NarrativeTemplate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative2; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative2; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative2; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NarrativeTemplateManifest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NarrativeTemplateManifest.java index e6b0cd80972..6710e66d28f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NarrativeTemplateManifest.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NarrativeTemplateManifest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative2; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative2; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative2; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NullNarrativeGenerator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NullNarrativeGenerator.java index 3ff366724ce..caa05aa1b9e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NullNarrativeGenerator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/NullNarrativeGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative2; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative2; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative2; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.narrative.INarrativeGenerator; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/TemplateTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/TemplateTypeEnum.java index 1f9aa1f5114..273cd7d958c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/TemplateTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative2/TemplateTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.narrative2; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.narrative2; * limitations under the License. * #L% */ +package ca.uhn.fhir.narrative2; public enum TemplateTypeEnum { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java index 75ffcbc1e9d..6f3d8406a6e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeDeclaredChildDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/DataFormatException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/DataFormatException.java index 725dfd8497c..2d7f46b0008 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/DataFormatException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/DataFormatException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; public class DataFormatException extends RuntimeException { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ErrorHandlerAdapter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ErrorHandlerAdapter.java index 088c8a4ecba..1c0f67e6d79 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ErrorHandlerAdapter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ErrorHandlerAdapter.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.parser; - -import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ScalarType; -import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; + +import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ScalarType; +import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; /** * Adapter implementation with NOP implementations of all {@link IParserErrorHandler} methods. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IJsonLikeParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IJsonLikeParser.java index 3eb3b459493..def9449c519 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IJsonLikeParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IJsonLikeParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.parser.json.BaseJsonLikeWriter; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IParser.java index 7b9f33f6149..ae620f47541 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IParserErrorHandler.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IParserErrorHandler.java index 3de6edcc62b..c9091d973df 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IParserErrorHandler.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/IParserErrorHandler.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.parser; - -import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ScalarType; -import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; + +import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ScalarType; +import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; /** * Error handler diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java index c0760c9b750..ae56cee0b73 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java index a0ee39d6d70..fc60dc8410f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.parser; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ScalarType; -import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; - -import static org.apache.commons.lang3.StringUtils.isBlank; - /* * #%L * HAPI FHIR - Core Library @@ -25,6 +17,13 @@ import static org.apache.commons.lang3.StringUtils.isBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ScalarType; +import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; + +import static org.apache.commons.lang3.StringUtils.isBlank; /** * The default error handler, which logs issues but does not abort parsing, with only one exception: diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/NDJsonParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/NDJsonParser.java index 382fbc9a355..f44a81851b0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/NDJsonParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/NDJsonParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParseErrorHandler.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParseErrorHandler.java index ff0589159fd..b28c00e5538 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParseErrorHandler.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParseErrorHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; class ParseErrorHandler { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParseLocation.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParseLocation.java index 7a9cbdc42f2..510d7744db4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParseLocation.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParseLocation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.parser.IParserErrorHandler.IParseLocation; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java index 3115cc31df1..71bbaedf1e6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeChildDefinition.IMutator; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/RDFParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/RDFParser.java index cc75bac48f9..53c2ce841b5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/RDFParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/RDFParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeDeclaredChildDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/StrictErrorHandler.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/StrictErrorHandler.java index b25a6d2a556..11180a065cd 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/StrictErrorHandler.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/StrictErrorHandler.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.parser; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ScalarType; -import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; -import ca.uhn.fhir.util.UrlUtil; - /* * #%L * HAPI FHIR - Core Library @@ -25,6 +17,13 @@ import ca.uhn.fhir.util.UrlUtil; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ScalarType; +import ca.uhn.fhir.parser.json.BaseJsonLikeValue.ValueType; +import ca.uhn.fhir.util.UrlUtil; /** * Parser error handler which throws a {@link DataFormatException} any time an diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java index a3934264d35..0adebc13664 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeDeclaredChildDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeArray.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeArray.java index 14a99e781e1..9d456fba8b2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeArray.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeArray.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser.json; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser.json; public abstract class BaseJsonLikeArray extends BaseJsonLikeValue { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeObject.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeObject.java index 631d2efb7d3..2254cce90fd 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeObject.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeObject.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.parser.json; - -import java.util.Iterator; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.util.Iterator; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser.json; + +import java.util.Iterator; public abstract class BaseJsonLikeObject extends BaseJsonLikeValue { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeWriter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeWriter.java index da1761aaa8e..4cb795914e9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeWriter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/BaseJsonLikeWriter.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.parser.json; - -import java.io.IOException; -import java.io.Writer; -import java.math.BigDecimal; -import java.math.BigInteger; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import java.math.BigInteger; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser.json; + +import java.io.IOException; +import java.io.Writer; +import java.math.BigDecimal; +import java.math.BigInteger; public abstract class BaseJsonLikeWriter { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonStructure.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonStructure.java index 998d74ab636..7baefbfea30 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonStructure.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonStructure.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser.json.jackson; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser.json.jackson; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser.json.jackson; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.parser.DataFormatException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonWriter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonWriter.java index dbb66331604..e43b12a0b25 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonWriter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/json/jackson/JacksonWriter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser.json.jackson; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser.json.jackson; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser.json.jackson; import ca.uhn.fhir.parser.json.BaseJsonLikeWriter; import com.fasterxml.jackson.core.JsonFactory; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/path/EncodeContextPath.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/path/EncodeContextPath.java index 11e7b63ed5a..0174bdf8718 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/path/EncodeContextPath.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/path/EncodeContextPath.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser.path; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser.path; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser.path; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/path/EncodeContextPathElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/path/EncodeContextPathElement.java index 0e990320a3a..fee8178e344 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/path/EncodeContextPathElement.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/path/EncodeContextPathElement.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.parser.path; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.parser.path; * limitations under the License. * #L% */ +package ca.uhn.fhir.parser.path; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/AddTags.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/AddTags.java index f624799192b..61a0229bcbc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/AddTags.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/AddTags.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/At.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/At.java index 335adcc76b1..ce660ca3ff5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/At.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/At.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ConditionalUrlParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ConditionalUrlParam.java index 4d579432b01..913d838ff86 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ConditionalUrlParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ConditionalUrlParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Count.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Count.java index be1c2b3d64a..7d3aa867ae9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Count.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Count.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Create.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Create.java index be3a352ab20..1984f00c0a8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Create.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Create.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Delete.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Delete.java index 27f2619103c..c3a57e638aa 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Delete.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Delete.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/DeleteTags.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/DeleteTags.java index b6522e938ed..ffaa0845f97 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/DeleteTags.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/DeleteTags.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Destroy.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Destroy.java index a5cdaf1dac3..a21a60a7f9f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Destroy.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Destroy.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import java.lang.annotation.Target; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * ResourceProvider methods tagged with {@link Destroy} will be invoked when the RestfulServer is shut down. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Elements.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Elements.java index 084f1107d34..44706ed5ab9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Elements.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Elements.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GetPage.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GetPage.java index 08691bda373..893a7940ef4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GetPage.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GetPage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQL.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQL.java index ec6c1660b29..1e0fb7fe401 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQL.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQL.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import ca.uhn.fhir.rest.api.RequestTypeEnum; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQLQueryBody.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQLQueryBody.java index cd765900bd0..7e24ad7ade6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQLQueryBody.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQLQueryBody.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQLQueryUrl.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQLQueryUrl.java index 017ac102611..db375080b39 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQLQueryUrl.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GraphQLQueryUrl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/History.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/History.java index 2956d02e439..02eb3a77174 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/History.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/History.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/IdParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/IdParam.java index 8461ec60852..ad671af0a4a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/IdParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/IdParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/IncludeParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/IncludeParam.java index 7805c2105e3..80a555c5082 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/IncludeParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/IncludeParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Initialize.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Initialize.java index 47565db6c94..0ae3d782caf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Initialize.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Initialize.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import java.lang.annotation.Target; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * ResourceProvider methods tagged with {@link Initialize} will be invoked when the RestfulServer is starting up. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Metadata.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Metadata.java index 81d86ecb940..a0eeb398ea4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Metadata.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Metadata.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Offset.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Offset.java index aef58bbd7cf..09c0f262ed6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Offset.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Offset.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Operation.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Operation.java index 68b691b2be9..7d8fe7d0d05 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Operation.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Operation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import ca.uhn.fhir.model.valueset.BundleTypeEnum; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OperationParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OperationParam.java index 95a4a8baf10..ee4956089fe 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OperationParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OperationParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java index 3b9a82f497a..6ea9a0bd87c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - -import java.lang.annotation.ElementType; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.lang.annotation.ElementType; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/PageIdParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/PageIdParam.java index 96d654675cc..d6e5e94f6ca 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/PageIdParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/PageIdParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Patch.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Patch.java index f6563b69f19..23a2ae6addb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Patch.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Patch.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - -import java.lang.annotation.ElementType; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.lang.annotation.ElementType; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RawParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RawParam.java index 65f0438daaf..19b13783f75 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RawParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RawParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Read.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Read.java index 9f7e58e9956..53dfd7c1f03 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Read.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Read.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + import java.lang.annotation.*; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RequiredParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RequiredParam.java index e9851940ff1..e36a63f937e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RequiredParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RequiredParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - -import java.lang.annotation.ElementType; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.lang.annotation.ElementType; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ResourceParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ResourceParam.java index 3cffeefb845..1b05ee5b72b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ResourceParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ResourceParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java index 87f838b3dd0..b47ce6237d0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ServerBase.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ServerBase.java index 7aed7d2ea11..6dbb1cbc80b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ServerBase.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ServerBase.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Since.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Since.java index 6e0bde7ad33..446370a0457 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Since.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Since.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Sort.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Sort.java index d6f472b6ab9..d62f8abe11e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Sort.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Sort.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Transaction.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Transaction.java index fee9d5d2a5e..4b13fe54e70 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Transaction.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Transaction.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + import java.lang.annotation.*; /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/TransactionParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/TransactionParam.java index 2ea93a68b07..a086ac1a062 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/TransactionParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/TransactionParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + import java.lang.annotation.*; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Update.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Update.java index ffb30d90853..4f3cee44680 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Update.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Update.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Validate.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Validate.java index 588c22a30c1..4f1d3b56355 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Validate.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Validate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.annotation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.annotation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.annotation; + import java.lang.annotation.*; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/BundleLinks.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/BundleLinks.java index 4ad85f5ed30..6cfe1ee5ebb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/BundleLinks.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/BundleLinks.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.valueset.BundleTypeEnum; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/CacheControlDirective.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/CacheControlDirective.java index 517196deeb8..d78454c7017 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/CacheControlDirective.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/CacheControlDirective.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java index 5848f1dd756..a15d92cb92d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/DeleteCascadeModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/DeleteCascadeModeEnum.java index 8ff052a8273..b8e3dd7b268 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/DeleteCascadeModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/DeleteCascadeModeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; /** * Used by the client to indicate the cascade mode associated with a delete operation. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/EncodingEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/EncodingEnum.java index cc142546799..c7430132762 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/EncodingEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/EncodingEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.IParser; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/IResourceSupportedSvc.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/IResourceSupportedSvc.java index 3a7a4f75178..49de82464d6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/IResourceSupportedSvc.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/IResourceSupportedSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; public interface IResourceSupportedSvc { boolean isSupported(String theResourceName); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/IVersionSpecificBundleFactory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/IVersionSpecificBundleFactory.java index a2d9643f4c3..4851f912898 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/IVersionSpecificBundleFactory.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/IVersionSpecificBundleFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import ca.uhn.fhir.context.api.BundleInclusionRule; import ca.uhn.fhir.model.api.Include; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/InterceptorInvocationTimingEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/InterceptorInvocationTimingEnum.java index 9e382a70751..98dec59d00a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/InterceptorInvocationTimingEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/InterceptorInvocationTimingEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; /** * during invocation of certain pointcuts, it is important to know whether they are being executed in diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java index 0499d58a91f..bff7a15e112 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import ca.uhn.fhir.util.CoverageIgnore; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PatchTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PatchTypeEnum.java index 0a562e946a2..6a913139b77 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PatchTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PatchTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferHandlingEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferHandlingEnum.java index 08bfc5022ab..13932b7c552 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferHandlingEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferHandlingEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferHeader.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferHeader.java index b0cd8caa9d3..09d42fdce25 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferHeader.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferHeader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import javax.annotation.Nullable; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferReturnEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferReturnEnum.java index f42e575adef..7b228c6b59c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferReturnEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PreferReturnEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/QualifiedParamList.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/QualifiedParamList.java index 29a878679d2..18247e7bcd0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/QualifiedParamList.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/QualifiedParamList.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.rest.api; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.api.IQueryParameterOr; -import ca.uhn.fhir.model.api.IQueryParameterType; - -import java.util.ArrayList; -import java.util.StringTokenizer; - -import static org.apache.commons.lang3.StringUtils.isBlank; - /* * #%L * HAPI FHIR - Core Library @@ -28,6 +17,16 @@ import static org.apache.commons.lang3.StringUtils.isBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.model.api.IQueryParameterOr; +import ca.uhn.fhir.model.api.IQueryParameterType; + +import java.util.ArrayList; +import java.util.StringTokenizer; + +import static org.apache.commons.lang3.StringUtils.isBlank; public class QualifiedParamList extends ArrayList { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RequestFormatParamStyleEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RequestFormatParamStyleEnum.java index 5164a1b4e1c..10042a89b1c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RequestFormatParamStyleEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RequestFormatParamStyleEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; public enum RequestFormatParamStyleEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RequestTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RequestTypeEnum.java index 5baf238ef6a..c812dcae34b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RequestTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RequestTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; public enum RequestTypeEnum { CONNECT, DELETE, GET, OPTIONS, PATCH, POST, PUT, TRACE, TRACK, HEAD diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestOperationTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestOperationTypeEnum.java index ee887332970..9878de291de 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestOperationTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestOperationTypeEnum.java @@ -1,6 +1,3 @@ - -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import ca.uhn.fhir.util.CoverageIgnore; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestSearchParameterTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestSearchParameterTypeEnum.java index a73e34314d9..b6829c6ea5d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestSearchParameterTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestSearchParameterTypeEnum.java @@ -1,6 +1,3 @@ - -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import java.util.HashMap; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchContainedModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchContainedModeEnum.java index 22d6d207ff0..1284709ef0c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchContainedModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchContainedModeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchStyleEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchStyleEnum.java index 181ac1f081d..19411a2fe9a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchStyleEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchStyleEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; /** * Enumerated type to represent the various allowable syntax for a search/query diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchTotalModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchTotalModeEnum.java index 803c5360238..5e4fafdc8c1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchTotalModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchTotalModeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import java.util.HashMap; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortOrderEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortOrderEnum.java index eb694be8ff5..295a256b3a6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortOrderEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortOrderEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; public enum SortOrderEnum { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortSpec.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortSpec.java index aa8099ef386..b6c4b9cf240 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortSpec.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortSpec.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.rest.api; - -import ca.uhn.fhir.i18n.Msg; - -import java.io.Serializable; - /* * #%L * HAPI FHIR - Core Library @@ -23,6 +17,11 @@ import java.io.Serializable; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; + +import ca.uhn.fhir.i18n.Msg; + +import java.io.Serializable; /** * Represents values for sorting resources diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SummaryEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SummaryEnum.java index d6ef507d40a..3a45c94ae21 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SummaryEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SummaryEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; import java.util.HashMap; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/ValidationModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/ValidationModeEnum.java index cd73474ea02..9149f855584 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/ValidationModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/ValidationModeEnum.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.rest.api; - -import java.util.HashMap; - -import org.apache.commons.lang3.Validate; - /* * #%L * HAPI FHIR - Core Library @@ -23,6 +17,11 @@ import org.apache.commons.lang3.Validate; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api; + +import java.util.HashMap; + +import org.apache.commons.lang3.Validate; /** * Validation mode parameter for the $validate operation (DSTU2+ only) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/BaseHttpRequest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/BaseHttpRequest.java index d2ec21c7c85..8e7a6633072 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/BaseHttpRequest.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/BaseHttpRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; public abstract class BaseHttpRequest implements IHttpRequest { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/Header.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/Header.java index eeb5c90721a..6859345dc11 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/Header.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/Header.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; /** * Represents an HTTP header field. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/HttpClientUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/HttpClientUtil.java index fba5fda049b..4efd0459e61 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/HttpClientUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/HttpClientUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.util.VersionUtil; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IBasicClient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IBasicClient.java index ebfa5574ae7..82fdfb6a428 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IBasicClient.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IBasicClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import org.hl7.fhir.instance.model.api.IBaseConformance; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IClientInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IClientInterceptor.java index ba04527b8f0..6367d9ef128 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IClientInterceptor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IClientInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IGenericClient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IGenericClient.java index 14b1a55ea04..e8b3a2c6db0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IGenericClient.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IGenericClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.UriDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpClient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpClient.java index 947e0b24daa..56df96d9874 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpClient.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import java.util.List; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java index 01ad58e4622..6e91ad9d694 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import java.io.IOException; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpResponse.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpResponse.java index 63f98a0ec1b..1da12787f1b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpResponse.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import ca.uhn.fhir.util.StopWatch; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClient.java index 7c4fc57750b..daec727f9f8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClient.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClient.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.interceptor.api.IInterceptorService; -import ca.uhn.fhir.rest.api.EncodingEnum; -import ca.uhn.fhir.rest.api.RequestFormatParamStyleEnum; -import ca.uhn.fhir.rest.api.SummaryEnum; -import org.hl7.fhir.instance.model.api.IBaseResource; - -import javax.annotation.Nonnull; - /* * #%L * HAPI FHIR - Core Library @@ -28,6 +17,16 @@ import javax.annotation.Nonnull; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.interceptor.api.IInterceptorService; +import ca.uhn.fhir.rest.api.EncodingEnum; +import ca.uhn.fhir.rest.api.RequestFormatParamStyleEnum; +import ca.uhn.fhir.rest.api.SummaryEnum; +import org.hl7.fhir.instance.model.api.IBaseResource; + +import javax.annotation.Nonnull; public interface IRestfulClient { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClientFactory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClientFactory.java index f9062989484..d67dd16f704 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClientFactory.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClientFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.rest.api.RequestTypeEnum; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/ServerValidationModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/ServerValidationModeEnum.java index 18dba42e589..1b29b88d837 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/ServerValidationModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/ServerValidationModeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/UrlSourceEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/UrlSourceEnum.java index bac8ad13b0c..feef25ff747 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/UrlSourceEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/UrlSourceEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.api; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.api; public enum UrlSourceEnum { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/FhirClientConnectionException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/FhirClientConnectionException.java index 65034fba5aa..41c7ac04eb1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/FhirClientConnectionException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/FhirClientConnectionException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.exceptions; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; import ca.uhn.fhir.util.CoverageIgnore; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/FhirClientInappropriateForServerException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/FhirClientInappropriateForServerException.java index 7c4b96dc328..7c4b214d0fd 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/FhirClientInappropriateForServerException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/FhirClientInappropriateForServerException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.exceptions; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; import ca.uhn.fhir.util.CoverageIgnore; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/InvalidResponseException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/InvalidResponseException.java index bf92029f12a..720a254de90 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/InvalidResponseException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/InvalidResponseException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.exceptions; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; import ca.uhn.fhir.util.CoverageIgnore; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java index 52a4a3e6e49..9da0f04e01f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.exceptions; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; import ca.uhn.fhir.util.CoverageIgnore; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/BaseClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/BaseClientParam.java index 739ad7d48da..fd5fc1ae098 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/BaseClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/BaseClientParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeClientParam.java index 656af58e63d..f36f729adb7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeClientParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; /** * Composite parameter type for use in fluent client interfaces diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeCriterion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeCriterion.java index 1abfba44d90..9425a3fa7b1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeCriterion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeCriterion.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + import static org.apache.commons.lang3.StringUtils.defaultString; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateClientParam.java index a38940c9b3c..058a6817b11 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateClientParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.util.Date; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IBaseOn.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IBaseOn.java index 885bdc7c4bb..47fe8f0b514 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IBaseOn.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IBaseOn.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IBaseQuery.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IBaseQuery.java index b6b1216611a..9758e315b5f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IBaseQuery.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IBaseQuery.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import ca.uhn.fhir.model.api.IQueryParameterType; - -import java.util.List; -import java.util.Map; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import java.util.Map; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.model.api.IQueryParameterType; + +import java.util.List; +import java.util.Map; public interface IBaseQuery> { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java index ae58a04e690..a97c0a0afab 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java @@ -1,13 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import ca.uhn.fhir.rest.api.CacheControlDirective; -import ca.uhn.fhir.rest.api.EncodingEnum; -import ca.uhn.fhir.rest.api.RequestFormatParamStyleEnum; -import ca.uhn.fhir.rest.api.SummaryEnum; -import org.hl7.fhir.instance.model.api.IBaseResource; - -import java.util.List; - /* * #%L * HAPI FHIR - Core Library @@ -27,6 +17,15 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.rest.api.CacheControlDirective; +import ca.uhn.fhir.rest.api.EncodingEnum; +import ca.uhn.fhir.rest.api.RequestFormatParamStyleEnum; +import ca.uhn.fhir.rest.api.SummaryEnum; +import org.hl7.fhir.instance.model.api.IBaseResource; + +import java.util.List; public interface IClientExecutable, Y> { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICompositeWithLeft.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICompositeWithLeft.java index 7e671def9f3..b9e202b1a8e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICompositeWithLeft.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICompositeWithLeft.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface ICompositeWithLeft { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreate.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreate.java index 80b198dafa2..44cf19d870e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreate.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreate.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import org.hl7.fhir.instance.model.api.IBaseResource; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBaseResource; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import org.hl7.fhir.instance.model.api.IBaseResource; public interface ICreate { ICreateTyped resource(IBaseResource theResource); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateTyped.java index fa23dde3012..3d51604b5d8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.PreferReturnEnum; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateWithQuery.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateWithQuery.java index 55c4b762a75..b179c9c17e7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateWithQuery.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateWithQuery.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface ICreateWithQuery extends IBaseQuery { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateWithQueryTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateWithQueryTyped.java index 5687635e21e..16fe644b9c5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateWithQueryTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateWithQueryTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface ICreateWithQueryTyped extends ICreateTyped, ICreateWithQuery { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICriterion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICriterion.java index 6b8da63e1d8..fb793070ea9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICriterion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICriterion.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface ICriterion { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICriterionInternal.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICriterionInternal.java index 3395bca737f..106e76c88e3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICriterionInternal.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICriterionInternal.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import ca.uhn.fhir.context.FhirContext; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.context.FhirContext; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.context.FhirContext; public interface ICriterionInternal { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDelete.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDelete.java index 67a3e1057c2..c857e30cfbb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDelete.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDelete.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import org.hl7.fhir.instance.model.api.IIdType; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; public interface IDelete { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteTyped.java index bac88afd74b..cc7273c3c1a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.rest.api.DeleteCascadeModeEnum; import ca.uhn.fhir.rest.api.MethodOutcome; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteWithQuery.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteWithQuery.java index a016ea9b9d2..6b2b253c022 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteWithQuery.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteWithQuery.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IDeleteWithQuery extends IBaseQuery { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteWithQueryTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteWithQueryTyped.java index 3748f9cfd7a..7b9309d3533 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteWithQueryTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDeleteWithQueryTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IDeleteWithQueryTyped extends IDeleteTyped, IDeleteWithQuery { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IFetchConformanceTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IFetchConformanceTyped.java index b45e3d4a021..518d1d99c22 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IFetchConformanceTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IFetchConformanceTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseConformance; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IFetchConformanceUntyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IFetchConformanceUntyped.java index d2a23bbaaf2..5f4e5b5c140 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IFetchConformanceUntyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IFetchConformanceUntyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseConformance; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPage.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPage.java index 77285859cd4..b2282f4b931 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPage.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseBundle; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPageTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPageTyped.java index d469a3a731c..c76ab57373e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPageTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPageTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IGetPageTyped extends IClientExecutable, T> { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPageUntyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPageUntyped.java index eac008b0189..8b38962b7ce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPageUntyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IGetPageUntyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseBundle; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistory.java index dfb4ab7e7a5..2b49cbd4de9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistory.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IHistory extends IBaseOn { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistoryTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistoryTyped.java index 6b14d3aaa6b..f2baf55b7f3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistoryTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistoryTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.rest.param.DateRangeParam; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistoryUntyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistoryUntyped.java index d40f3f43e33..faa1e9099cb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistoryUntyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IHistoryUntyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseBundle; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMeta.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMeta.java index 5de58b0d2e7..48e9959374e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMeta.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMeta.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import org.hl7.fhir.instance.model.api.IBaseMetaType; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBaseMetaType; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import org.hl7.fhir.instance.model.api.IBaseMetaType; public interface IMeta { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaAddOrDeleteSourced.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaAddOrDeleteSourced.java index e95ed7f7e86..e890fb05173 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaAddOrDeleteSourced.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaAddOrDeleteSourced.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseMetaType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaAddOrDeleteUnsourced.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaAddOrDeleteUnsourced.java index 4d872f1824b..c4b697a1f57 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaAddOrDeleteUnsourced.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaAddOrDeleteUnsourced.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaGetUnsourced.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaGetUnsourced.java index 9e3494a2547..f6a5e4f6326 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaGetUnsourced.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IMetaGetUnsourced.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseMetaType; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperation.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperation.java index 2653c204c9d..0607930db6e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperation.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperation.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import org.hl7.fhir.instance.model.api.IIdType; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,10 @@ import org.hl7.fhir.instance.model.api.IIdType; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import org.hl7.fhir.instance.model.api.IIdType; + public interface IOperation extends IBaseOn { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationOn.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationOn.java index 69a428d3c3b..a11ce5a93ae 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationOn.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationOn.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IOperationOn extends IBaseOn { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsg.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsg.java index 2a0f2c45c85..79df7257018 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsg.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsg.java @@ -1,10 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsgMode.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsgMode.java index 6a706c8d88c..561352683e7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsgMode.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsgMode.java @@ -1,12 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package ca.uhn.fhir.rest.gclient; - -import org.hl7.fhir.instance.model.api.IBaseResource; - /* * #%L * HAPI FHIR - Core Library @@ -26,6 +17,15 @@ import org.hl7.fhir.instance.model.api.IBaseResource; * limitations under the License. * #L% */ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package ca.uhn.fhir.rest.gclient; + +import org.hl7.fhir.instance.model.api.IBaseResource; + public interface IOperationProcessMsgMode extends IClientExecutable, T> { IOperationProcessMsgMode asynchronous(Class theResponseClass); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationTyped.java index fc884f11858..18d6d5bc821 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IOperationTyped { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUnnamed.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUnnamed.java index 0186c4f5d88..0af8dd569b2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUnnamed.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUnnamed.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IOperationUnnamed { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntyped.java index ed262ef89fa..67ae039f98c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntyped.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import org.hl7.fhir.instance.model.api.IBase; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBase; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IBaseParameters; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInput.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInput.java index 93795965c31..5786456bbd0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInput.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInput.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.rest.api.MethodOutcome; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInputAndPartialOutput.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInputAndPartialOutput.java index 7ff16854904..35af4b9da83 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInputAndPartialOutput.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInputAndPartialOutput.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IBaseParameters; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IParam.java index 8ac21fd58e8..3726a1d0b9f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatch.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatch.java index 6e91f6c93e5..19e12d7c94d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatch.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseParameters; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchExecutable.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchExecutable.java index 29d571838f6..5990fe0d918 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchExecutable.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchExecutable.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.PreferReturnEnum; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithBody.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithBody.java index b92f7c876f1..8d7cbf75072 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithBody.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithBody.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import org.hl7.fhir.instance.model.api.IBaseResource; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBaseResource; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithQuery.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithQuery.java index e9862f6a4c1..13a35c2698d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithQuery.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithQuery.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IPatchWithQuery extends IBaseQuery { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithQueryTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithQueryTyped.java index 56cbf93c7cc..e28bbd04ce7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithQueryTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IPatchWithQueryTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IPatchWithQueryTyped extends IPatchWithBody, IPatchWithQuery { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java index 70645bb7898..15ca5fbcaab 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java @@ -1,17 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import ca.uhn.fhir.model.api.Include; -import ca.uhn.fhir.rest.api.SearchStyleEnum; -import ca.uhn.fhir.rest.api.SearchTotalModeEnum; -import ca.uhn.fhir.rest.api.SortSpec; -import ca.uhn.fhir.rest.api.SummaryEnum; -import ca.uhn.fhir.rest.param.DateRangeParam; -import org.hl7.fhir.instance.model.api.IBaseBundle; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - /* * #%L * HAPI FHIR - Core Library @@ -31,6 +17,19 @@ import java.util.Map; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.rest.api.SearchStyleEnum; +import ca.uhn.fhir.rest.api.SearchTotalModeEnum; +import ca.uhn.fhir.rest.api.SortSpec; +import ca.uhn.fhir.rest.api.SummaryEnum; +import ca.uhn.fhir.rest.param.DateRangeParam; +import org.hl7.fhir.instance.model.api.IBaseBundle; + +import java.util.Collection; +import java.util.List; +import java.util.Map; public interface IQuery extends IBaseQuery>, IClientExecutable, Y> { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IRead.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IRead.java index 342e2daf9df..a83dbef9740 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IRead.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IRead.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import org.hl7.fhir.instance.model.api.IBaseResource; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBaseResource; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import org.hl7.fhir.instance.model.api.IBaseResource; public interface IRead { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadExecutable.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadExecutable.java index 31e9a6cd7fd..3f38e73f5ae 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadExecutable.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadExecutable.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadIfNoneMatch.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadIfNoneMatch.java index 96f48c5d7bb..e26a3e8d67c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadIfNoneMatch.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadIfNoneMatch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadTyped.java index 7d30802e58f..92b37a5aefa 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IReadTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ISort.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ISort.java index 0c1b29a68eb..c8de0bbed63 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ISort.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ISort.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface ISort { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ITransaction.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ITransaction.java index 3dc5a27155a..e20facda7cd 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ITransaction.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ITransaction.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ITransactionTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ITransactionTyped.java index 17c55d531d3..afc2d381133 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ITransactionTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ITransactionTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface ITransactionTyped extends IClientExecutable, T> { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUntypedQuery.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUntypedQuery.java index 97da49a9c5b..47eb32588cb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUntypedQuery.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUntypedQuery.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdate.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdate.java index df22bc79577..b80bad639cb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdate.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateExecutable.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateExecutable.java index 4d5c8a65c7b..f5e4bf4e7fa 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateExecutable.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateExecutable.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.PreferReturnEnum; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateTyped.java index a0f51d06d5f..e8756a2a201 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateWithQuery.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateWithQuery.java index ddfd525aa7d..d76caeeeec1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateWithQuery.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateWithQuery.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IUpdateWithQuery extends IBaseQuery { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateWithQueryTyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateWithQueryTyped.java index 4cda9604ea2..37a0408a828 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateWithQueryTyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IUpdateWithQueryTyped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; public interface IUpdateWithQueryTyped extends IUpdateTyped, IUpdateWithQuery { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IValidate.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IValidate.java index c7613cad27b..000325d270f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IValidate.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IValidate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IValidateUntyped.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IValidateUntyped.java index 8f3aeea2bfe..317b1477364 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IValidateUntyped.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IValidateUntyped.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import ca.uhn.fhir.rest.api.MethodOutcome; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.rest.api.MethodOutcome; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.rest.api.MethodOutcome; public interface IValidateUntyped extends IClientExecutable { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberClientParam.java index 3d998917a94..c81cbce0b6d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberClientParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import ca.uhn.fhir.rest.param.ParamPrefixEnum; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.rest.param.ParamPrefixEnum; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.rest.param.ParamPrefixEnum; /** * Token parameter type for use in fluent client interfaces diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java index 48214b20356..8ab9263a0a8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + import static org.apache.commons.lang3.StringUtils.defaultString; import ca.uhn.fhir.rest.gclient.NumberClientParam.IMatches; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityCriterion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityCriterion.java index eaa96592b97..26ff6e9f2e2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityCriterion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityCriterion.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import static org.apache.commons.lang3.StringUtils.isNotBlank; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.rest.param.ParamPrefixEnum; -import ca.uhn.fhir.rest.param.ParameterUtil; - /* * #%L * HAPI FHIR - Core Library @@ -25,6 +17,13 @@ import ca.uhn.fhir.rest.param.ParameterUtil; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.rest.param.ParamPrefixEnum; +import ca.uhn.fhir.rest.param.ParameterUtil; class QuantityCriterion implements ICriterion, ICriterionInternal { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceClientParam.java index 1ecfbe468e9..ebf2ce2a58a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceClientParam.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import ca.uhn.fhir.context.FhirContext; -import org.apache.commons.lang3.Validate; -import org.hl7.fhir.instance.model.api.IIdType; - -import java.util.Arrays; -import java.util.Collection; - -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR - Core Library @@ -28,6 +17,16 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.context.FhirContext; +import org.apache.commons.lang3.Validate; +import org.hl7.fhir.instance.model.api.IIdType; + +import java.util.Arrays; +import java.util.Collection; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; public class ReferenceClientParam extends BaseClientParam implements IParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/SpecialClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/SpecialClientParam.java index 0c685d0fd4f..365d5c99986 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/SpecialClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/SpecialClientParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.rest.api.Constants; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java index 6ca2067a8a7..382a9385d33 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import ca.uhn.fhir.rest.api.Constants; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringCriterion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringCriterion.java index 2950c81bcaa..f783e3bb9ce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringCriterion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringCriterion.java @@ -1,15 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import static org.apache.commons.lang3.StringUtils.isBlank; - -import java.util.Collection; - -import org.apache.commons.lang3.StringUtils; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.rest.param.ParamPrefixEnum; -import ca.uhn.fhir.rest.param.ParameterUtil; - /* * #%L * HAPI FHIR - Core Library @@ -29,6 +17,17 @@ import ca.uhn.fhir.rest.param.ParameterUtil; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import static org.apache.commons.lang3.StringUtils.isBlank; + +import java.util.Collection; + +import org.apache.commons.lang3.StringUtils; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.rest.param.ParamPrefixEnum; +import ca.uhn.fhir.rest.param.ParameterUtil; class StringCriterion implements ICriterion, ICriterionInternal { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java index aaf49957c67..82430ced34c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import static org.apache.commons.lang3.StringUtils.defaultString; - -import java.util.*; - -import org.apache.commons.lang3.ObjectUtils; -import org.hl7.fhir.instance.model.api.IBaseCoding; - -import ca.uhn.fhir.model.base.composite.BaseIdentifierDt; - /* * #%L * HAPI FHIR - Core Library @@ -28,6 +17,16 @@ import ca.uhn.fhir.model.base.composite.BaseIdentifierDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import static org.apache.commons.lang3.StringUtils.defaultString; + +import java.util.*; + +import org.apache.commons.lang3.ObjectUtils; +import org.hl7.fhir.instance.model.api.IBaseCoding; + +import ca.uhn.fhir.model.base.composite.BaseIdentifierDt; /** * Token parameter type for use in fluent client interfaces diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenCriterion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenCriterion.java index 4ca59451bb5..f4855c05959 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenCriterion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenCriterion.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; - -import java.util.Collection; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import java.util.Collection; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; + +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; + +import java.util.Collection; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/UriClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/UriClientParam.java index 210d6096c3c..5e722ccb29c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/UriClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/UriClientParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.gclient; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.gclient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.gclient; import java.util.Arrays; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseAndListParam.java index 4cc503eba0f..7cf9758514d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseAndListParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.IQueryParameterAnd; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java index a878d198d22..53e65ec76b7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.IQueryParameterOr; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParam.java index 39a6e712ff0..6d8693f758e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParamWithPrefix.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParamWithPrefix.java index b240f4d8069..d238e9691b4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParamWithPrefix.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParamWithPrefix.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.parser.DataFormatException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeAndListParam.java index d349abeb10f..952a30c88c6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeAndListParam.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.model.api.IQueryParameterType; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.model.api.IQueryParameterType; +import ca.uhn.fhir.util.CoverageIgnore; public class CompositeAndListParam extends BaseAndListParam> { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeOrListParam.java index 5541a48a7a2..9eb86fd2ea3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeOrListParam.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.model.api.IQueryParameterType; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.model.api.IQueryParameterType; +import ca.uhn.fhir.util.CoverageIgnore; public class CompositeOrListParam extends BaseOrListParam, CompositeParam> { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java index c76986b4789..0fb80dd24da 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateAndListParam.java index 27aaa33fb2d..b901a843fac 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateAndListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class DateAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateOrListParam.java index 8324858114d..506315f976d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateOrListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class DateOrListParam extends BaseOrListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateParam.java index 24bf3287221..a6806ae35f2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java index 8432360b40e..beadf2f65b6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; @@ -22,26 +41,6 @@ import static ca.uhn.fhir.rest.param.ParamPrefixEnum.LESSTHAN_OR_EQUALS; import static java.lang.String.format; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @SuppressWarnings("UnusedReturnValue") public class DateRangeParam implements IQueryParameterAnd { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasAndListParam.java index b17fbf0516e..f0a838f1da6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasAndListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class HasAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasOrListParam.java index 56cabd9b799..65da4de8564 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasOrListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class HasOrListParam extends BaseOrListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasParam.java index ea36c311a44..9b73af22997 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasParam.java @@ -1,13 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.model.api.IQueryParameterType; -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; - -import static org.apache.commons.lang3.StringUtils.defaultString; - /* * #%L * HAPI FHIR - Core Library @@ -27,6 +17,15 @@ import static org.apache.commons.lang3.StringUtils.defaultString; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.model.api.IQueryParameterType; +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; + +import static org.apache.commons.lang3.StringUtils.defaultString; /** * Implementation of the _has method parameter diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HistorySearchDateRangeParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HistorySearchDateRangeParam.java index 66a9c459c9e..86ef7fd952c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HistorySearchDateRangeParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HistorySearchDateRangeParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HistorySearchStyleEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HistorySearchStyleEnum.java index 28f00497654..2ee4cb05bcf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HistorySearchStyleEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HistorySearchStyleEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/InternalCodingDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/InternalCodingDt.java index 24e7a633e75..3925c4e1f9c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/InternalCodingDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/InternalCodingDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.ICompositeDatatype; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberAndListParam.java index f4ede88dd31..2ac358a2771 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberAndListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class NumberAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberOrListParam.java index 11ba8faf4b0..251b5301473 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberOrListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class NumberOrListParam extends BaseOrListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberParam.java index f9ba28d8e1f..be0eb7c2c4a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParamPrefixEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParamPrefixEnum.java index e1ac26638df..2a3032ead59 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParamPrefixEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParamPrefixEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import java.util.*; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java index 10de0e96408..e629ab26891 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.ConfigurationException; @@ -23,26 +42,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class ParameterUtil { @SuppressWarnings("unchecked") diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifierDetails.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifierDetails.java index 6f439bd3b01..d35d3113ff8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifierDetails.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifierDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import java.util.Set; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityAndListParam.java index 3fc969a33ee..c1300ad8cb4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityAndListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class QuantityAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityOrListParam.java index 34029d1c229..d1f62416fc8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityOrListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class QuantityOrListParam extends BaseOrListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java index 177b6ec4a6e..0d9c3995839 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceAndListParam.java index 618cc8286e0..a6fc2eb52a6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceAndListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class ReferenceAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceOrListParam.java index fbb914cb19c..9c3a2ad5e85 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceOrListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class ReferenceOrListParam extends BaseOrListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java index 43e48b4f058..13ccc24f427 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.primitive.IdDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialAndListParam.java index 8443dd502e5..c2ecbe1c3fc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialAndListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class SpecialAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialOrListParam.java index dfb3d87c7fa..de102a63910 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialOrListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class SpecialOrListParam extends BaseOrListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialParam.java index f76ad05fa35..7acab0a860c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.primitive.UriDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringAndListParam.java index ba72db4df38..88720024821 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringAndListParam.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.model.api.IQueryParameterOr; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.model.api.IQueryParameterOr; +import ca.uhn.fhir.util.CoverageIgnore; public class StringAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringOrListParam.java index de92cdad969..8adc230ab47 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringOrListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class StringOrListParam extends BaseOrListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java index eb3cba862ae..4afedc52385 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenAndListParam.java index 2c111e654f4..7f4fd026d6c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenAndListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import org.apache.commons.lang3.Validate; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import org.apache.commons.lang3.Validate; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import org.apache.commons.lang3.Validate; public class TokenAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenOrListParam.java index 1910f2040de..b2e225f3e80 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenOrListParam.java @@ -1,12 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import java.util.ArrayList; -import java.util.List; - -import ca.uhn.fhir.model.base.composite.BaseCodingDt; -import ca.uhn.fhir.model.base.composite.BaseIdentifierDt; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -26,6 +17,14 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import java.util.ArrayList; +import java.util.List; + +import ca.uhn.fhir.model.base.composite.BaseCodingDt; +import ca.uhn.fhir.model.base.composite.BaseIdentifierDt; +import ca.uhn.fhir.util.CoverageIgnore; /** * This class represents a restful search operation parameter for an "OR list" of tokens (in other words, a diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java index d923878c219..b85441438ea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParamModifier.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParamModifier.java index b66368016e0..7208d46a683 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParamModifier.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParamModifier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriAndListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriAndListParam.java index 0f3c150ce4b..571d199948d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriAndListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriAndListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class UriAndListParam extends BaseAndListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriOrListParam.java index df11dd90b55..039b7d579c3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriOrListParam.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.param; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + +import ca.uhn.fhir.util.CoverageIgnore; public class UriOrListParam extends BaseOrListParam { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriParam.java index 995a6ad8005..c1e7a9e3adb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; + import static org.apache.commons.lang3.StringUtils.defaultString; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriParamQualifierEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriParamQualifierEnum.java index 6380bd86119..dcf01f1bd80 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriParamQualifierEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/UriParamQualifierEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param; import java.util.Collections; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/BaseBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/BaseBinder.java index 521ac92303d..91a66aaf126 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/BaseBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/BaseBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/BaseJavaPrimitiveBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/BaseJavaPrimitiveBinder.java index 52281585064..940edc40df5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/BaseJavaPrimitiveBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/BaseJavaPrimitiveBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/CalendarBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/CalendarBinder.java index a4d46956717..c47d08fa8c9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/CalendarBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/CalendarBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import java.util.Calendar; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/CollectionBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/CollectionBinder.java index af4a4a775f1..4414d6b02c7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/CollectionBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/CollectionBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/DateBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/DateBinder.java index 41336f5f03d..cb36494f9a8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/DateBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/DateBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import java.util.Date; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/FhirPrimitiveBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/FhirPrimitiveBinder.java index cdc9e07c406..67da7de9105 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/FhirPrimitiveBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/FhirPrimitiveBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/IParamBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/IParamBinder.java index d07d6a23eb5..733e97b5792 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/IParamBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/IParamBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterAndBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterAndBinder.java index 95e1bba668b..eff86a5dbae 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterAndBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterAndBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterOrBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterOrBinder.java index 71f683e61e8..67a97f6e16a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterOrBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterOrBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterTypeBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterTypeBinder.java index 79b94f08d83..48e9117cd78 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterTypeBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/QueryParameterTypeBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/StringBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/StringBinder.java index 1c6350919fa..3bdf1e47e37 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/StringBinder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/binder/StringBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.param.binder; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.param.binder; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.param.binder; public final class StringBinder extends BaseJavaPrimitiveBinder { public StringBinder() { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/AuthenticationException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/AuthenticationException.java index 95eb102560e..feddcdd1d99 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/AuthenticationException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/AuthenticationException.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.util.CoverageIgnore; /** * Represents an HTTP 401 Client Unauthorized response, which diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java index a904a0efc3d..bc4c59b7398 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java @@ -1,17 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import ca.uhn.fhir.i18n.Msg; -import org.apache.commons.lang3.Validate; -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - /* * #%L * HAPI FHIR - Core Library @@ -31,6 +17,19 @@ import java.util.Map; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import ca.uhn.fhir.i18n.Msg; +import org.apache.commons.lang3.Validate; +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Base class for RESTful client and server exceptions. RESTful client methods will only throw exceptions which are subclasses of this exception type, and RESTful server methods should also only call diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ForbiddenOperationException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ForbiddenOperationException.java index b9a4585a284..ecae1d6e59a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ForbiddenOperationException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ForbiddenOperationException.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.util.CoverageIgnore; /** * This Represents an HTTP 403 Forbidden response, which generally indicates one of two conditions: diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/InternalErrorException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/InternalErrorException.java index 00504b107ae..7d1b4842dee 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/InternalErrorException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/InternalErrorException.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.util.CoverageIgnore; /** * Represents an HTTP 500 Internal Error response. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/InvalidRequestException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/InvalidRequestException.java index 299f24b3df7..5bb9316c4e9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/InvalidRequestException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/InvalidRequestException.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.util.CoverageIgnore; /** * Represents an HTTP 400 Bad Request response. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/MethodNotAllowedException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/MethodNotAllowedException.java index 6a850d6ce1e..ce292de869e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/MethodNotAllowedException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/MethodNotAllowedException.java @@ -1,13 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import java.util.LinkedHashSet; -import java.util.Set; - -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.api.RequestTypeEnum; - /* * #%L * HAPI FHIR - Core Library @@ -27,6 +17,15 @@ import ca.uhn.fhir.rest.api.RequestTypeEnum; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import java.util.LinkedHashSet; +import java.util.Set; + +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.rest.api.RequestTypeEnum; /** * Represents an HTTP 405 Method Not Allowed response. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/NotImplementedOperationException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/NotImplementedOperationException.java index 3a1aff77c60..86f4533f22d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/NotImplementedOperationException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/NotImplementedOperationException.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.util.CoverageIgnore; /** * This Represents an HTTP 501 Not Implemented response, which means the resource provider currently lacks the diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/NotModifiedException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/NotModifiedException.java index 23a08a429c2..ad1a1396f3c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/NotModifiedException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/NotModifiedException.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -24,6 +17,12 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.util.CoverageIgnore; /** * This Represents an HTTP 301 Not Modified response, which means the resource has not diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/PayloadTooLargeException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/PayloadTooLargeException.java index 637381a423f..83eeebdcc03 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/PayloadTooLargeException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/PayloadTooLargeException.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.util.CoverageIgnore; -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - /* * #%L * HAPI FHIR - Core Library @@ -23,6 +17,11 @@ import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.util.CoverageIgnore; +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; /** * This Represents an HTTP 413 Payload Too Large response, which means the request body diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/PreconditionFailedException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/PreconditionFailedException.java index 73b5fb3d5f3..f240a101e4f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/PreconditionFailedException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/PreconditionFailedException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceGoneException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceGoneException.java index 33c003aaf9a..1e484a9de60 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceGoneException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceGoneException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; import ca.uhn.fhir.model.base.composite.BaseIdentifierDt; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceNotFoundException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceNotFoundException.java index 7d9543b56bf..999aec68926 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceNotFoundException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceNotFoundException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; import ca.uhn.fhir.i18n.Msg; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionConflictException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionConflictException.java index 71798d5a7b4..3661524d186 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionConflictException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionConflictException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionNotSpecifiedException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionNotSpecifiedException.java index 65afca8a140..42ae113e8a7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionNotSpecifiedException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionNotSpecifiedException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnclassifiedServerFailureException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnclassifiedServerFailureException.java index 5596fec74f4..4229e169350 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnclassifiedServerFailureException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnclassifiedServerFailureException.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR - Core Library @@ -23,6 +17,11 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; + +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; + +import ca.uhn.fhir.util.CoverageIgnore; /** * Exception for use when a response is received or being sent that does not correspond to any other exception type. An HTTP status code must be provided, and will be provided to the caller in the diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java index 1bd8de30057..b11f7f5f159 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.exceptions; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.exceptions; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.exceptions; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/store/IAuditDataStore.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/store/IAuditDataStore.java index 9db0d62ab8b..378b3ac5ffc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/store/IAuditDataStore.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/store/IAuditDataStore.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.store; - -import ca.uhn.fhir.model.base.resource.BaseSecurityEvent; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.model.base.resource.BaseSecurityEvent; * limitations under the License. * #L% */ +package ca.uhn.fhir.store; + +import ca.uhn.fhir.model.base.resource.BaseSecurityEvent; /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/system/HapiSystemProperties.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/system/HapiSystemProperties.java index a9ed2e1ebde..547963963e4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/system/HapiSystemProperties.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/system/HapiSystemProperties.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.system; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.system; * limitations under the License. * #L% */ +package ca.uhn.fhir.system; import org.apache.commons.lang3.time.DateUtils; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/BaseStoreInfo.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/BaseStoreInfo.java index fde9ca648a7..51e9befebde 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/BaseStoreInfo.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/BaseStoreInfo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.tls; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.tls; * limitations under the License. * #L% */ +package ca.uhn.fhir.tls; import ca.uhn.fhir.i18n.Msg; import org.apache.commons.io.FilenameUtils; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/KeyStoreInfo.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/KeyStoreInfo.java index aef590e1529..df27f90e84b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/KeyStoreInfo.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/KeyStoreInfo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.tls; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.tls; * limitations under the License. * #L% */ +package ca.uhn.fhir.tls; public class KeyStoreInfo extends BaseStoreInfo { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/KeyStoreType.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/KeyStoreType.java index bcae5da8b15..98260c1fefb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/KeyStoreType.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/KeyStoreType.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.tls; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.tls; * limitations under the License. * #L% */ +package ca.uhn.fhir.tls; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/PathType.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/PathType.java index 1b2d9a33e77..b8c1c2bd347 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/PathType.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/PathType.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.tls; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.tls; * limitations under the License. * #L% */ +package ca.uhn.fhir.tls; public enum PathType { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/TlsAuthentication.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/TlsAuthentication.java index 3a0764a9040..ecc48e02731 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/TlsAuthentication.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/TlsAuthentication.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.tls; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.tls; * limitations under the License. * #L% */ +package ca.uhn.fhir.tls; import java.util.Optional; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/TrustStoreInfo.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/TrustStoreInfo.java index 2a587006d7b..002de3c8b67 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/TrustStoreInfo.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/tls/TrustStoreInfo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.tls; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.tls; * limitations under the License. * #L% */ +package ca.uhn.fhir.tls; public class TrustStoreInfo extends BaseStoreInfo { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ArrayUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ArrayUtil.java index 5e5f0eff8e0..648f324045d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ArrayUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ArrayUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import java.util.Arrays; import java.util.Set; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AsyncUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AsyncUtil.java index 3a16b99f1c2..72514dbcb38 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AsyncUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AsyncUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AttachmentUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AttachmentUtil.java index a883d7c5de9..c0c7f013499 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AttachmentUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AttachmentUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.*; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BaseUnrecoverableRuntimeException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BaseUnrecoverableRuntimeException.java index 702bfc85061..49094719e0d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BaseUnrecoverableRuntimeException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BaseUnrecoverableRuntimeException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; /** * Exception superclass for an exception representing an unrecoverable failure diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BinaryUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BinaryUtil.java index ee83fccbe7b..408260f06ff 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BinaryUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BinaryUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleBuilder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleBuilder.java index 4fbf6261fb3..ad5866f8492 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleBuilder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleUtil.java index 3f1655b6935..eed870ccd30 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleUtil.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; @@ -32,26 +51,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * Fetch resources from a bundle */ diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ClasspathUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ClasspathUtil.java index 1df46e78737..27682182577 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ClasspathUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ClasspathUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CollectionUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CollectionUtil.java index 152ba4c90fb..b4192603ce1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CollectionUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CollectionUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import java.util.HashSet; import java.util.Set; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CompositionBuilder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CompositionBuilder.java index 49589864e55..f5b7ee2f4ec 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CompositionBuilder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CompositionBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CountingAndLimitingInputStream.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CountingAndLimitingInputStream.java index b994e128d48..216b2aeb51a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CountingAndLimitingInputStream.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CountingAndLimitingInputStream.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.Msg; import com.google.common.io.CountingInputStream; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CoverageIgnore.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CoverageIgnore.java index af014bcc0ae..f6f299427b3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CoverageIgnore.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/CoverageIgnore.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; public @interface CoverageIgnore { // nothing diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DatatypeUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DatatypeUtil.java index 1451981a204..00bb29f8492 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DatatypeUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DatatypeUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateRangeUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateRangeUtil.java index 68f54f5aad0..b2f0b148876 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateRangeUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateRangeUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.rest.param.DateRangeParam; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateUtils.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateUtils.java index 4b825bf331a..de9d64c8132 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateUtils.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.Msg; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ElementUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ElementUtil.java index 9891578a6f2..5e0b162204d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ElementUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ElementUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.ICompositeElement; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ExtensionConstants.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ExtensionConstants.java index df09278018d..dab73ff0ac6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ExtensionConstants.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ExtensionConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; public class ExtensionConstants { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ExtensionUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ExtensionUtil.java index e9d8d0e5df5..9f165516db3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ExtensionUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ExtensionUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java index d708a929eda..8013560a454 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; @@ -60,26 +79,6 @@ import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.substring; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class FhirTerser { private static final Pattern COMPARTMENT_MATCHER_PATH = Pattern.compile("([a-zA-Z.]+)\\.where\\(resolve\\(\\) is ([a-zA-Z]+)\\)"); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirVersionIndependentConcept.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirVersionIndependentConcept.java index c3a33a31e41..421468b7a56 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirVersionIndependentConcept.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirVersionIndependentConcept.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import org.apache.commons.lang3.builder.CompareToBuilder; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FileUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FileUtil.java index c59d81ab4d8..c035602185f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FileUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FileUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import java.text.DecimalFormat; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/HapiExtensions.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/HapiExtensions.java index a5e0add14aa..4261f72d4e6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/HapiExtensions.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/HapiExtensions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; public class HapiExtensions { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ICallable.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ICallable.java index a900bb26c41..9155d1d869e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ICallable.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ICallable.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; public interface ICallable { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor.java index 05c5bdc1959..b4c1eaed1c8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor2.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor2.java index 174dd34c08b..87338b4ff32 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor2.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IoUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IoUtil.java index f82dd9a81b9..6be207770ec 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IoUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IoUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; public class IoUtil { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/JsonUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/JsonUtil.java index 604ee44da11..aa70522de2d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/JsonUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/JsonUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/LogUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/LogUtil.java index 84f759ce252..4131bd6be5b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/LogUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/LogUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import org.slf4j.Logger; import org.slf4j.event.Level; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/Logs.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/Logs.java index 4da6fa01edb..25b56076983 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/Logs.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/Logs.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MessageSupplier.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MessageSupplier.java index 1a29732569e..c622c1abc09 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MessageSupplier.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MessageSupplier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import java.util.function.Supplier; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java index 8b651f34d78..476b36bd283 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MultimapCollector.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MultimapCollector.java index 48f56ecacf5..1682aa8c661 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MultimapCollector.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MultimapCollector.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableSet; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/NonPrettyPrintWriterWrapper.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/NonPrettyPrintWriterWrapper.java index 830dcfa1388..f1a73af0ada 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/NonPrettyPrintWriterWrapper.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/NonPrettyPrintWriterWrapper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLStreamException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/NumericParamRangeUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/NumericParamRangeUtil.java index e6c17e2ab92..3a8975f7619 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/NumericParamRangeUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/NumericParamRangeUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import org.apache.commons.lang3.tuple.Pair; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ObjectUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ObjectUtil.java index 57a2c52cdc1..eae12d73aea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ObjectUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ObjectUtil.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.util; - -import ca.uhn.fhir.i18n.Msg; -import org.apache.commons.lang3.StringUtils; - -import java.util.Objects; -import java.util.Optional; - /* * #%L * HAPI FHIR - Core Library @@ -25,6 +17,13 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; + +import ca.uhn.fhir.i18n.Msg; +import org.apache.commons.lang3.StringUtils; + +import java.util.Objects; +import java.util.Optional; public class ObjectUtil { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/OperationOutcomeUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/OperationOutcomeUtil.java index 6f1a85b002f..422a90d1ea1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/OperationOutcomeUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/OperationOutcomeUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ParametersUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ParametersUtil.java index 498844c258c..0d00118bb0d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ParametersUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ParametersUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PhoneticEncoderUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PhoneticEncoderUtil.java index 3f2ef0810ec..57825d9ab48 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PhoneticEncoderUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PhoneticEncoderUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.phonetic.ApacheEncoder; import ca.uhn.fhir.context.phonetic.IPhoneticEncoder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PrettyPrintWriterWrapper.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PrettyPrintWriterWrapper.java index 06cc60606c1..947040f73cc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PrettyPrintWriterWrapper.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PrettyPrintWriterWrapper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import java.util.HashMap; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PrimitiveTypeEqualsPredicate.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PrimitiveTypeEqualsPredicate.java index 2ef9c6ccb46..8c1492e0e57 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PrimitiveTypeEqualsPredicate.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PrimitiveTypeEqualsPredicate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PropertyModifyingHelper.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PropertyModifyingHelper.java index 7ca3ba0b815..2a98697b842 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PropertyModifyingHelper.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/PropertyModifyingHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ProxyUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ProxyUtil.java index 536e964957f..1470deb778b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ProxyUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ProxyUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ReflectionUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ReflectionUtil.java index 7154491b4de..055efc1e5ed 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ReflectionUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ReflectionUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java index 6ee6e63613f..f759ab16817 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import java.util.Iterator; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceUtil.java index ecc79d04f16..234853e3d70 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/SearchParameterUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/SearchParameterUtil.java index 98cb45e72d4..7aa8733742e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/SearchParameterUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/SearchParameterUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StopWatch.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StopWatch.java index 6e2cc9a5f9f..fd8fdcbb223 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StopWatch.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StopWatch.java @@ -1,15 +1,3 @@ -package ca.uhn.fhir.util; - -import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.lang3.Validate; -import org.apache.commons.lang3.time.DateUtils; - -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.util.Date; -import java.util.LinkedList; -import java.util.concurrent.TimeUnit; - /* * #%L * HAPI FHIR - Core Library @@ -29,6 +17,17 @@ import java.util.concurrent.TimeUnit; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; + +import com.google.common.annotations.VisibleForTesting; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.time.DateUtils; + +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.Date; +import java.util.LinkedList; +import java.util.concurrent.TimeUnit; /** * A multipurpose stopwatch which can be used to time tasks and produce diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StringUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StringUtil.java index 3ffb7e2b445..6daa93680f9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StringUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StringUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import javax.annotation.Nonnull; import java.io.CharArrayWriter; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/SubscriptionUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/SubscriptionUtil.java index f05d3ad9a64..67ec84a5d03 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/SubscriptionUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/SubscriptionUtil.java @@ -1,20 +1,3 @@ -package ca.uhn.fhir.util; - -import ca.uhn.fhir.context.BaseRuntimeChildDefinition; -import ca.uhn.fhir.context.BaseRuntimeElementDefinition; -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.context.RuntimeResourceDefinition; -import org.hl7.fhir.instance.model.api.IBase; -import org.hl7.fhir.instance.model.api.IBaseBooleanDatatype; -import org.hl7.fhir.instance.model.api.IBaseExtension; -import org.hl7.fhir.instance.model.api.IBaseHasExtensions; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IPrimitiveType; -import org.thymeleaf.util.Validate; - -import java.util.List; -import java.util.Objects; - /* * #%L * HAPI FHIR - Core Library @@ -34,6 +17,22 @@ import java.util.Objects; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; + +import ca.uhn.fhir.context.BaseRuntimeChildDefinition; +import ca.uhn.fhir.context.BaseRuntimeElementDefinition; +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.RuntimeResourceDefinition; +import org.hl7.fhir.instance.model.api.IBase; +import org.hl7.fhir.instance.model.api.IBaseBooleanDatatype; +import org.hl7.fhir.instance.model.api.IBaseExtension; +import org.hl7.fhir.instance.model.api.IBaseHasExtensions; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IPrimitiveType; +import org.thymeleaf.util.Validate; + +import java.util.List; +import java.util.Objects; /** * Utilities for working with the subscription resource diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtil.java index 58a33f1ddec..14dd95ae02b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtilHelper.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtilHelper.java index 781e2a71acc..5c40e3f0d7f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtilHelper.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtilHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TestUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TestUtil.java index 0b9d3698bfc..d0bd276488a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TestUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.HapiLocalizer; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutException.java index 967e3a40bf7..b126cbee85a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; public class TimeoutException extends RuntimeException { public TimeoutException(String theMessage) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutManager.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutManager.java index 32bc01713e5..a7bd39d9a37 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutManager.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutManager.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.system.HapiSystemProperties; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlPathTokenizer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlPathTokenizer.java index a7e2dc3f94a..261c869b1ad 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlPathTokenizer.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlPathTokenizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import java.util.StringTokenizer; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java index 83ea4efbe2b..b414df0c9ac 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.util; import ca.uhn.fhir.context.FhirContext; @@ -36,26 +55,6 @@ import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.endsWith; import static org.apache.commons.lang3.StringUtils.isBlank; -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class UrlUtil { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(UrlUtil.class); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ValidateUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ValidateUtil.java index 10b0392ce12..324a0399c6e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ValidateUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ValidateUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java index d7ab5058a52..deb6cd4042f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; public enum VersionEnum { V0_1, diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionUtil.java index 227030fd794..722a71ee4dc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.system.HapiSystemProperties; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlDetectionUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlDetectionUtil.java index 9b5c5ac0f53..d7e77157956 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlDetectionUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlDetectionUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java index 6424deb0ad5..d4b514ccded 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/BundleEntryMutator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/BundleEntryMutator.java index ac9f55a0d5c..b7ac634feec 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/BundleEntryMutator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/BundleEntryMutator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util.bundle; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util.bundle; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.bundle; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/BundleEntryParts.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/BundleEntryParts.java index bc875210644..a40577db637 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/BundleEntryParts.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/BundleEntryParts.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util.bundle; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util.bundle; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.bundle; import ca.uhn.fhir.rest.api.RequestTypeEnum; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/EntryListAccumulator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/EntryListAccumulator.java index 1efc9df48d1..5d64799738e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/EntryListAccumulator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/EntryListAccumulator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util.bundle; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util.bundle; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.bundle; import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/ModifiableBundleEntry.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/ModifiableBundleEntry.java index f8e48bef3bb..2099c446dab 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/ModifiableBundleEntry.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/ModifiableBundleEntry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util.bundle; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util.bundle; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.bundle; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/SearchBundleEntryParts.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/SearchBundleEntryParts.java index d6f94bbd563..e8f97336610 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/SearchBundleEntryParts.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/bundle/SearchBundleEntryParts.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util.bundle; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util.bundle; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.bundle; import ca.uhn.fhir.model.valueset.BundleEntrySearchModeEnum; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/DependencyLogFactory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/DependencyLogFactory.java index 5c58258fe29..5046d04437c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/DependencyLogFactory.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/DependencyLogFactory.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.util.jar; - -import ca.uhn.fhir.util.CoverageIgnore; -import ca.uhn.fhir.util.ReflectionUtil; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import ca.uhn.fhir.util.ReflectionUtil; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.jar; + +import ca.uhn.fhir.util.CoverageIgnore; +import ca.uhn.fhir.util.ReflectionUtil; public class DependencyLogFactory { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/DependencyLogImpl.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/DependencyLogImpl.java index 4cf27315dca..181e6868c8b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/DependencyLogImpl.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/DependencyLogImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util.jar; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util.jar; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.jar; import java.io.InputStream; import java.net.MalformedURLException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/IDependencyLog.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/IDependencyLog.java index d5f067229b2..30c639ad409 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/IDependencyLog.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/jar/IDependencyLog.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util.jar; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util.jar; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.jar; public interface IDependencyLog { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/rdf/RDFUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/rdf/RDFUtil.java index c3cb468ea35..c1678236b7d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/rdf/RDFUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/rdf/RDFUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util.rdf; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.util.rdf; * limitations under the License. * #L% */ +package ca.uhn.fhir.util.rdf; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/BaseValidationContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/BaseValidationContext.java index eade6b86c8b..498493ecbc5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/BaseValidationContext.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/BaseValidationContext.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java index d5eb604015f..dc00d9e2fc6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IInstanceValidatorModule.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IInstanceValidatorModule.java index fabf214f5b0..d6aaec59870 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IInstanceValidatorModule.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IInstanceValidatorModule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; /** * This interface marks a {@link IValidatorModule validator module} that uses the FHIR diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IResourceLoader.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IResourceLoader.java index 72917bfe27b..fabde11965d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IResourceLoader.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IResourceLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java index 23d9786bf08..482fdea5c09 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.validation; - -import java.util.List; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; + +import java.util.List; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.EncodingEnum; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidatorModule.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidatorModule.java index ec5220ffe5b..214963c4914 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidatorModule.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidatorModule.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.validation; - -import org.hl7.fhir.instance.model.api.IBaseResource; - - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import org.hl7.fhir.instance.model.api.IBaseResource; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; + +import org.hl7.fhir.instance.model.api.IBaseResource; + /** * An individual validation module, which applies validation rules against diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/LSInputImpl.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/LSInputImpl.java index 4e881bd2b72..4efbe4a3606 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/LSInputImpl.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/LSInputImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import java.io.InputStream; import java.io.Reader; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ResultSeverityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ResultSeverityEnum.java index 652f1ae4570..138918f0f4e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ResultSeverityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ResultSeverityEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import java.util.Collections; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java index 4f49336b33f..f9cadac52e8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SingleValidationMessage.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SingleValidationMessage.java index 458b3c12ecb..c22465a21ff 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SingleValidationMessage.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SingleValidationMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java index 367c3135e02..5edaa77ed6c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java @@ -1,20 +1,3 @@ -package ca.uhn.fhir.validation; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.parser.IParser; -import ca.uhn.fhir.parser.LenientErrorHandler; -import ca.uhn.fhir.rest.api.EncodingEnum; -import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -import ca.uhn.fhir.util.ObjectUtil; -import org.hl7.fhir.instance.model.api.IBaseResource; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - -import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; - /* * #%L * HAPI FHIR - Core Library @@ -34,6 +17,22 @@ import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.parser.IParser; +import ca.uhn.fhir.parser.LenientErrorHandler; +import ca.uhn.fhir.rest.api.EncodingEnum; +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; +import ca.uhn.fhir.util.ObjectUtil; +import org.hl7.fhir.instance.model.api.IBaseResource; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; public class ValidationContext extends BaseValidationContext implements IValidationContext { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationFailureException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationFailureException.java index b9e78fbadef..5f1cecf9a44 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationFailureException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationFailureException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationOptions.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationOptions.java index dd998f8b5dd..40ee00e383d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationOptions.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationOptions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /*- * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java index 891b1c1cccb..7b164103bc1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronBaseValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronBaseValidator.java index b8d5e67a2ef..b5657fc7629 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronBaseValidator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronBaseValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation.schematron; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation.schematron; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation.schematron; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronProvider.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronProvider.java index d34629be77c..508a27e1c07 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronProvider.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.validation.schematron; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package ca.uhn.fhir.validation.schematron; * limitations under the License. * #L% */ +package ca.uhn.fhir.validation.schematron; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IAnyResource.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IAnyResource.java index 9a4b3b8b0e6..e15dd0ae0ca 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IAnyResource.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IAnyResource.java @@ -1,8 +1,3 @@ -package org.hl7.fhir.instance.model.api; - -import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; -import ca.uhn.fhir.rest.gclient.TokenClientParam; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import ca.uhn.fhir.rest.gclient.TokenClientParam; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** * An IBaseResource that has a FHIR version of DSTU3 or higher diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBackboneElement.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBackboneElement.java index bcbb324e918..5342bf23a96 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBackboneElement.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBackboneElement.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBackboneElement extends IBase { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBase.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBase.java index 3b9c8364fdb..74713fea6a8 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBase.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBase.java @@ -1,8 +1,3 @@ -package org.hl7.fhir.instance.model.api; - -import java.io.Serializable; -import java.util.List; - /* * #%L * HAPI FHIR - Core Library @@ -22,6 +17,10 @@ import java.util.List; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + +import java.io.Serializable; +import java.util.List; /** * This interface is a simple marker for anything which is an HL7 diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBackboneElement.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBackboneElement.java index 06bf0454606..e818d71cc9b 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBackboneElement.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBackboneElement.java @@ -1,7 +1,3 @@ -package org.hl7.fhir.instance.model.api; - -import ca.uhn.fhir.model.api.IElement; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.model.api.IElement; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + +import ca.uhn.fhir.model.api.IElement; public interface IBaseBackboneElement extends IElement, IBaseHasExtensions, IBaseHasModifierExtensions { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBinary.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBinary.java index 095dfeabc31..9415e712b48 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBinary.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBinary.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseBinary extends IBaseResource { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBooleanDatatype.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBooleanDatatype.java index 34a0f510d56..60e777a6b65 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBooleanDatatype.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBooleanDatatype.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseBooleanDatatype extends IPrimitiveType { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBundle.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBundle.java index 87ac6f1c22a..50cb3ac75c5 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBundle.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBundle.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseBundle extends IBaseResource { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseCoding.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseCoding.java index 9a97cf7522d..c7b830d7d20 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseCoding.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseCoding.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseCoding extends IBase { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseConformance.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseConformance.java index c32fedb9df1..a43b7f1e079 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseConformance.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseConformance.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseConformance extends IBaseResource { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatype.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatype.java index 3026d061ac4..2258a418dfa 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatype.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatype.java @@ -1,7 +1,3 @@ -package org.hl7.fhir.instance.model.api; - -import ca.uhn.fhir.model.api.IElement; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import ca.uhn.fhir.model.api.IElement; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + +import ca.uhn.fhir.model.api.IElement; public interface IBaseDatatype extends IElement { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatypeElement.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatypeElement.java index a9ea93c1663..06f0748a1a2 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatypeElement.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatypeElement.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseDatatypeElement extends IBase { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDecimalDatatype.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDecimalDatatype.java index adbdea2527a..6d28244b8ee 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDecimalDatatype.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDecimalDatatype.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; import java.math.BigDecimal; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseElement.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseElement.java index 8f94b39a757..1ab0354cd6d 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseElement.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseElement.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseElement { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumFactory.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumFactory.java index 1e7dc44a740..05b3c4c9f50 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumFactory.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumFactory.java @@ -1,7 +1,3 @@ -package org.hl7.fhir.instance.model.api; - -import java.io.Serializable; - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ import java.io.Serializable; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + +import java.io.Serializable; public interface IBaseEnumFactory> extends Serializable { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumeration.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumeration.java index f0f24badb47..dc5ae61bc6d 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumeration.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumeration.java @@ -1,6 +1,3 @@ -package org.hl7.fhir.instance.model.api; - - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,8 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + public interface IBaseEnumeration> extends IPrimitiveType { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseExtension.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseExtension.java index 02b2e3a5e9e..50845a4a175 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseExtension.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseExtension.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseFhirEnum.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseFhirEnum.java index 31ef3e83ba9..b939e748893 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseFhirEnum.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseFhirEnum.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseHasExtensions.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseHasExtensions.java index 879885e13a4..e3721abd6a9 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseHasExtensions.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseHasExtensions.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseHasModifierExtensions.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseHasModifierExtensions.java index a31e9ca754f..f0ca9af1fd1 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseHasModifierExtensions.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseHasModifierExtensions.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseIntegerDatatype.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseIntegerDatatype.java index 06fd15d0e4f..b40b2640f79 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseIntegerDatatype.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseIntegerDatatype.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseIntegerDatatype extends IPrimitiveType { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseLongDatatype.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseLongDatatype.java index fd8daf6b6ec..48af47414e1 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseLongDatatype.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseLongDatatype.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseLongDatatype extends IPrimitiveType { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseMetaType.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseMetaType.java index e4b78c5fd52..c8b089ca6bf 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseMetaType.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseMetaType.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; import java.util.Date; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseOperationOutcome.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseOperationOutcome.java index 1f972bd4ada..2b1b2aecdbc 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseOperationOutcome.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseOperationOutcome.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseOperationOutcome extends IBaseResource { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseParameters.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseParameters.java index 323b1a3dbb7..9beaad81383 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseParameters.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseParameters.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseParameters extends IBaseResource { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseReference.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseReference.java index 88810932552..c2eaaa15dde 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseReference.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseReference.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseReference extends ICompositeType { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java index b001d68076a..5dabddd7ada 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java @@ -1,14 +1,3 @@ -package org.hl7.fhir.instance.model.api; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import ca.uhn.fhir.context.FhirVersionEnum; -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.Include; - /* * #%L * HAPI FHIR - Core Library @@ -28,6 +17,16 @@ import ca.uhn.fhir.model.api.Include; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import ca.uhn.fhir.context.FhirVersionEnum; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.Include; /** * For now, this is a simple marker interface indicating that a class is a resource type. diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseXhtml.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseXhtml.java index b5c1ec1827f..2520777d940 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseXhtml.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseXhtml.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface IBaseXhtml extends IPrimitiveType { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/ICompositeType.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/ICompositeType.java index 04f765c9ceb..0e02e68d250 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/ICompositeType.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/ICompositeType.java @@ -1,6 +1,3 @@ -package org.hl7.fhir.instance.model.api; - - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,8 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + public interface ICompositeType extends IBaseDatatype { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IDomainResource.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IDomainResource.java index 2cce587056d..c1dacc0860c 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IDomainResource.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IDomainResource.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java index 4df38e0e412..27eb3319706 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java @@ -1,7 +1,3 @@ -package org.hl7.fhir.instance.model.api; - - - /* * #%L * HAPI FHIR - Core Library @@ -21,6 +17,9 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + + /** * Base interface for ID datatype. diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/INarrative.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/INarrative.java index 66d421685b0..0ebaa620b3a 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/INarrative.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/INarrative.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.instance.model.api; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; public interface INarrative extends ICompositeType { diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IPrimitiveType.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IPrimitiveType.java index e74de1527e1..33bcc293d53 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IPrimitiveType.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IPrimitiveType.java @@ -1,6 +1,3 @@ -package org.hl7.fhir.instance.model.api; - - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,8 @@ package org.hl7.fhir.instance.model.api; * limitations under the License. * #L% */ +package org.hl7.fhir.instance.model.api; + import javax.annotation.Nullable; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/AbstractImportExportCsvConceptMapCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/AbstractImportExportCsvConceptMapCommand.java index ddf9057e420..8a9d7f2f265 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/AbstractImportExportCsvConceptMapCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/AbstractImportExportCsvConceptMapCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/App.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/App.java index b99cf8219fa..7352946164f 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/App.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/App.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.util.VersionUtil; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java index 7255d2b96bc..f1e7e3af88c 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.system.HapiSystemProperties; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseClearMigrationLockCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseClearMigrationLockCommand.java index a2319036d17..d2fdba59d80 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseClearMigrationLockCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseClearMigrationLockCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java index cfa243dd0d4..a2f61980875 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.cli.client.HapiFhirCliRestfulClientFactory; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseFlywayMigrateDatabaseCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseFlywayMigrateDatabaseCommand.java index d94066bad5d..ae2f22283d4 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseFlywayMigrateDatabaseCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseFlywayMigrateDatabaseCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseRequestGeneratingCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseRequestGeneratingCommand.java index ae58bdd4214..ab4dd16af71 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseRequestGeneratingCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseRequestGeneratingCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.rest.client.api.IGenericClient; import ca.uhn.fhir.rest.client.interceptor.AdditionalRequestHeadersInterceptor; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BulkImportCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BulkImportCommand.java index 56f4a85331b..f1d7c27cef0 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BulkImportCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BulkImportCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.batch2.jobs.imprt.BulkDataImportProvider; import ca.uhn.fhir.batch2.jobs.imprt.BulkImportFileServlet; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/CommandFailureException.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/CommandFailureException.java index ac475a9716e..edc201eef93 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/CommandFailureException.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/CommandFailureException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; public class CommandFailureException extends Error { diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/CreatePackageCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/CreatePackageCommand.java index 8a02a5f8729..0fbc3bef4fa 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/CreatePackageCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/CreatePackageCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.parser.DataFormatException; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java index 593821cd773..a37f003ebfa 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ExportConceptMapToCsvCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ExportConceptMapToCsvCommand.java index f75271966c1..7bfd94b0109 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ExportConceptMapToCsvCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ExportConceptMapToCsvCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/HapiClearMigrationLockCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/HapiClearMigrationLockCommand.java index 36282993cba..496c2b9ed7a 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/HapiClearMigrationLockCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/HapiClearMigrationLockCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.jpa.migrate.SchemaMigrator; import org.apache.commons.cli.CommandLine; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/HapiFlywayMigrateDatabaseCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/HapiFlywayMigrateDatabaseCommand.java index 18918fd12f4..37b96655ea1 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/HapiFlywayMigrateDatabaseCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/HapiFlywayMigrateDatabaseCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.jpa.migrate.HapiMigrator; import ca.uhn.fhir.jpa.migrate.MigrationTaskList; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ImportCsvToConceptMapCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ImportCsvToConceptMapCommand.java index 7945960109c..369c8cff340 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ImportCsvToConceptMapCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ImportCsvToConceptMapCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu2.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu2.java index 2bb3efab811..880f2bf0cda 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu2.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java index a05f384b99c..c735f0f62c5 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java index f88ee7dc0e5..c50c8ba1f49 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LogbackUtil.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LogbackUtil.java index 84795a66c29..b43f5ee299e 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LogbackUtil.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LogbackUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ReindexTerminologyCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ReindexTerminologyCommand.java index 801e70a2120..c60803a46a6 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ReindexTerminologyCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ReindexTerminologyCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java index 6e68e2f72ad..2c5cf3139da 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ToggleSearchParametersCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ToggleSearchParametersCommand.java index 36829623a27..bd247398cdd 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ToggleSearchParametersCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ToggleSearchParametersCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; import org.apache.commons.cli.CommandLine; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/UploadTerminologyCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/UploadTerminologyCommand.java index d92df2f70ed..f42db49d441 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/UploadTerminologyCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/UploadTerminologyCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.model.util.JpaConstants; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidateCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidateCommand.java index d722d1baebf..4b2bd91bb86 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidateCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidateCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidationDataUploader.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidationDataUploader.java index cd0ef218744..a0866e2f0b0 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidationDataUploader.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidationDataUploader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidationSupportChainCreator.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidationSupportChainCreator.java index 1eb6407a568..e07ebc6a8ed 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidationSupportChainCreator.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ValidationSupportChainCreator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.DefaultProfileValidationSupport; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/WebsocketSubscribeCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/WebsocketSubscribeCommand.java index 222e8190b63..523a9df9221 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/WebsocketSubscribeCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/WebsocketSubscribeCommand.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.primitive.IdDt; diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/client/HapiFhirCliRestfulClientFactory.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/client/HapiFhirCliRestfulClientFactory.java index be8e5b03193..7bc7cfca520 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/client/HapiFhirCliRestfulClientFactory.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/client/HapiFhirCliRestfulClientFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cli.client; - /* * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package ca.uhn.fhir.cli.client; * limitations under the License. * #L% */ +package ca.uhn.fhir.cli.client; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java index 3df0687a4c6..5ae7a3352a8 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.demo; - /*- * #%L * HAPI FHIR - Command Line Client - Server WAR @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.demo; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.demo; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/ContextHolder.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/ContextHolder.java index 5c86ee20f91..2b997266d11 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/ContextHolder.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/ContextHolder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.demo; - /*- * #%L * HAPI FHIR - Command Line Client - Server WAR @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.demo; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.demo; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java index c4e5e8221c6..b2038b11ec6 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.demo; - /*- * #%L * HAPI FHIR - Command Line Client - Server WAR @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.demo; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.demo; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java index 11f8cfc761d..83c7c9d0203 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.demo; - /*- * #%L * HAPI FHIR - Command Line Client - Server WAR @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.demo; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.demo; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.config.HapiJpaConfig; diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigR4.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigR4.java index 6d2e863b1d3..e602e6180e9 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigR4.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigR4.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.demo; - /*- * #%L * HAPI FHIR - Command Line Client - Server WAR @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.demo; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.demo; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.config.HapiJpaConfig; diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirTesterConfig.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirTesterConfig.java index 24462d8c6cb..30d7c34535f 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirTesterConfig.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirTesterConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.demo; - /*- * #%L * HAPI FHIR - Command Line Client - Server WAR @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.demo; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.demo; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java index b28e4291840..ed3d4028673 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.demo; - /*- * #%L * HAPI FHIR - Command Line Client - Server WAR @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.demo; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.demo; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java index 5d4acce5b4a..7c43da19c41 100644 --- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java +++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.okhttp.client; - /*- * #%L * HAPI FHIR OkHttp Client @@ -19,6 +17,7 @@ package ca.uhn.fhir.okhttp.client; * limitations under the License. * #L% */ +package ca.uhn.fhir.okhttp.client; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java index f326e9fa3a8..7ad0f06df7b 100644 --- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java +++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.okhttp.client; - -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - /* * #%L * HAPI FHIR OkHttp Client @@ -25,6 +17,13 @@ import java.util.concurrent.TimeUnit; * limitations under the License. * #L% */ +package ca.uhn.fhir.okhttp.client; + +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java index 5e810701baa..31612a7e701 100644 --- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java +++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java @@ -1,20 +1,3 @@ -package ca.uhn.fhir.okhttp.client; - -import ca.uhn.fhir.rest.api.RequestTypeEnum; -import ca.uhn.fhir.rest.client.api.BaseHttpRequest; -import ca.uhn.fhir.rest.client.api.IHttpRequest; -import ca.uhn.fhir.rest.client.api.IHttpResponse; -import ca.uhn.fhir.util.StopWatch; -import okhttp3.Call; -import okhttp3.Call.Factory; -import okhttp3.Request; -import okhttp3.RequestBody; - -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Map; - /* * #%L * HAPI FHIR OkHttp Client @@ -34,6 +17,22 @@ import java.util.Map; * limitations under the License. * #L% */ +package ca.uhn.fhir.okhttp.client; + +import ca.uhn.fhir.rest.api.RequestTypeEnum; +import ca.uhn.fhir.rest.client.api.BaseHttpRequest; +import ca.uhn.fhir.rest.client.api.IHttpRequest; +import ca.uhn.fhir.rest.client.api.IHttpResponse; +import ca.uhn.fhir.util.StopWatch; +import okhttp3.Call; +import okhttp3.Call.Factory; +import okhttp3.Request; +import okhttp3.RequestBody; + +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; /** * Adapter for building an OkHttp-specific request. diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java index 1255266f278..7b1c3212846 100644 --- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java +++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java @@ -1,16 +1,3 @@ -package ca.uhn.fhir.okhttp.client; - -import ca.uhn.fhir.i18n.Msg; -import java.io.*; -import java.util.List; -import java.util.Map; - -import ca.uhn.fhir.rest.client.impl.BaseHttpResponse; -import ca.uhn.fhir.util.StopWatch; -import org.apache.commons.io.IOUtils; - -import ca.uhn.fhir.rest.api.Constants; - /* * #%L * HAPI FHIR OkHttp Client @@ -30,6 +17,18 @@ import ca.uhn.fhir.rest.api.Constants; * limitations under the License. * #L% */ +package ca.uhn.fhir.okhttp.client; + +import ca.uhn.fhir.i18n.Msg; +import java.io.*; +import java.util.List; +import java.util.Map; + +import ca.uhn.fhir.rest.client.impl.BaseHttpResponse; +import ca.uhn.fhir.util.StopWatch; +import org.apache.commons.io.IOUtils; + +import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.client.api.IHttpResponse; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java index b979c075fb0..4bda70d377e 100644 --- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java +++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.okhttp.utils; - /* * #%L * HAPI FHIR OkHttp Client @@ -19,6 +17,8 @@ package ca.uhn.fhir.okhttp.utils; * limitations under the License. * #L% */ +package ca.uhn.fhir.okhttp.utils; + public class UrlStringUtils { public static String withTrailingQuestionMarkRemoved(String input) { diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpClient.java index 597d541a542..4e090d7daf0 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpClient.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.apache; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.apache; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.apache; import ca.uhn.fhir.i18n.Msg; import java.io.UnsupportedEncodingException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java index e34facfc720..371213c7af4 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.apache; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.apache; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.apache; import ca.uhn.fhir.rest.client.api.BaseHttpRequest; import ca.uhn.fhir.rest.client.api.IHttpRequest; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpResponse.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpResponse.java index 6d6f972d29f..527d02a1f13 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpResponse.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.apache; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.client.apache; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.apache; + import ca.uhn.fhir.i18n.Msg; import java.io.*; import java.nio.charset.Charset; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheRestfulClientFactory.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheRestfulClientFactory.java index d426fd067c5..e5519f8b5a8 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheRestfulClientFactory.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheRestfulClientFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.apache; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.apache; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.apache; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.RequestTypeEnum; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java index a0c5db55e1b..113f72f7502 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.apache; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.apache; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.apache; import java.util.List; import java.util.Map; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/GZipContentInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/GZipContentInterceptor.java index 51cf4b18885..23c7ccbad55 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/GZipContentInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/GZipContentInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.apache; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.apache; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.apache; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ResourceEntity.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ResourceEntity.java index d3fda5bece1..418be8d4b01 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ResourceEntity.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ResourceEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.apache; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.apache; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.apache; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java index 6114e30556f..c9ee276d150 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.impl; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.impl; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpClientInvocation.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpClientInvocation.java index 359dfa7b609..7605978792c 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpClientInvocation.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpClientInvocation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.impl; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.impl; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.EncodingEnum; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpResponse.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpResponse.java index c3f4178e54b..9c64c074985 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpResponse.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.impl; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.impl; import ca.uhn.fhir.rest.client.api.IHttpResponse; import ca.uhn.fhir.util.StopWatch; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandler.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandler.java index 4cb4f7b8396..dd40a85179e 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandler.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.impl; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.impl; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.InvocationHandler; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java index 7205e06ee77..33ef2db8d68 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.impl; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.impl; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java index 6e33997f9d7..0d57d24dcb2 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.impl; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.impl; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/HttpBasicAuthInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/HttpBasicAuthInterceptor.java index 002c8eff99a..b9aa2e72901 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/HttpBasicAuthInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/HttpBasicAuthInterceptor.java @@ -1,21 +1,3 @@ -package ca.uhn.fhir.rest.client.impl; - -import java.io.IOException; - -import org.apache.http.HttpException; -import org.apache.http.HttpRequest; -import org.apache.http.HttpRequestInterceptor; -import org.apache.http.auth.AuthState; -import org.apache.http.auth.Credentials; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.impl.auth.BasicScheme; -import org.apache.http.protocol.HttpContext; - -import ca.uhn.fhir.rest.client.api.IBasicClient; -import ca.uhn.fhir.rest.client.api.IClientInterceptor; -import ca.uhn.fhir.rest.client.api.IGenericClient; - /* * #%L * HAPI FHIR - Client Framework @@ -35,6 +17,23 @@ import ca.uhn.fhir.rest.client.api.IGenericClient; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.impl; + +import java.io.IOException; + +import org.apache.http.HttpException; +import org.apache.http.HttpRequest; +import org.apache.http.HttpRequestInterceptor; +import org.apache.http.auth.AuthState; +import org.apache.http.auth.Credentials; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.impl.auth.BasicScheme; +import org.apache.http.protocol.HttpContext; + +import ca.uhn.fhir.rest.client.api.IBasicClient; +import ca.uhn.fhir.rest.client.api.IClientInterceptor; +import ca.uhn.fhir.rest.client.api.IGenericClient; /** diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/RestfulClientFactory.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/RestfulClientFactory.java index 770a0d27399..e8539cc7896 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/RestfulClientFactory.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/RestfulClientFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.impl; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.impl; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/AdditionalRequestHeadersInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/AdditionalRequestHeadersInterceptor.java index 56cc1ccf74a..2357d2dd1a3 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/AdditionalRequestHeadersInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/AdditionalRequestHeadersInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BasicAuthInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BasicAuthInterceptor.java index 7a5a08a7a84..e9cf82a57e3 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BasicAuthInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BasicAuthInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BearerTokenAuthInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BearerTokenAuthInterceptor.java index 364a25ed0fa..3d6928fbb20 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BearerTokenAuthInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BearerTokenAuthInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.client.api.IClientInterceptor; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java index 4c59c9b42b3..2126a1e90eb 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CookieInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CookieInterceptor.java index 54f407d06d5..690870c1141 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CookieInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CookieInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.client.api.*; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/InterceptorOrders.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/InterceptorOrders.java index 75ce89d3f57..5be4cf85497 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/InterceptorOrders.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/InterceptorOrders.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; public interface InterceptorOrders { diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/LoggingInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/LoggingInterceptor.java index 8a3c138dcf2..8f75eb872ad 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/LoggingInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/LoggingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/SimpleRequestHeaderInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/SimpleRequestHeaderInterceptor.java index 8345d13e42c..a715cefc150 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/SimpleRequestHeaderInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/SimpleRequestHeaderInterceptor.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR - Client Framework @@ -21,6 +17,9 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.io.IOException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/ThreadLocalCapturingInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/ThreadLocalCapturingInterceptor.java index ca607c7fc59..cc71bf32a26 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/ThreadLocalCapturingInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/ThreadLocalCapturingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import ca.uhn.fhir.rest.client.api.IClientInterceptor; import ca.uhn.fhir.rest.client.api.IHttpRequest; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UrlTenantSelectionInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UrlTenantSelectionInterceptor.java index 968272ad341..ee583fbc2c0 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UrlTenantSelectionInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UrlTenantSelectionInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UserInfoInterceptor.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UserInfoInterceptor.java index 8546ea609b0..590a6c67634 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UserInfoInterceptor.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UserInfoInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.interceptor; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.interceptor; import java.io.IOException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/AtParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/AtParameter.java index 0e4f46c42b9..4e40fbe9867 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/AtParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/AtParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.rest.annotation.At; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseHttpClientInvocationWithContents.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseHttpClientInvocationWithContents.java index 14d14e63770..83ac509a84b 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseHttpClientInvocationWithContents.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseHttpClientInvocationWithContents.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java index cb5f5262b3d..1368843854e 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.io.IOException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java index 7b4da4a98a2..ec5254c5d67 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.io.InputStream; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java index fe48d4bd5f9..57e5e53ae3b 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceParam.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceParam.java index 1bb53f86cd3..e2929aaad70 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceParam.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseQueryParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseQueryParameter.java index e2c5b654824..69738ce2863 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseQueryParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseQueryParameter.java @@ -1,21 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.rest.api.QualifiedParamList; -import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum; -import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; -import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -import org.hl7.fhir.instance.model.api.IBaseResource; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR - Client Framework @@ -35,6 +17,23 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; + +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.rest.api.QualifiedParamList; +import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum; +import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; +import org.hl7.fhir.instance.model.api.IBaseResource; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; public abstract class BaseQueryParameter implements IParameter { diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java index 451fc24dad3..5dbc8c30efc 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConditionalParamBinder.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConditionalParamBinder.java index a9744f7cb3f..e888a393c1f 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConditionalParamBinder.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConditionalParamBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConformanceMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConformanceMethodBinding.java index b0a0f7c832c..9a0e72d772c 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConformanceMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConformanceMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CountParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CountParameter.java index 26fe7403481..60b714b2098 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CountParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CountParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CreateMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CreateMethodBinding.java index 37028631f64..7440d42f20e 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CreateMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CreateMethodBinding.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - -import ca.uhn.fhir.i18n.Msg; -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR - Client Framework @@ -22,6 +17,10 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; + +import ca.uhn.fhir.i18n.Msg; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.lang.reflect.Method; import java.util.Collections; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/DeleteMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/DeleteMethodBinding.java index 08d64d9e25f..19eb6b1b58d 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/DeleteMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/DeleteMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ElementsParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ElementsParameter.java index 3b13bb160ea..8662adaf123 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ElementsParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ElementsParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; + import ca.uhn.fhir.i18n.Msg; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HistoryMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HistoryMethodBinding.java index ed64c352b5b..71c9157b6b6 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HistoryMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HistoryMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; + import ca.uhn.fhir.i18n.Msg; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpDeleteClientInvocation.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpDeleteClientInvocation.java index a29d2fc19a8..c67c34d67d0 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpDeleteClientInvocation.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpDeleteClientInvocation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.util.List; import java.util.Map; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpGetClientInvocation.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpGetClientInvocation.java index d30eca76791..4a6a594deaf 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpGetClientInvocation.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpGetClientInvocation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.EncodingEnum; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPatchClientInvocation.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPatchClientInvocation.java index 1af2d275ee2..4936e407124 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPatchClientInvocation.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPatchClientInvocation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.util.List; import java.util.Map; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPostClientInvocation.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPostClientInvocation.java index 5acd87e3482..dc53d89f3d9 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPostClientInvocation.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPostClientInvocation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.util.List; import java.util.Map; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPutClientInvocation.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPutClientInvocation.java index e96576a1597..0d659660751 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPutClientInvocation.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPutClientInvocation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpSimpleGetClientInvocation.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpSimpleGetClientInvocation.java index 28bdd86259a..b8bb9170614 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpSimpleGetClientInvocation.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpSimpleGetClientInvocation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.EncodingEnum; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java index a9ef208b4c9..a3e11f61c09 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.io.IOException; import java.io.InputStream; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java index c7abef6ef1e..4fd0469bdd4 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.io.IOException; import java.io.InputStream; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IParameter.java index e855439dfc5..584531d1dc3 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IRestfulHeader.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IRestfulHeader.java index b1d7403d8c6..61e92e117db 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IRestfulHeader.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IRestfulHeader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; public interface IRestfulHeader { diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IncludeParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IncludeParameter.java index 4d0124adf1d..f1da6e62379 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IncludeParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IncludeParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java index c6284ea74d7..50bdba8afd3 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Client Framework + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.context.ConfigurationException; @@ -64,26 +83,6 @@ import java.util.Map.Entry; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR - Client Framework - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class MethodUtil { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(MethodUtil.class); diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/NullParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/NullParameter.java index 1d31ee4ff8b..6821158f919 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/NullParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/NullParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.lang.reflect.Method; import java.util.*; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OffsetParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OffsetParameter.java index a81185a1cfd..4acb821e580 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OffsetParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OffsetParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationMethodBinding.java index a75558a3bca..6303b04d322 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationParameter.java index ea3e0224215..d2076119137 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PageMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PageMethodBinding.java index df0f5fbfc9b..61fb5f01338 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PageMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PageMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchMethodBinding.java index bf25e4c93aa..ca7e1e57a03 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.annotation.Annotation; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchTypeParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchTypeParameter.java index e180a695129..36a853f19fd 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchTypeParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchTypeParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/RawParamsParmeter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/RawParamsParmeter.java index 51dd0d0bd4a..98ceed0bd82 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/RawParamsParmeter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/RawParamsParmeter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.lang.reflect.Method; import java.util.*; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java index 6e3fa3fc7d6..fc1cb67ac7d 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.io.IOException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ResourceParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ResourceParameter.java index 17099271834..c651602fb0a 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ResourceParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ResourceParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchMethodBinding.java index 87d047df9a4..3d01eada4de 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchParameter.java index c7ca46392fb..b679772d070 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; + import ca.uhn.fhir.i18n.Msg; import java.util.*; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceOrAtParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceOrAtParameter.java index 82979831376..95449e9f033 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceOrAtParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceOrAtParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; class SinceOrAtParameter extends SearchParameter { diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceParameter.java index 03500d2c03d..819cefdd8de 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.rest.annotation.Since; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SortParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SortParameter.java index 15118346db0..69b09adffdc 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SortParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SortParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; + import ca.uhn.fhir.i18n.Msg; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SummaryEnumParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SummaryEnumParameter.java index 9e4a27acb23..c31bc7fbbaf 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SummaryEnumParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SummaryEnumParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionMethodBinding.java index e7ad8f04de9..812e59f6682 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionParameter.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionParameter.java index 3e5e5c13f02..69dee2dd6ed 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionParameter.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/UpdateMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/UpdateMethodBinding.java index 5c2a7f276eb..e78d61ef87c 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/UpdateMethodBinding.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/UpdateMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import ca.uhn.fhir.i18n.Msg; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ValidateMethodBindingDstu2Plus.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ValidateMethodBindingDstu2Plus.java index f1a7756294c..973a3f7a9cb 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ValidateMethodBindingDstu2Plus.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ValidateMethodBindingDstu2Plus.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.method; - /* * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.method; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/tls/TlsAuthenticationSvc.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/tls/TlsAuthenticationSvc.java index 6fc929d2ada..547ccbceb39 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/tls/TlsAuthenticationSvc.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/tls/TlsAuthenticationSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.client.tls; - /*- * #%L * HAPI FHIR - Client Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.client.tls; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.client.tls; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.tls.BaseStoreInfo; diff --git a/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/canonical/VersionCanonicalizer.java b/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/canonical/VersionCanonicalizer.java index 57f86921c58..6d66774be87 100644 --- a/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/canonical/VersionCanonicalizer.java +++ b/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/canonical/VersionCanonicalizer.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.converters.canonical; - /*- * #%L * HAPI FHIR - Converter @@ -19,6 +17,7 @@ package ca.uhn.hapi.converters.canonical; * limitations under the License. * #L% */ +package ca.uhn.hapi.converters.canonical; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java b/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java index 0fe7ec2bfe0..e4ee5517b16 100644 --- a/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java +++ b/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.converters.server; - /*- * #%L * HAPI FHIR - Converter @@ -19,6 +17,7 @@ package ca.uhn.hapi.converters.server; * limitations under the License. * #L% */ +package ca.uhn.hapi.converters.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_30.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_30.java index 4ff3af5c8da..4696f2b6ba6 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_30.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_30.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.converter; - /* * #%L * HAPI FHIR - Converter @@ -19,6 +17,7 @@ package org.hl7.fhir.converter; * limitations under the License. * #L% */ +package org.hl7.fhir.converter; import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_10_30; import org.hl7.fhir.dstu3.model.CodeSystem; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_40.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_40.java index e0704b326a7..3d31e45ea68 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_40.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_40.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.converter; - /* * #%L * HAPI FHIR - Converter @@ -19,6 +17,7 @@ package org.hl7.fhir.converter; * limitations under the License. * #L% */ +package org.hl7.fhir.converter; import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_10_40; import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_50.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_50.java index dc635b8d9e9..a1c2fa2b528 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_50.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor10_50.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.converter; - /* * #%L * HAPI FHIR - Converter @@ -19,6 +17,7 @@ package org.hl7.fhir.converter; * limitations under the License. * #L% */ +package org.hl7.fhir.converter; import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_10_50; import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-docs/src/main/java/ChangelogMigrator.java b/hapi-fhir-docs/src/main/java/ChangelogMigrator.java index fe866d74da8..f76d910b4ae 100644 --- a/hapi-fhir-docs/src/main/java/ChangelogMigrator.java +++ b/hapi-fhir-docs/src/main/java/ChangelogMigrator.java @@ -17,7 +17,6 @@ * limitations under the License. * #L% */ - import ca.uhn.fhir.i18n.Msg; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/AuthorizationInterceptors.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/AuthorizationInterceptors.java index 85f087f3d45..1dcd46a3d26 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/AuthorizationInterceptors.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/AuthorizationInterceptors.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/AuthorizingTesterUiClientFactory.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/AuthorizingTesterUiClientFactory.java index 63d0513f820..55aaf1d226f 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/AuthorizingTesterUiClientFactory.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/AuthorizingTesterUiClientFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/BundleBuilderExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/BundleBuilderExamples.java index e9a909d30d4..1e8df7d0509 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/BundleBuilderExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/BundleBuilderExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/BundleFetcher.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/BundleFetcher.java index 00ce94dc228..31589f888e4 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/BundleFetcher.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/BundleFetcher.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientExamples.java index c44a037616a..d65ebe6231f 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.okhttp.client.OkHttpRestfulClientFactory; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientTransactionExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientTransactionExamples.java index 67d93046db8..570d8cf8043 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientTransactionExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientTransactionExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CompleteExampleClient.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CompleteExampleClient.java index 0acd9c45f14..5cae0e14d06 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CompleteExampleClient.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CompleteExampleClient.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; //START SNIPPET: client diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConsentInterceptors.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConsentInterceptors.java index 27025e1151e..1bb72b5ade5 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConsentInterceptors.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConsentInterceptors.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java index 82008d0ca04..8d8b49ea01b 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_10_30; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_14_30; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Copier.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Copier.java index f6fe06e64f3..4c2b35417a3 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Copier.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Copier.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CreateCompositionAndGenerateDocument.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CreateCompositionAndGenerateDocument.java index 3577f563520..e81c4f039b1 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CreateCompositionAndGenerateDocument.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CreateCompositionAndGenerateDocument.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CustomObservation.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CustomObservation.java index 8559aacb996..75c18109bdf 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CustomObservation.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/CustomObservation.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import org.hl7.fhir.dstu3.model.Observation; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Dstu2Examples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Dstu2Examples.java index e92b6547098..81ef66972b1 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Dstu2Examples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Dstu2Examples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.IParser; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleProviders.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleProviders.java index 7acc07d11a2..af534e6b0f5 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleProviders.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleProviders.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.annotation.RequiredParam; import ca.uhn.fhir.rest.annotation.Search; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleRestfulClient.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleRestfulClient.java index 757035fa182..c4ad20d195e 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleRestfulClient.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleRestfulClient.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.r4.model.*; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleRestfulServlet.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleRestfulServlet.java index ffe35f31eb3..a5768a9d6ff 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleRestfulServlet.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExampleRestfulServlet.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.RestfulServer; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExtensionsDstu2.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExtensionsDstu2.java index acdf54a196a..bbed4377514 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExtensionsDstu2.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExtensionsDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.ExtensionDt; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExtensionsDstu3.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExtensionsDstu3.java index 0302dd3ebac..6180acf013c 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExtensionsDstu3.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ExtensionsDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.DataFormatException; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirContextIntro.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirContextIntro.java index b2d33bc3179..4676813fdf3 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirContextIntro.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirContextIntro.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.DataFormatException; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirDataModel.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirDataModel.java index a60cbe73a63..208681f619e 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirDataModel.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirDataModel.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.TemporalPrecisionEnum; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirTesterConfig.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirTesterConfig.java index e1aaba9b1d7..f700294b507 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirTesterConfig.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/FhirTesterConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/GenericClientExample.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/GenericClientExample.java index 1a80bd216b9..db6617bd076 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/GenericClientExample.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/GenericClientExample.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.PerformanceOptionsEnum; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/GenomicsUploader.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/GenomicsUploader.java index 6b702ec059b..3950e7969ce 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/GenomicsUploader.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/GenomicsUploader.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/HttpProxy.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/HttpProxy.java index 5a4f9ff4871..425970a83aa 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/HttpProxy.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/HttpProxy.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/IRestfulClient.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/IRestfulClient.java index 81cc62708fe..ab8bb1363ac 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/IRestfulClient.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/IRestfulClient.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.Read; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/IncludesExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/IncludesExamples.java index 71ea3672548..f50710dc8d4 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/IncludesExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/IncludesExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.valueset.BundleTypeEnum; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Interceptors.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Interceptors.java index 43eb6e69398..b8f3467efab 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Interceptors.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Interceptors.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsClient.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsClient.java index 18d2d6375ed..64586007bd7 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsClient.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsClient.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jaxrs.client.JaxRsRestfulClientFactory; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsConformanceProvider.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsConformanceProvider.java index 8b18cd6e9b2..78e0034a65b 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsConformanceProvider.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsConformanceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.jaxrs.server.AbstractJaxRsConformanceProvider; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsPatientRestProvider.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsPatientRestProvider.java index a90b355784c..b10b0a1fe28 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsPatientRestProvider.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/JaxRsPatientRestProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.jaxrs.server.AbstractJaxRsResourceProvider; import ca.uhn.fhir.model.primitive.StringDt; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Multitenancy.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Multitenancy.java index 2344e677fdc..e7b6c37f34d 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Multitenancy.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Multitenancy.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.Read; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/MyPatient.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/MyPatient.java index 3ce0236c374..6e3fc75423a 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/MyPatient.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/MyPatient.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; //START SNIPPET: patientDef diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/MyPatientUse.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/MyPatientUse.java index b4c044b9a21..79e69a93827 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/MyPatientUse.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/MyPatientUse.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Narrative.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Narrative.java index 2c492d3c5b3..e858fc957ae 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Narrative.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Narrative.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/NarrativeGenerator.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/NarrativeGenerator.java index c5ebae69f3d..dd24ad6ab57 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/NarrativeGenerator.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/NarrativeGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.dstu2.resource.Patient; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PagingPatientProvider.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PagingPatientProvider.java index e910b8f2e52..fab3cb559e2 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PagingPatientProvider.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PagingPatientProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.annotation.RequiredParam; import ca.uhn.fhir.rest.annotation.Search; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PagingServer.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PagingServer.java index 86bab94fa7d..2e506d59004 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PagingServer.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PagingServer.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider; import ca.uhn.fhir.rest.server.RestfulServer; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Parser.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Parser.java index 4c460eb0c44..bd2b201bf16 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Parser.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/Parser.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.DataFormatException; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PartitionExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PartitionExamples.java index 501aebe937e..d41f34f38c5 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PartitionExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PartitionExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PatchExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PatchExamples.java index 6eadf772a4a..0f82ce92ad3 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PatchExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/PatchExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.Patch; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/QuickUsage.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/QuickUsage.java index 881ec8d7570..f26722b840c 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/QuickUsage.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/QuickUsage.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.dstu2.composite.IdentifierDt; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RepositoryValidatingInterceptorExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RepositoryValidatingInterceptorExamples.java index 35c2a873e9b..c703f7fe2ee 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RepositoryValidatingInterceptorExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RepositoryValidatingInterceptorExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.executor.InterceptorService; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RequestCounterInterceptor.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RequestCounterInterceptor.java index 91bc9cedb92..423c31c996a 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RequestCounterInterceptor.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RequestCounterInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RequestExceptionInterceptor.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RequestExceptionInterceptor.java index c91589df226..0351c6a8a33 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RequestExceptionInterceptor.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RequestExceptionInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ResourceRefs.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ResourceRefs.java index c34f066c218..696bb99b6ad 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ResourceRefs.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ResourceRefs.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.r4.model.Organization; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulObservationResourceProvider.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulObservationResourceProvider.java index c6dc7a05f8d..35736100b22 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulObservationResourceProvider.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulObservationResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.rest.annotation.IdParam; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulPatientResourceProvider.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulPatientResourceProvider.java index c3d3be04c52..86e263e5877 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulPatientResourceProvider.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulPatientResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.model.dstu2.resource.Patient; import ca.uhn.fhir.model.dstu2.valueset.AdministrativeGenderEnum; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulPatientResourceProviderMore.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulPatientResourceProviderMore.java index 10d7735293a..765b6cf3621 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulPatientResourceProviderMore.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/RestfulPatientResourceProviderMore.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/SecurityInterceptors.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/SecurityInterceptors.java index 70f31590444..29b6bf69ecb 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/SecurityInterceptors.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/SecurityInterceptors.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerETagExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerETagExamples.java index ef8811924f2..2c98c6fb453 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerETagExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerETagExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.rest.server.ETagSupportEnum; import ca.uhn.fhir.rest.server.RestfulServer; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerExceptionsExample.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerExceptionsExample.java index cc46e9b217e..87a6d52b887 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerExceptionsExample.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerExceptionsExample.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.dstu2.resource.OperationOutcome; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerInterceptors.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerInterceptors.java index e290080c5a8..735b400756a 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerInterceptors.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerInterceptors.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.ExtensionDt; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerMetadataExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerMetadataExamples.java index 0b32465a9f6..8370b28df29 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerMetadataExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerMetadataExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.api.Tag; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerOperations.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerOperations.java index 8a9839f9df6..a1f66c5cde1 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerOperations.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServerOperations.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.StringDt; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServletExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServletExamples.java index ec948baeee3..5860e7bc986 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServletExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ServletExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/TagsExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/TagsExamples.java index 94f3ea8c9d6..c8dc33a28bf 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/TagsExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/TagsExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.annotation.Search; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidateDirectory.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidateDirectory.java index 7a2939042cc..8e5e60cdac2 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidateDirectory.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidateDirectory.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.IParser; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidatorExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidatorExamples.java index d79c4e89256..3ad82a35f33 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidatorExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidatorExamples.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidatorExamplesDstu3.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidatorExamplesDstu3.java index 6ae3bd3b469..cc0c1469384 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidatorExamplesDstu3.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ValidatorExamplesDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.validation.FhirValidator; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomCompositeExtension.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomCompositeExtension.java index 61ebcd95333..e6843ec2833 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomCompositeExtension.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomCompositeExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs.customtype; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs.customtype; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs.customtype; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomDatatype.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomDatatype.java index 4b415a925b8..f227f7d3b89 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomDatatype.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomDatatype.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs.customtype; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs.customtype; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs.customtype; //START SNIPPET: datatype diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomResource.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomResource.java index f2c1cc84dd9..fffc14f427d 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomResource.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomResource.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs.customtype; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs.customtype; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs.customtype; // START SNIPPET: resource diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomUsage.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomUsage.java index 566ef929789..4848542dbc5 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomUsage.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/customtype/CustomUsage.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs.customtype; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs.customtype; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs.customtype; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.dstu3.model.DateTimeType; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/MyTestInterceptor.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/MyTestInterceptor.java index c2e785221ae..a9689b7e660 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/MyTestInterceptor.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/MyTestInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs.interceptor; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs.interceptor; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/PatientNameModifierMdmPreProcessingInterceptor.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/PatientNameModifierMdmPreProcessingInterceptor.java index c153a225343..53ab62d13f2 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/PatientNameModifierMdmPreProcessingInterceptor.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/PatientNameModifierMdmPreProcessingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs.interceptor; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs.interceptor; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/TagTrimmingInterceptor.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/TagTrimmingInterceptor.java index 1764903a66e..0d8c169f0b7 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/TagTrimmingInterceptor.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/interceptor/TagTrimmingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.hapi.fhir.docs.interceptor; - /*- * #%L * HAPI FHIR - Docs @@ -19,6 +17,7 @@ package ca.uhn.hapi.fhir.docs.interceptor; * limitations under the License. * #L% */ +package ca.uhn.hapi.fhir.docs.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java index 5b362ab61a3..3e7e964f984 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.client; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.client; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.client; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpRequest.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpRequest.java index 9023c0094ae..40c06ec04d5 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpRequest.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.client; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.client; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.client; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.api.RequestTypeEnum; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java index a92e6df5248..063550a4a79 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.jaxrs.client; - -import java.io.*; - /* * #%L * HAPI FHIR JAX-RS Server @@ -21,6 +17,9 @@ import java.io.*; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.client; + +import java.io.*; import java.util.List; import java.util.Map; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsRestfulClientFactory.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsRestfulClientFactory.java index 14b4a5c9ba0..97c34b3c9e7 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsRestfulClientFactory.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsRestfulClientFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.client; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.client; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.client; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsBundleProvider.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsBundleProvider.java index b3f59c12af0..74c56d643f1 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsBundleProvider.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsBundleProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.server; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server; import java.io.IOException; import java.util.Collections; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProvider.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProvider.java index 76a13686f22..720c40a12ef 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProvider.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.server; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java index 861ffc6edec..710e51d4d50 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.server; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server; import java.io.IOException; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsProvider.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsProvider.java index 5c31306640a..e02f5b3102a 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsProvider.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsProvider.java @@ -1,6 +1,3 @@ -package ca.uhn.fhir.jaxrs.server; - -import java.io.IOException; /* * #%L * HAPI FHIR JAX-RS Server @@ -20,6 +17,9 @@ import java.io.IOException; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server; + +import java.io.IOException; import java.util.*; import java.util.Map.Entry; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java index 77e947dd1a5..5543c15d7d5 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.server; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server; import java.io.IOException; import java.net.URL; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptor.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptor.java index d9ba3d2300e..2116c9ed52f 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptor.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.server.interceptor; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server.interceptor; import java.io.IOException; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsResponseException.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsResponseException.java index 88a41dfaaa4..76ff6e09f49 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsResponseException.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsResponseException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.server.interceptor; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server.interceptor; import javax.ejb.ApplicationException; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsMethodBindings.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsMethodBindings.java index f798e0889e8..87ccddc5cad 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsMethodBindings.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsMethodBindings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.server.util; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jaxrs.server.AbstractJaxRsProvider; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsRequest.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsRequest.java index 176530dc279..28d39761613 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsRequest.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jaxrs.server.util; - /* * #%L * HAPI FHIR JAX-RS Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jaxrs.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jaxrs.server.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsResponse.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsResponse.java index b8c25373a4e..dc802ba3412 100644 --- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsResponse.java +++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsResponse.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JAX-RS Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jaxrs.server.util; import ca.uhn.fhir.rest.api.Constants; @@ -19,26 +38,6 @@ import java.util.Map.Entry; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR JAX-RS Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * The JaxRsResponse is a jax-rs specific implementation of the RestfulResponse. * diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirLocalContainerEntityManagerFactoryBean.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirLocalContainerEntityManagerFactoryBean.java index 5b7ff60e6b9..1a51ddf4ba0 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirLocalContainerEntityManagerFactoryBean.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirLocalContainerEntityManagerFactoryBean.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.rest.api.Constants; import com.google.common.base.Strings; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/HapiJob.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/HapiJob.java index da09c22f3f6..e8561f3c582 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/HapiJob.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/HapiJob.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.sched; import org.quartz.DisallowConcurrentExecution; import org.quartz.Job; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/IHapiScheduler.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/IHapiScheduler.java index 8b5270919f0..6889e5bc0ab 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/IHapiScheduler.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/IHapiScheduler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.sched; import org.quartz.JobKey; import org.quartz.SchedulerException; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/IHasScheduledJobs.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/IHasScheduledJobs.java index 984f272ed67..37041b7590c 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/IHasScheduledJobs.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/IHasScheduledJobs.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.sched; /** * This interface is implemented by classes that have scheduled jobs diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/ISchedulerService.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/ISchedulerService.java index 31d01f394da..81d3368bb99 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/ISchedulerService.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/ISchedulerService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.sched; import com.google.common.annotations.VisibleForTesting; import org.quartz.JobKey; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/ScheduledJobDefinition.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/ScheduledJobDefinition.java index bebb1be2ec4..2925843c801 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/ScheduledJobDefinition.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/sched/ScheduledJobDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.sched; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/AutowiringSpringBeanJobFactory.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/AutowiringSpringBeanJobFactory.java index 8e9e35f7bac..ba95ffc50d6 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/AutowiringSpringBeanJobFactory.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/AutowiringSpringBeanJobFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sched; import org.hl7.fhir.r4.model.InstantType; import org.quartz.JobKey; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseHapiScheduler.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseHapiScheduler.java index c2820c61557..2d82959f9e5 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseHapiScheduler.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseHapiScheduler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sched; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseSchedulerServiceImpl.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseSchedulerServiceImpl.java index 4a9375e01d0..419680136fe 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseSchedulerServiceImpl.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseSchedulerServiceImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sched; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/ClusteredHapiScheduler.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/ClusteredHapiScheduler.java index aecf1c5bc28..396f891f989 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/ClusteredHapiScheduler.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/ClusteredHapiScheduler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sched; public class ClusteredHapiScheduler extends BaseHapiScheduler { public ClusteredHapiScheduler(String theThreadNamePrefix, AutowiringSpringBeanJobFactory theSpringBeanJobFactory) { diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/HapiNullScheduler.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/HapiNullScheduler.java index 0046bde5bb1..b87454ce32e 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/HapiNullScheduler.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/HapiNullScheduler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sched; import ca.uhn.fhir.jpa.model.sched.IHapiScheduler; import ca.uhn.fhir.jpa.model.sched.ScheduledJobDefinition; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/HapiSchedulerServiceImpl.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/HapiSchedulerServiceImpl.java index 7807861beea..0a3ca1dec9b 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/HapiSchedulerServiceImpl.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/HapiSchedulerServiceImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sched; import ca.uhn.fhir.jpa.model.sched.IHapiScheduler; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/LocalHapiScheduler.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/LocalHapiScheduler.java index adc3f0f6af8..d9137fe25d1 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/LocalHapiScheduler.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/LocalHapiScheduler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sched; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sched; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sched; public class LocalHapiScheduler extends BaseHapiScheduler { public LocalHapiScheduler(String theThreadNamePrefix, AutowiringSpringBeanJobFactory theSpringBeanJobFactory) { diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/DerbyTenSevenHapiFhirDialect.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/DerbyTenSevenHapiFhirDialect.java index 9e0d1318e8d..2ed4c8d3c54 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/DerbyTenSevenHapiFhirDialect.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/DerbyTenSevenHapiFhirDialect.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import org.hibernate.dialect.DerbyTenSevenDialect; import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtracter; diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java index 175b4141f66..c1a04fccac7 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * hapi-fhir-jpa @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.InstantType; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaBatch2Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaBatch2Config.java index fde49461ae0..8951920a26e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaBatch2Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaBatch2Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.batch2; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.batch2; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.config.BaseBatch2Config; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java index a98ced617cd..800f2456e69 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.batch2; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.batch2; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.api.JobOperationResultJson; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImpl.java index 230ddce4c82..de38c1f1ae4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binstore; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binstore; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binstore; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.binary.api.StoredDetails; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/job/BulkExportJobConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/job/BulkExportJobConfig.java index 079bb169291..38f73e9c927 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/job/BulkExportJobConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/job/BulkExportJobConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.job; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.job; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.job; import ca.uhn.fhir.jpa.dao.mdm.MdmExpansionCacheSvc; import org.springframework.context.annotation.Bean; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/BulkDataExportJobSchedulingHelperImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/BulkDataExportJobSchedulingHelperImpl.java index 4bdfed88d8b..de0b9bbe034 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/BulkDataExportJobSchedulingHelperImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/BulkDataExportJobSchedulingHelperImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.svc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.svc; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.model.JobInstance; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessor.java index 8487b0cef05..f32c1e2aa38 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.svc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImpl.java index 49e8e2f80ca..cc417ab38f1 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.imprt.svc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.imprt.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.imprt.svc; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.importpull.models.Batch2BulkImportPullJobParameters; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionSvcDaoImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionSvcDaoImpl.java index 070b36729ec..e50c3d28ade 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionSvcDaoImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionSvcDaoImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/Batch2SupportConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/Batch2SupportConfig.java index 002b2e8cba1..0b5cc7287fb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/Batch2SupportConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/Batch2SupportConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.api.svc.IBatch2DaoSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BeanPostProcessorConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BeanPostProcessorConfig.java index 669bf3c285a..433aa069b9c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BeanPostProcessorConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BeanPostProcessorConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/FhirContextDstu2Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/FhirContextDstu2Config.java index 770912dbb0a..d41d396b488 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/FhirContextDstu2Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/FhirContextDstu2Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.context.FhirContext; import org.springframework.context.annotation.Bean; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialect.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialect.java index 773e5b229a0..e6f700c62f8 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialect.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialect.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.i18n.HapiLocalizer; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiJpaConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiJpaConfig.java index 13000bb9048..6c6f30e11ec 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiJpaConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HapiJpaConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.jpa.api.IDaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HibernatePropertiesProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HibernatePropertiesProvider.java index acae577eec0..fce9c8321ce 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HibernatePropertiesProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HibernatePropertiesProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.util.ReflectionUtil; import com.google.common.annotations.VisibleForTesting; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaBulkExportConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaBulkExportConfig.java index 11f69e97ccc..03887177bb7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaBulkExportConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaBulkExportConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.jpa.bulk.export.api.IBulkExportProcessor; import ca.uhn.fhir.jpa.bulk.export.svc.BulkExportHelperService; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java index db2c5fbcace..0ff96e94a29 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.batch2.api.IJobPersistence; @@ -179,26 +198,6 @@ import javax.annotation.Nullable; import java.io.IOException; import java.util.Date; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @Configuration // repositoryFactoryBeanClass: EnversRevisionRepositoryFactoryBean is needed primarily for unit testing @EnableJpaRepositories(basePackages = "ca.uhn.fhir.jpa.dao.data", repositoryFactoryBeanClass = EnversRevisionRepositoryFactoryBean.class) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaDstu2Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaDstu2Config.java index 7ce42337ba5..93d56aa52be 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaDstu2Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaDstu2Config.java @@ -1,19 +1,3 @@ -package ca.uhn.fhir.jpa.config; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; -import ca.uhn.fhir.jpa.dao.ITransactionProcessorVersionAdapter; -import ca.uhn.fhir.jpa.dao.TransactionProcessorVersionAdapterDstu2; -import ca.uhn.fhir.jpa.provider.JpaSystemProvider; -import ca.uhn.fhir.jpa.term.TermVersionAdapterSvcDstu2; -import ca.uhn.fhir.jpa.term.api.ITermVersionAdapterSvc; -import ca.uhn.fhir.model.dstu2.composite.MetaDt; -import ca.uhn.fhir.model.dstu2.resource.Bundle; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.transaction.annotation.EnableTransactionManagement; - /* * #%L * HAPI FHIR JPA Server @@ -33,6 +17,21 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; +import ca.uhn.fhir.jpa.dao.ITransactionProcessorVersionAdapter; +import ca.uhn.fhir.jpa.dao.TransactionProcessorVersionAdapterDstu2; +import ca.uhn.fhir.jpa.provider.JpaSystemProvider; +import ca.uhn.fhir.jpa.term.TermVersionAdapterSvcDstu2; +import ca.uhn.fhir.jpa.term.api.ITermVersionAdapterSvc; +import ca.uhn.fhir.model.dstu2.composite.MetaDt; +import ca.uhn.fhir.model.dstu2.resource.Bundle; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration @EnableTransactionManagement diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/PackageLoaderConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/PackageLoaderConfig.java index eb07ab92c77..9618c8cebcd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/PackageLoaderConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/PackageLoaderConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.packages.loader.PackageLoaderSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/SearchConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/SearchConfig.java index 5007c55f44f..0cbc723dca7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/SearchConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/SearchConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/ValidationSupportConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/ValidationSupportConfig.java index 2a5c824f4cf..a7e7f91f102 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/ValidationSupportConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/ValidationSupportConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/FhirContextDstu3Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/FhirContextDstu3Config.java index 448b07efd63..34fcab7bdac 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/FhirContextDstu3Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/FhirContextDstu3Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.dstu3; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.dstu3; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.dstu3; import ca.uhn.fhir.context.FhirContext; import org.springframework.context.annotation.Bean; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/JpaDstu3Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/JpaDstu3Config.java index 9abec6296f3..b5ce122c8de 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/JpaDstu3Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/JpaDstu3Config.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.config.dstu3; import ca.uhn.fhir.context.FhirContext; @@ -27,26 +46,6 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.EnableTransactionManagement; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @Configuration @EnableTransactionManagement @Import({ diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/FhirContextR4Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/FhirContextR4Config.java index 122d44dd85c..52f065c685d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/FhirContextR4Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/FhirContextR4Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.r4; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.r4; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/JpaR4Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/JpaR4Config.java index 95c36644666..38dd34df2e0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/JpaR4Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/JpaR4Config.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.config.r4; import ca.uhn.fhir.context.FhirContext; @@ -35,26 +54,6 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.EnableTransactionManagement; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @Configuration @EnableTransactionManagement @Import({ diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4b/FhirContextR4BConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4b/FhirContextR4BConfig.java index 77db9b40575..68af537318d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4b/FhirContextR4BConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4b/FhirContextR4BConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.r4b; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.r4b; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.r4b; import ca.uhn.fhir.context.FhirContext; import org.springframework.context.annotation.Bean; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4b/JpaR4BConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4b/JpaR4BConfig.java index 4bf4d94314f..335447ee595 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4b/JpaR4BConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4b/JpaR4BConfig.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.config.r4b; import ca.uhn.fhir.context.FhirContext; @@ -27,26 +46,6 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.EnableTransactionManagement; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @Configuration @EnableTransactionManagement @Import({ diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/FhirContextR5Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/FhirContextR5Config.java index 963f3098655..e7e36c5e2d9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/FhirContextR5Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/FhirContextR5Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.r5; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.r5; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.r5; import ca.uhn.fhir.context.FhirContext; import org.springframework.context.annotation.Bean; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/JpaR5Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/JpaR5Config.java index 864397e9906..badb1f01217 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/JpaR5Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/JpaR5Config.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.config.r5; import ca.uhn.fhir.context.FhirContext; @@ -27,26 +46,6 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.EnableTransactionManagement; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @Configuration @EnableTransactionManagement @Import({ diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/BasicDataSourceConnectionPoolInfoProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/BasicDataSourceConnectionPoolInfoProvider.java index e0c69d6c903..65bc571abd0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/BasicDataSourceConnectionPoolInfoProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/BasicDataSourceConnectionPoolInfoProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.util; import org.apache.commons.dbcp2.BasicDataSource; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ConnectionPoolInfoProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ConnectionPoolInfoProvider.java index dfc2aa59cac..1efd62b5541 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ConnectionPoolInfoProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ConnectionPoolInfoProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.util; import net.ttddyy.dsproxy.support.ProxyDataSource; import org.apache.commons.dbcp2.BasicDataSource; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/HapiEntityManagerFactoryUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/HapiEntityManagerFactoryUtil.java index 1b3b9bf7005..654a5f58ec4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/HapiEntityManagerFactoryUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/HapiEntityManagerFactoryUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.util; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.config.HapiFhirHibernateJpaDialect; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/IConnectionPoolInfoProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/IConnectionPoolInfoProvider.java index 768a4a0c7f4..3c741b06b13 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/IConnectionPoolInfoProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/IConnectionPoolInfoProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.util; import java.util.Optional; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ResourceCountCacheUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ResourceCountCacheUtil.java index a441506617e..4f940450a47 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ResourceCountCacheUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ResourceCountCacheUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.util; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.util.ResourceCountCache; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ValidationSupportConfigUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ValidationSupportConfigUtil.java index caa10977064..2bc0abb9873 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ValidationSupportConfigUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/util/ValidationSupportConfigUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.config.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.config.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.config.util; import ca.uhn.fhir.jpa.validation.JpaValidationSupportChain; import org.hl7.fhir.common.hapi.validation.support.CachingValidationSupport; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java index 7ae0d861935..8495fc8e9c5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; @@ -154,26 +173,6 @@ import static org.apache.commons.lang3.StringUtils.trim; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * TODO: JA - This class has only one subclass now. Historically it was a common diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java index a4fdcc3382d..44997fe1724 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.jobs.parameters.UrlPartitioner; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java index b844ae87e42..f830e35088c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirSystemDao.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; @@ -51,26 +70,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public abstract class BaseHapiFhirSystemDao extends BaseStorageDao implements IFhirSystemDao { public static final Predicate[] EMPTY_PREDICATE_ARRAY = new Predicate[0]; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/EncodedResource.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/EncodedResource.java index cf620139c26..7695b44ca13 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/EncodedResource.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/EncodedResource.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.model.entity.ResourceEncodingEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java index 350261aa438..d166952d3e4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoSubscription; import ca.uhn.fhir.jpa.dao.data.ISubscriptionTableDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu2.java index 82b8c9da611..0db34409020 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; import ca.uhn.fhir.jpa.model.entity.TagDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java index 489eb8b68f9..ec537acac44 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/HistoryBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/HistoryBuilder.java index 02089b3d7db..0c2e06be492 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/HistoryBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/HistoryBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/HistoryBuilderFactory.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/HistoryBuilderFactory.java index ba3cf59bba7..51e6ea85d71 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/HistoryBuilderFactory.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/HistoryBuilderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.config.JpaConfig; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFulltextSearchSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFulltextSearchSvc.java index e9704aa3d58..7c048020c5f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFulltextSearchSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFulltextSearchSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.model.search.ExtendedHSearchIndexData; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IHSearchEventListener.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IHSearchEventListener.java index 4c1b4fa8bb7..8aad5300688 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IHSearchEventListener.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IHSearchEventListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; public interface IHSearchEventListener { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IJpaStorageResourceParser.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IJpaStorageResourceParser.java index 096f85f0bdc..4f67245dcbd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IJpaStorageResourceParser.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IJpaStorageResourceParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.model.entity.BaseTag; import ca.uhn.fhir.jpa.model.entity.IBaseResourceEntity; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IndexedParam.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IndexedParam.java index cd18f478d3f..532763e83de 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IndexedParam.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IndexedParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; public @interface IndexedParam { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupport.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupport.java index 246492e4bb5..f5259004527 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupport.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupport.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDao.java index 6c0d4ff9b37..ce178165f1c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.exceptions.NotImplementedOperationException; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoBundle.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoBundle.java index 087ee626ab6..ae7a9a28108 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoBundle.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoBundle.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.model.dstu2.resource.Bundle; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoCodeSystem.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoCodeSystem.java index 49b55c5b464..e642938a39b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoCodeSystem.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoCodeSystem.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoComposition.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoComposition.java index f142e6d9509..d7a4429e912 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoComposition.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoComposition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoComposition; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoConceptMap.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoConceptMap.java index cda03b4ef4b..e9bc7edcac7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoConceptMap.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoConceptMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.context.support.TranslateConceptResults; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoEncounter.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoEncounter.java index 96884cfa9a2..87bb3cc46ef 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoEncounter.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoEncounter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoEncounter; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoObservation.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoObservation.java index 147f87a3ed9..13e938f1c9b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoObservation.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoObservation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoPatient.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoPatient.java index 37043a8066a..d3e57be01fa 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoPatient.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoPatient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoSearchParameter.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoSearchParameter.java index 56e6b42e609..89230025d09 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoSearchParameter.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoSearchParameter.java @@ -1,18 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - -import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoSearchParameter; -import ca.uhn.fhir.jpa.model.entity.ResourceTable; -import ca.uhn.fhir.jpa.dao.validation.SearchParameterDaoValidator; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.hapi.converters.canonical.VersionCanonicalizer; -import com.google.common.annotations.VisibleForTesting; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.r5.model.CodeType; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; -import java.util.stream.Collectors; - /* * #%L * HAPI FHIR JPA Server @@ -32,6 +17,20 @@ import java.util.stream.Collectors; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; + +import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoSearchParameter; +import ca.uhn.fhir.jpa.model.entity.ResourceTable; +import ca.uhn.fhir.jpa.dao.validation.SearchParameterDaoValidator; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.hapi.converters.canonical.VersionCanonicalizer; +import com.google.common.annotations.VisibleForTesting; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.r5.model.CodeType; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.stream.Collectors; public class JpaResourceDaoSearchParameter extends BaseHapiFhirResourceDao implements IFhirResourceDaoSearchParameter { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoStructureDefinition.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoStructureDefinition.java index 9ba9b145520..61042ea28de 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoStructureDefinition.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoStructureDefinition.java @@ -1,12 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - -import ca.uhn.fhir.context.support.IValidationSupport; -import ca.uhn.fhir.context.support.ValidationSupportContext; -import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoStructureDefinition; -import org.apache.commons.lang3.Validate; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.springframework.beans.factory.annotation.Autowired; - /* * #%L * HAPI FHIR JPA Server @@ -26,6 +17,14 @@ import org.springframework.beans.factory.annotation.Autowired; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; + +import ca.uhn.fhir.context.support.IValidationSupport; +import ca.uhn.fhir.context.support.ValidationSupportContext; +import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoStructureDefinition; +import org.apache.commons.lang3.Validate; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.springframework.beans.factory.annotation.Autowired; public class JpaResourceDaoStructureDefinition extends BaseHapiFhirResourceDao implements IFhirResourceDaoStructureDefinition { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoValueSet.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoValueSet.java index f3e298b2c08..fa3191d08fd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoValueSet.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoValueSet.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.context.support.ConceptValidationOptions; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaStorageResourceParser.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaStorageResourceParser.java index 6f004aafe94..ca51ff69f8b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaStorageResourceParser.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaStorageResourceParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ObservationLastNIndexPersistSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ObservationLastNIndexPersistSvc.java index 7d777ca4043..eef5557c9b7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ObservationLastNIndexPersistSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ObservationLastNIndexPersistSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TolerantJsonParser.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TolerantJsonParser.java index a25d476516f..09c475b4fe5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TolerantJsonParser.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TolerantJsonParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java index d3a6420c2e6..c5e8b601dbc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessorVersionAdapterDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessorVersionAdapterDstu2.java index e46eb3b7cbf..f0c2747cdef 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessorVersionAdapterDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessorVersionAdapterDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2JobInstanceRepository.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2JobInstanceRepository.java index bc8e24e0928..c7d687316c7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2JobInstanceRepository.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2JobInstanceRepository.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.batch2.model.StatusEnum; import ca.uhn.fhir.jpa.entity.Batch2JobInstanceEntity; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java index d50d1af09f6..3bde06d9044 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.batch2.model.WorkChunkStatusEnum; import ca.uhn.fhir.jpa.entity.Batch2WorkChunkEntity; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBinaryStorageEntityDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBinaryStorageEntityDao.java index b687285b856..5c11209fca7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBinaryStorageEntityDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBinaryStorageEntityDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.BinaryStorageEntity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkExportJobDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkExportJobDao.java index b36ab12da2d..3b7cf5fa5dc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkExportJobDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkExportJobDao.java @@ -1,17 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.bulk.export.model.BulkExportJobStatusEnum; -import ca.uhn.fhir.jpa.entity.BulkExportJobEntity; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Date; -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -31,6 +17,19 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.bulk.export.model.BulkExportJobStatusEnum; +import ca.uhn.fhir.jpa.entity.BulkExportJobEntity; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Date; +import java.util.Optional; public interface IBulkExportJobDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkImportJobDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkImportJobDao.java index 4826105b7f9..0c3b14c41a4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkImportJobDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkImportJobDao.java @@ -1,15 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobStatusEnum; -import ca.uhn.fhir.jpa.entity.BulkImportJobEntity; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -29,6 +17,17 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobStatusEnum; +import ca.uhn.fhir.jpa.entity.BulkImportJobEntity; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Optional; public interface IBulkImportJobDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkImportJobFileDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkImportJobFileDao.java index 55c2f32aa56..acdfa0e2c02 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkImportJobFileDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBulkImportJobFileDao.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.BulkImportJobEntity; -import ca.uhn.fhir.jpa.entity.BulkImportJobFileEntity; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -28,6 +17,16 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.BulkImportJobEntity; +import ca.uhn.fhir.jpa.entity.BulkImportJobFileEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; +import java.util.Optional; public interface IBulkImportJobFileDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IForcedIdDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IForcedIdDao.java index c7a229e93ff..bd4a80f64ed 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IForcedIdDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IForcedIdDao.java @@ -1,16 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.dao.data.custom.IForcedIdQueries; -import ca.uhn.fhir.jpa.model.entity.ForcedId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -30,6 +17,19 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.dao.data.custom.IForcedIdQueries; +import ca.uhn.fhir.jpa.model.entity.ForcedId; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + @Repository public interface IForcedIdDao extends JpaRepository, IHapiFhirJpaRepository, IForcedIdQueries { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IHapiFhirJpaRepository.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IHapiFhirJpaRepository.java index c232b023d9d..26be1126fa3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IHapiFhirJpaRepository.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IHapiFhirJpaRepository.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IMdmLinkJpaRepository.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IMdmLinkJpaRepository.java index ae96d0012e8..82bf4ac5d04 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IMdmLinkJpaRepository.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IMdmLinkJpaRepository.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.entity.MdmLink; import ca.uhn.fhir.mdm.api.MdmMatchResultEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageDao.java index d21db7b8874..6170e838db7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageDao.java @@ -1,12 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.model.entity.NpmPackageEntity; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -26,6 +17,14 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.model.entity.NpmPackageEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Optional; public interface INpmPackageDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageVersionDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageVersionDao.java index a9cc547fc94..73105f35895 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageVersionDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageVersionDao.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.model.entity.NpmPackageVersionEntity; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Collection; -import java.util.List; -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -28,6 +17,16 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.model.entity.NpmPackageVersionEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; public interface INpmPackageVersionDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageVersionResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageVersionResourceDao.java index 4895ef1db69..1fec9e2044b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageVersionResourceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/INpmPackageVersionResourceDao.java @@ -1,13 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.context.FhirVersionEnum; -import ca.uhn.fhir.jpa.model.entity.NpmPackageVersionResourceEntity; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - /* * #%L * HAPI FHIR JPA Server @@ -27,6 +17,15 @@ import org.springframework.data.repository.query.Param; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.context.FhirVersionEnum; +import ca.uhn.fhir.jpa.model.entity.NpmPackageVersionResourceEntity; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface INpmPackageVersionResourceDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IPartitionDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IPartitionDao.java index 33cb6939b9d..5b8921aa292 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IPartitionDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IPartitionDao.java @@ -1,12 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.PartitionEntity; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -26,6 +17,14 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.PartitionEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Optional; public interface IPartitionDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryProvenanceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryProvenanceDao.java index 611a6ed1de7..0fece322308 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryProvenanceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryProvenanceDao.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.model.entity.ResourceHistoryProvenanceEntity; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - /* * #%L * HAPI FHIR JPA Server @@ -25,6 +17,13 @@ import org.springframework.data.repository.query.Param; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.model.entity.ResourceHistoryProvenanceEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface IResourceHistoryProvenanceDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTableDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTableDao.java index 1b695abe37d..7b34fca78a5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTableDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTableDao.java @@ -1,15 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - /* * #%L * HAPI FHIR JPA Server @@ -29,6 +17,17 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; public interface IResourceHistoryTableDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTagDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTagDao.java index 2ecef606c72..d5824b92e8d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTagDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTagDao.java @@ -1,13 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTag; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - /* * #%L * HAPI FHIR JPA Server @@ -27,6 +17,15 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTag; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; public interface IResourceHistoryTagDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedComboStringUniqueDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedComboStringUniqueDao.java index 9d3ce5d4e53..3e755d4456f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedComboStringUniqueDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedComboStringUniqueDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedComboStringUnique; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedComboTokensNonUniqueDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedComboTokensNonUniqueDao.java index da6ddb1e601..e8dc3678264 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedComboTokensNonUniqueDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedComboTokensNonUniqueDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedComboTokenNonUnique; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamCoordsDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamCoordsDao.java index 3893692f443..b781005af0f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamCoordsDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamCoordsDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamDateDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamDateDao.java index bead0f80624..ef5b19c44ec 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamDateDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamDateDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamDate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamNumberDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamNumberDao.java index d58c1014c37..10d9b9686fd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamNumberDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamNumberDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamQuantityDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamQuantityDao.java index 99e75d5e9a6..0c990c5193c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamQuantityDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamQuantityDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamQuantityNormalizedDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamQuantityNormalizedDao.java index edb898fab80..132c4e5f2d2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamQuantityNormalizedDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamQuantityNormalizedDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamQuantityNormalized; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamStringDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamStringDao.java index 2c82b83cc2a..6575b948b7d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamStringDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamStringDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamString; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamTokenDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamTokenDao.java index 704c4a2a6d2..880f57d89a7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamTokenDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamTokenDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamToken; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamUriDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamUriDao.java index 33521ced29a..54df9c0e7fb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamUriDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceIndexedSearchParamUriDao.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import java.util.Collection; - /* * #%L * HAPI FHIR JPA Server @@ -21,6 +17,9 @@ import java.util.Collection; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import java.util.Collection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceLinkDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceLinkDao.java index c28c2fce6fc..d97b05d834f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceLinkDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceLinkDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceLink; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceReindexJobDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceReindexJobDao.java index b1c80d0f770..af8c1d3e874 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceReindexJobDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceReindexJobDao.java @@ -1,16 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.ResourceReindexJobEntity; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Date; -import java.util.List; -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -30,6 +17,18 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.ResourceReindexJobEntity; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Date; +import java.util.List; +import java.util.Optional; @Deprecated public interface IResourceReindexJobDao extends JpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceSearchUrlDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceSearchUrlDao.java index 5915e63648f..c7883474ffb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceSearchUrlDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceSearchUrlDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceSearchUrlEntity; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceSearchViewDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceSearchViewDao.java index 0f4e78493a8..685cf925b1f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceSearchViewDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceSearchViewDao.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import java.util.Collection; - /* * #%L * HAPI FHIR JPA Server @@ -21,6 +17,9 @@ import java.util.Collection; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import java.util.Collection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceTableDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceTableDao.java index e2c2ecb360e..5bd2d8e04c5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceTableDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceTableDao.java @@ -1,21 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.model.entity.ResourceTable; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -35,6 +17,23 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.model.entity.ResourceTable; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Optional; @Transactional(propagation = Propagation.MANDATORY) public interface IResourceTableDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceTagDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceTagDao.java index 71e4f8f5b7c..d2484b721cf 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceTagDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceTagDao.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import java.util.Collection; - /* * #%L * HAPI FHIR JPA Server @@ -21,6 +17,9 @@ import java.util.Collection; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import java.util.Collection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java index 8e8b9136e41..aa666741938 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java @@ -1,17 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.Search; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Collection; -import java.util.Date; -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -31,6 +17,19 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.Search; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Collection; +import java.util.Date; +import java.util.Optional; public interface ISearchDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchIncludeDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchIncludeDao.java index f19cdc42f52..87c60aa5a85 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchIncludeDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchIncludeDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.entity.SearchInclude; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchParamPresentDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchParamPresentDao.java index b2c1793c1ae..bea83fc61e4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchParamPresentDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchParamPresentDao.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.model.entity.ResourceTable; -import ca.uhn.fhir.jpa.model.entity.SearchParamPresentEntity; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - /* * #%L * HAPI FHIR JPA Server @@ -28,6 +17,16 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.model.entity.ResourceTable; +import ca.uhn.fhir.jpa.model.entity.SearchParamPresentEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; public interface ISearchParamPresentDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java index aa02f141751..493c7f44955 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java @@ -1,16 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.Search; -import ca.uhn.fhir.jpa.entity.SearchResult; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - /* * #%L * HAPI FHIR JPA Server @@ -30,6 +17,18 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.Search; +import ca.uhn.fhir.jpa.entity.SearchResult; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; public interface ISearchResultDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISubscriptionTableDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISubscriptionTableDao.java index fead5a94981..9280dd85a0d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISubscriptionTableDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISubscriptionTableDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.entity.SubscriptionTable; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITagDefinitionDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITagDefinitionDao.java index 45e6a25ea2b..1502e7522d5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITagDefinitionDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITagDefinitionDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermCodeSystemDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermCodeSystemDao.java index 2eb2c562f9c..bbac84fd706 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermCodeSystemDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermCodeSystemDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermCodeSystemVersionDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermCodeSystemVersionDao.java index a9336918369..e9ddcdef535 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermCodeSystemVersionDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermCodeSystemVersionDao.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermCodeSystem; -import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - /* * #%L * HAPI FHIR JPA Server @@ -28,6 +17,16 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermCodeSystem; +import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; public interface ITermCodeSystemVersionDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptDao.java index aa2f2b3442a..2aab148ac93 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptDao.java @@ -1,17 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; -import ca.uhn.fhir.jpa.entity.TermConcept; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; -import java.util.Optional; - /* * #%L * HAPI FHIR JPA Server @@ -31,6 +17,19 @@ import java.util.Optional; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; +import ca.uhn.fhir.jpa.entity.TermConcept; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; +import java.util.Optional; public interface ITermConceptDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptDesignationDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptDesignationDao.java index 4a5bc53f34d..706fb8292e7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptDesignationDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptDesignationDao.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermConceptDesignation; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - /* * #%L * HAPI FHIR JPA Server @@ -25,6 +17,13 @@ import org.springframework.data.repository.query.Param; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermConceptDesignation; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ITermConceptDesignationDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapDao.java index 70de05cd003..f23f3a77f7d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapDao.java @@ -1,16 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import java.util.List; -import java.util.Optional; - -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import ca.uhn.fhir.jpa.entity.TermConceptMap; - /* * #%L * HAPI FHIR JPA Server @@ -30,6 +17,18 @@ import ca.uhn.fhir.jpa.entity.TermConceptMap; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import ca.uhn.fhir.jpa.entity.TermConceptMap; public interface ITermConceptMapDao extends JpaRepository, IHapiFhirJpaRepository { @Query("DELETE FROM TermConceptMap cm WHERE cm.myId = :pid") diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupDao.java index 16b2a63acb3..81d4c16803d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupDao.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermConceptMapGroup; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - /* * #%L * HAPI FHIR JPA Server @@ -25,6 +17,13 @@ import org.springframework.data.repository.query.Param; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermConceptMapGroup; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ITermConceptMapGroupDao extends JpaRepository, IHapiFhirJpaRepository { @Query("DELETE FROM TermConceptMapGroup g WHERE g.myId = :pid") diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupElementDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupElementDao.java index 84cb4037222..1a5044cb82d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupElementDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupElementDao.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermConceptMapGroupElement; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - /* * #%L * HAPI FHIR JPA Server @@ -25,6 +17,13 @@ import org.springframework.data.repository.query.Param; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermConceptMapGroupElement; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ITermConceptMapGroupElementDao extends JpaRepository, IHapiFhirJpaRepository { @Query("DELETE FROM TermConceptMapGroupElement e WHERE e.myId = :pid") diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupElementTargetDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupElementTargetDao.java index e7d0df5ca71..67a976c4013 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupElementTargetDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptMapGroupElementTargetDao.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermConceptMapGroupElementTarget; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - /* * #%L * HAPI FHIR JPA Server @@ -25,6 +17,13 @@ import org.springframework.data.repository.query.Param; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermConceptMapGroupElementTarget; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ITermConceptMapGroupElementTargetDao extends JpaRepository, IHapiFhirJpaRepository { @Query("DELETE FROM TermConceptMapGroupElementTarget t WHERE t.myId = :pid") diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptParentChildLinkDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptParentChildLinkDao.java index 59f827512a2..90496eb66eb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptParentChildLinkDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptParentChildLinkDao.java @@ -1,13 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.Collection; - /* * #%L * HAPI FHIR JPA Server @@ -27,6 +17,15 @@ import java.util.Collection; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Collection; public interface ITermConceptParentChildLinkDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptPropertyDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptPropertyDao.java index dcda9e571ac..1bd5f211fb3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptPropertyDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermConceptPropertyDao.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermConceptProperty; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - /* * #%L * HAPI FHIR JPA Server @@ -25,6 +17,13 @@ import org.springframework.data.repository.query.Param; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermConceptProperty; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ITermConceptPropertyDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptDao.java index a11f806464a..61f20bc374b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.entity.TermValueSetConcept; import org.springframework.data.domain.Pageable; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptDesignationDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptDesignationDao.java index b79d0584537..a3690d32193 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptDesignationDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptDesignationDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.entity.TermValueSetConceptDesignation; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptViewDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptViewDao.java index a4b9414bba4..44d609db604 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptViewDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptViewDao.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - -import ca.uhn.fhir.jpa.entity.TermValueSetConceptView; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - /* * #%L * HAPI FHIR JPA Server @@ -28,6 +17,16 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; + +import ca.uhn.fhir.jpa.entity.TermValueSetConceptView; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; public interface ITermValueSetConceptViewDao extends JpaRepository, IHapiFhirJpaRepository { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptViewOracleDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptViewOracleDao.java index ed23ee88df9..8c8d6d84457 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptViewOracleDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetConceptViewOracleDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.entity.TermValueSetConceptViewOracle; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetDao.java index b2914d60a02..5c0b19056b5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ITermValueSetDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.entity.TermValueSet; import ca.uhn.fhir.jpa.entity.TermValueSetPreExpansionStatusEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IForcedIdDaoImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IForcedIdDaoImpl.java index f3041af02e0..a00004d685c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IForcedIdDaoImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IForcedIdDaoImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data.custom; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.data.custom; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data.custom; import org.springframework.stereotype.Component; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IForcedIdQueries.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IForcedIdQueries.java index 83dc7b739a1..7c83509e1de 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IForcedIdQueries.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IForcedIdQueries.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.jpa.dao.data.custom; - -import java.util.Collection; -import java.util.List; - /* * #%L * HAPI FHIR JPA Server @@ -22,6 +17,10 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.data.custom; + +import java.util.Collection; +import java.util.List; public interface IForcedIdQueries { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSubscriptionDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSubscriptionDstu3.java index d3bf88e908d..c84ecbcdf44 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSubscriptionDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSubscriptionDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.dstu3; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoSubscription; import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java index 8c42a24f1e3..9abded872b9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.dstu3; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.jpa.dao.BaseHapiFhirSystemDao; import ca.uhn.fhir.jpa.dao.JpaResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeEverythingService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeEverythingService.java index 468caedb2ca..a5d055739e0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeEverythingService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeEverythingService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/JpaResourceExpungeService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/JpaResourceExpungeService.java index bb514e896e0..4bfb86c9490 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/JpaResourceExpungeService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/JpaResourceExpungeService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceForeignKey.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceForeignKey.java index 5f30b0b5233..81170edc775 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceForeignKey.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceForeignKey.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProvider.java index aacff3e2e0a..cfb343f9f41 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import ca.uhn.fhir.mdm.api.IMdmSettings; import ca.uhn.fhir.mdm.rules.config.MdmSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoSearchParamSynchronizer.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoSearchParamSynchronizer.java index 86558f8f13a..5656fef963c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoSearchParamSynchronizer.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoSearchParamSynchronizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.index; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.index; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.index; import ca.uhn.fhir.jpa.model.entity.BaseResourceIndex; import ca.uhn.fhir.jpa.model.entity.ResourceTable; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java index 95ec3644650..9c9027a2665 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.index; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.index; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.index; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/SearchParamWithInlineReferencesExtractor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/SearchParamWithInlineReferencesExtractor.java index a73efbb63af..c4bcfb1fd33 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/SearchParamWithInlineReferencesExtractor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/SearchParamWithInlineReferencesExtractor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.index; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.index; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.index; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/JpaMdmLinkImplFactory.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/JpaMdmLinkImplFactory.java index efc8376e19c..5d669f8639b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/JpaMdmLinkImplFactory.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/JpaMdmLinkImplFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.mdm; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.mdm; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.mdm; import ca.uhn.fhir.jpa.entity.MdmLink; import ca.uhn.fhir.mdm.api.IMdmLink; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java index 131003cbc07..4a83c67885f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.mdm; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.mdm; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.mdm; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java index e26b83b419b..2e1d6f40e66 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.mdm; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.mdm; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.mdm; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/SearchFilterParser.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/SearchFilterParser.java index 3d6b4d1be35..ce64f87ed3b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/SearchFilterParser.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/SearchFilterParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.predicate; import ca.uhn.fhir.i18n.Msg; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/SearchFuzzUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/SearchFuzzUtil.java index a8aa23ad561..5569d310bc0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/SearchFuzzUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/SearchFuzzUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.predicate; import ca.uhn.fhir.rest.param.ParamPrefixEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java index 48d10e66040..5b30e1c696d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r4; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoSubscription; import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4.java index 0a9b1109102..b3e5758319b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r4; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.dao.BaseHapiFhirSystemDao; import ca.uhn.fhir.jpa.dao.JpaResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/FhirResourceDaoSubscriptionR4B.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/FhirResourceDaoSubscriptionR4B.java index 7d720cdc65f..c12fec750e6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/FhirResourceDaoSubscriptionR4B.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/FhirResourceDaoSubscriptionR4B.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r4b; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r4b; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r4b; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoSubscription; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/FhirSystemDaoR4B.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/FhirSystemDaoR4B.java index 06ba671d9e8..681fe318d0f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/FhirSystemDaoR4B.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/FhirSystemDaoR4B.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r4b; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r4b; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r4b; import ca.uhn.fhir.jpa.dao.BaseHapiFhirSystemDao; import ca.uhn.fhir.jpa.dao.JpaResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/TransactionProcessorVersionAdapterR4B.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/TransactionProcessorVersionAdapterR4B.java index 8328c11de05..74fc3d8832e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/TransactionProcessorVersionAdapterR4B.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4b/TransactionProcessorVersionAdapterR4B.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r4b; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r4b; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r4b; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoSubscriptionR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoSubscriptionR5.java index 66294ace216..270390828f6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoSubscriptionR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoSubscriptionR5.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r5; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r5; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r5; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoSubscription; import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirSystemDaoR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirSystemDaoR5.java index 08216298d41..a9b1bb93fd7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirSystemDaoR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirSystemDaoR5.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r5; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r5; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r5; import ca.uhn.fhir.jpa.dao.BaseHapiFhirSystemDao; import ca.uhn.fhir.jpa.dao.JpaResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/TransactionProcessorVersionAdapterR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/TransactionProcessorVersionAdapterR5.java index 0f6d95b5dc0..c1eca2d61a3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/TransactionProcessorVersionAdapterR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/TransactionProcessorVersionAdapterR5.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r5; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r5; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r5; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchClauseBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchClauseBuilder.java index 8e76ca759b6..c30be87bf7e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchClauseBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchClauseBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchIndexExtractor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchIndexExtractor.java index 517b0eaf998..b1c64f524d3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchIndexExtractor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchIndexExtractor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchResourceProjection.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchResourceProjection.java index b5266ddf9c3..ea07da24fad 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchResourceProjection.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchResourceProjection.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.primitive.IdDt; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchSearchBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchSearchBuilder.java index e1b0b63ee0b..1e200074e57 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchSearchBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchSearchBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/HSearchCompositeSearchIndexDataImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/HSearchCompositeSearchIndexDataImpl.java index 65b81faaa27..7e8bf9ed86e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/HSearchCompositeSearchIndexDataImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/HSearchCompositeSearchIndexDataImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamDate; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamNumber; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/HSearchSortHelperImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/HSearchSortHelperImpl.java index 6dba8d8ee89..82e1b1b6447 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/HSearchSortHelperImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/HSearchSortHelperImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/IHSearchSortHelper.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/IHSearchSortHelper.java index 53f9e156aa7..a95d8a39e29 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/IHSearchSortHelper.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/IHSearchSortHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.rest.api.SortSpec; import org.hibernate.search.engine.search.sort.dsl.SearchSortFactory; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/LastNAggregation.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/LastNAggregation.java index 2e1ee34876b..e31928baa81 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/LastNAggregation.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/LastNAggregation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/LastNOperation.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/LastNOperation.java index 963ebe47e45..2bd9e98ee84 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/LastNOperation.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/LastNOperation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.entity.StorageSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java index 57afe191d4c..4c6eaad77e9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import org.apache.commons.lang3.Validate; import org.hibernate.search.engine.search.predicate.dsl.*; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ResourceNotFoundInIndexException.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ResourceNotFoundInIndexException.java index 4005ffe6a12..8b912b5a790 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ResourceNotFoundInIndexException.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ResourceNotFoundInIndexException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; public class ResourceNotFoundInIndexException extends IllegalStateException { private static final long serialVersionUID = 1L; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/SearchScrollQueryExecutorAdaptor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/SearchScrollQueryExecutorAdaptor.java index adde4911f88..33104ff1cd6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/SearchScrollQueryExecutorAdaptor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/SearchScrollQueryExecutorAdaptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import ca.uhn.fhir.jpa.search.builder.ISearchQueryExecutor; import org.hibernate.search.engine.backend.common.DocumentReference; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/TermHelper.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/TermHelper.java index ebf1f15b54c..974f2315e83 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/TermHelper.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/TermHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.search; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/package-info.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/package-info.java index 400287ef5fb..28c76576c5d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/package-info.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/package-info.java @@ -1,3 +1,22 @@ +/*- + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ /** *

Extended fhir indexing for Hibernate Search using Lucene/Elasticsearch. *

@@ -35,22 +54,3 @@ */ package ca.uhn.fhir.jpa.dao.search; -/*- - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictFinderService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictFinderService.java index d6d1687d4c2..50d94d7ece1 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictFinderService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictFinderService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.delete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.delete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.delete; import ca.uhn.fhir.jpa.model.entity.ResourceLink; import ca.uhn.fhir.jpa.model.entity.ResourceTable; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictOutcome.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictOutcome.java index abacd4475b1..b37c2cf0927 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictOutcome.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.delete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.delete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.delete; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictService.java index 611eea13936..8edae514c5d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.delete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.delete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.delete; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/ThreadSafeResourceDeleterSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/ThreadSafeResourceDeleterSvc.java index 0b5c3a6fcc7..dd947f7ea58 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/ThreadSafeResourceDeleterSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/ThreadSafeResourceDeleterSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.delete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.delete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.delete; import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/batch2/DeleteExpungeSqlBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/batch2/DeleteExpungeSqlBuilder.java index 955de2f3ce2..f8d84d390fa 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/batch2/DeleteExpungeSqlBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/batch2/DeleteExpungeSqlBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.delete.batch2; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.delete.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.delete.batch2; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/batch2/DeleteExpungeSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/batch2/DeleteExpungeSvcImpl.java index 3306d97a650..72e3d0cdf53 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/batch2/DeleteExpungeSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/delete/batch2/DeleteExpungeSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.delete.batch2; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.delete.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.delete.batch2; import ca.uhn.fhir.jpa.api.svc.IDeleteExpungeSvc; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2JobInstanceEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2JobInstanceEntity.java index 789a4267ef1..374c8934432 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2JobInstanceEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2JobInstanceEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.batch2.model.JobDefinition; import ca.uhn.fhir.batch2.model.StatusEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkEntity.java index dbc568dca20..674d549dba7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.batch2.model.WorkChunkStatusEnum; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportCollectionEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportCollectionEntity.java index ea86e9e11a9..73ae67256f2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportCollectionEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportCollectionEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.model.entity.ResourceTable; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportCollectionFileEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportCollectionFileEntity.java index eb66081bfac..5a811de58d9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportCollectionFileEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportCollectionFileEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.model.entity.ForcedId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportJobEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportJobEntity.java index 050860b47da..0f9caeac028 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportJobEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkExportJobEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.bulk.export.model.BulkExportJobStatusEnum; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobEntity.java index 27d75dbedc9..95d3bf9eb94 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobJson; import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobStatusEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobFileEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobFileEntity.java index defc3cd319a..c73f914076b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobFileEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobFileEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobFileJson; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/HapiFhirEnversRevision.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/HapiFhirEnversRevision.java index cd4ab19b192..6a575efb63f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/HapiFhirEnversRevision.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/HapiFhirEnversRevision.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.envers.RevisionEntity; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ITermValueSetConceptView.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ITermValueSetConceptView.java index e5be91fcc32..4706243b5f0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ITermValueSetConceptView.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ITermValueSetConceptView.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; public interface ITermValueSetConceptView { String getConceptSystemUrl(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java index 230ce914f26..70533362266 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.model.dao.JpaPid; import ca.uhn.fhir.jpa.model.entity.BasePartitionable; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/PartitionEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/PartitionEntity.java index 0162d383b48..bb3579a52cd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/PartitionEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/PartitionEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceReindexJobEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceReindexJobEntity.java index b76e632a75d..85422e91e08 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceReindexJobEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceReindexJobEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.rest.api.Constants; import com.google.common.annotations.VisibleForTesting; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceSearchView.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceSearchView.java index c86dada29ff..f3d6e6f1a73 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceSearchView.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceSearchView.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.jpa.model.entity.ForcedId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java index d656df3778d..264eb66829e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.interceptor.model.RequestPartitionId; @@ -47,26 +66,6 @@ import java.util.UUID; import static org.apache.commons.lang3.StringUtils.left; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @Entity @Table(name = Search.HFJ_SEARCH, uniqueConstraints = { @UniqueConstraint(name = "IDX_SEARCH_UUID", columnNames = "SEARCH_UUID") diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchInclude.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchInclude.java index 2f9c79fefa7..fa7c03dd5a5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchInclude.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchInclude.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import java.io.Serializable; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchResult.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchResult.java index bc6c232e8f8..cb0174eed88 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchResult.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchTypeEnum.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchTypeEnum.java index a785e5b5719..28106a86125 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchTypeEnum.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; public enum SearchTypeEnum { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionTable.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionTable.java index e29132aae76..9888c6a392d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionTable.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionTable.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.model.entity.ResourceTable; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystem.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystem.java index 28338d45110..83492094115 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystem.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystem.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.util.ValidateUtil; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystemVersion.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystemVersion.java index 4d192653a6f..fdb324061d6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystemVersion.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystemVersion.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.util.ValidateUtil; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConcept.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConcept.java index dce6b39afd5..68052caaa08 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConcept.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConcept.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptDesignation.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptDesignation.java index 56b9912d29e..a9e2bde5ace 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptDesignation.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptDesignation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.util.ValidateUtil; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMap.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMap.java index 7e974a9f41a..b5840b05137 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMap.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.util.ValidateUtil; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroup.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroup.java index 50c4913878b..a693c019530 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroup.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroup.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.util.ValidateUtil; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElement.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElement.java index ad8cd22410b..946cab72699 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElement.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElement.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.util.ValidateUtil; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java index 7b512c6c683..1529288cad3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.util.ValidateUtil; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptParentChildLink.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptParentChildLink.java index e3b951c6c5c..0561138d9b1 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptParentChildLink.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptParentChildLink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptProperty.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptProperty.java index 785053a36c8..bf4983cb613 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptProperty.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptProperty.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.util.ValidateUtil; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyBinder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyBinder.java index 9227bd91cea..0045edbc795 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyBinder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import org.hibernate.search.engine.backend.document.DocumentElement; import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyTypeEnum.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyTypeEnum.java index a68b4d40794..aef88ffc65c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyTypeEnum.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; /** * @see TermConceptProperty#getType() diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java index 1ceb326bba3..1c275612581 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.util.ValidateUtil; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConcept.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConcept.java index 97991272e88..c9836aaa69f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConcept.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConcept.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.util.ValidateUtil; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptDesignation.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptDesignation.java index 56a12277fc1..67413f0c02b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptDesignation.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptDesignation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.util.ValidateUtil; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptView.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptView.java index 84c14a0fc4c..dfe3691c3ac 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptView.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptView.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptViewOracle.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptViewOracle.java index 1e9eaf957ac..841bc8db97f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptViewOracle.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetConceptViewOracle.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetPreExpansionStatusEnum.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetPreExpansionStatusEnum.java index c69ffee4cb2..12314cbf725 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetPreExpansionStatusEnum.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSetPreExpansionStatusEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.entity; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.entity; import java.util.Collections; import java.util.HashMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceAddress.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceAddress.java index 6c2abc8601c..448c1fea8ab 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceAddress.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceAddress.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.esr; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.esr; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.esr; public class ExternallyStoredResourceAddress { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceAddressMetadataKey.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceAddressMetadataKey.java index dfe1e1a61b1..553deb06c7b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceAddressMetadataKey.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceAddressMetadataKey.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.esr; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.esr; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.esr; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceServiceRegistry.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceServiceRegistry.java index 1a89700110f..cd75867d117 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceServiceRegistry.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/ExternallyStoredResourceServiceRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.esr; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.esr; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.esr; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/IExternallyStoredResourceService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/IExternallyStoredResourceService.java index da8b9c43097..18e1e6a1dae 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/IExternallyStoredResourceService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/IExternallyStoredResourceService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.esr; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.esr; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.esr; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/package-info.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/package-info.java index 8e0c2b9f59a..c54429b0743 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/package-info.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/esr/package-info.java @@ -1,18 +1,3 @@ - -/** - * This package stores the mechanism for Externally Stored Resources (ESRs). - *

- * A normal resource stores its contents in the {@link ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable} - * entity as text (compressed JSON or otherwise) with one row in that table per version of the - * resource. An ESR still creates a row in that table, but stores a reference to actual body - * storage instead. - *

- * THIS IS AN EXPERIMENTAL API - IT MAY GO AWAY OR CHANGE IN THE FUTURE - * - * @since 6.6.0 - */ -package ca.uhn.fhir.jpa.esr; - /*- * #%L * HAPI FHIR JPA Server @@ -32,3 +17,18 @@ package ca.uhn.fhir.jpa.esr; * limitations under the License. * #L% */ + +/** + * This package stores the mechanism for Externally Stored Resources (ESRs). + *

+ * A normal resource stores its contents in the {@link ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable} + * entity as text (compressed JSON or otherwise) with one row in that table per version of the + * resource. An ESR still creates a row in that table, but stores a reference to actual body + * storage instead. + *

+ * THIS IS AN EXPERIMENTAL API - IT MAY GO AWAY OR CHANGE IN THE FUTURE + * + * @since 6.6.0 + */ +package ca.uhn.fhir.jpa.esr; + diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java index fb94ffb4236..6f3e2264eb7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.graphql; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.graphql; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.graphql; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptor.java index 88bb5eb17b7..90754ff7064 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/ForceOffsetSearchModeInterceptor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/ForceOffsetSearchModeInterceptor.java index 4890cab007f..b9f2b794187 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/ForceOffsetSearchModeInterceptor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/ForceOffsetSearchModeInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/JpaConsentContextServices.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/JpaConsentContextServices.java index 69225bc109f..2e858093a1c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/JpaConsentContextServices.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/JpaConsentContextServices.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.rest.server.interceptor.consent.IConsentContextServices; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/JpaPreResourceAccessDetails.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/JpaPreResourceAccessDetails.java index 57164faf4cc..7399b8b2419 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/JpaPreResourceAccessDetails.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/JpaPreResourceAccessDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.jpa.dao.ISearchBuilder; import ca.uhn.fhir.jpa.model.dao.JpaPid; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptor.java index ea80b7527bc..004f18c6a62 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.fhirpath.IFhirPath; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/PerformanceTracingLoggingInterceptor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/PerformanceTracingLoggingInterceptor.java index 29e35ba9b7e..264d1afa90d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/PerformanceTracingLoggingInterceptor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/PerformanceTracingLoggingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/TransactionConcurrencySemaphoreInterceptor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/TransactionConcurrencySemaphoreInterceptor.java index ec3e5bbf3c9..cb3e4bca51a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/TransactionConcurrencySemaphoreInterceptor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/TransactionConcurrencySemaphoreInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java index 9c66fc95132..238517426ce 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.tasks; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.tasks; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.tasks; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.entity.BulkExportJobEntity; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/model/cross/JpaResourceLookup.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/model/cross/JpaResourceLookup.java index 4df1f63245b..5463da85369 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/model/cross/JpaResourceLookup.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/model/cross/JpaResourceLookup.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.cross; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.cross; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.cross; import ca.uhn.fhir.jpa.model.dao.JpaPid; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IHapiPackageCacheManager.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IHapiPackageCacheManager.java index 5e6291a4e30..e598cdcc596 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IHapiPackageCacheManager.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IHapiPackageCacheManager.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IPackageInstallerSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IPackageInstallerSvc.java index 24cf9782bb0..908a6ebce2d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IPackageInstallerSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/IPackageInstallerSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; public interface IPackageInstallerSvc { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/ImplementationGuideInstallationException.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/ImplementationGuideInstallationException.java index c784c761e5e..18e26fb48cc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/ImplementationGuideInstallationException.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/ImplementationGuideInstallationException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; /** * Used internally to indicate a failure to install the implementation guide diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/JpaPackageCache.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/JpaPackageCache.java index 9a5251d6b0b..16102cc8281 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/JpaPackageCache.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/JpaPackageCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmJpaValidationSupport.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmJpaValidationSupport.java index d4f1b2f6c6e..9a29e24d41b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmJpaValidationSupport.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmJpaValidationSupport.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmPackageMetadataJson.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmPackageMetadataJson.java index 0c1f8c0ed23..91ea49776b2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmPackageMetadataJson.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmPackageMetadataJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.jpa.util.JsonDateDeserializer; import ca.uhn.fhir.jpa.util.JsonDateSerializer; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmPackageSearchResultJson.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmPackageSearchResultJson.java index 2daeb52692b..fc528e2037b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmPackageSearchResultJson.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmPackageSearchResultJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageDeleteOutcomeJson.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageDeleteOutcomeJson.java index 7f5421ca7b5..a2783f2fbf0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageDeleteOutcomeJson.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageDeleteOutcomeJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallOutcomeJson.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallOutcomeJson.java index 9ed80cf499a..15254a2b6d1 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallOutcomeJson.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallOutcomeJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallationSpec.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallationSpec.java index dccb7db9729..13ac10728c2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallationSpec.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallationSpec.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.model.api.annotation.ExampleSupplier; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java index 23a04cb27d2..d779a60b5b3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageSearchSpec.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageSearchSpec.java index cbc9a7370de..af64ce17d71 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageSearchSpec.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageSearchSpec.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageVersionComparator.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageVersionComparator.java index 66bc15fa4f4..0b6fe0cfe96 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageVersionComparator.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageVersionComparator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import java.math.BigDecimal; import java.util.Comparator; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/NpmPackageData.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/NpmPackageData.java index f0284f3250c..ef19cd3ed05 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/NpmPackageData.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/NpmPackageData.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages.loader; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages.loader; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages.loader; import org.hl7.fhir.utilities.npm.NpmPackage; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/PackageLoaderSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/PackageLoaderSvc.java index ac7b900ebec..16add14c842 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/PackageLoaderSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/PackageLoaderSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages.loader; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages.loader; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages.loader; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.packages.PackageInstallationSpec; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/PackageResourceParsingSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/PackageResourceParsingSvc.java index be1898a3a65..25daffd0d74 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/PackageResourceParsingSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/loader/PackageResourceParsingSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages.loader; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages.loader; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages.loader; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/util/PackageUtils.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/util/PackageUtils.java index 5fce8092bec..acaaf1ab26b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/util/PackageUtils.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/util/PackageUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages.util; import com.google.common.collect.Lists; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/IPartitionLookupSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/IPartitionLookupSvc.java index a3cddfc0384..cc18df11003 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/IPartitionLookupSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/IPartitionLookupSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.partition; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.partition; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.partition; import ca.uhn.fhir.jpa.entity.PartitionEntity; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionLookupSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionLookupSvcImpl.java index 9ee2d00d150..88f8eb4e1df 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionLookupSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionLookupSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.partition; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.partition; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.partition; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionManagementProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionManagementProvider.java index 6ca9c306eb2..29fad5af4a5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionManagementProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionManagementProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.partition; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.partition; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.partition; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.entity.PartitionEntity; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java index 9b178f66287..a4526706684 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.partition; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.partition; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.partition; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderCodeSystem.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderCodeSystem.java index 95796923572..b78ee65ee5b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderCodeSystem.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderCodeSystem.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.support.ConceptValidationOptions; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderComposition.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderComposition.java index c87211a4642..314a22e911b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderComposition.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderComposition.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoComposition; @@ -19,26 +38,6 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType; import org.hl7.fhir.r5.model.Composition; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public abstract class BaseJpaResourceProviderComposition extends BaseJpaResourceProvider { /** diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderConceptMap.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderConceptMap.java index 16e18d62249..9d1e1c4e3a2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderConceptMap.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderConceptMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.support.TranslateConceptResults; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounter.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounter.java index 1a2161b2208..c10e5717e93 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounter.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounter.java @@ -1,21 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - -import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoEncounter; -import ca.uhn.fhir.jpa.model.util.JpaConstants; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.valueset.BundleTypeEnum; -import ca.uhn.fhir.rest.annotation.IdParam; -import ca.uhn.fhir.rest.annotation.Operation; -import ca.uhn.fhir.rest.annotation.OperationParam; -import ca.uhn.fhir.rest.annotation.Sort; -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.api.SortSpec; -import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.param.DateRangeParam; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; -import org.hl7.fhir.instance.model.api.IPrimitiveType; - /* * #%L * HAPI FHIR JPA Server @@ -35,6 +17,23 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; + +import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoEncounter; +import ca.uhn.fhir.jpa.model.util.JpaConstants; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.valueset.BundleTypeEnum; +import ca.uhn.fhir.rest.annotation.IdParam; +import ca.uhn.fhir.rest.annotation.Operation; +import ca.uhn.fhir.rest.annotation.OperationParam; +import ca.uhn.fhir.rest.annotation.Sort; +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.rest.api.SortSpec; +import ca.uhn.fhir.rest.api.server.IBundleProvider; +import ca.uhn.fhir.rest.param.DateRangeParam; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; public abstract class BaseJpaResourceProviderEncounter extends BaseJpaResourceProvider { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu2.java index 3eb9ad88085..f8cb14fadee 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoEncounter; import ca.uhn.fhir.jpa.model.util.JpaConstants; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderObservation.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderObservation.java index 1e597f8b9a6..55837d9b8a3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderObservation.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderObservation.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoObservation; @@ -19,26 +38,6 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType; import java.util.List; import java.util.Map; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public abstract class BaseJpaResourceProviderObservation extends BaseJpaResourceProvider { /** diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderPatient.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderPatient.java index 0bb463f41f4..243adcba978 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderPatient.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderPatient.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoPatient; @@ -29,26 +48,6 @@ import java.util.List; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public abstract class BaseJpaResourceProviderPatient extends BaseJpaResourceProvider { /** diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderStructureDefinition.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderStructureDefinition.java index e7ab0a838b9..c2878796faa 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderStructureDefinition.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderStructureDefinition.java @@ -1,21 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoStructureDefinition; -import ca.uhn.fhir.jpa.model.util.JpaConstants; -import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; -import ca.uhn.fhir.rest.annotation.IdParam; -import ca.uhn.fhir.rest.annotation.Operation; -import ca.uhn.fhir.rest.annotation.OperationParam; -import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.param.UriParam; -import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; -import ca.uhn.fhir.util.ValidateUtil; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; -import org.hl7.fhir.instance.model.api.IPrimitiveType; - /* * #%L * HAPI FHIR JPA Server @@ -35,6 +17,23 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; + +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoStructureDefinition; +import ca.uhn.fhir.jpa.model.util.JpaConstants; +import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.rest.annotation.IdParam; +import ca.uhn.fhir.rest.annotation.Operation; +import ca.uhn.fhir.rest.annotation.OperationParam; +import ca.uhn.fhir.rest.api.server.IBundleProvider; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.param.UriParam; +import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; +import ca.uhn.fhir.util.ValidateUtil; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; public abstract class BaseJpaResourceProviderStructureDefinition extends BaseJpaResourceProvider { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaSystemProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaSystemProvider.java index 2979ec27313..73b9202915f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaSystemProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaSystemProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.search.reindex.IResourceReindexingSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/DiffProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/DiffProvider.java index 720a858e6b3..b426e2a720a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/DiffProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/DiffProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaCapabilityStatementProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaCapabilityStatementProvider.java index 8d4129d4d1c..ba8167343ff 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaCapabilityStatementProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaCapabilityStatementProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu2.java index fb000b232a0..9eb06d490c2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaSystemProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaSystemProvider.java index 51c5a11b41c..ce24a11facc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaSystemProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaSystemProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.batch2.jobs.reindex.ReindexProvider; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ProcessMessageProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ProcessMessageProvider.java index 42565354be1..b597f0d98c6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ProcessMessageProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ProcessMessageProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.model.util.JpaConstants; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProvider.java index c5acc75fc6a..ae5b3225d7c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ValueSetOperationProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ValueSetOperationProvider.java index 9aa357b3c9b..34c8319637d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ValueSetOperationProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ValueSetOperationProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.ConceptValidationOptions; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ValueSetOperationProviderDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ValueSetOperationProviderDstu2.java index 60a2768efe1..27e2c777ace 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ValueSetOperationProviderDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ValueSetOperationProviderDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.jpa.dao.JpaResourceDaoCodeSystem; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java index d1518ca1d6a..f4c85ec3919 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider.dstu3; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider.dstu3; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider.dstu3; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/IConsentExtensionProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/IConsentExtensionProvider.java index b466b3ab0bf..6f32028e1e5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/IConsentExtensionProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/IConsentExtensionProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider.r4; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider.r4; import ca.uhn.fhir.util.ExtensionUtil; import org.hl7.fhir.instance.model.api.IBaseExtension; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/IMemberMatchConsentHook.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/IMemberMatchConsentHook.java index fa2e2bbc9ae..6cd82f1a180 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/IMemberMatchConsentHook.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/IMemberMatchConsentHook.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider.r4; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider.r4; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatchR4ResourceProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatchR4ResourceProvider.java index b1b95017850..d013e9197cb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatchR4ResourceProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatchR4ResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider.r4; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider.r4; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4Helper.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4Helper.java index 97abe077f42..7a82c122055 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4Helper.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4Helper.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.provider.r4; import ca.uhn.fhir.context.FhirContext; @@ -37,26 +56,6 @@ import static ca.uhn.fhir.rest.api.Constants.PARAM_MEMBER_IDENTIFIER; import static ca.uhn.fhir.rest.api.Constants.PARAM_MEMBER_PATIENT; import static ca.uhn.fhir.rest.api.Constants.PARAM_NEW_COVERAGE; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class MemberMatcherR4Helper { static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(MemberMatcherR4Helper.class); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/reindex/Batch2DaoSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/reindex/Batch2DaoSvcImpl.java index 2ae5ba2c7f2..1064519fcf3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/reindex/Batch2DaoSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/reindex/Batch2DaoSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.reindex; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.reindex; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/DatabaseBackedPagingProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/DatabaseBackedPagingProvider.java index db9baad7b3d..6af19809913 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/DatabaseBackedPagingProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/DatabaseBackedPagingProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.dao.SearchBuilderFactory; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/DeferConceptIndexingRoutingBinder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/DeferConceptIndexingRoutingBinder.java index fa6b01b0d7d..4789f58655e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/DeferConceptIndexingRoutingBinder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/DeferConceptIndexingRoutingBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.jpa.entity.TermConcept; import org.hibernate.search.mapper.pojo.bridge.RoutingBridge; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ExceptionService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ExceptionService.java index 200a5fe210a..2866373dfe8 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ExceptionService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ExceptionService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/HapiHSearchAnalysisConfigurers.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/HapiHSearchAnalysisConfigurers.java index efbdb41f652..00232f60074 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/HapiHSearchAnalysisConfigurers.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/HapiHSearchAnalysisConfigurers.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import org.apache.lucene.analysis.core.KeywordTokenizerFactory; import org.apache.lucene.analysis.core.LowerCaseFilterFactory; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/IStaleSearchDeletingSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/IStaleSearchDeletingSvc.java index 9567c44dbe6..bbd353c16bc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/IStaleSearchDeletingSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/IStaleSearchDeletingSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; public interface IStaleSearchDeletingSvc { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ISynchronousSearchSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ISynchronousSearchSvc.java index 5f66b8376ed..d3aa5ef78fe 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ISynchronousSearchSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ISynchronousSearchSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.svc.ISearchSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java index 54d53fefd84..85df3e6a91a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderFactory.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderFactory.java index c14aa477a74..5be99eb2276 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderFactory.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.config.JpaConfig; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaSearchFirstPageBundleProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaSearchFirstPageBundleProvider.java index 3169170700a..be0c352b101 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaSearchFirstPageBundleProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaSearchFirstPageBundleProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.dao.ISearchBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ResourceSearchUrlSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ResourceSearchUrlSvc.java index 40a0d7a2038..62470304d6e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ResourceSearchUrlSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/ResourceSearchUrlSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java index 0830789e38c..c42637fdd8c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L%family */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchStrategyFactory.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchStrategyFactory.java index 6fe52be9056..a21b7e7ce8e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchStrategyFactory.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchStrategyFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchUrlJobMaintenanceSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchUrlJobMaintenanceSvcImpl.java index 799403e6345..0ac33f6b8fe 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchUrlJobMaintenanceSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchUrlJobMaintenanceSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.jpa.api.svc.ISearchUrlJobMaintenanceSvc; import ca.uhn.fhir.jpa.model.sched.HapiJob; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/StaleSearchDeletingSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/StaleSearchDeletingSvcImpl.java index 34aa8043b8b..96f67adcbcf 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/StaleSearchDeletingSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/StaleSearchDeletingSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.model.sched.HapiJob; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SynchronousSearchSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SynchronousSearchSvcImpl.java index 2b535f2be5e..eae46731eb5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SynchronousSearchSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SynchronousSearchSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/WarmSearchDefinition.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/WarmSearchDefinition.java index 95b85a3e740..e427d1773fd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/WarmSearchDefinition.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/WarmSearchDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; public class WarmSearchDefinition { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/RawElasticJsonBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/RawElasticJsonBuilder.java index 921445bdfe1..c9c81baaa64 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/RawElasticJsonBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/RawElasticJsonBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.autocomplete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.autocomplete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.autocomplete; import com.google.gson.JsonObject; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteAggregation.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteAggregation.java index 34b00e38a2e..942dd34ca80 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteAggregation.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteAggregation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.autocomplete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.autocomplete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.autocomplete; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteHit.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteHit.java index b105e0a7db0..cd79686e401 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteHit.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteHit.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.autocomplete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.autocomplete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.autocomplete; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteSearch.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteSearch.java index 7b9a8206055..86f5330e82f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteSearch.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteSearch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.autocomplete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.autocomplete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.autocomplete; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.dao.search.ExtendedHSearchClauseBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteOptions.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteOptions.java index c2cb1b5bbb1..7a0aa904210 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteOptions.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteOptions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.autocomplete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.autocomplete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.autocomplete; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteSearch.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteSearch.java index 4abf32164e6..0c660b1acd3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteSearch.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteSearch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.autocomplete; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.autocomplete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.autocomplete; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.entity.StorageSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/package-info.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/package-info.java index bf64dade18c..d9e346dd41a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/package-info.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/autocomplete/package-info.java @@ -1,16 +1,3 @@ -/** - * Search for distinct Coding elements by the display text, or by partial codes for a given SearchParameter. - *

- * Main entrypoint - {@link ca.uhn.fhir.jpa.search.autocomplete.TokenAutocompleteSearch#search} - * - * This work depends on on the Hibernate Search infrastructure in {@link ca.uhn.fhir.jpa.dao.search}. - * - * Provides an interactive-autocomplete when browsing codes in a dataset. - * - * - */ -package ca.uhn.fhir.jpa.search.autocomplete; - /*- * #%L * HAPI FHIR JPA Server @@ -30,3 +17,16 @@ package ca.uhn.fhir.jpa.search.autocomplete; * limitations under the License. * #L% */ +/** + * Search for distinct Coding elements by the display text, or by partial codes for a given SearchParameter. + *

+ * Main entrypoint - {@link ca.uhn.fhir.jpa.search.autocomplete.TokenAutocompleteSearch#search} + * + * This work depends on on the Hibernate Search infrastructure in {@link ca.uhn.fhir.jpa.dao.search}. + * + * Provides an interactive-autocomplete when browsing codes in a dataset. + * + * + */ +package ca.uhn.fhir.jpa.search.autocomplete; + diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/ISearchQueryExecutor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/ISearchQueryExecutor.java index 817e79877e8..46bf188c550 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/ISearchQueryExecutor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/ISearchQueryExecutor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder; import java.io.Closeable; import java.util.Iterator; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/QueryStack.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/QueryStack.java index cd8f94ca53f..25002e765a7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/QueryStack.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/QueryStack.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchBuilder.java index 9d128127c39..d2be770574a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder; import ca.uhn.fhir.context.ComboSearchParamType; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchQueryExecutors.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchQueryExecutors.java index b0018365478..513ae1f26c0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchQueryExecutors.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchQueryExecutors.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder; import ca.uhn.fhir.jpa.model.dao.JpaPid; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/StorageInterceptorHooksFacade.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/StorageInterceptorHooksFacade.java index ff021676441..bbfbc879c40 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/StorageInterceptorHooksFacade.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/StorageInterceptorHooksFacade.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder; import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/MissingParameterQueryParams.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/MissingParameterQueryParams.java index 608bfdff520..ae7cce2c1c6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/MissingParameterQueryParams.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/MissingParameterQueryParams.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.models; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.models; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/MissingQueryParameterPredicateParams.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/MissingQueryParameterPredicateParams.java index 8353618a377..9c9edde05f6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/MissingQueryParameterPredicateParams.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/MissingQueryParameterPredicateParams.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.models; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.models; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.search.builder.predicate.ResourceTablePredicateBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderCacheKey.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderCacheKey.java index e135bf210d0..00b2ea5ddcb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderCacheKey.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderCacheKey.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.models; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.models; import com.healthmarketscience.sqlbuilder.dbspec.basic.DbColumn; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderCacheLookupResult.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderCacheLookupResult.java index 8c7ade1b840..a8e09b9d9df 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderCacheLookupResult.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderCacheLookupResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.models; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.models; import ca.uhn.fhir.jpa.search.builder.predicate.BaseJoiningPredicateBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderTypeEnum.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderTypeEnum.java index 833b900dabe..901f6f5733c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderTypeEnum.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/PredicateBuilderTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.models; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.models; public enum PredicateBuilderTypeEnum { DATE, COORDS, NUMBER, QUANTITY, REFERENCE, SOURCE, STRING, TOKEN, TAG diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseJoiningPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseJoiningPredicateBuilder.java index 18a8474208b..30cd55920f5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseJoiningPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseJoiningPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BasePredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BasePredicateBuilder.java index 6ecaf6b8836..2160ecf2d53 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BasePredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BasePredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseQuantityPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseQuantityPredicateBuilder.java index 0e546d1cbd2..07b5a7f7127 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseQuantityPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseQuantityPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseSearchParamPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseSearchParamPredicateBuilder.java index 78c55a45479..1058c0051fc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseSearchParamPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/BaseSearchParamPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.entity.BaseResourceIndexedSearchParam; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ComboNonUniqueSearchParameterPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ComboNonUniqueSearchParameterPredicateBuilder.java index 5149508cdc3..42c4f050314 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ComboNonUniqueSearchParameterPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ComboNonUniqueSearchParameterPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.search.builder.sql.SearchQueryBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ComboUniqueSearchParameterPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ComboUniqueSearchParameterPredicateBuilder.java index c630f79c3cf..975ec4edd75 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ComboUniqueSearchParameterPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ComboUniqueSearchParameterPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.search.builder.sql.SearchQueryBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/CoordsPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/CoordsPredicateBuilder.java index 8e001ab5517..a10460a067d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/CoordsPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/CoordsPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/DatePredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/DatePredicateBuilder.java index eb3d71240d0..8687f11ca19 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/DatePredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/DatePredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ForcedIdPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ForcedIdPredicateBuilder.java index d933df13b5b..8429ed32c36 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ForcedIdPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ForcedIdPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.jpa.search.builder.sql.SearchQueryBuilder; import com.healthmarketscience.sqlbuilder.dbspec.basic.DbColumn; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ICanMakeMissingParamPredicate.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ICanMakeMissingParamPredicate.java index 4d847d17037..365f5b4f974 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ICanMakeMissingParamPredicate.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ICanMakeMissingParamPredicate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.search.builder.models.MissingQueryParameterPredicateParams; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/NumberPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/NumberPredicateBuilder.java index 3a5ab0d9b6b..628b91bd939 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/NumberPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/NumberPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/QuantityNormalizedPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/QuantityNormalizedPredicateBuilder.java index e9c81c01361..7e860caf1ed 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/QuantityNormalizedPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/QuantityNormalizedPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.jpa.search.builder.sql.SearchQueryBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/QuantityPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/QuantityPredicateBuilder.java index 0218b1edb5a..fa1d8769640 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/QuantityPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/QuantityPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.jpa.search.builder.sql.SearchQueryBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceIdPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceIdPredicateBuilder.java index 474c270a184..2d6d4df6d99 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceIdPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceIdPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.svc.IIdHelperService; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceLinkPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceLinkPredicateBuilder.java index c1e3444ecdd..7d9dd624598 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceLinkPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceLinkPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceTablePredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceTablePredicateBuilder.java index a9760c007d4..5f77daea0d6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceTablePredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceTablePredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.jpa.util.QueryParameterUtils; import ca.uhn.fhir.jpa.search.builder.sql.SearchQueryBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/SearchParamPresentPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/SearchParamPresentPredicateBuilder.java index 9b845de662e..b41de65659c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/SearchParamPresentPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/SearchParamPresentPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/SourcePredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/SourcePredicateBuilder.java index 633cd658bcb..0366a56646b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/SourcePredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/SourcePredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.jpa.search.builder.sql.SearchQueryBuilder; import com.healthmarketscience.sqlbuilder.BinaryCondition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/StringPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/StringPredicateBuilder.java index 5fe66ae74b2..c2a80e77509 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/StringPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/StringPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/TagPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/TagPredicateBuilder.java index 8883a3a8aa3..eec4cf2076b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/TagPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/TagPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/TokenPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/TokenPredicateBuilder.java index 48fcc05c98d..7f2d347109d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/TokenPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/TokenPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeDeclaredChildDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/UriPredicateBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/UriPredicateBuilder.java index 5cb0c2e8507..3c54668b801 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/UriPredicateBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/predicate/UriPredicateBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.predicate; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.predicate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.predicate; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/GeneratedSql.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/GeneratedSql.java index 4dd562fa75b..16c68e0b178 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/GeneratedSql.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/GeneratedSql.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.sql; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.sql; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.sql; import java.util.List; import java.util.regex.Pattern; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/PredicateBuilderFactory.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/PredicateBuilderFactory.java index 6e624aa8f5e..570caa9d607 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/PredicateBuilderFactory.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/PredicateBuilderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.sql; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.sql; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.sql; import ca.uhn.fhir.jpa.search.builder.QueryStack; import ca.uhn.fhir.jpa.search.builder.predicate.CoordsPredicateBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilder.java index d098599650e..2dc933dc27a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.sql; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.sql; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.sql; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryExecutor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryExecutor.java index 78ccc1c0dc3..ec6d0c997b7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryExecutor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryExecutor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.sql; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.sql; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.sql; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.search.builder.ISearchQueryExecutor; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SqlObjectFactory.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SqlObjectFactory.java index 2df06f25e00..60ae1a571fc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SqlObjectFactory.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SqlObjectFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.sql; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.sql; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.sql; import ca.uhn.fhir.jpa.search.builder.QueryStack; import ca.uhn.fhir.jpa.search.builder.predicate.ComboNonUniqueSearchParameterPredicateBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchContinuationTask.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchContinuationTask.java index f766c8dffc0..c2921ba2976 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchContinuationTask.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchContinuationTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.tasks; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.tasks; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.tasks; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTask.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTask.java index f401a5bfcff..1e2c6b18680 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTask.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.tasks; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.tasks; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.tasks; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTaskParameters.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTaskParameters.java index 0a587d682c5..016cadd504d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTaskParameters.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTaskParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.builder.tasks; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.builder.tasks; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.builder.tasks; import ca.uhn.fhir.jpa.api.dao.IDao; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchCacheSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchCacheSvcImpl.java index 52e9bce687d..03f5dbb705e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchCacheSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchCacheSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.cache; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.cache; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchResultCacheSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchResultCacheSvcImpl.java index 027745081b0..2f5580edc2a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchResultCacheSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchResultCacheSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.cache; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.cache; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.dao.data.ISearchResultDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/ISearchCacheSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/ISearchCacheSvc.java index bc28213b029..49da515bf45 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/ISearchCacheSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/ISearchCacheSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.cache; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.cache; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.entity.Search; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/ISearchResultCacheSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/ISearchResultCacheSvc.java index 9880e22ee7e..4c01e36b978 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/ISearchResultCacheSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/ISearchResultCacheSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.cache; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.cache; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.entity.Search; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/SearchCacheStatusEnum.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/SearchCacheStatusEnum.java index 7df08f39611..71bc961f031 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/SearchCacheStatusEnum.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/cache/SearchCacheStatusEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.cache; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.cache; public enum SearchCacheStatusEnum { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/ElasticsearchHibernatePropertiesBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/ElasticsearchHibernatePropertiesBuilder.java index f748c8013b9..ab5c8c66257 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/ElasticsearchHibernatePropertiesBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/ElasticsearchHibernatePropertiesBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.elastic; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.elastic; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.elastic; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/IndexNamePrefixLayoutStrategy.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/IndexNamePrefixLayoutStrategy.java index ee58c5e4db9..41943bcfc9d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/IndexNamePrefixLayoutStrategy.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/elastic/IndexNamePrefixLayoutStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.elastic; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.elastic; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.elastic; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchRestClientFactory.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchRestClientFactory.java index 3c33857df92..74f71cade5c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchRestClientFactory.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchRestClientFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.lastn; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.lastn; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.lastn; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java index 52482c6d71a..c5aad25b680 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.lastn; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.lastn; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.lastn; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/IElasticsearchSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/IElasticsearchSvc.java index 5093540045b..3b02c38567d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/IElasticsearchSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/IElasticsearchSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.lastn; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.lastn; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.lastn; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.search.lastn.json.CodeJson; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/json/CodeJson.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/json/CodeJson.java index 1ba3f34b262..8b7fc717525 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/json/CodeJson.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/json/CodeJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.lastn.json; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.lastn.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.lastn.json; import ca.uhn.fhir.jpa.model.util.CodeSystemHash; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/json/ObservationJson.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/json/ObservationJson.java index 3628249e2da..8abbdd9bdcc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/json/ObservationJson.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/json/ObservationJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.lastn.json; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.lastn.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.lastn.json; import ca.uhn.fhir.jpa.model.util.CodeSystemHash; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/IResourceReindexingSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/IResourceReindexingSvc.java index b1ef985d375..d4f069f27a2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/IResourceReindexingSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/IResourceReindexingSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.reindex; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.reindex; import ca.uhn.fhir.batch2.model.JobInstanceStartRequest; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexer.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexer.java index 1ceed446354..99e673a38e8 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexer.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.reindex; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.reindex; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImpl.java index ac49b3a5ded..1e2dd9b79b7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.reindex; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.reindex; import ca.uhn.fhir.batch2.model.JobInstanceStartRequest; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/warm/CacheWarmingSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/warm/CacheWarmingSvcImpl.java index dca2291a6c1..ca7d6dcf198 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/warm/CacheWarmingSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/warm/CacheWarmingSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.warm; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.warm; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.warm; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/warm/ICacheWarmingSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/warm/ICacheWarmingSvc.java index b69b97ee435..95996db8493 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/warm/ICacheWarmingSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/warm/ICacheWarmingSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.warm; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.warm; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.warm; public interface ICacheWarmingSvc { void performWarmingPass(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sp/ISearchParamPresenceSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sp/ISearchParamPresenceSvc.java index a047b9e6bbe..ffe49d172cd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sp/ISearchParamPresenceSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sp/ISearchParamPresenceSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sp; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sp; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sp; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.util.AddRemoveCount; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sp/SearchParamPresenceSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sp/SearchParamPresenceSvcImpl.java index 1f39d5e894d..1ae0ae17e62 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sp/SearchParamPresenceSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sp/SearchParamPresenceSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.sp; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.sp; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.sp; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.dao.data.ISearchParamPresentDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermVersionAdapterSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermVersionAdapterSvcImpl.java index 09566fc052b..2edb04b7afe 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermVersionAdapterSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermVersionAdapterSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.term.api.ITermVersionAdapterSvc; import ca.uhn.fhir.util.ValidateUtil; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ExpansionFilter.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ExpansionFilter.java index a2f9b4b5985..d7d3402f506 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ExpansionFilter.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ExpansionFilter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.model.util.JpaConstants; import ca.uhn.fhir.util.FhirVersionIndependentConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IValueSetConceptAccumulator.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IValueSetConceptAccumulator.java index 29bff62abcf..906a13f087f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IValueSetConceptAccumulator.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IValueSetConceptAccumulator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.entity.TermConceptDesignation; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IZipContentsHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IZipContentsHandler.java index 33444fdcfaf..e64af4f4f4d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IZipContentsHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IZipContentsHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import java.io.IOException; import java.io.Reader; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IZipContentsHandlerCsv.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IZipContentsHandlerCsv.java index 304dd826cc1..f025c719ceb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IZipContentsHandlerCsv.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IZipContentsHandlerCsv.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import org.apache.commons.csv.CSVRecord; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java index 32110eedc91..3d4d8b27df7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcImpl.java index 15486da8827..a4f0d767cd3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermConceptDaoSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermConceptDaoSvc.java index 8aef54f7335..ace6483f35e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermConceptDaoSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermConceptDaoSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; import ca.uhn.fhir.jpa.dao.data.ITermConceptDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermConceptMappingSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermConceptMappingSvcImpl.java index c907b2ea3c5..b35e5a7086f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermConceptMappingSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermConceptMappingSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.TranslateConceptResult; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java index 6ea9f5b3697..d6e21a081fe 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.model.JobInstance; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImpl.java index f72dcc9f30e..7920db84645 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImpl.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.context.FhirContext; @@ -140,26 +159,6 @@ import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.hl7.fhir.common.hapi.validation.support.ValidationConstants.LOINC_ALL_VALUESET_ID; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class TermLoaderSvcImpl implements ITermLoaderSvc { public static final String CUSTOM_CONCEPTS_FILE = "concepts.csv"; public static final String CUSTOM_HIERARCHY_FILE = "hierarchy.csv"; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java index 38860db808c..3b839ca94ab 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcUtil.java index 7fc2ac2d38c..d165b4a2b80 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReindexingSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReindexingSvcImpl.java index 6ac01ad168e..af9eaf804f4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReindexingSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReindexingSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.dao.data.ITermConceptDao; import ca.uhn.fhir.jpa.dao.data.ITermConceptParentChildLinkDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcDstu2.java index 1ec6e8eadae..47be4e7fd8e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.term.api.ITermVersionAdapterSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcDstu3.java index eeae25469cd..5e530fc24f6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4.java index 73772613170..8be659d365f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4B.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4B.java index f414e163e33..ed51a9347db 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4B.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4B.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.term.api.ITermVersionAdapterSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR5.java index 5fa8c2a7942..98ef3079fbd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR5.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.term.api.ITermVersionAdapterSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ValueSetConceptAccumulator.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ValueSetConceptAccumulator.java index e4fe86a4885..b0f5de0f874 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ValueSetConceptAccumulator.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ValueSetConceptAccumulator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.dao.data.ITermValueSetConceptDao; import ca.uhn.fhir.jpa.dao.data.ITermValueSetConceptDesignationDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ValueSetExpansionComponentWithConceptAccumulator.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ValueSetExpansionComponentWithConceptAccumulator.java index 8dd8ea19016..e8c3e996376 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ValueSetExpansionComponentWithConceptAccumulator.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ValueSetExpansionComponentWithConceptAccumulator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemStorageSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemStorageSvc.java index 677ac5c20d0..2d1cfc7ffae 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemStorageSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemStorageSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermConceptMappingSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermConceptMappingSvc.java index 91dd44c8453..181d3f5fbb9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermConceptMappingSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermConceptMappingSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.jpa.api.model.TranslationRequest; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermDeferredStorageSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermDeferredStorageSvc.java index 85901322fce..b55b73efee8 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermDeferredStorageSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermDeferredStorageSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReadSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReadSvc.java index 480ef9f1d01..f19cd90fdb7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReadSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReadSvc.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.term.api; import ca.uhn.fhir.context.support.ConceptValidationOptions; @@ -25,26 +44,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * This interface is the "read" interface for the terminology service. It handles things like * lookups, code validations, expansions, concept mappings, etc. diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReindexingSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReindexingSvc.java index 19947af782c..812af9e36a4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReindexingSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermReindexingSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; public interface ITermReindexingSvc { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermVersionAdapterSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermVersionAdapterSvc.java index f54d8f31db4..948b8f69706 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermVersionAdapterSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermVersionAdapterSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; import ca.uhn.fhir.rest.api.server.RequestDetails; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ReindexTerminologyResult.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ReindexTerminologyResult.java index 711dfb464df..fbe16ec7d6d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ReindexTerminologyResult.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ReindexTerminologyResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; public enum ReindexTerminologyResult { SUCCESS, diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/TermCodeSystemDeleteJobSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/TermCodeSystemDeleteJobSvc.java index 9bf9b387b3c..e47699cd401 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/TermCodeSystemDeleteJobSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/TermCodeSystemDeleteJobSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; import ca.uhn.fhir.jpa.dao.data.ITermCodeSystemDao; import ca.uhn.fhir.jpa.dao.data.ITermCodeSystemVersionDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/config/TermCodeSystemConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/config/TermCodeSystemConfig.java index 43c6a5431f5..90790553eb2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/config/TermCodeSystemConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/config/TermCodeSystemConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.config; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.config; import ca.uhn.fhir.jpa.term.TermConceptDaoSvc; import ca.uhn.fhir.jpa.term.TermDeferredStorageSvcImpl; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/ConceptHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/ConceptHandler.java index 6e3125679fc..7df7f9fe5f5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/ConceptHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/ConceptHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.custom; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.custom; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.custom; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/CustomTerminologySet.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/CustomTerminologySet.java index 25a811f8c4a..20c412abe20 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/CustomTerminologySet.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/CustomTerminologySet.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.custom; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.custom; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.custom; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/HierarchyHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/HierarchyHandler.java index 4458c5cec73..f418fa83189 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/HierarchyHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/HierarchyHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.custom; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.custom; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.custom; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/PropertyHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/PropertyHandler.java index b53439257f2..6a5be2cd6e7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/PropertyHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/custom/PropertyHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.custom; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.custom; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.custom; import ca.uhn.fhir.jpa.entity.TermConceptProperty; import ca.uhn.fhir.jpa.entity.TermConceptPropertyTypeEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ex/ExpansionTooCostlyException.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ex/ExpansionTooCostlyException.java index e01c306ff0f..03a941f44f2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ex/ExpansionTooCostlyException.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ex/ExpansionTooCostlyException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.ex; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.ex; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.ex; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/icd10/Icd10Loader.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/icd10/Icd10Loader.java index 1a443d8944b..582836644b8 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/icd10/Icd10Loader.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/icd10/Icd10Loader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.icd10; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.icd10; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.icd10; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/icd10cm/Icd10CmLoader.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/icd10cm/Icd10CmLoader.java index d618d7dfa03..73731b9e190 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/icd10cm/Icd10CmLoader.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/icd10cm/Icd10CmLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.icd10cm; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.icd10cm; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.icd10cm; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java index f58beaf4d41..e3f32c60ca7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincTop2000LabResultsHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincTop2000LabResultsHandler.java index e9ddfa32320..f5be7c612d9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincTop2000LabResultsHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincTop2000LabResultsHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListHandler.java index 3c1c860aba8..181cffca751 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListLinkHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListLinkHandler.java index 446611ff172..4c47c1b790f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListLinkHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListLinkHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincCodingPropertiesHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincCodingPropertiesHandler.java index ffffffb0aac..5fddbc8c053 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincCodingPropertiesHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincCodingPropertiesHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincConsumerNameHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincConsumerNameHandler.java index a5faf0577a6..c95f868aca9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincConsumerNameHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincConsumerNameHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincDocumentOntologyHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincDocumentOntologyHandler.java index 173c478831e..624b7c621be 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincDocumentOntologyHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincDocumentOntologyHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincGroupFileHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincGroupFileHandler.java index 078aa71910b..110e37f7453 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincGroupFileHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincGroupFileHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincGroupTermsFileHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincGroupTermsFileHandler.java index 99460cabebb..00bed183749 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincGroupTermsFileHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincGroupTermsFileHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincHandler.java index 17da8af0133..ea8cf45f299 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincHierarchyHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincHierarchyHandler.java index 936a8d18818..7b5493cabdb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincHierarchyHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincHierarchyHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java index 5d543c9320b..85d4609e2c0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincImagingDocumentCodeHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincImagingDocumentCodeHandler.java index 7918e88cff1..5611536a243 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincImagingDocumentCodeHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincImagingDocumentCodeHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantHandler.java index f534b188fba..256a195db57 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantHandler.java @@ -1,17 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.trim; -import static org.apache.commons.lang3.StringUtils.trimToEmpty; - -import java.util.Map; - -import org.apache.commons.csv.CSVRecord; - -import ca.uhn.fhir.jpa.entity.TermConcept; -import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; -import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; - /*- * #%L * HAPI FHIR JPA Server @@ -31,6 +17,19 @@ import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; + +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.trim; +import static org.apache.commons.lang3.StringUtils.trimToEmpty; + +import java.util.Map; + +import org.apache.commons.csv.CSVRecord; + +import ca.uhn.fhir.jpa.entity.TermConcept; +import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; +import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; public class LoincLinguisticVariantHandler implements IZipContentsHandlerCsv { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantsHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantsHandler.java index e3b010bb509..f89921f923c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantsHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantsHandler.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - -import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; -import org.apache.commons.csv.CSVRecord; - -import javax.annotation.Nonnull; -import java.util.List; - -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.trim; - /*- * #%L * HAPI FHIR JPA Server @@ -28,6 +17,16 @@ import static org.apache.commons.lang3.StringUtils.trim; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; + +import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; +import org.apache.commons.csv.CSVRecord; + +import javax.annotation.Nonnull; +import java.util.List; + +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.trim; public class LoincLinguisticVariantsHandler implements IZipContentsHandlerCsv { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincMapToHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincMapToHandler.java index 687e70c417b..77e877a6e59 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincMapToHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincMapToHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincParentGroupFileHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincParentGroupFileHandler.java index e8398470f84..3abf530c2dc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincParentGroupFileHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincParentGroupFileHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartHandler.java index 2ae7d093f5e..442a2302c2b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartLinkHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartLinkHandler.java index ea83f1e8948..8792d286eab 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartLinkHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartLinkHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartRelatedCodeMappingHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartRelatedCodeMappingHandler.java index 398081b9b4c..05384c4c72c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartRelatedCodeMappingHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartRelatedCodeMappingHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincRsnaPlaybookHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincRsnaPlaybookHandler.java index 7ff2d5b5608..35b450f2431 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincRsnaPlaybookHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincRsnaPlaybookHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincTop2000LabResultsSiHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincTop2000LabResultsSiHandler.java index f2a29db6630..26c29f7e563 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincTop2000LabResultsSiHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincTop2000LabResultsSiHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import org.hl7.fhir.r4.model.ConceptMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincTop2000LabResultsUsHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincTop2000LabResultsUsHandler.java index 45d303df232..48c2d5b23b5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincTop2000LabResultsUsHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincTop2000LabResultsUsHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import org.hl7.fhir.r4.model.ConceptMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUniversalOrderSetHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUniversalOrderSetHandler.java index a723cef36a4..b4ea99d6161 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUniversalOrderSetHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUniversalOrderSetHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUploadPropertiesEnum.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUploadPropertiesEnum.java index e86dafa74c5..54c8beb1d19 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUploadPropertiesEnum.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUploadPropertiesEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import java.util.Collections; import java.util.HashMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincXmlFileZipContentsHandler.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincXmlFileZipContentsHandler.java index 6c21b749cd0..3a89b452319 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincXmlFileZipContentsHandler.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincXmlFileZipContentsHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import ca.uhn.fhir.jpa.term.IZipContentsHandler; import org.apache.commons.io.IOUtils; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/PartTypeAndPartName.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/PartTypeAndPartName.java index 697df8431ac..0baddcefbee 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/PartTypeAndPartName.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/PartTypeAndPartName.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.loinc; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.loinc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.loinc; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerConcept.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerConcept.java index 6c99015a3aa..4208196fbae 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerConcept.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerConcept.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.snomedct; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.snomedct; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.snomedct; import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv; import org.apache.commons.csv.CSVRecord; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerDescription.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerDescription.java index 41887916901..5c5e9327818 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerDescription.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerDescription.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.snomedct; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.snomedct; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.snomedct; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerRelationship.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerRelationship.java index 2366becc1e7..99e8491f65f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerRelationship.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/snomedct/SctHandlerRelationship.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.snomedct; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.snomedct; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.snomedct; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/AddRemoveCount.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/AddRemoveCount.java index 70224d5482d..2b096e863d6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/AddRemoveCount.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/AddRemoveCount.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; public class AddRemoveCount { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/BaseIterator.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/BaseIterator.java index 4cd75c434b2..66220b6752d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/BaseIterator.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/BaseIterator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.i18n.Msg; import java.util.Iterator; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/CoordCalculator.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/CoordCalculator.java index e5f565d8588..5068f135126 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/CoordCalculator.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/CoordCalculator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import org.hibernate.search.engine.spatial.GeoPoint; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/Counter.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/Counter.java index 04c6203fa7a..ae9eb5bc8d4 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/Counter.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/Counter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; public class Counter { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JobInstanceUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JobInstanceUtil.java index 29fdc05800a..2a29b559caf 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JobInstanceUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JobInstanceUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.batch2.model.JobInstance; import ca.uhn.fhir.batch2.model.WorkChunk; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaHapiTransactionService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaHapiTransactionService.java index 826c64b4dca..01cf764d192 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaHapiTransactionService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaHapiTransactionService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.jpa.dao.tx.HapiTransactionService; import org.springframework.orm.jpa.JpaDialect; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/LogicUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/LogicUtil.java index 3121a7f9666..81bc79571ba 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/LogicUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/LogicUtil.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.jpa.util; - -import ca.uhn.fhir.util.CoverageIgnore; - /* * #%L * HAPI FHIR JPA Server @@ -21,6 +17,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; + +import ca.uhn.fhir.util.CoverageIgnore; public class LogicUtil { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/MethodRequest.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/MethodRequest.java index b6d9eeec07b..3558e4b6a91 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/MethodRequest.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/MethodRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; /** * Created by Jeff on 2/8/2017. diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/PersistenceContextProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/PersistenceContextProvider.java index d0ad98ebf12..fec6c6290c1 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/PersistenceContextProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/PersistenceContextProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/QueryChunker.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/QueryChunker.java index e86a70bf054..b624d9ccf48 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/QueryChunker.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/QueryChunker.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.jpa.search.builder.SearchBuilder; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/QueryParameterUtils.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/QueryParameterUtils.java index 4db0e59565e..6693f8b28df 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/QueryParameterUtils.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/QueryParameterUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.dao.predicate.SearchFilterParser; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/RegexpGsonBuilderUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/RegexpGsonBuilderUtil.java index d7324d548de..f0172075d15 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/RegexpGsonBuilderUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/RegexpGsonBuilderUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ResourceCountCache.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ResourceCountCache.java index d90d97ffc83..7ea7836e289 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ResourceCountCache.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ResourceCountCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.model.sched.HapiJob; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ScrollableResultsIterator.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ScrollableResultsIterator.java index c884b8f3844..b892f36e8db 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ScrollableResultsIterator.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ScrollableResultsIterator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import org.apache.commons.lang3.Validate; import org.hibernate.ScrollableResults; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SearchParameterMapCalculator.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SearchParameterMapCalculator.java index bbdb0a88967..dd11b79f13e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SearchParameterMapCalculator.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SearchParameterMapCalculator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.rest.api.SearchTotalModeEnum; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SpringObjectCaster.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SpringObjectCaster.java index 0439032ab01..81702c3089d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SpringObjectCaster.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SpringObjectCaster.java @@ -1,6 +1,3 @@ - -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server @@ -21,6 +18,8 @@ package ca.uhn.fhir.jpa.util; * #L% */ +package ca.uhn.fhir.jpa.util; + import org.springframework.aop.framework.Advised; import org.springframework.aop.support.AopUtils; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu2.java index f3bb7c31ea2..7c0e9c1e871 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu2.java @@ -1,22 +1,3 @@ -package ca.uhn.fhir.jpa.util; - -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; -import ca.uhn.fhir.model.dstu2.resource.Subscription; -import ca.uhn.fhir.model.dstu2.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu2.valueset.SubscriptionChannelTypeEnum; -import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum; -import ca.uhn.fhir.rest.api.RestOperationTypeEnum; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; -import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -import ca.uhn.fhir.rest.server.interceptor.ServerOperationInterceptorAdapter; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR JPA Server @@ -36,6 +17,24 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; + +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; +import ca.uhn.fhir.model.dstu2.resource.Subscription; +import ca.uhn.fhir.model.dstu2.valueset.ResourceTypeEnum; +import ca.uhn.fhir.model.dstu2.valueset.SubscriptionChannelTypeEnum; +import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum; +import ca.uhn.fhir.rest.api.RestOperationTypeEnum; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; +import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; +import ca.uhn.fhir.rest.server.interceptor.ServerOperationInterceptorAdapter; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; /** * Interceptor which requires newly created {@link Subscription subscriptions} to be in diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu3.java index 2b3415bf85e..1f16114273f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu3.java @@ -1,22 +1,3 @@ -package ca.uhn.fhir.jpa.util; - -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; -import ca.uhn.fhir.model.dstu2.valueset.ResourceTypeEnum; -import ca.uhn.fhir.rest.api.RestOperationTypeEnum; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; -import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -import ca.uhn.fhir.rest.server.interceptor.ServerOperationInterceptorAdapter; -import org.hl7.fhir.dstu3.model.Subscription; -import org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType; -import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR JPA Server @@ -36,6 +17,24 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; + +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; +import ca.uhn.fhir.model.dstu2.valueset.ResourceTypeEnum; +import ca.uhn.fhir.rest.api.RestOperationTypeEnum; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; +import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; +import ca.uhn.fhir.rest.server.interceptor.ServerOperationInterceptorAdapter; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; /** * Interceptor which requires newly created {@link Subscription subscriptions} to be in diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorR4.java index fc7c6083649..d5999ac829f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorR4.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorR4.java @@ -1,22 +1,3 @@ -package ca.uhn.fhir.jpa.util; - -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; -import ca.uhn.fhir.model.dstu2.valueset.ResourceTypeEnum; -import ca.uhn.fhir.rest.api.RestOperationTypeEnum; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; -import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -import ca.uhn.fhir.rest.server.interceptor.ServerOperationInterceptorAdapter; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.r4.model.Subscription; -import org.hl7.fhir.r4.model.Subscription.SubscriptionChannelType; -import org.hl7.fhir.r4.model.Subscription.SubscriptionStatus; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR JPA Server @@ -36,6 +17,24 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; + +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; +import ca.uhn.fhir.model.dstu2.valueset.ResourceTypeEnum; +import ca.uhn.fhir.rest.api.RestOperationTypeEnum; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; +import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; +import ca.uhn.fhir.rest.server.interceptor.ServerOperationInterceptorAdapter; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.r4.model.Subscription; +import org.hl7.fhir.r4.model.Subscription.SubscriptionChannelType; +import org.hl7.fhir.r4.model.Subscription.SubscriptionStatus; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; /** * Interceptor which requires newly created {@link Subscription subscriptions} to be in diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtils.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtils.java index 187ccf5a6ac..b3a48b40b5f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtils.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util.jsonpatch; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util.jsonpatch; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util.jsonpatch; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/xmlpatch/XmlPatchUtils.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/xmlpatch/XmlPatchUtils.java index 0a27010b56d..d579d972e39 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/xmlpatch/XmlPatchUtils.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/xmlpatch/XmlPatchUtils.java @@ -1,16 +1,3 @@ -package ca.uhn.fhir.jpa.util.xmlpatch; - -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; -import com.github.dnault.xmlpatch.Patcher; -import org.hl7.fhir.instance.model.api.IBaseResource; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - /* * #%L * HAPI FHIR JPA Server @@ -30,6 +17,18 @@ import java.io.IOException; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util.xmlpatch; + +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; +import com.github.dnault.xmlpatch.Patcher; +import org.hl7.fhir.instance.model.api.IBaseResource; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; public class XmlPatchUtils { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChain.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChain.java index e4a5e8d1c55..39df15bbf69 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChain.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChain.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.validation; - /* * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IIpsGenerationStrategy.java b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IIpsGenerationStrategy.java index 196aceb3ed1..6d3322e9b72 100644 --- a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IIpsGenerationStrategy.java +++ b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IIpsGenerationStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.ips.api; - /*- * #%L * HAPI FHIR JPA Server - International Patient Summary (IPS) @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.ips.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.ips.api; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.model.api.Include; diff --git a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IpsContext.java b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IpsContext.java index 118a9722726..92492b44da5 100644 --- a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IpsContext.java +++ b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IpsContext.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.ips.api; - /*- * #%L * HAPI FHIR JPA Server - International Patient Summary (IPS) @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.ips.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.ips.api; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IpsSectionEnum.java b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IpsSectionEnum.java index 31b0fc02c9e..f7b23cc9a4c 100644 --- a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IpsSectionEnum.java +++ b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/IpsSectionEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.ips.api; - /*- * #%L * HAPI FHIR JPA Server - International Patient Summary (IPS) @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.ips.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.ips.api; public enum IpsSectionEnum { ALLERGY_INTOLERANCE, diff --git a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/SectionRegistry.java b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/SectionRegistry.java index 1b4fc7f3544..de6957227ce 100644 --- a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/SectionRegistry.java +++ b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/api/SectionRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.ips.api; - /*- * #%L * HAPI FHIR JPA Server - International Patient Summary (IPS) @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.ips.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.ips.api; import org.apache.commons.lang3.Validate; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/generator/IIpsGeneratorSvc.java b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/generator/IIpsGeneratorSvc.java index 42a6ab9a395..0c7b253dafd 100644 --- a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/generator/IIpsGeneratorSvc.java +++ b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/generator/IIpsGeneratorSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.ips.generator; - /*- * #%L * HAPI FHIR JPA Server - International Patient Summary (IPS) @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.ips.generator; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.ips.generator; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.param.TokenParam; diff --git a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/generator/IpsGeneratorSvcImpl.java b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/generator/IpsGeneratorSvcImpl.java index e85d1241b28..b308d06b026 100644 --- a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/generator/IpsGeneratorSvcImpl.java +++ b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/generator/IpsGeneratorSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.ips.generator; - /*- * #%L * HAPI FHIR JPA Server - International Patient Summary (IPS) @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.ips.generator; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.ips.generator; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/provider/IpsOperationProvider.java b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/provider/IpsOperationProvider.java index 8371430dfeb..8bb9845d151 100644 --- a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/provider/IpsOperationProvider.java +++ b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/provider/IpsOperationProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.ips.provider; - /*- * #%L * HAPI FHIR JPA Server - International Patient Summary (IPS) @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.ips.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.ips.provider; import ca.uhn.fhir.jpa.ips.generator.IIpsGeneratorSvc; import ca.uhn.fhir.jpa.model.util.JpaConstants; diff --git a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/strategy/DefaultIpsGenerationStrategy.java b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/strategy/DefaultIpsGenerationStrategy.java index a97df7705ab..db477611b11 100644 --- a/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/strategy/DefaultIpsGenerationStrategy.java +++ b/hapi-fhir-jpaserver-ips/src/main/java/ca/uhn/fhir/jpa/ips/strategy/DefaultIpsGenerationStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.ips.strategy; - /*- * #%L * HAPI FHIR JPA Server - International Patient Summary (IPS) @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.ips.strategy; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.ips.strategy; import ca.uhn.fhir.jpa.ips.api.IIpsGenerationStrategy; import ca.uhn.fhir.jpa.ips.api.IpsContext; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java index 4314630c0b2..a04e45b5e4e 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.broker; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.broker; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.broker; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageKeySvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageKeySvc.java index f2852ab248a..e0f92fe0588 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageKeySvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageKeySvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.broker; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.broker; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.broker; import ca.uhn.fhir.jpa.subscription.api.ISubscriptionMessageKeySvc; import ca.uhn.fhir.mdm.model.CanonicalEID; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java index 3881db35da1..310fa64e846 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java @@ -1,17 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.broker; - -import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings; -import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory; -import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver; -import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedJsonMessage; -import ca.uhn.fhir.mdm.api.IMdmSettings; -import ca.uhn.fhir.mdm.log.Logs; -import com.google.common.annotations.VisibleForTesting; -import org.slf4j.Logger; -import org.springframework.stereotype.Service; - -import javax.annotation.PreDestroy; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -31,6 +17,19 @@ import javax.annotation.PreDestroy; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.broker; + +import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings; +import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory; +import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver; +import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedJsonMessage; +import ca.uhn.fhir.mdm.api.IMdmSettings; +import ca.uhn.fhir.mdm.log.Logs; +import com.google.common.annotations.VisibleForTesting; +import org.slf4j.Logger; +import org.springframework.stereotype.Service; + +import javax.annotation.PreDestroy; @Service public class MdmQueueConsumerLoader { diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmCommonConfig.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmCommonConfig.java index 39ca9a62544..9f9d90aad92 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmCommonConfig.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmCommonConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.config; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.interceptor.MdmSearchExpandingInterceptor; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java index 3419effb58c..d1c2a37d684 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.config; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java index add3a378971..8423514526d 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.config; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.config; import ca.uhn.fhir.IHapiBootOrder; import ca.uhn.fhir.mdm.api.IMdmSettings; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java index 3839ecfb83d..aa9bc5256de 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.config; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.mdm.interceptor.MdmSubmitterInterceptorLoader; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java index 45e07e80434..1315965e257 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.config; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.config; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java index 3c7579cbe06..17688ebeac0 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.dao; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java index 5271e20c8e3..0dc44c104b0 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceSearchSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceSearchSvcImpl.java index 473e962aeb8..9532a7fe4c3 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceSearchSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceSearchSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/IMdmModelConverterSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/IMdmModelConverterSvc.java index c6b6e74896d..86d4c93b9e0 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/IMdmModelConverterSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/IMdmModelConverterSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.mdm.api.IMdmLink; import ca.uhn.fhir.mdm.api.MdmLinkJson; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java index 98c2059ad4e..bf1e6b38b08 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.model.JobInstanceStartRequest; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java index 1dfe97a9f18..1edba9ace35 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc; import ca.uhn.fhir.jpa.mdm.svc.candidate.MatchedGoldenResourceCandidate; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImpl.java index e5784877298..78fdd4613a1 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImplSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImplSvc.java index 144a43c3953..9416d3b0c2a 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImplSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImplSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc; import ca.uhn.fhir.mdm.api.IMdmLink; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java index 9fed2eecb6d..40324395d5f 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java index 22537cfbf58..132ee28000f 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java index 1638ea8de70..30fe27dccb5 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchSvc; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java index 51a4304c44a..b70155ce793 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.jpa.mdm.svc.candidate.CandidateList; import ca.uhn.fhir.jpa.mdm.svc.candidate.MatchedGoldenResourceCandidate; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmModelConverterSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmModelConverterSvcImpl.java index bb8d0475e90..a365632b5b6 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmModelConverterSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmModelConverterSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.jpa.api.svc.IIdHelperService; import ca.uhn.fhir.mdm.api.IMdmLink; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java index fcce3901404..2f7811111e9 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java index 539ac3311b1..33c0a68bfba 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.api.IMdmSettings; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSurvivorshipSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSurvivorshipSvcImpl.java index 943dc957cd9..4f04a51d466 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSurvivorshipSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSurvivorshipSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.api.IMdmSurvivorshipService; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java index b41e5f04756..52c14beb005 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.jpa.api.svc.IIdHelperService; import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java index c712e84c167..5357af0304c 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import java.util.ArrayList; import java.util.Collections; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateSearcher.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateSearcher.java index 53ef3d96cd4..feff31940b5 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateSearcher.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateSearcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java index c8c3e965cbd..4337fc62b73 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; public enum CandidateStrategyEnum { /** Find Golden Resource candidates based on matching EID */ diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java index 71b1893f80f..a58920f2660 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java index f402c3048d1..86fb9beaea6 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java index a0743dc860f..2f848ccfc14 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.mdm.api.IMdmLink; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedGoldenResourceCandidate.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedGoldenResourceCandidate.java index 8e5c6906a79..8854c6a500b 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedGoldenResourceCandidate.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedGoldenResourceCandidate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.mdm.api.IMdmLink; import ca.uhn.fhir.mdm.api.MdmMatchOutcome; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java index 84e547f043b..2dea91d2ab4 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.mdm.rules.json.MdmResourceSearchParamJson; import ca.uhn.fhir.mdm.svc.MdmSearchParamSvc; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java index a0dedd40d95..8c29830d5d4 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java index 032faef6e01..0d7b55cb049 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; import ca.uhn.fhir.jpa.mdm.svc.MdmResourceDaoSvc; import ca.uhn.fhir.mdm.log.Logs; diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/TooManyCandidatesException.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/TooManyCandidatesException.java index 5aa5aff6dab..9aba5fd8d43 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/TooManyCandidatesException.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/TooManyCandidatesException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.svc.candidate; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.svc.candidate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.svc.candidate; public class TooManyCandidatesException extends RuntimeException { public TooManyCandidatesException(String theMessage) { diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/util/MdmPartitionHelper.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/util/MdmPartitionHelper.java index 2b78170228d..f5a6ceb7070 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/util/MdmPartitionHelper.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/util/MdmPartitionHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.util; - /*- * #%L * HAPI FHIR JPA Server - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/config/PartitionSettings.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/config/PartitionSettings.java index 02e94f816be..f5f07acb083 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/config/PartitionSettings.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/config/PartitionSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.config; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.config; /** * @since 5.0.0 diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/cross/IBasePersistedResource.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/cross/IBasePersistedResource.java index f57ab77846f..cd7c7f42f55 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/cross/IBasePersistedResource.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/cross/IBasePersistedResource.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.cross; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.cross; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.cross; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/cross/IResourceLookup.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/cross/IResourceLookup.java index cb3c5a5597f..e3efe12595c 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/cross/IResourceLookup.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/cross/IResourceLookup.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.cross; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.cross; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.cross; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dao/JpaPid.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dao/JpaPid.java index 21544474bb7..6f8ea7f8d42 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dao/JpaPid.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dao/JpaPid.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.dao; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.dao; import ca.uhn.fhir.rest.api.server.storage.BaseResourcePersistentId; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java index 1e552b87a68..435f1a7e368 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.dialect; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.dialect; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.dialect; import org.hibernate.dialect.H2Dialect; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirPostgres94Dialect.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirPostgres94Dialect.java index 0c9719a1012..e79c31488f5 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirPostgres94Dialect.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirPostgres94Dialect.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.dialect; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.dialect; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.dialect; import org.hibernate.dialect.PostgreSQL94Dialect; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiSequenceStyleGenerator.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiSequenceStyleGenerator.java index b25eabd30cd..5eaf92ea409 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiSequenceStyleGenerator.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiSequenceStyleGenerator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.dialect; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.dialect; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.dialect; import ca.uhn.fhir.jpa.model.entity.StorageSettings; import ca.uhn.fhir.util.ReflectionUtil; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/ISequenceValueMassager.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/ISequenceValueMassager.java index bf940b2e47f..8c815ebad07 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/ISequenceValueMassager.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/ISequenceValueMassager.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.dialect; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.dialect; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.dialect; import javax.annotation.Nullable; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseHasResource.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseHasResource.java index 2d0d95ddbe0..02bf8d7275f 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseHasResource.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseHasResource.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BasePartitionable.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BasePartitionable.java index fced5f2e9e1..70079d8038c 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BasePartitionable.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BasePartitionable.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import javax.annotation.Nullable; import javax.persistence.Column; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndex.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndex.java index 3342662d0fc..1dfff3b9f2e 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndex.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndex.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import org.apache.commons.lang3.ObjectUtils; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParam.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParam.java index 36f65380a0a..39146b8ce0e 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParam.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParam.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParamQuantity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParamQuantity.java index 76eb2c86dbe..38408384911 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParamQuantity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParamQuantity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseTag.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseTag.java index 605aabceb8f..fc507f05fe2 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseTag.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseTag.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import javax.persistence.Column; import javax.persistence.JoinColumn; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BinaryStorageEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BinaryStorageEntity.java index 62befbe0b80..48b1e42764c 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BinaryStorageEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BinaryStorageEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ForcedId.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ForcedId.java index 895f6d842c0..f5a9d42354a 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ForcedId.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ForcedId.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/IBaseResourceEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/IBaseResourceEntity.java index d001e065689..bbdff924f65 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/IBaseResourceEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/IBaseResourceEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/IResourceIndexComboSearchParameter.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/IResourceIndexComboSearchParameter.java index 550ce7772fb..ac9c3fa577e 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/IResourceIndexComboSearchParameter.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/IResourceIndexComboSearchParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NormalizedQuantitySearchLevel.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NormalizedQuantitySearchLevel.java index ba3dc5e7cae..647bb423eb5 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NormalizedQuantitySearchLevel.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NormalizedQuantitySearchLevel.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; /** * Support different UCUM services level for FHIR Quantity data type. diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageEntity.java index 9a3c51bd3c6..6a8e2f843b2 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionEntity.java index 090e206c7bf..59db3b4b516 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.util.StringUtil; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionResourceEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionResourceEntity.java index 4b086a5c03b..ed61a6da71b 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionResourceEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionResourceEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.context.FhirVersionEnum; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/PartitionablePartitionId.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/PartitionablePartitionId.java index 9d5bef4c2bb..ccadafb7e83 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/PartitionablePartitionId.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/PartitionablePartitionId.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceEncodingEnum.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceEncodingEnum.java index 4dda8e4898e..f9f15e1a329 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceEncodingEnum.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceEncodingEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.IParser; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryProvenanceEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryProvenanceEntity.java index b7519672bcb..b732ad85c1a 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryProvenanceEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryProvenanceEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.rest.api.Constants; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java index 30a940970d3..9a5b7dc171d 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.jpa.model.dao.JpaPid; import ca.uhn.fhir.model.primitive.IdDt; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java index 03d4e8b8960..4b85128aedf 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import javax.persistence.Column; import javax.persistence.Embeddable; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboStringUnique.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboStringUnique.java index 66e9e8f5a93..3d76fedd04a 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboStringUnique.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboStringUnique.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.CompareToBuilder; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboTokenNonUnique.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboTokenNonUnique.java index d5768a2aa74..e4937e6ac18 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboTokenNonUnique.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboTokenNonUnique.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java index 9070b478c4b..28f9725e7ba 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.model.api.IQueryParameterType; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java index 8385eb6ddf3..1df92e2275c 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java index 726cbbf7a29..29cda130d91 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.model.api.IQueryParameterType; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java index 9effc2f7c3e..c47b448f0eb 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.model.api.IQueryParameterType; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java index ef34acab0b5..991dd1fc83e 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.jpa.model.util.UcumServiceUtil; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java index 915fc9d2038..3983ffd7517 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java index ebc10bd512a..7c1fa0152f2 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java index f4166359810..ff225f3f3f7 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java index 6c4bfa0bf42..5358c67bd23 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceSearchUrlEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceSearchUrlEntity.java index 5e81e2fa1f1..8a576d74cef 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceSearchUrlEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceSearchUrlEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java index 370de32fc4f..622db4a896e 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java index 4b97d4d65f2..3f7512a583e 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java index 4a1be218563..0a49117683c 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/StorageSettings.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/StorageSettings.java index ba93ab803c6..ac21403bdd6 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/StorageSettings.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/StorageSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import ca.uhn.fhir.context.ParserOptions; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/TagDefinition.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/TagDefinition.java index c2cf7755498..0eec2674bc4 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/TagDefinition.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/TagDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/TagTypeEnum.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/TagTypeEnum.java index 786c89dd29e..454d52a6b01 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/TagTypeEnum.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/TagTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.entity; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.entity; public enum TagTypeEnum { diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/CompositeSearchIndexData.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/CompositeSearchIndexData.java index 13e1cbdc323..9257fbdffa7 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/CompositeSearchIndexData.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/CompositeSearchIndexData.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; public interface CompositeSearchIndexData { void writeIndexEntry(HSearchIndexWriter theHSearchIndexWriter, HSearchElementCache theRoot); diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/DateSearchIndexData.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/DateSearchIndexData.java index 1336a55e4bf..bea6c843c27 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/DateSearchIndexData.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/DateSearchIndexData.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; import java.util.Date; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ExtendedHSearchIndexData.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ExtendedHSearchIndexData.java index ff59717f466..79b19e67ff9 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ExtendedHSearchIndexData.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ExtendedHSearchIndexData.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.entity.StorageSettings; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchElementCache.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchElementCache.java index cd553ee2ffd..124caeb3a63 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchElementCache.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchElementCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; import org.hibernate.search.engine.backend.document.DocumentElement; import org.slf4j.Logger; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchIndexWriter.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchIndexWriter.java index ad5da3dae43..b9a0b51eff0 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchIndexWriter.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchIndexWriter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; import ca.uhn.fhir.jpa.model.entity.StorageSettings; import ca.uhn.fhir.jpa.model.util.UcumServiceUtil; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/QuantitySearchIndexData.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/QuantitySearchIndexData.java index dc78b0b2b45..af0ee905e9d 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/QuantitySearchIndexData.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/QuantitySearchIndexData.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; public class QuantitySearchIndexData { diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ResourceTableRoutingBinder.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ResourceTableRoutingBinder.java index fe01b389c4f..675d437c9e9 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ResourceTableRoutingBinder.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ResourceTableRoutingBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import org.hibernate.search.mapper.pojo.bridge.RoutingBridge; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/SearchParamTextPropertyBinder.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/SearchParamTextPropertyBinder.java index 516133a5450..d5b385fa2e7 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/SearchParamTextPropertyBinder.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/SearchParamTextPropertyBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; import org.hibernate.search.engine.backend.document.DocumentElement; import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/StorageProcessingMessage.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/StorageProcessingMessage.java index 0c2f4b3158b..b1d0cb9b5f2 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/StorageProcessingMessage.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/StorageProcessingMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; public class StorageProcessingMessage { diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/CodeSystemHash.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/CodeSystemHash.java index 9f9702f99ab..221b11adf9c 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/CodeSystemHash.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/CodeSystemHash.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.util; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.util; import ca.uhn.fhir.util.UrlUtil; import com.google.common.base.Charsets; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/JpaConstants.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/JpaConstants.java index 359a45a5e50..ebcfec8503a 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/JpaConstants.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/JpaConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.util; - /*- * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.util; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.server.provider.ProviderConstants; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/UcumServiceUtil.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/UcumServiceUtil.java index 7a0d30a45ef..626d5195d68 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/UcumServiceUtil.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/UcumServiceUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.util; - /* * #%L * HAPI FHIR JPA Model @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.util; import java.io.InputStream; import java.math.BigDecimal; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/interceptor/model/ReadPartitionIdRequestDetails.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/interceptor/model/ReadPartitionIdRequestDetails.java index 39dd974dd83..de2111e8045 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/interceptor/model/ReadPartitionIdRequestDetails.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/interceptor/model/ReadPartitionIdRequestDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.interceptor.model; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.interceptor.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.interceptor.model; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeEvent.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeEvent.java index 87c84d184c5..76c9ac5d0c2 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeEvent.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeEvent.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListener.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListener.java index 93acc94b404..0f6b2a61a44 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListener.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerCache.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerCache.java index 4d130487fc1..a3c7cddcea9 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerCache.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerCacheRefresher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerCacheRefresher.java index 9f51b2829b1..5cba0d76dd0 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerCacheRefresher.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerCacheRefresher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; /** * This is an internal service and is not intended to be used outside this package. Implementers should only directly diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerRegistry.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerRegistry.java index 6f4ad00dbd3..f9e72033f9b 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerRegistry.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceChangeListenerRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import com.google.common.annotations.VisibleForTesting; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceVersionSvc.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceVersionSvc.java index e359c626b95..f2921864b39 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceVersionSvc.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/IResourceVersionSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeEvent.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeEvent.java index baaf2ce7128..6f4081219b1 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeEvent.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeEvent.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.model.primitive.IdDt; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCache.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCache.java index 749157e1896..d1a60768ce9 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCache.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCacheFactory.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCacheFactory.java index 30e29b7804a..ce7e61187e9 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCacheFactory.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCacheFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCacheRefresherImpl.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCacheRefresherImpl.java index 69db62961b9..af354dc074a 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCacheRefresherImpl.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerCacheRefresherImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.jpa.model.sched.HapiJob; import ca.uhn.fhir.jpa.model.sched.IHasScheduledJobs; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImpl.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImpl.java index af4e0f572d0..d7f72315c24 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImpl.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryInterceptor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryInterceptor.java index 546ae874407..07ecf3a5ca0 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryInterceptor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.IHapiBootOrder; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeResult.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeResult.java index 40019f90167..e3cb663cbd7 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeResult.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceChangeResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourcePersistentIdMap.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourcePersistentIdMap.java index 1d927fadd1e..7cf97dde1f3 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourcePersistentIdMap.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourcePersistentIdMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionCache.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionCache.java index 993c89a6edf..6b54a10a5ab 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionCache.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.model.primitive.IdDt; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionMap.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionMap.java index 624904341fb..0ed0502b0e9 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionMap.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.cache; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.cache; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import ca.uhn.fhir.model.primitive.IdDt; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/partition/IRequestPartitionHelperSvc.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/partition/IRequestPartitionHelperSvc.java index ea9daa36e77..2191fac8ca2 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/partition/IRequestPartitionHelperSvc.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/partition/IRequestPartitionHelperSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.partition; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.partition; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.partition; import ca.uhn.fhir.interceptor.model.ReadPartitionIdRequestDetails; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java index 1202ed06b4c..02662779596 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/ResourceMetaParams.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/ResourceMetaParams.java index 6c6ee5749b1..40a4658aeb5 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/ResourceMetaParams.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/ResourceMetaParams.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam; import ca.uhn.fhir.model.api.IQueryParameterAnd; import ca.uhn.fhir.model.api.IQueryParameterType; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/ResourceSearch.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/ResourceSearch.java index 3dbf89e4a31..d62683929e1 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/ResourceSearch.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/ResourceSearch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParamConstants.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParamConstants.java index db33ec07ffe..9478efdab78 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParamConstants.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParamConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam; public class SearchParamConstants { diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParameterMap.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParameterMap.java index de3a7a4a8bf..d06a3db65af 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParameterMap.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParameterMap.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR Search Parameters + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.searchparam; import ca.uhn.fhir.context.FhirContext; @@ -44,26 +63,6 @@ import static ca.uhn.fhir.rest.param.ParamPrefixEnum.NOT_EQUAL; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR Search Parameters - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class SearchParameterMap implements Serializable { public static final Integer INTEGER_0 = 0; private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchParameterMap.class); diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/config/SearchParamConfig.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/config/SearchParamConfig.java index 13521c4a1ab..fa2b85d238f 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/config/SearchParamConfig.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/config/SearchParamConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.config; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java index ca77f58a1d8..d1f879ffe16 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /* * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/CrossPartitionReferenceDetails.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/CrossPartitionReferenceDetails.java index 78d288e67b8..5870f8443c1 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/CrossPartitionReferenceDetails.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/CrossPartitionReferenceDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/GeopointNormalizer.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/GeopointNormalizer.java index 0d7cb374813..9af38d021b7 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/GeopointNormalizer.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/GeopointNormalizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; /** * This class fully and unabashedly stolen from Hibernate search 5.11.4 FINAL's implementation as it was stripped in HS6 diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/IResourceLinkResolver.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/IResourceLinkResolver.java index 7628770eabc..3c8a6aa90c6 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/IResourceLinkResolver.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/IResourceLinkResolver.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.cross.IResourceLookup; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamExtractor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamExtractor.java index cfcbd2d0bc5..b0b95d5ef81 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamExtractor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamExtractor.java @@ -1,6 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - - /* * #%L * HAPI FHIR Search Parameters @@ -20,6 +17,8 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; + import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.jpa.model.entity.BaseResourceIndexedSearchParam; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/LogicalReferenceHelper.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/LogicalReferenceHelper.java index d688e46f0e3..3f1a299b960 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/LogicalReferenceHelper.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/LogicalReferenceHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.jpa.model.entity.StorageSettings; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/PathAndRef.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/PathAndRef.java index c735ee93a88..a649c0601e1 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/PathAndRef.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/PathAndRef.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /* * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParamComposite.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParamComposite.java index 7261c400e2b..da1bb8c9b4b 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParamComposite.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParamComposite.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.jpa.model.entity.BaseResourceIndexedSearchParam; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParams.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParams.java index 83df7c9e25e..5610f1f63dd 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParams.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParams.java @@ -1,6 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - - /*- * #%L * HAPI FHIR Search Parameters @@ -20,6 +17,8 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; + import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorDstu2.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorDstu2.java index 47e2eed9880..6a953fe9beb 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorDstu2.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /* * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorDstu3.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorDstu3.java index 4730fa593ad..9b1ee2e0e65 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorDstu3.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /* * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java index 2b15406115d..d36a8c616f8 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /* * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4B.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4B.java index ae333e71e8c..9fa6813c02d 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4B.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4B.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /* * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java index 5df87cc9d5f..8a8e6dba54a 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /* * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.config.PartitionSettings; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java index bd2bf8e593e..bf19c243652 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/StringTrimmingTrimmerMatcher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/StringTrimmingTrimmerMatcher.java index fc6d0ce90d4..f091bdf3c1d 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/StringTrimmingTrimmerMatcher.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/StringTrimmingTrimmerMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import org.apache.commons.text.matcher.StringMatcher; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/AuthorizationSearchParamMatcher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/AuthorizationSearchParamMatcher.java index ff7abe3aaf7..25366064cfd 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/AuthorizationSearchParamMatcher.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/AuthorizationSearchParamMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.matcher; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.matcher; import ca.uhn.fhir.jpa.searchparam.MatchUrlService; import ca.uhn.fhir.rest.server.interceptor.auth.IAuthorizationSearchParamMatcher; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryMatchResult.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryMatchResult.java index 02d2aee978a..b972503da12 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryMatchResult.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryMatchResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.matcher; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.matcher; public class InMemoryMatchResult { public static final String PARSE_FAIL = "Failed to translate parse query string"; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java index bd1affaddbe..8b203f15c7a 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.matcher; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.matcher; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/IndexedSearchParamExtractor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/IndexedSearchParamExtractor.java index 81cb92ec2c5..e4499a20e63 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/IndexedSearchParamExtractor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/IndexedSearchParamExtractor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.matcher; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.matcher; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.entity.ResourceTable; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/SearchParamMatcher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/SearchParamMatcher.java index ed5d5c0c32d..272c404b492 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/SearchParamMatcher.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/SearchParamMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.matcher; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.matcher; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameInterceptor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameInterceptor.java index bcd23888b6d..3739c3f0d22 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameInterceptor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.nickname; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.nickname; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.nickname; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameMap.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameMap.java index 6a9db1bc641..fc5900e5816 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameMap.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.nickname; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.nickname; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.nickname; import javax.annotation.Nonnull; import java.io.BufferedReader; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameSvc.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameSvc.java index c7812d0ca02..e500dcc8466 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameSvc.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/nickname/NicknameSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.nickname; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.nickname; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.nickname; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/provider/SearchableHashMapResourceProvider.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/provider/SearchableHashMapResourceProvider.java index 80c922f2fa3..02473092945 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/provider/SearchableHashMapResourceProvider.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/provider/SearchableHashMapResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.provider; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.provider; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ISearchParamProvider.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ISearchParamProvider.java index 0f02e82a5f8..ac050c36b9c 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ISearchParamProvider.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ISearchParamProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.registry; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.registry; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.rest.api.server.IBundleProvider; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ISearchParamRegistryController.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ISearchParamRegistryController.java index 9b3590801c9..21e9014ecd9 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ISearchParamRegistryController.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ISearchParamRegistryController.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.registry; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.registry; import ca.uhn.fhir.jpa.cache.ResourceChangeResult; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/JpaSearchParamCache.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/JpaSearchParamCache.java index 89701db2777..ab4b3d14dbe 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/JpaSearchParamCache.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/JpaSearchParamCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.registry; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.registry; import ca.uhn.fhir.context.ComboSearchParamType; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ReadOnlySearchParamCache.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ReadOnlySearchParamCache.java index c48219c21de..d1397272030 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ReadOnlySearchParamCache.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ReadOnlySearchParamCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.registry; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.registry; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/RuntimeSearchParamCache.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/RuntimeSearchParamCache.java index 613a241560f..732b07c851f 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/RuntimeSearchParamCache.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/RuntimeSearchParamCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.registry; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.registry; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.rest.server.util.ResourceSearchParams; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java index e06199911e5..8c0de8799aa 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.registry; - /* * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.registry; import ca.uhn.fhir.context.ComboSearchParamType; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParameterCanonicalizer.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParameterCanonicalizer.java index 7e46b06ffc8..51049be3fdd 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParameterCanonicalizer.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParameterCanonicalizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.registry; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.registry; import ca.uhn.fhir.context.ComboSearchParamType; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/retry/Retrier.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/retry/Retrier.java index 72260236849..34e9f61575c 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/retry/Retrier.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/retry/Retrier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.retry; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.retry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.retry; import ca.uhn.fhir.system.HapiSystemProperties; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/Dstu3DistanceHelper.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/Dstu3DistanceHelper.java index 0a7379b6ce4..04485bb6d6c 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/Dstu3DistanceHelper.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/Dstu3DistanceHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.util; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/JpaParamUtil.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/JpaParamUtil.java index 0dcf24b7f61..a1ca638a590 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/JpaParamUtil.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/JpaParamUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.util; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/LastNParameterHelper.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/LastNParameterHelper.java index 00a928baea6..13bd137399c 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/LastNParameterHelper.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/LastNParameterHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.util; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SearchParameterHelper.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SearchParameterHelper.java index 644040ce3c2..09fbe60b877 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SearchParameterHelper.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SearchParameterHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.util; - /*- * #%L * HAPI FHIR Search Parameters @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.util; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SourceParam.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SourceParam.java index fb1a37a9276..4ec77935492 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SourceParam.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SourceParam.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.util; - -import ca.uhn.fhir.rest.api.Constants; - -import static org.apache.commons.lang3.StringUtils.defaultString; -import static org.apache.commons.lang3.StringUtils.left; - /* * #%L * HAPI FHIR Search Parameters @@ -24,6 +17,12 @@ import static org.apache.commons.lang3.StringUtils.left; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.util; + +import ca.uhn.fhir.rest.api.Constants; + +import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.left; /** * Model of the _source parameter diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/api/ISubscriptionMessageKeySvc.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/api/ISubscriptionMessageKeySvc.java index b2112be4445..54a509c23e0 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/api/ISubscriptionMessageKeySvc.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/api/ISubscriptionMessageKeySvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.api; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.api; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/BaseChannelParameters.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/BaseChannelParameters.java index 6ea05cdefd2..ca8a411b735 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/BaseChannelParameters.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/BaseChannelParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.models; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.models; import ca.uhn.fhir.jpa.subscription.model.ChannelRetryConfiguration; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/ProducingChannelParameters.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/ProducingChannelParameters.java index 1e868ae6ed4..29fa6aa0f33 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/ProducingChannelParameters.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/ProducingChannelParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.models; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.models; public class ProducingChannelParameters extends BaseChannelParameters { diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/ReceivingChannelParameters.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/ReceivingChannelParameters.java index f71e56e49d7..947780ce85e 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/ReceivingChannelParameters.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/models/ReceivingChannelParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.models; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.models; public class ReceivingChannelParameters extends BaseChannelParameters { diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/ISubscriptionDeliveryChannelNamer.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/ISubscriptionDeliveryChannelNamer.java index 4b3b5b0dba1..b49d346b80f 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/ISubscriptionDeliveryChannelNamer.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/ISubscriptionDeliveryChannelNamer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.model.CanonicalSubscription; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelCache.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelCache.java index e5b33157684..b1bf9280088 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelCache.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.match.registry.SubscriptionRegistry; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelRegistry.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelRegistry.java index 77d5f456a71..639e9c43939 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelRegistry.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings; import ca.uhn.fhir.jpa.subscription.channel.api.ChannelProducerSettings; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelWithHandlers.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelWithHandlers.java index 2b61355d777..028e56c4bb5 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelWithHandlers.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelWithHandlers.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.match.registry.ActiveSubscription; import com.google.common.annotations.VisibleForTesting; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionDeliveryChannelNamer.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionDeliveryChannelNamer.java index 469624bc1e7..cd8c3e70b17 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionDeliveryChannelNamer.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionDeliveryChannelNamer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.model.CanonicalSubscription; import org.springframework.stereotype.Service; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionDeliveryHandlerFactory.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionDeliveryHandlerFactory.java index 858ea6eb3b2..7e8b6e40eb5 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionDeliveryHandlerFactory.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionDeliveryHandlerFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.match.deliver.email.IEmailSender; import ca.uhn.fhir.jpa.subscription.match.deliver.email.SubscriptionDeliveringEmailSubscriber; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/config/SubscriptionProcessorConfig.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/config/SubscriptionProcessorConfig.java index ca98cee942d..fd2f614d133 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/config/SubscriptionProcessorConfig.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/config/SubscriptionProcessorConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.config; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.config; import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory; import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionChannelRegistry; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/config/WebsocketDispatcherConfig.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/config/WebsocketDispatcherConfig.java index d65fa1a6999..e7e05c090a4 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/config/WebsocketDispatcherConfig.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/config/WebsocketDispatcherConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.config; - /* * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.config; import ca.uhn.fhir.jpa.model.entity.StorageSettings; import ca.uhn.fhir.jpa.subscription.match.deliver.websocket.SubscriptionWebsocketHandler; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/BaseSubscriptionDeliverySubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/BaseSubscriptionDeliverySubscriber.java index 16a98325ee2..c2891bf27dd 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/BaseSubscriptionDeliverySubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/BaseSubscriptionDeliverySubscriber.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/EmailDetails.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/EmailDetails.java index b0e4f657177..e6c9fba1522 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/EmailDetails.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/EmailDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.email; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.email; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.email; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/EmailSenderImpl.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/EmailSenderImpl.java index 99b70ff5792..a3c7cfc4e45 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/EmailSenderImpl.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/EmailSenderImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.email; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.email; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.email; import ca.uhn.fhir.rest.server.mail.IMailSvc; import ca.uhn.fhir.util.StopWatch; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/IEmailSender.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/IEmailSender.java index c910c4df033..26d33bbbd0e 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/IEmailSender.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/IEmailSender.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.email; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.email; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.email; public interface IEmailSender { diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/SubscriptionDeliveringEmailSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/SubscriptionDeliveringEmailSubscriber.java index 61ff8b2505b..8c8af24bf1c 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/SubscriptionDeliveringEmailSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/email/SubscriptionDeliveringEmailSubscriber.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.email; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.email; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.email; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.entity.StorageSettings; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java index b79b755667b..a2782c3f251 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.message; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.message; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.message; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/resthook/SubscriptionDeliveringRestHookSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/resthook/SubscriptionDeliveringRestHookSubscriber.java index c0d59936e12..3d0c02990d4 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/resthook/SubscriptionDeliveringRestHookSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/resthook/SubscriptionDeliveringRestHookSubscriber.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.resthook; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.resthook; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.resthook; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/SubscriptionWebsocketHandler.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/SubscriptionWebsocketHandler.java index 930213d05ad..f67e4f62739 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/SubscriptionWebsocketHandler.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/SubscriptionWebsocketHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; - /* * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/WebsocketConnectionValidator.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/WebsocketConnectionValidator.java index 303cac9a35d..35b6e172732 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/WebsocketConnectionValidator.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/WebsocketConnectionValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; import ca.uhn.fhir.jpa.subscription.match.registry.ActiveSubscription; import ca.uhn.fhir.jpa.subscription.match.registry.SubscriptionRegistry; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/WebsocketValidationResponse.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/WebsocketValidationResponse.java index e0f82d66c33..d480f1aa192 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/WebsocketValidationResponse.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/websocket/WebsocketValidationResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.deliver.websocket; import ca.uhn.fhir.jpa.subscription.match.registry.ActiveSubscription; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/CompositeInMemoryDaoSubscriptionMatcher.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/CompositeInMemoryDaoSubscriptionMatcher.java index 741cc7bac4b..9aac55c2a27 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/CompositeInMemoryDaoSubscriptionMatcher.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/CompositeInMemoryDaoSubscriptionMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.matching; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.matching; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.matching; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.model.entity.StorageSettings; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/DaoSubscriptionMatcher.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/DaoSubscriptionMatcher.java index b575b13e808..e39b34bf2d3 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/DaoSubscriptionMatcher.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/DaoSubscriptionMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.matching; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.matching; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.matching; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/ISubscriptionMatcher.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/ISubscriptionMatcher.java index db5b3cad984..e28aad26700 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/ISubscriptionMatcher.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/ISubscriptionMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.matching; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.matching; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.matching; import ca.uhn.fhir.jpa.searchparam.matcher.InMemoryMatchResult; import ca.uhn.fhir.jpa.subscription.model.CanonicalSubscription; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/InMemorySubscriptionMatcher.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/InMemorySubscriptionMatcher.java index 249e8e12cc8..0db1f7ae721 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/InMemorySubscriptionMatcher.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/InMemorySubscriptionMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.matching; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.matching; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.matching; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/SubscriptionStrategyEvaluator.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/SubscriptionStrategyEvaluator.java index c34e86b57a1..a9ac0b618b4 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/SubscriptionStrategyEvaluator.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/SubscriptionStrategyEvaluator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.matching; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.matching; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.matching; import ca.uhn.fhir.jpa.searchparam.matcher.InMemoryMatchResult; import ca.uhn.fhir.jpa.searchparam.matcher.InMemoryResourceMatcher; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/BaseSubscriberForSubscriptionResources.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/BaseSubscriberForSubscriptionResources.java index 7850927c45d..e5fc17c86d4 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/BaseSubscriberForSubscriptionResources.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/BaseSubscriberForSubscriptionResources.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedMessage; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/MatchingQueueSubscriberLoader.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/MatchingQueueSubscriberLoader.java index f0ee61fefcb..f05cd6a9fbe 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/MatchingQueueSubscriberLoader.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/MatchingQueueSubscriberLoader.java @@ -1,21 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; - -import ca.uhn.fhir.IHapiBootOrder; -import ca.uhn.fhir.jpa.model.entity.StorageSettings; -import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings; -import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver; -import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionChannelFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.context.event.EventListener; -import org.springframework.core.annotation.Order; - -import javax.annotation.PreDestroy; - -import static ca.uhn.fhir.jpa.subscription.match.matcher.subscriber.SubscriptionMatchingSubscriber.SUBSCRIPTION_MATCHING_CHANNEL_NAME; - /*- * #%L * HAPI FHIR Subscription Server @@ -35,6 +17,23 @@ import static ca.uhn.fhir.jpa.subscription.match.matcher.subscriber.Subscription * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; + +import ca.uhn.fhir.IHapiBootOrder; +import ca.uhn.fhir.jpa.model.entity.StorageSettings; +import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings; +import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver; +import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionChannelFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.context.event.EventListener; +import org.springframework.core.annotation.Order; + +import javax.annotation.PreDestroy; + +import static ca.uhn.fhir.jpa.subscription.match.matcher.subscriber.SubscriptionMatchingSubscriber.SUBSCRIPTION_MATCHING_CHANNEL_NAME; public class MatchingQueueSubscriberLoader { protected IChannelReceiver myMatchingChannel; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionActivatingSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionActivatingSubscriber.java index 2e67b757470..b8c3ef41d59 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionActivatingSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionActivatingSubscriber.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionCriteriaParser.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionCriteriaParser.java index 4aa3de9f305..5f0902fbaef 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionCriteriaParser.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionCriteriaParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; import ca.uhn.fhir.jpa.searchparam.extractor.StringTrimmingTrimmerMatcher; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionMatchingSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionMatchingSubscriber.java index e87ef9681ba..974c68c940e 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionMatchingSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionMatchingSubscriber.java @@ -1,3 +1,22 @@ +/*- + * #%L + * HAPI FHIR Subscription Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; import ca.uhn.fhir.context.FhirContext; @@ -33,26 +52,6 @@ import static ca.uhn.fhir.rest.server.messaging.BaseResourceMessage.OperationTyp import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/*- - * #%L - * HAPI FHIR Subscription Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class SubscriptionMatchingSubscriber implements MessageHandler { private final Logger ourLog = LoggerFactory.getLogger(SubscriptionMatchingSubscriber.class); public static final String SUBSCRIPTION_MATCHING_CHANNEL_NAME = "subscription-matching"; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionRegisteringSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionRegisteringSubscriber.java index da807364e78..3eaabe261b5 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionRegisteringSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/subscriber/SubscriptionRegisteringSubscriber.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.subscriber; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/ActiveSubscription.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/ActiveSubscription.java index de092a6055c..579d57ef67c 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/ActiveSubscription.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/ActiveSubscription.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.registry; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.registry; import ca.uhn.fhir.jpa.subscription.match.matcher.subscriber.SubscriptionCriteriaParser; import ca.uhn.fhir.jpa.subscription.model.CanonicalSubscription; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/ActiveSubscriptionCache.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/ActiveSubscriptionCache.java index 6c4d7e5d7f3..3de52a050bd 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/ActiveSubscriptionCache.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/ActiveSubscriptionCache.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.registry; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.registry; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionLoader.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionLoader.java index 6f5b179e859..2aaae54e355 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionLoader.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.registry; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.registry; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionRegistry.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionRegistry.java index 9af6e1007ae..1be9a491213 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionRegistry.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.registry; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.registry; import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/model/config/SubscriptionModelConfig.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/model/config/SubscriptionModelConfig.java index aea771a8a5f..0ee234566f5 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/model/config/SubscriptionModelConfig.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/model/config/SubscriptionModelConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.model.config; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.model.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.model.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.subscription.match.matcher.matching.SubscriptionStrategyEvaluator; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/package-info.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/package-info.java index ce8348915b4..83318a2080f 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/package-info.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/package-info.java @@ -1,15 +1,3 @@ -/** - * Module to support Subscriptions - *

- * Subscriptions are partition aware - *

- * The functionalities of this module follows the HL7 spec on Subscriptions: - * http://hl7.org/fhir/subscription.html - *

- * Activated by {@link ca.uhn.fhir.jpa.model.config.PartitionSettings#setPartitioningEnabled(boolean)} - */ -package ca.uhn.fhir.jpa.subscription; - /*- * #%L * HAPI FHIR Subscription Server @@ -29,3 +17,15 @@ package ca.uhn.fhir.jpa.subscription; * limitations under the License. * #L% */ +/** + * Module to support Subscriptions + *

+ * Subscriptions are partition aware + *

+ * The functionalities of this module follows the HL7 spec on Subscriptions: + * http://hl7.org/fhir/subscription.html + *

+ * Activated by {@link ca.uhn.fhir.jpa.model.config.PartitionSettings#setPartitioningEnabled(boolean)} + */ +package ca.uhn.fhir.jpa.subscription; + diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/config/SubscriptionSubmitterConfig.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/config/SubscriptionSubmitterConfig.java index 623807d2230..4c1a9973cbb 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/config/SubscriptionSubmitterConfig.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/config/SubscriptionSubmitterConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.submit.config; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.submit.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.submit.config; import ca.uhn.fhir.jpa.subscription.model.config.SubscriptionModelConfig; import ca.uhn.fhir.jpa.subscription.submit.interceptor.SubscriptionMatcherInterceptor; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionMatcherInterceptor.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionMatcherInterceptor.java index 712a0c8832d..3406981c04e 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionMatcherInterceptor.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionMatcherInterceptor.java @@ -1,3 +1,22 @@ +/*- + * #%L + * HAPI FHIR Subscription Server + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.subscription.submit.interceptor; import ca.uhn.fhir.context.FhirContext; @@ -32,26 +51,6 @@ import org.springframework.transaction.support.TransactionSynchronizationManager import static org.apache.commons.lang3.StringUtils.isNotBlank; -/*- - * #%L - * HAPI FHIR Subscription Server - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @Interceptor public class SubscriptionMatcherInterceptor implements IResourceModifiedConsumer { private static final Logger ourLog = LoggerFactory.getLogger(SubscriptionMatcherInterceptor.class); diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionSubmitInterceptorLoader.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionSubmitInterceptorLoader.java index 034c6ed82e9..9da2fe47bea 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionSubmitInterceptorLoader.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionSubmitInterceptorLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.submit.interceptor; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.submit.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.submit.interceptor; import ca.uhn.fhir.interceptor.api.IInterceptorService; import ca.uhn.fhir.jpa.model.entity.StorageSettings; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionValidatingInterceptor.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionValidatingInterceptor.java index f555d0a1278..eea9d895914 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionValidatingInterceptor.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionValidatingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.submit.interceptor; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.submit.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.submit.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/SubscriptionTriggeringSvcImpl.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/SubscriptionTriggeringSvcImpl.java index 3481c0b49f8..d9c8288f4aa 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/SubscriptionTriggeringSvcImpl.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/SubscriptionTriggeringSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.triggering; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.triggering; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.triggering; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/util/SubscriptionDebugLogInterceptor.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/util/SubscriptionDebugLogInterceptor.java index 04e0e3dbd2e..ae4265aba23 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/util/SubscriptionDebugLogInterceptor.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/util/SubscriptionDebugLogInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.util; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.util; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/util/SubscriptionUtil.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/util/SubscriptionUtil.java index 7ddb3449a47..3263ff1d273 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/util/SubscriptionUtil.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/util/SubscriptionUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.util; - /*- * #%L * HAPI FHIR Subscription Server @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.util; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.model.entity.PartitionablePartitionId; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/dao/DaoTestUtils.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/dao/DaoTestUtils.java index 23acce6979c..bad1ac68d7b 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/dao/DaoTestUtils.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/dao/DaoTestUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.IInterceptorService; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/dao/TestDaoSearch.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/dao/TestDaoSearch.java index 86dadea0e32..5b7ac13b849 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/dao/TestDaoSearch.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/dao/TestDaoSearch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadAllPartitions.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadAllPartitions.java index 6551dbc3eb7..1ca003b2afd 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadAllPartitions.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadAllPartitions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.ex; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.ex; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.ex; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadPartitionsBasedOnScopes.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadPartitionsBasedOnScopes.java index 3d76aa7e986..10a3ca05d74 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadPartitionsBasedOnScopes.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadPartitionsBasedOnScopes.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.ex; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.ex; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.ex; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/packages/FakeNpmServlet.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/packages/FakeNpmServlet.java index 7f8e5c512eb..b7ab0e1016d 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/packages/FakeNpmServlet.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/packages/FakeNpmServlet.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.packages; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.packages; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.rest.api.Constants; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/BaseResourceProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/BaseResourceProviderR4Test.java index 79da95510df..039c11635eb 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/BaseResourceProviderR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/BaseResourceProviderR4Test.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.batch2.jobs.expunge.DeleteExpungeProvider; import ca.uhn.fhir.batch2.jobs.reindex.ReindexProvider; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/GraphQLProviderTestUtil.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/GraphQLProviderTestUtil.java index b3784fce0b8..1b8bd77c37a 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/GraphQLProviderTestUtil.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/GraphQLProviderTestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; public class GraphQLProviderTestUtil { public static final String DATA_PREFIX = "{\"data\": "; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/ServerConfiguration.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/ServerConfiguration.java index 80e6f077e9d..72f26efedf8 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/ServerConfiguration.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/ServerConfiguration.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.subscription.match.config.WebsocketDispatcherConfig; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java index 2eaf9a4c56f..48cd0ac4022 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider.r4; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider.r4; import ca.uhn.fhir.batch2.jobs.expunge.DeleteExpungeProvider; import ca.uhn.fhir.batch2.jobs.reindex.ReindexProvider; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/search/CompositeSearchParameterTestCases.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/search/CompositeSearchParameterTestCases.java index 1c4ea6ec4a8..d7714b64f4a 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/search/CompositeSearchParameterTestCases.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/search/CompositeSearchParameterTestCases.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.dao.TestDaoSearch; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/search/QuantitySearchParameterTestCases.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/search/QuantitySearchParameterTestCases.java index e5f9f6ba6d8..872850796b9 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/search/QuantitySearchParameterTestCases.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/search/QuantitySearchParameterTestCases.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.dao.TestDaoSearch; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/CountingInterceptor.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/CountingInterceptor.java index 5a87eb82b9a..3bdf39ff12f 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/CountingInterceptor.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/CountingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/NotificationServlet.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/NotificationServlet.java index ac3f34508fc..62f9af9d61d 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/NotificationServlet.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/NotificationServlet.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/SocketImplementation.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/SocketImplementation.java index b1f4ac0477c..c4e67c55b92 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/SocketImplementation.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/subscription/SocketImplementation.java @@ -1,6 +1,3 @@ - -package ca.uhn.fhir.jpa.subscription; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -20,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription; import ca.uhn.fhir.rest.api.EncodingEnum; import org.eclipse.jetty.websocket.api.Session; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemDeleteJobSvcWithUniTestFailures.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemDeleteJobSvcWithUniTestFailures.java index 15dacdc2e34..8dce738410c 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemDeleteJobSvcWithUniTestFailures.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemDeleteJobSvcWithUniTestFailures.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.term.api.ITermCodeSystemDeleteJobSvc; import ca.uhn.fhir.jpa.term.api.TermCodeSystemDeleteJobSvc; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/TermTestUtil.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/TermTestUtil.java index f7fc7dbf711..8318d23ab6a 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/TermTestUtil.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/TermTestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.entity.TermConceptDesignation; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/ZipCollectionBuilder.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/ZipCollectionBuilder.java index 4dc32341dba..5931a78f5cb 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/ZipCollectionBuilder.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/term/ZipCollectionBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; import com.google.common.base.Charsets; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java index 5d866a22f04..7f8bbfa6ca5 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaR4Test.java index 3387b7757b3..b8036f16bd8 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaR4Test.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaTest.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaTest.java index 54002cf35b7..327f2d2c503 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaTest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseValueSetHSearchExpansionR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseValueSetHSearchExpansionR4Test.java index f5a89258ad1..bc8facbfec4 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseValueSetHSearchExpansionR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseValueSetHSearchExpansionR4Test.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java index 19e6e9afa21..33af84cfb25 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.api.IJobMaintenanceService; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PatientReindexTestHelper.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PatientReindexTestHelper.java index 4b1135b7016..684b428a784 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PatientReindexTestHelper.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PatientReindexTestHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.jobs.reindex.ReindexAppCtx; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PreventDanglingInterceptorsExtension.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PreventDanglingInterceptorsExtension.java index 68acd488c14..8f2c3ddc46a 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PreventDanglingInterceptorsExtension.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PreventDanglingInterceptorsExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test; import ca.uhn.fhir.interceptor.api.IInterceptorService; import org.junit.jupiter.api.extension.AfterEachCallback; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/BlockLargeNumbersOfParamsListener.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/BlockLargeNumbersOfParamsListener.java index 2f25f575073..0362c18604b 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/BlockLargeNumbersOfParamsListener.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/BlockLargeNumbersOfParamsListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import net.ttddyy.dsproxy.ExecutionInfo; import net.ttddyy.dsproxy.QueryInfo; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/ConnectionWrapper.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/ConnectionWrapper.java index b0984b942aa..a628e4a854d 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/ConnectionWrapper.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/ConnectionWrapper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import java.sql.Array; import java.sql.Blob; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/DelayListener.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/DelayListener.java index 578469995de..940144f5b90 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/DelayListener.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/DelayListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import net.ttddyy.dsproxy.ExecutionInfo; import net.ttddyy.dsproxy.QueryInfo; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/MandatoryTransactionListener.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/MandatoryTransactionListener.java index a6d5e132cef..fe9accecc94 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/MandatoryTransactionListener.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/MandatoryTransactionListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import net.ttddyy.dsproxy.ExecutionInfo; import net.ttddyy.dsproxy.QueryInfo; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu2Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu2Config.java index b68a769d73b..6d05e2e500d 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu2Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu2Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import ca.uhn.fhir.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu3Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu3Config.java index 637c5755a48..a7d2881eb7e 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu3Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu3Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import ca.uhn.fhir.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestElasticsearchContainerHelper.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestElasticsearchContainerHelper.java index bea451335d1..1a57238b737 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestElasticsearchContainerHelper.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestElasticsearchContainerHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import org.testcontainers.elasticsearch.ElasticsearchContainer; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestHSearchAddInConfig.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestHSearchAddInConfig.java index da35452bbf3..416913fdcfd 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestHSearchAddInConfig.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestHSearchAddInConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import ca.uhn.fhir.jpa.dao.FulltextSearchSvcImpl; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestJPAConfig.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestJPAConfig.java index 621af0a380f..aa5538b1c54 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestJPAConfig.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestJPAConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.api.IJobMaintenanceService; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4BConfig.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4BConfig.java index b3c114dcbcf..9ca5f9033ec 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4BConfig.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4BConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import ca.uhn.fhir.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4Config.java index 43a8d0c9aa0..de70f667892 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import ca.uhn.fhir.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4WithDelayConfig.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4WithDelayConfig.java index a6233792059..83ca219928d 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4WithDelayConfig.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4WithDelayConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import ca.uhn.fhir.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.jpa.batch2.JpaBatch2Config; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR5Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR5Config.java index a01fc128d70..4dcdf1158ec 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR5Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR5Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.config; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.config; import ca.uhn.fhir.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/StoppableSubscriptionDeliveringRestHookSubscriber.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/StoppableSubscriptionDeliveringRestHookSubscriber.java index 2d92e0f4361..cd618856acb 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/StoppableSubscriptionDeliveringRestHookSubscriber.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/StoppableSubscriptionDeliveringRestHookSubscriber.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.util; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.util; import ca.uhn.fhir.jpa.subscription.match.deliver.resthook.SubscriptionDeliveringRestHookSubscriber; import org.slf4j.Logger; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/SubscriptionTestUtil.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/SubscriptionTestUtil.java index ee6647e192a..ad35d9ace33 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/SubscriptionTestUtil.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/SubscriptionTestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.util; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.util; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.cache.IResourceChangeListenerCacheRefresher; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/TestHSearchEventDispatcher.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/TestHSearchEventDispatcher.java index 4e8591fa4a5..a19477d8874 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/TestHSearchEventDispatcher.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/TestHSearchEventDispatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.test.util; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.test.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.test.util; import ca.uhn.fhir.jpa.dao.IHSearchEventListener; import org.slf4j.Logger; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/CoordCalculatorTestUtil.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/CoordCalculatorTestUtil.java index a0e244aa162..c5bb90b9f3f 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/CoordCalculatorTestUtil.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/CoordCalculatorTestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; public final class CoordCalculatorTestUtil { // CHIN and UHN coordinates from Google Maps diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/ForceSynchronousSearchInterceptor.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/ForceSynchronousSearchInterceptor.java index 86d8fd8927c..3a63d588010 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/ForceSynchronousSearchInterceptor.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/ForceSynchronousSearchInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/ValueSetTestUtil.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/ValueSetTestUtil.java index 89801b4b656..ef9b2da7fff 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/ValueSetTestUtil.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/ValueSetTestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.hapi.converters.canonical.VersionCanonicalizer; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/WebsocketSubscriptionClient.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/WebsocketSubscriptionClient.java index 3dbc3d102ce..813a97ac5a5 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/WebsocketSubscriptionClient.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/WebsocketSubscriptionClient.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR JPA Server Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.jpa.model.entity.StorageSettings; import ca.uhn.fhir.jpa.subscription.SocketImplementation; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java index b645d01607f..568e3a05d76 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.model.MdmTransactionContext; import org.hl7.fhir.instance.model.api.IAnyResource; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java index 3f688e6a840..8e3f7259b12 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java index 0c8ec0edaf6..b0bffca1dc9 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.api.paging.MdmPageRequest; import ca.uhn.fhir.mdm.model.MdmTransactionContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLink.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLink.java index 7b42afcf923..efc45688b64 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLink.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.jpa.model.entity.PartitionablePartitionId; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkCreateSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkCreateSvc.java index 4fa280e1836..03ba6bb2991 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkCreateSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkCreateSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.model.MdmTransactionContext; import org.hl7.fhir.instance.model.api.IAnyResource; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkExpandSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkExpandSvc.java index 3db39c163f3..bd96c6379d3 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkExpandSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkExpandSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java index 8ce6918a01a..4d1c2dc4d62 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.api.paging.MdmPageRequest; import ca.uhn.fhir.mdm.model.MdmTransactionContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java index 21fd6ff3730..d4eee131fd2 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.model.MdmTransactionContext; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java index 37b46b279a7..f13e17cad18 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.model.MdmTransactionContext; import org.hl7.fhir.instance.model.api.IAnyResource; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java index ddd69f8bdf9..cff2f655120 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import org.hl7.fhir.instance.model.api.IAnyResource; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java index 1125fdc1525..2827eff6f9d 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.rules.json.MdmRulesJson; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java index e161497b9a7..8a533b39671 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.dao.IMdmLinkImplFactory; import ca.uhn.fhir.mdm.rules.json.MdmRulesJson; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java index 48ff8648ff0..15efea42952 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.rest.api.server.RequestDetails; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSurvivorshipService.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSurvivorshipService.java index 19d5fa9b382..16032e99498 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSurvivorshipService.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSurvivorshipService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.mdm.model.MdmTransactionContext; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java index c0b579940d2..4a8baf34956 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import org.hl7.fhir.instance.model.api.IAnyResource; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java index 58cf2b2101c..1b072d6ceb2 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; public class MdmConstants { diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkEvent.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkEvent.java index 97a400e847b..e7d6132429b 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkEvent.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkEvent.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java index 7d5c3dc2ab2..4392f586505 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java index 0a4212c32b0..612449585b5 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; public enum MdmLinkSourceEnum { diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java index f9833e780da..eac113f7a16 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; public class MdmMatchEvaluation { diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java index d443e8b2926..9be3d111396 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java index f5a9b2aa226..22f6e2230ae 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; public enum MdmMatchResultEnum { diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmQuerySearchParameters.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmQuerySearchParameters.java index ec747c84979..44075debd46 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmQuerySearchParameters.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmQuerySearchParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.mdm.api.paging.MdmPageRequest; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageLinkBuilder.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageLinkBuilder.java index 1bf85e8c749..d9b73b5b21d 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageLinkBuilder.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageLinkBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api.paging; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api.paging; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api.paging; import ca.uhn.fhir.mdm.api.MdmLinkJson; import ca.uhn.fhir.rest.server.RestfulServerUtils; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageLinkTuple.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageLinkTuple.java index a8b1adaf0c5..45e61e905b6 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageLinkTuple.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageLinkTuple.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api.paging; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api.paging; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api.paging; import java.util.Optional; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageRequest.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageRequest.java index a80d3bcc045..7700ee743ae 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageRequest.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/paging/MdmPageRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.api.paging; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.api.paging; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.api.paging; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.IPagingProvider; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java index afc67a72cfc..ae187d92544 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.dao; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.dao; import ca.uhn.fhir.mdm.api.IMdmLink; import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkImplFactory.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkImplFactory.java index 01da6727e5f..57852d29dd6 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkImplFactory.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkImplFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.dao; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.dao; import ca.uhn.fhir.mdm.api.IMdmLink; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/MdmLinkFactory.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/MdmLinkFactory.java index b90caf47d35..22624b9fd44 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/MdmLinkFactory.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/MdmLinkFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.dao; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.dao; import ca.uhn.fhir.mdm.api.IMdmLink; import ca.uhn.fhir.mdm.api.IMdmSettings; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/IMdmStorageInterceptor.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/IMdmStorageInterceptor.java index 343805fa584..6fbf5ddd67e 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/IMdmStorageInterceptor.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/IMdmStorageInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.interceptor; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.interceptor; public interface IMdmStorageInterceptor { } diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/MdmSearchExpandingInterceptor.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/MdmSearchExpandingInterceptor.java index 20f6d58b8f1..49ab460b48c 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/MdmSearchExpandingInterceptor.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/MdmSearchExpandingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.interceptor; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/MdmStorageInterceptor.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/MdmStorageInterceptor.java index 522786f4697..397512decb5 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/MdmStorageInterceptor.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/interceptor/MdmStorageInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.interceptor; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java index 70226e7d551..e076ab7c214 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.model; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.model; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.fhirpath.IFhirPath; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmPidTuple.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmPidTuple.java index f1d8f56777e..904dd102077 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmPidTuple.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmPidTuple.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.model; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.model; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java index 4665e7c5d46..7bc6e2321f1 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.model; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.model; import ca.uhn.fhir.mdm.api.IMdmLink; import ca.uhn.fhir.mdm.api.MdmLinkEvent; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java index 926ebbd5773..b434ca16689 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.provider; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.provider; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java index 1176557e0e1..5fbeaf947fc 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.provider; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.provider; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java index d6318ece79d..42141c6b20d 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.provider; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.provider; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3Plus.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3Plus.java index eb4a5e70a1d..07c4bda6530 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3Plus.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3Plus.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.provider; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.provider; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java index 8e630f61e62..05c00ffd8eb 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.provider; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.provider; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java index 20ff3fba1f0..919f9627a76 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.config; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.config; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java index 88f3029b2e4..24910969008 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.config; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.config; import ca.uhn.fhir.mdm.api.IMdmLink; import ca.uhn.fhir.mdm.api.IMdmRuleValidator; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java index ae44efbf51e..70059c9f37b 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.json; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.json; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java index 0e64b5e1cb0..72603d604f6 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.json; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.json; import ca.uhn.fhir.model.api.IModelJson; import ca.uhn.fhir.rest.param.TokenParamModifier; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java index 5371916b518..18332a2a1c4 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.json; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.json; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.rules.matcher.MdmMatcherEnum; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java index 7879413d2fb..e800bfa4431 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.json; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.json; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java index 9de02f4bdef..6d13abd1b54 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.json; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.json; import ca.uhn.fhir.mdm.api.MdmMatchResultEnum; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java index 6afcacb96e9..fc122d2148a 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.json; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.json; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.api.MdmMatchEvaluation; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java index 9c20c39f52c..5af083ba3af 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.json; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.json; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java index 99765daa6c4..e4485019ade 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.util.StringUtil; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/EmptyFieldMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/EmptyFieldMatcher.java index 0b6952fc9f0..a3341ebf9fe 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/EmptyFieldMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/EmptyFieldMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/ExtensionMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/ExtensionMatcher.java index a872d8c11fe..fea4d7314eb 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/ExtensionMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/ExtensionMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.util.ExtensionUtil; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java index 669aa25dab4..8c923f2c167 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java index b02eef41b06..2682856f291 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import org.hl7.fhir.dstu3.model.BaseDateTimeType; import org.hl7.fhir.dstu3.model.DateTimeType; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java index b0fe0591a15..ade01e59c30 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.r4.model.BaseDateTimeType; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java index 5bc4c6eb178..9d5b9d6b674 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java index 4b50973bec2..c9603d9b224 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java index 7a32f7fb6b0..638c2741d3c 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; public interface IMdmStringMatcher { boolean matches(String theLeftString, String theRightString); diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java index 02193fcabe1..94662737cbc 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.util.CanonicalIdentifier; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java index 4dd2520d81c..17e2dd1e7f4 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.phonetic.PhoneticEncoderEnum; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmNameMatchModeEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmNameMatchModeEnum.java index f7ec7a0046f..aff7121d24b 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmNameMatchModeEnum.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmNameMatchModeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; public enum MdmNameMatchModeEnum { ANY_ORDER, diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java index dcc1b7a3649..c87a47c5246 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.util.NameUtil; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NicknameMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NicknameMatcher.java index 685e84bf5fa..335acdc5636 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NicknameMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NicknameMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NumericMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NumericMatcher.java index 474c95485fe..d7ece7966d4 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NumericMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NumericMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.phonetic.NumericEncoder; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java index da4283c66dc..cd158a443d7 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; import ca.uhn.fhir.context.phonetic.IPhoneticEncoder; import ca.uhn.fhir.context.phonetic.PhoneticEncoderEnum; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java index 2e76449408c..28fc98f18b6 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.matcher; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.matcher; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.matcher; public class SubstringStringMatcher implements IMdmStringMatcher { @Override diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java index 07a30f7751d..d2e7d894a6b 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.similarity; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.similarity; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.similarity; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.rules.matcher.BaseHapiStringMetric; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java index 1e32dbc3382..78fdd6cc2ba 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.similarity; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.similarity; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.similarity; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java index fae098a7324..66285dfa66a 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.similarity; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.similarity; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.similarity; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.api.MdmMatchEvaluation; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java index 1e6abc1911d..55c125d1bc4 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.svc; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.fhirpath.IFhirPath; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java index 571f747372e..5dc9e46fbf4 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.rules.svc; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.rules.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.rules.svc; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmChannelSubmitterSvcImpl.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmChannelSubmitterSvcImpl.java index d92c93f6312..57e43b33e18 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmChannelSubmitterSvcImpl.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmChannelSubmitterSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.svc; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java index f4fc879cebf..a6697ff0afa 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.svc; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.svc; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.svc.IIdHelperService; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java index 00caa52ba4f..389d5e20985 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.svc; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.svc; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.svc.IIdHelperService; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmSearchParamSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmSearchParamSvc.java index 7b451027848..bafd5e54a95 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmSearchParamSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmSearchParamSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.svc; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmSubmitSvcImpl.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmSubmitSvcImpl.java index f2dbb4af609..a7fb6f94473 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmSubmitSvcImpl.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmSubmitSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.svc; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.svc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java index c48289033ab..4aa1a63c84d 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.util; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.util; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.api.MdmConstants; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java index 924fffcbd63..afce028978d 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.util; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.util; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java index befc44170cf..4433b82a19c 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.util; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MdmResourceUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MdmResourceUtil.java index 6f02d898129..cdcdd85db54 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MdmResourceUtil.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MdmResourceUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.util; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.util; import ca.uhn.fhir.mdm.api.MdmConstants; import org.hl7.fhir.instance.model.api.IBaseCoding; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java index c13e4d7ce89..7f81b6dab55 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.util; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.util; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.mdm.api.IMdmSettings; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java index 76d1e1e8c70..78a1b5406b3 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.util; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeEqualsPredicate.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeEqualsPredicate.java index 7b2389719a6..e22f7e8e513 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeEqualsPredicate.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeEqualsPredicate.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.util; - /*- * #%L * HAPI FHIR - Master Data Management @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.util; import org.hl7.fhir.instance.model.api.IPrimitiveType; diff --git a/hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java b/hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java index 8923895f13b..bd09d784de8 100644 --- a/hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java +++ b/hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.openapi; - /*- * #%L * hapi-fhir-server-openapi @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.openapi; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.openapi; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/BaseParseAction.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/BaseParseAction.java index 5d1c51ca090..31734694338 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/BaseParseAction.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/BaseParseAction.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import ca.uhn.fhir.parser.IParser; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IBundleProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IBundleProvider.java index f28ea4cefe5..d66eb706f2a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IBundleProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IBundleProvider.java @@ -1,18 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.context.ConfigurationException; -import org.apache.commons.lang3.Validate; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IPrimitiveType; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - /* * #%L * HAPI FHIR - Server Framework @@ -32,6 +17,20 @@ import java.util.stream.Collectors; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; + +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.context.ConfigurationException; +import org.apache.commons.lang3.Validate; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IPrimitiveType; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; public interface IBundleProvider { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IFhirVersionServer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IFhirVersionServer.java index ee349f1415c..a3a8b1a739a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IFhirVersionServer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IFhirVersionServer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceAccessDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceAccessDetails.java index ab2ddd7c49d..fdbd25fe075 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceAccessDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceAccessDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceShowDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceShowDetails.java index 76238462c29..bf796a86e7d 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceShowDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceShowDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IRestfulResponse.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IRestfulResponse.java index 24241e9f0d2..2433f1111a4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IRestfulResponse.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IRestfulResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IRestfulServer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IRestfulServer.java index c1ae42cee61..84d2a365354 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IRestfulServer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IRestfulServer.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - -import ca.uhn.fhir.context.api.BundleInclusionRule; -import ca.uhn.fhir.rest.api.PreferReturnEnum; -import ca.uhn.fhir.rest.server.IPagingProvider; -import ca.uhn.fhir.rest.server.IRestfulServerDefaults; - /* * #%L * HAPI FHIR - Server Framework @@ -24,6 +17,13 @@ import ca.uhn.fhir.rest.server.IRestfulServerDefaults; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; + +import ca.uhn.fhir.context.api.BundleInclusionRule; +import ca.uhn.fhir.rest.api.PreferReturnEnum; +import ca.uhn.fhir.rest.server.IPagingProvider; +import ca.uhn.fhir.rest.server.IRestfulServerDefaults; + public interface IRestfulServer extends IRestfulServerDefaults { @Override diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IServerMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IServerMethodBinding.java index 11f61ac3c13..5c37791425a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IServerMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IServerMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; public interface IServerMethodBinding { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/RequestDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/RequestDetails.java index 4bdf8357c01..f3d62beaecb 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/RequestDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/RequestDetails.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Server Framework + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.api.server; import ca.uhn.fhir.context.FhirContext; @@ -31,26 +50,6 @@ import java.util.stream.Collectors; import static org.apache.commons.lang3.StringUtils.isBlank; -/* - * #%L - * HAPI FHIR - Server Framework - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public abstract class RequestDetails { private final StopWatch myRequestStopwatch; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/ResponseDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/ResponseDetails.java index 91effc4fa8d..e04e23d5dc9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/ResponseDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/ResponseDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceAccessDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceAccessDetails.java index 3552a6c0290..6dee7dd9319 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceAccessDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceAccessDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceShowDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceShowDetails.java index ed9decf5c38..8058de9b315 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceShowDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceShowDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import com.google.common.collect.Lists; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SystemRequestDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SystemRequestDetails.java index 021220e8526..4020cd64e80 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SystemRequestDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SystemRequestDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.api.AddProfileTagEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/bulk/BulkDataExportOptions.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/bulk/BulkDataExportOptions.java index 952370a9d0d..685bd401c1d 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/bulk/BulkDataExportOptions.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/bulk/BulkDataExportOptions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server.bulk; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server.bulk; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server.bulk; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/BaseResourcePersistentId.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/BaseResourcePersistentId.java index 3b50a771189..8fd916b7007 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/BaseResourcePersistentId.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/BaseResourcePersistentId.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server.storage; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server.storage; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server.storage; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/DeferredInterceptorBroadcasts.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/DeferredInterceptorBroadcasts.java index 7232388df4c..6771beefcc7 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/DeferredInterceptorBroadcasts.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/DeferredInterceptorBroadcasts.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server.storage; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server.storage; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server.storage; import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/IDeleteExpungeJobSubmitter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/IDeleteExpungeJobSubmitter.java index eefa32b638f..41bb5348b9e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/IDeleteExpungeJobSubmitter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/IDeleteExpungeJobSubmitter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server.storage; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server.storage; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server.storage; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/IResourcePersistentId.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/IResourcePersistentId.java index 2bcf929151d..0e9caf6ce0c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/IResourcePersistentId.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/IResourcePersistentId.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server.storage; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server.storage; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server.storage; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/NotFoundPid.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/NotFoundPid.java index d62e7e0ff61..53536ee98b2 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/NotFoundPid.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/NotFoundPid.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server.storage; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server.storage; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server.storage; public class NotFoundPid extends BaseResourcePersistentId { public NotFoundPid() { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/TransactionDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/TransactionDetails.java index ab1a0c9ec54..9d27d7169b2 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/TransactionDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/TransactionDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.api.server.storage; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.api.server.storage; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.api.server.storage; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java index ea1515f45c3..426a926ea96 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import java.util.Optional; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BasePagingProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BasePagingProvider.java index 960a9c6260d..9d8b27b2bb7 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BasePagingProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BasePagingProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BaseRestfulResponse.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BaseRestfulResponse.java index 28a30e0df8e..a24f5d7197a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BaseRestfulResponse.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BaseRestfulResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.rest.api.server.IRestfulResponse; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/Bindings.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/Bindings.java index 7f1efd43b3e..1a724538ba4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/Bindings.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/Bindings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.rest.server.method.OperationMethodBinding; import ca.uhn.fhir.rest.server.method.SearchMethodBinding; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BundleProviderWithNamedPages.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BundleProviderWithNamedPages.java index 02e4c2be427..a213d97cc27 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BundleProviderWithNamedPages.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BundleProviderWithNamedPages.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import org.apache.commons.lang3.Validate; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BundleProviders.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BundleProviders.java index 049276fec13..5828e42a108 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BundleProviders.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/BundleProviders.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import java.util.Collections; import java.util.List; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/CommonResourceSupertypeScanner.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/CommonResourceSupertypeScanner.java index 03f83667b28..6ea76d83fc9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/CommonResourceSupertypeScanner.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/CommonResourceSupertypeScanner.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.model.api.annotation.ResourceDef; import java.util.Collections; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ETagSupportEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ETagSupportEnum.java index 92440b861a1..3fb8c826958 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ETagSupportEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ETagSupportEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; /** * RESTful server behaviour for automatically adding profile tags diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ElementsSupportEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ElementsSupportEnum.java index 6fecdedf2e2..65d215c2588 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ElementsSupportEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ElementsSupportEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; /** * @see Extended Elements Support diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/FifoMemoryPagingProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/FifoMemoryPagingProvider.java index 3942ae35080..36f7a816213 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/FifoMemoryPagingProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/FifoMemoryPagingProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/HardcodedServerAddressStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/HardcodedServerAddressStrategy.java index 1753709954c..60f9bba0be3 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/HardcodedServerAddressStrategy.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/HardcodedServerAddressStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IDynamicSearchResourceProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IDynamicSearchResourceProvider.java index 24538ffdf0b..ba3f7510108 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IDynamicSearchResourceProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IDynamicSearchResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import java.util.List; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IPagingProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IPagingProvider.java index 4971eaeab21..ea388a8cf32 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IPagingProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IPagingProvider.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.rest.server; - -import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.api.server.RequestDetails; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - /* * #%L * HAPI FHIR - Server Framework @@ -25,6 +17,13 @@ import javax.annotation.Nullable; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; + +import ca.uhn.fhir.rest.api.server.IBundleProvider; +import ca.uhn.fhir.rest.api.server.RequestDetails; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface IPagingProvider { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IResourceProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IResourceProvider.java index 6a2ae22627e..7fccf76d078 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IResourceProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IRestfulServerDefaults.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IRestfulServerDefaults.java index b520fff097b..cf1ba88179a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IRestfulServerDefaults.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IRestfulServerDefaults.java @@ -1,13 +1,3 @@ -package ca.uhn.fhir.rest.server; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.context.api.AddProfileTagEnum; -import ca.uhn.fhir.interceptor.api.IInterceptorService; -import ca.uhn.fhir.rest.api.EncodingEnum; -import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; - -import java.util.List; - /* * #%L * HAPI FHIR - Server Framework @@ -27,6 +17,15 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.api.AddProfileTagEnum; +import ca.uhn.fhir.interceptor.api.IInterceptorService; +import ca.uhn.fhir.rest.api.EncodingEnum; +import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; + +import java.util.List; public interface IRestfulServerDefaults { /** diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IRestfulServerUtil.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IRestfulServerUtil.java index d87721464a4..991ce5338f6 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IRestfulServerUtil.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IRestfulServerUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IServerAddressStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IServerAddressStrategy.java index 100e8a11e70..2ebf244c393 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IServerAddressStrategy.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IServerAddressStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IServerConformanceProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IServerConformanceProvider.java index 26542c4a320..3325acfb302 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IServerConformanceProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IServerConformanceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import javax.servlet.http.HttpServletRequest; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java index 0b433613789..1bec0b5b6d5 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/PageProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/PageProvider.java index f2be0089c45..3390e782056 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/PageProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/PageProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.rest.annotation.GetPage; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ResourceBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ResourceBinding.java index 97b6d2674b7..9c0da650ded 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ResourceBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ResourceBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.method.BaseMethodBinding; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java index 12b0258a5de..106c9351ec1 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java index bf7ac776e94..f7549f2f76c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java index 93680b410f0..1bc8dfb8bc1 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ServletRequestTracing.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ServletRequestTracing.java index 2df648838c7..16d0faa1ce8 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ServletRequestTracing.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ServletRequestTracing.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.rest.api.Constants; import org.apache.commons.lang3.RandomStringUtils; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/SimpleBundleProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/SimpleBundleProvider.java index 109fe623a84..c5f57ee4977 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/SimpleBundleProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/SimpleBundleProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.rest.api.server.IBundleProvider; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/TransactionLogMessages.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/TransactionLogMessages.java index 6ffded1438d..bd4a17dab2e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/TransactionLogMessages.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/TransactionLogMessages.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server; import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BanUnsupportedHttpMethodsInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BanUnsupportedHttpMethodsInterceptor.java index 74a6f2c37ce..7e89fde07e2 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BanUnsupportedHttpMethodsInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BanUnsupportedHttpMethodsInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.i18n.Msg; import java.util.HashSet; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseResponseTerminologyInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseResponseTerminologyInterceptor.java index 7cd4f3473a2..3a06bb755ee 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseResponseTerminologyInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseResponseTerminologyInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseValidatingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseValidatingInterceptor.java index 8fa9c5d013e..132039c926f 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseValidatingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseValidatingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CaptureResourceSourceFromHeaderInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CaptureResourceSourceFromHeaderInterceptor.java index 7cbb1f94eb4..514b77b1948 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CaptureResourceSourceFromHeaderInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CaptureResourceSourceFromHeaderInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ConfigLoader.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ConfigLoader.java index 70e646ca34e..d6fb76d7bcc 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ConfigLoader.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ConfigLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.util.ClasspathUtil; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CorsInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CorsInterceptor.java index d77c19a6311..f7bb2bb4890 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CorsInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CorsInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.i18n.Msg; import java.io.IOException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java index d2f70eb78b8..97482e5d160 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; + import ca.uhn.fhir.i18n.Msg; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.http.HttpHeaders.CONTENT_ENCODING; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/FhirPathFilterInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/FhirPathFilterInterceptor.java index 877f39721a3..8538396c431 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/FhirPathFilterInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/FhirPathFilterInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java index 93fb75c4f27..e2fab0cbb08 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerOperationInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerOperationInterceptor.java index 8c6c50b2e24..38571116edf 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerOperationInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerOperationInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InteractionBlockingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InteractionBlockingInterceptor.java index aa0aa7270c0..f33f36d93b5 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InteractionBlockingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InteractionBlockingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InterceptorAdapter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InterceptorAdapter.java index e6fe56683ff..6476c53625e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InterceptorAdapter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InterceptorAdapter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.model.api.TagList; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InterceptorOrders.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InterceptorOrders.java index 8b5a6df219e..34eca7f5c4d 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InterceptorOrders.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/InterceptorOrders.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; public class InterceptorOrders { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptor.java index c39ed9619db..2584640cd12 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptor.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Server Framework + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.interceptor.api.Hook; @@ -28,26 +47,6 @@ import java.util.Map.Entry; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR - Server Framework - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * Server interceptor which logs each request using a defined format *

diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/RequestValidatingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/RequestValidatingInterceptor.java index 12426d547e7..6b1febcc1b6 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/RequestValidatingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/RequestValidatingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java index 1fcd7d7858d..9ebc7238cb4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Server Framework + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.i18n.Msg; @@ -49,26 +68,6 @@ import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.trim; -/* - * #%L - * HAPI FHIR - Server Framework - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * This interceptor detects when a request is coming from a browser, and automatically returns a response with syntax * highlighted (coloured) HTML for the response instead of just returning raw XML/JSON. diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseSizeCapturingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseSizeCapturingInterceptor.java index 8072858df3a..ca107e104a9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseSizeCapturingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseSizeCapturingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyDisplayPopulationInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyDisplayPopulationInterceptor.java index 8e3b0306d0d..3a455de9cca 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyDisplayPopulationInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyDisplayPopulationInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyTranslationInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyTranslationInterceptor.java index 2ef01b870f4..6469f21b2aa 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyTranslationInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyTranslationInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyTranslationSvc.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyTranslationSvc.java index 5b65302f425..293fecad643 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyTranslationSvc.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseTerminologyTranslationSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseValidatingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseValidatingInterceptor.java index 8dd6d6acc02..73ac775212f 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseValidatingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseValidatingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/SearchPreferHandlingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/SearchPreferHandlingInterceptor.java index 1ada68f3fc1..b76a3cdc062 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/SearchPreferHandlingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/SearchPreferHandlingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.i18n.HapiLocalizer; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServeMediaResourceRawInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServeMediaResourceRawInterceptor.java index 81477869d3a..038e29ddee7 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServeMediaResourceRawInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServeMediaResourceRawInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServerInterceptorUtil.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServerInterceptorUtil.java index d6ccfa3a448..993c0ab922e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServerInterceptorUtil.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServerInterceptorUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServerOperationInterceptorAdapter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServerOperationInterceptorAdapter.java index a9058bf56bf..bcabe2c00ab 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServerOperationInterceptorAdapter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ServerOperationInterceptorAdapter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/StaticCapabilityStatementInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/StaticCapabilityStatementInterceptor.java index 64952d3b741..d415349f70b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/StaticCapabilityStatementInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/StaticCapabilityStatementInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ValidationResultEnrichingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ValidationResultEnrichingInterceptor.java index 6f661dd6600..2b87a28dcf7 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ValidationResultEnrichingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ValidationResultEnrichingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/VerboseLoggingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/VerboseLoggingInterceptor.java index c2ad20c49bf..652eb6d153b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/VerboseLoggingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/VerboseLoggingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor; import java.util.Enumeration; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AdditionalCompartmentSearchParameters.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AdditionalCompartmentSearchParameters.java index df8dcd665c6..7165d925b80 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AdditionalCompartmentSearchParameters.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AdditionalCompartmentSearchParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.i18n.Msg; import javax.annotation.Nonnull; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AllowedCodeInValueSet.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AllowedCodeInValueSet.java index ee8e4d00e33..8095150b74a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AllowedCodeInValueSet.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AllowedCodeInValueSet.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import javax.annotation.Nonnull; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AppliesTypeEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AppliesTypeEnum.java index 187c8dd3f52..aee4b2d27e6 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AppliesTypeEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AppliesTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; enum AppliesTypeEnum { ALL_RESOURCES, TYPES, INSTANCES diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationConstants.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationConstants.java index 3650ca16e61..3c2da3fc6c6 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationConstants.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public class AuthorizationConstants { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationFlagsEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationFlagsEnum.java index 9a1e21f7ea6..a2431014715 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationFlagsEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationFlagsEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationInterceptor.java index c9bdabc764f..514b1117e75 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizedList.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizedList.java index ca7c0883286..2773721b02f 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizedList.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizedList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.rest.api.server.RequestDetails; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/BaseRule.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/BaseRule.java index 714e0b30486..093c4705643 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/BaseRule.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/BaseRule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/ClassifierTypeEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/ClassifierTypeEnum.java index 87fc9590002..a4446dd715b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/ClassifierTypeEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/ClassifierTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; enum ClassifierTypeEnum { IN_COMPARTMENT, ANY_ID diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/FhirQueryRuleTester.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/FhirQueryRuleTester.java index 41e01ee8dcd..43111aeefc7 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/FhirQueryRuleTester.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/FhirQueryRuleTester.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRule.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRule.java index 43d0cce2f86..509cfb360a1 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRule.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilder.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilder.java index 5b78eeb3827..763a8eb75b5 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilder.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilder.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - -import java.util.List; - /* * #%L * HAPI FHIR - Server Framework @@ -21,6 +17,9 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; + +import java.util.List; /** * Used by {@link AuthorizationInterceptor} in order to allow user code to define authorization diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderAppliesTo.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderAppliesTo.java index 48744448ed5..7ade4f86a12 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderAppliesTo.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderAppliesTo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderGraphQL.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderGraphQL.java index c58adbb5a38..3a9fe7ea61b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderGraphQL.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderGraphQL.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderGraphQL { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperation.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperation.java index 9962f02562d..c91138e910b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperation.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderOperation { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperationNamed.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperationNamed.java index eb7a64f9ebc..49d5c540668 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperationNamed.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperationNamed.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperationNamedAndScoped.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperationNamedAndScoped.java index 8d20ea7edbb..81fd5fd8dfe 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperationNamedAndScoped.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderOperationNamedAndScoped.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderOperationNamedAndScoped { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderPatch.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderPatch.java index a43885b70ea..c7e2dfff237 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderPatch.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderPatch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.rest.api.server.RequestDetails; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRule.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRule.java index f9081929eac..af981ef55de 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRule.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderRule { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleBulkExport.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleBulkExport.java index 58daecf1c2f..a5891af3649 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleBulkExport.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleBulkExport.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleBulkExportWithTarget.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleBulkExportWithTarget.java index 9051dedc9d3..5dd3798e28a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleBulkExportWithTarget.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleBulkExportWithTarget.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleConditional.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleConditional.java index 1a4ce5a71f9..5489016b842 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleConditional.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleConditional.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderRuleConditional extends IAuthRuleBuilderAppliesTo { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleConditionalClassifier.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleConditionalClassifier.java index b09a3611f9b..9d09f9c59a6 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleConditionalClassifier.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleConditionalClassifier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderRuleConditionalClassifier extends IAuthRuleFinished { // nothing diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOp.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOp.java index 3d951017d25..aab1830a2c4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOp.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOp.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - -import org.hl7.fhir.instance.model.api.IIdType; - -import java.util.Collection; - /* * #%L * HAPI FHIR - Server Framework @@ -23,6 +17,11 @@ import java.util.Collection; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; + +import org.hl7.fhir.instance.model.api.IIdType; + +import java.util.Collection; public interface IAuthRuleBuilderRuleOp extends IAuthRuleBuilderAppliesTo { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifier.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifier.java index 76e5ddcb03e..de7454d23e4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifier.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifierFinished.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifierFinished.java index 16a60be246b..6e98c5db730 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifierFinished.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifierFinished.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifierFinishedWithTenantId.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifierFinishedWithTenantId.java index 720445fef2c..e2789f4a551 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifierFinishedWithTenantId.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpClassifierFinishedWithTenantId.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderRuleOpClassifierFinishedWithTenantId extends IAuthRuleFinished { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpDelete.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpDelete.java index 44c374580ea..a706e0e473e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpDelete.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleOpDelete.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderRuleOpDelete extends IAuthRuleBuilderRuleOp { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleTransaction.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleTransaction.java index c4cc03f0f5e..20f50db1c57 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleTransaction.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleTransaction.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderRuleTransaction { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleTransactionOp.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleTransactionOp.java index 9ec2b8abbb7..23faf474b5b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleTransactionOp.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderRuleTransactionOp.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderRuleTransactionOp { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderUpdateHistoryRewrite.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderUpdateHistoryRewrite.java index 69df6c72311..a0c0468422a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderUpdateHistoryRewrite.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleBuilderUpdateHistoryRewrite.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public interface IAuthRuleBuilderUpdateHistoryRewrite { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleFinished.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleFinished.java index 8aa5e2722b6..c76acc3ff07 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleFinished.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleFinished.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import javax.annotation.Nullable; import java.util.List; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleTester.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleTester.java index ef879256797..ce60a7aec0b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleTester.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthRuleTester.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthorizationSearchParamMatcher.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthorizationSearchParamMatcher.java index ea21fe47f7e..9a79d423e2c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthorizationSearchParamMatcher.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IAuthorizationSearchParamMatcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IRuleApplier.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IRuleApplier.java index 4f42fe5458b..acef0833c63 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IRuleApplier.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/IRuleApplier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/OperationRule.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/OperationRule.java index 4c8fb9ec2d1..8efd9d1e194 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/OperationRule.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/OperationRule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.Pointcut; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/PolicyEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/PolicyEnum.java index df029598006..d5a07389126 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/PolicyEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/PolicyEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; public enum PolicyEnum { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBuilder.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBuilder.java index 6081f176ba9..6a84f7a962f 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBuilder.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.model.api.annotation.ResourceDef; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBulkExportImpl.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBulkExportImpl.java index b44d4f63d93..ebc885223b9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBulkExportImpl.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBulkExportImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.model.primitive.IdDt; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplConditional.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplConditional.java index d9cb85c9baa..3731d683937 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplConditional.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplConditional.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOp.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOp.java index a33e83dd545..38c45de6a04 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOp.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOp.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Server Framework + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.context.FhirContext; @@ -42,26 +61,6 @@ import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.hl7.fhir.instance.model.api.IAnyResource.SP_RES_ID; -/* - * #%L - * HAPI FHIR - Server Framework - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @SuppressWarnings("EnumSwitchStatementWhichMissesCases") class RuleImplOp extends BaseRule /* implements IAuthRule */ { private static final Logger ourLog = LoggerFactory.getLogger(RuleImplOp.class); diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplPatch.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplPatch.java index edba60f7cd2..e3efbd26602 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplPatch.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplPatch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplUpdateHistoryRewrite.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplUpdateHistoryRewrite.java index 4a32b58028c..bdac717afa4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplUpdateHistoryRewrite.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplUpdateHistoryRewrite.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleOpEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleOpEnum.java index fe8230443fe..b6cd1aed89a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleOpEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleOpEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; enum RuleOpEnum { READ, diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleTarget.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleTarget.java index 222a8e44b54..4497328cedd 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleTarget.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleTarget.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingConsentService.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingConsentService.java index 7d590b24553..cc7a9666b4e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingConsentService.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingConsentService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingInterceptor.java index e618c5f1415..8ea3e6e93c2 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchParameterAndValueSetRuleImpl.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchParameterAndValueSetRuleImpl.java index 8b0dd6e758b..a39f21cc4d9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchParameterAndValueSetRuleImpl.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchParameterAndValueSetRuleImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/TransactionAppliesToEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/TransactionAppliesToEnum.java index 1c587b12bdc..3188f825d66 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/TransactionAppliesToEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/TransactionAppliesToEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; enum TransactionAppliesToEnum { ANY_OPERATION diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentInterceptor.java index f526f765609..89e6898a0dd 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.consent; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.consent; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.consent; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentOperationStatusEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentOperationStatusEnum.java index b9ad531db9b..d0baf09ca5a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentOperationStatusEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentOperationStatusEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.consent; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.consent; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.consent; public enum ConsentOperationStatusEnum { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentOutcome.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentOutcome.java index 09252f27096..77cc87a37b1 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentOutcome.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/ConsentOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.consent; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.consent; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.consent; import org.apache.commons.lang3.Validate; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/DelegatingConsentService.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/DelegatingConsentService.java index 981157b1301..e57afb47818 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/DelegatingConsentService.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/DelegatingConsentService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.consent; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.consent; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.consent; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/IConsentContextServices.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/IConsentContextServices.java index 1fba1435691..007d924732c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/IConsentContextServices.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/IConsentContextServices.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.consent; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.consent; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.consent; public interface IConsentContextServices { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/IConsentService.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/IConsentService.java index 552e3bad784..f58cf3641b9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/IConsentService.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/IConsentService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.consent; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.consent; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.consent; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/NullConsentContextServices.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/NullConsentContextServices.java index 4ddf424a37e..055bc40c9b0 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/NullConsentContextServices.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/NullConsentContextServices.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.consent; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.consent; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.consent; /** * Implementation of {@link IConsentContextServices} that always throws a {@link UnsupportedOperationException} diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/RuleFilteringConsentService.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/RuleFilteringConsentService.java index 7c9ddceb522..3af11415817 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/RuleFilteringConsentService.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/consent/RuleFilteringConsentService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.consent; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.consent; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.consent; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/partition/RequestTenantPartitionInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/partition/RequestTenantPartitionInterceptor.java index 3302d772d80..eef6a577218 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/partition/RequestTenantPartitionInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/partition/RequestTenantPartitionInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.partition; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.partition; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.partition; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.Hook; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/StandardizingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/StandardizingInterceptor.java index 02109b642a7..8a472df001b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/StandardizingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/StandardizingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/EmailStandardizer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/EmailStandardizer.java index 47fc79bff1a..8ae9efbcfd6 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/EmailStandardizer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/EmailStandardizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; /** * Standardizes email addresses by removing whitespace, ISO control characters and applying lower-case to the values. diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/FirstNameStandardizer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/FirstNameStandardizer.java index 624c4610074..c9e28f043ef 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/FirstNameStandardizer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/FirstNameStandardizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.CaseUtils; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/IStandardizer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/IStandardizer.java index d4a15e87bc4..f2cdee40e54 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/IStandardizer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/IStandardizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; /** * Contract for standardizing textual primitives in the FHIR resources. diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/LastNameStandardizer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/LastNameStandardizer.java index f80004e8c64..dd368310ef9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/LastNameStandardizer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/LastNameStandardizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; import org.apache.commons.text.WordUtils; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/NoiseCharacters.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/NoiseCharacters.java index 906734571ba..6c0a0aee278 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/NoiseCharacters.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/NoiseCharacters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.server.interceptor.ConfigLoader; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/PhoneStandardizer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/PhoneStandardizer.java index d125a6ee51d..944edfa4ffb 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/PhoneStandardizer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/PhoneStandardizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; /** * Standardizes phone numbers to fit 123-456-7890 pattern. diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/Range.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/Range.java index 2855d2bc8fa..226cb4cdc9c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/Range.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/Range.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; import java.util.Objects; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/TextStandardizer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/TextStandardizer.java index 4f08cc2dc44..fc1ac7e0dbf 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/TextStandardizer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/TextStandardizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; import java.util.ArrayList; import java.util.Arrays; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/TitleStandardizer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/TitleStandardizer.java index d071900bd58..10369ca4ddd 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/TitleStandardizer.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/s13n/standardizers/TitleStandardizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.s13n.standardizers; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/ValidationMessageSuppressingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/ValidationMessageSuppressingInterceptor.java index ab40e2ba961..7126d9fe41b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/ValidationMessageSuppressingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/ValidationMessageSuppressingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidatingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidatingInterceptor.java index 2c0c9ef97ec..10646a4846e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidatingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidatingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.address; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.address; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.address; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidationException.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidationException.java index 49145bb2ba9..185cc464351 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidationException.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidationException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.address; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.address; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.address; public class AddressValidationException extends RuntimeException { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidationResult.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidationResult.java index 941bb57d23e..cb746793b6b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidationResult.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/AddressValidationResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.address; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.address; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.address; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/IAddressValidator.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/IAddressValidator.java index 019e8a7e6f6..216ee122939 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/IAddressValidator.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/IAddressValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.address; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.address; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.address; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/BaseRestfulValidator.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/BaseRestfulValidator.java index 6e2fc77fb76..a8b1d5f2aca 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/BaseRestfulValidator.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/BaseRestfulValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.address.impl; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.address.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.address.impl; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/LoquateAddressValidator.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/LoquateAddressValidator.java index 764b60ddae5..419bfcb268a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/LoquateAddressValidator.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/LoquateAddressValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.address.impl; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.address.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.address.impl; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.server.interceptor.validation.address.AddressValidationResult; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/EmailValidator.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/EmailValidator.java index e51bb516484..73dbf507cd6 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/EmailValidator.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/EmailValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.fields; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.fields; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.fields; import java.util.regex.Pattern; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/FieldValidatingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/FieldValidatingInterceptor.java index 3e340226c99..2068da63f04 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/FieldValidatingInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/FieldValidatingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.fields; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.fields; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.fields; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/IValidator.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/IValidator.java index 0e216939624..c8f49cc777e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/IValidator.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/IValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.fields; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.fields; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.fields; public interface IValidator { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/helpers/AddressHelper.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/helpers/AddressHelper.java index 46411151dd2..f79b9543b8c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/helpers/AddressHelper.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/helpers/AddressHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.validation.helpers; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.validation.helpers; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.validation.helpers; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.util.PropertyModifyingHelper; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/IMailSvc.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/IMailSvc.java index 174121a87dc..204f77f6ee4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/IMailSvc.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/IMailSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.mail; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.mail; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.mail; import org.simplejavamail.api.email.Email; import org.simplejavamail.api.mailer.AsyncResponse; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/MailConfig.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/MailConfig.java index 2aef575dc64..4e43967c507 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/MailConfig.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/MailConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.mail; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.mail; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.mail; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/MailSvc.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/MailSvc.java index 085bf5003f3..230fc66236e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/MailSvc.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/mail/MailSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.mail; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.mail; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.mail; import org.apache.commons.lang3.Validate; import org.simplejavamail.MailException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceMessage.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceMessage.java index b1524e65a15..618f8cc51a4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceMessage.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.messaging; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.messaging; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.messaging; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceModifiedMessage.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceModifiedMessage.java index 7aab813dc3b..fe40f2291dd 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceModifiedMessage.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceModifiedMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.messaging; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.messaging; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.messaging; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/IResourceMessage.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/IResourceMessage.java index 9cd58175a4a..5470216073b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/IResourceMessage.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/IResourceMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.messaging; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.messaging; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.messaging; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/ResourceOperationMessage.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/ResourceOperationMessage.java index e669aa2cc9e..fa136af604c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/ResourceOperationMessage.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/ResourceOperationMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.messaging; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.messaging; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.messaging; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/BaseJsonMessage.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/BaseJsonMessage.java index 4195b3a1fe6..ad34b48549f 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/BaseJsonMessage.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/BaseJsonMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.messaging.json; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.messaging.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.messaging.json; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/HapiMessageHeaders.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/HapiMessageHeaders.java index 0478f4cbc89..b1ae4a1ae5d 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/HapiMessageHeaders.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/HapiMessageHeaders.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.messaging.json; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.messaging.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.messaging.json; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/ResourceOperationJsonMessage.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/ResourceOperationJsonMessage.java index 9e299ac4142..fa8b308f85b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/ResourceOperationJsonMessage.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/ResourceOperationJsonMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.messaging.json; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.messaging.json; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.messaging.json; import ca.uhn.fhir.rest.server.messaging.ResourceOperationMessage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/AtParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/AtParameter.java index 08da60848ea..8447c05de6c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/AtParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/AtParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.rest.annotation.At; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseMethodBinding.java index 21e208863f8..872ffb24c64 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBinding.java index 68b5353d2de..d4d6b02cace 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java index d6a83f30311..16b09b037be 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBindingWithResourceParam.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBindingWithResourceParam.java index c0ecbd08496..345d6e7d6bd 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBindingWithResourceParam.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBindingWithResourceParam.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - -import ca.uhn.fhir.i18n.Msg; -import static org.apache.commons.lang3.StringUtils.defaultIfBlank; - /* * #%L * HAPI FHIR - Server Framework @@ -22,6 +17,10 @@ import static org.apache.commons.lang3.StringUtils.defaultIfBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; + +import ca.uhn.fhir.i18n.Msg; +import static org.apache.commons.lang3.StringUtils.defaultIfBlank; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseQueryParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseQueryParameter.java index 765c2e978b1..e6e284461ac 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseQueryParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseQueryParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.QualifiedParamList; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseResourceReturningMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseResourceReturningMethodBinding.java index 6331e8c8276..5dfa3b91436 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseResourceReturningMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseResourceReturningMethodBinding.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Server Framework + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.ConfigurationException; @@ -52,26 +71,6 @@ import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR - Server Framework - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public abstract class BaseResourceReturningMethodBinding extends BaseMethodBinding { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(BaseResourceReturningMethodBinding.class); diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConditionalParamBinder.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConditionalParamBinder.java index 3c38de65754..d25150b5b3d 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConditionalParamBinder.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConditionalParamBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConformanceMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConformanceMethodBinding.java index ad57f3c59e2..021f46197fa 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConformanceMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConformanceMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/CountParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/CountParameter.java index c3390001ef5..afcb8335ec2 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/CountParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/CountParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/CreateMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/CreateMethodBinding.java index b7184526150..fcc213d0768 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/CreateMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/CreateMethodBinding.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - -import ca.uhn.fhir.i18n.Msg; -import static org.apache.commons.lang3.StringUtils.isNotBlank; - /* * #%L * HAPI FHIR - Server Framework @@ -22,6 +17,10 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; + +import ca.uhn.fhir.i18n.Msg; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.lang.reflect.Method; import java.util.Collections; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/DeleteMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/DeleteMethodBinding.java index 011fa3b7431..cf9350f36cf 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/DeleteMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/DeleteMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Collections; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ElementsParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ElementsParameter.java index 17dc26ac30a..e84ffa8426e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ElementsParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ElementsParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLMethodBinding.java index dc45bedb0ca..e41aca5e59e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLQueryBodyParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLQueryBodyParameter.java index 1c2cbf7debd..432406b0144 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLQueryBodyParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLQueryBodyParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLQueryUrlParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLQueryUrlParameter.java index 3b1c9b3adae..ab88de812f7 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLQueryUrlParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/GraphQLQueryUrlParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/HistoryMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/HistoryMethodBinding.java index 793ba33804d..8e2a88ed9b4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/HistoryMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/HistoryMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IParameter.java index 094a1f5dc03..feca99e578c 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IRestfulHeader.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IRestfulHeader.java index 06a06940541..8ef7a351107 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IRestfulHeader.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IRestfulHeader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; public interface IRestfulHeader { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IncludeParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IncludeParameter.java index 228c27b8d42..7c518f3187d 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IncludeParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/IncludeParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/InterceptorBroadcasterParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/InterceptorBroadcasterParameter.java index ce05f33bd1a..80433ef92a9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/InterceptorBroadcasterParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/InterceptorBroadcasterParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/MethodMatchEnum.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/MethodMatchEnum.java index 07d9d497acd..ab43660624b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/MethodMatchEnum.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/MethodMatchEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; public enum MethodMatchEnum { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/MethodUtil.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/MethodUtil.java index 75be9dc3667..fe78a04f322 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/MethodUtil.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/MethodUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/NullParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/NullParameter.java index 1dde4e60453..8fe559a466d 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/NullParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/NullParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OffsetParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OffsetParameter.java index 1f3234e4ad1..18f098ba6b4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OffsetParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OffsetParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import java.lang.reflect.Method; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationMethodBinding.java index 1a935f642ac..1cf2715ba09 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationParameter.java index 490f996d71f..b924b471020 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationParameter.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Server Framework + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; @@ -49,26 +68,6 @@ import java.util.function.Consumer; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR - Server Framework - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public class OperationParameter implements IParameter { static final String REQUEST_CONTENTS_USERDATA_KEY = OperationParam.class.getName() + "_PARSED_RESOURCE"; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PageMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PageMethodBinding.java index 8a5f33a97fe..55998774bd7 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PageMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PageMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PatchMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PatchMethodBinding.java index d32ecea9fbe..46199fa5cfd 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PatchMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PatchMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import java.lang.annotation.Annotation; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PatchTypeParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PatchTypeParameter.java index b8351f89bb5..497fbc8146e 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PatchTypeParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/PatchTypeParameter.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - -import static org.apache.commons.lang3.StringUtils.defaultString; -import static org.apache.commons.lang3.StringUtils.trim; - /* * #%L * HAPI FHIR - Server Framework @@ -22,6 +17,10 @@ import static org.apache.commons.lang3.StringUtils.trim; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; + +import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.trim; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/RawParamsParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/RawParamsParameter.java index 3d1e3976761..7a8c6fd571b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/RawParamsParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/RawParamsParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ReadMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ReadMethodBinding.java index 25a822cdc35..0193a755b21 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ReadMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ReadMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/RequestDetailsParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/RequestDetailsParameter.java index 6fa05916d42..40c866ba7a1 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/RequestDetailsParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/RequestDetailsParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ResourceParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ResourceParameter.java index 8be114c4d26..fff2eea253b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ResourceParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ResourceParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchContainedModeParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchContainedModeParameter.java index e87e90305b1..e01b5639ded 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchContainedModeParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchContainedModeParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.SearchContainedModeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchMethodBinding.java index 4540a46d0a7..d8e08c40f7f 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchParameter.java index cecc45425fb..b60268ccc8a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; + import ca.uhn.fhir.i18n.Msg; import java.util.*; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchTotalModeParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchTotalModeParameter.java index 930a8b6fbc1..480090de694 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchTotalModeParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SearchTotalModeParameter.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.api.SearchTotalModeEnum; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; -import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; - -import java.lang.reflect.Method; -import java.util.Collection; - /* * #%L * HAPI FHIR - Server Framework @@ -28,6 +17,16 @@ import java.util.Collection; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; + +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.rest.api.SearchTotalModeEnum; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; + +import java.lang.reflect.Method; +import java.util.Collection; class SearchTotalModeParameter implements IParameter { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServerBaseParamBinder.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServerBaseParamBinder.java index c4cf130553d..03a95a59a22 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServerBaseParamBinder.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServerBaseParamBinder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServletRequestParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServletRequestParameter.java index b4a0c16385f..8c4a427ba99 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServletRequestParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServletRequestParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServletResponseParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServletResponseParameter.java index 517e6092b0d..7aa23a77d1b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServletResponseParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ServletResponseParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import java.lang.reflect.Method; import java.util.Collection; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SinceOrAtParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SinceOrAtParameter.java index 5a75b061d5e..e7c9d298e79 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SinceOrAtParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SinceOrAtParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import java.util.Set; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SinceParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SinceParameter.java index 5eb52d4138d..ec241f074dc 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SinceParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SinceParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.rest.annotation.Since; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SortParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SortParameter.java index 53c59533139..1ab857bfc31 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SortParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SortParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; + import ca.uhn.fhir.i18n.Msg; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SummaryEnumParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SummaryEnumParameter.java index d3c8d870fbf..cb56dc619b3 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SummaryEnumParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/SummaryEnumParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,8 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; + import ca.uhn.fhir.i18n.Msg; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/TransactionMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/TransactionMethodBinding.java index 6a2abcb6584..db1146ec56a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/TransactionMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/TransactionMethodBinding.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/TransactionParameter.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/TransactionParameter.java index 4d091c92601..a7c5ee8d6cd 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/TransactionParameter.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/TransactionParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/UpdateMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/UpdateMethodBinding.java index 30fef03086a..eb77fe09984 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/UpdateMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/UpdateMethodBinding.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - -import ca.uhn.fhir.i18n.Msg; -import static org.apache.commons.lang3.StringUtils.isBlank; /* * #%L * HAPI FHIR - Server Framework @@ -21,6 +17,10 @@ import static org.apache.commons.lang3.StringUtils.isBlank; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; + +import ca.uhn.fhir.i18n.Msg; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.lang.reflect.Method; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ValidateMethodBindingDstu2Plus.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ValidateMethodBindingDstu2Plus.java index 57550e8ffe5..6d3260b12f2 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ValidateMethodBindingDstu2Plus.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ValidateMethodBindingDstu2Plus.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.method; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.method; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.method; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.valueset.BundleTypeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/BaseLastNProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/BaseLastNProvider.java index bdde4354b21..c282c43f593 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/BaseLastNProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/BaseLastNProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.provider; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.provider; import ca.uhn.fhir.rest.annotation.Operation; import ca.uhn.fhir.rest.annotation.OperationParam; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java index 9c982bb9c86..dfa4abf5a8f 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.provider; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.provider; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/IResourceProviderFactoryObserver.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/IResourceProviderFactoryObserver.java index 5742bed3c32..cdd446f00d0 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/IResourceProviderFactoryObserver.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/IResourceProviderFactoryObserver.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.provider; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.provider; import javax.annotation.Nonnull; import java.util.function.Supplier; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java index a972c061180..518dff711ca 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.provider; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.provider; public class ProviderConstants { public static final String SUBSCRIPTION_TRIGGERING_PARAM_RESOURCE_ID = "resourceId"; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ResourceProviderFactory.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ResourceProviderFactory.java index ba0c13207a4..4ebf6049e57 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ResourceProviderFactory.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ResourceProviderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.provider; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.provider; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java index c5eeb97e097..d64dd429821 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR - Server Framework + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.server.provider; import ca.uhn.fhir.context.FhirContext; @@ -63,26 +82,6 @@ import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR - Server Framework - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * Server FHIR Provider which serves the conformance statement for a RESTful server implementation *

diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java index c8b702b3e17..f52a8ce7a70 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.servlet; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.servlet; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.servlet; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRestfulResponse.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRestfulResponse.java index 9e8f9b6e047..6a36d1f5780 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRestfulResponse.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRestfulResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.servlet; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.servlet; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.servlet; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.server.BaseRestfulResponse; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletSubRequestDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletSubRequestDetails.java index a35f7416c00..80662578416 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletSubRequestDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletSubRequestDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.servlet; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.servlet; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.servlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/tenant/ITenantIdentificationStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/tenant/ITenantIdentificationStrategy.java index ea1138df88f..adac4d18ad9 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/tenant/ITenantIdentificationStrategy.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/tenant/ITenantIdentificationStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.tenant; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.tenant; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.tenant; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.util.UrlPathTokenizer; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/tenant/UrlBaseTenantIdentificationStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/tenant/UrlBaseTenantIdentificationStrategy.java index 3a07fd980b5..f4d7ddbad31 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/tenant/UrlBaseTenantIdentificationStrategy.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/tenant/UrlBaseTenantIdentificationStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.tenant; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.tenant; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.tenant; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.i18n.HapiLocalizer; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/BaseServerCapabilityStatementProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/BaseServerCapabilityStatementProvider.java index 1a929169159..3e467fe8fad 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/BaseServerCapabilityStatementProvider.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/BaseServerCapabilityStatementProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.util; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.util; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.RestfulServer; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/CompositeInterceptorBroadcaster.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/CompositeInterceptorBroadcaster.java index 239a3285d37..3c8c11a1cc8 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/CompositeInterceptorBroadcaster.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/CompositeInterceptorBroadcaster.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.util; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.util; import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/FhirContextSearchParamRegistry.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/FhirContextSearchParamRegistry.java index 321feaa95ce..4d455cd3e9b 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/FhirContextSearchParamRegistry.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/FhirContextSearchParamRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.util; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.util; import ca.uhn.fhir.context.ComboSearchParamType; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ICachedSearchDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ICachedSearchDetails.java index 8482b3e0380..28fd680a9ff 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ICachedSearchDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ICachedSearchDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.util; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.util; public interface ICachedSearchDetails { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java index 1fe42cdfcb5..f236ef682b4 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.util; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.util; import ca.uhn.fhir.context.ComboSearchParamType; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ITestingUiClientFactory.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ITestingUiClientFactory.java index 267ad9edcbe..518d44a1623 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ITestingUiClientFactory.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ITestingUiClientFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.util; - /* * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.util; import javax.servlet.http.HttpServletRequest; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ResourceSearchParams.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ResourceSearchParams.java index 9836a455b72..6cfa13ee5ed 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ResourceSearchParams.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ResourceSearchParams.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.util; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.util; import ca.uhn.fhir.context.RuntimeSearchParam; import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java index 9c9480a0df6..55615960f59 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.util; - /*- * #%L * HAPI FHIR - Server Framework @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.util; import ca.uhn.fhir.rest.api.RequestTypeEnum; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java index 78b1f3b828a..3332d84d26e 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.spring.boot.autoconfigure; - /*- * #%L * hapi-fhir-spring-boot-autoconfigure @@ -19,6 +17,7 @@ package ca.uhn.fhir.spring.boot.autoconfigure; * limitations under the License. * #L% */ +package ca.uhn.fhir.spring.boot.autoconfigure; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirProperties.java b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirProperties.java index 57847a51175..f949fa89a41 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirProperties.java +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirProperties.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.spring.boot.autoconfigure; - /*- * #%L * hapi-fhir-spring-boot-autoconfigure @@ -19,6 +17,7 @@ package ca.uhn.fhir.spring.boot.autoconfigure; * limitations under the License. * #L% */ +package ca.uhn.fhir.spring.boot.autoconfigure; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirRestfulServerCustomizer.java b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirRestfulServerCustomizer.java index 66602470df8..a218b75b1e2 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirRestfulServerCustomizer.java +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirRestfulServerCustomizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.spring.boot.autoconfigure; - /*- * #%L * hapi-fhir-spring-boot-autoconfigure @@ -19,6 +17,7 @@ package ca.uhn.fhir.spring.boot.autoconfigure; * limitations under the License. * #L% */ +package ca.uhn.fhir.spring.boot.autoconfigure; import ca.uhn.fhir.rest.server.RestfulServer; diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/src/main/java/sample/fhir/client/SampleApacheRestfulClientApplication.java b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/src/main/java/sample/fhir/client/SampleApacheRestfulClientApplication.java index dd5568a59ca..31003ec4b87 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/src/main/java/sample/fhir/client/SampleApacheRestfulClientApplication.java +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/src/main/java/sample/fhir/client/SampleApacheRestfulClientApplication.java @@ -1,5 +1,3 @@ -package sample.fhir.client; - /*- * #%L * hapi-fhir-spring-boot-sample-client-apache @@ -19,6 +17,7 @@ package sample.fhir.client; * limitations under the License. * #L% */ +package sample.fhir.client; import ca.uhn.fhir.rest.client.api.IGenericClient; import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/src/main/java/sample/fhir/client/SampleOkHttpRestfulClientApplication.java b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/src/main/java/sample/fhir/client/SampleOkHttpRestfulClientApplication.java index 482bbc8b793..6451cf4115f 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/src/main/java/sample/fhir/client/SampleOkHttpRestfulClientApplication.java +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/src/main/java/sample/fhir/client/SampleOkHttpRestfulClientApplication.java @@ -1,5 +1,3 @@ -package sample.fhir.client; - /*- * #%L * hapi-fhir-spring-boot-sample-client-okhttp @@ -19,6 +17,7 @@ package sample.fhir.client; * limitations under the License. * #L% */ +package sample.fhir.client; import ca.uhn.fhir.rest.client.api.IGenericClient; import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/java/sample/fhir/server/jersey/SampleJerseyRestfulServerApplication.java b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/java/sample/fhir/server/jersey/SampleJerseyRestfulServerApplication.java index 77ca17aa41c..7754fa49fc4 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/java/sample/fhir/server/jersey/SampleJerseyRestfulServerApplication.java +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/java/sample/fhir/server/jersey/SampleJerseyRestfulServerApplication.java @@ -1,5 +1,3 @@ -package sample.fhir.server.jersey; - /*- * #%L * hapi-fhir-spring-boot-sample-server-jersey @@ -19,6 +17,7 @@ package sample.fhir.server.jersey; * limitations under the License. * #L% */ +package sample.fhir.server.jersey; import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor; diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/java/sample/fhir/server/jersey/provider/PatientResourceProvider.java b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/java/sample/fhir/server/jersey/provider/PatientResourceProvider.java index e70fb5febcf..190c0220927 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/java/sample/fhir/server/jersey/provider/PatientResourceProvider.java +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/src/main/java/sample/fhir/server/jersey/provider/PatientResourceProvider.java @@ -1,5 +1,3 @@ -package sample.fhir.server.jersey.provider; - /*- * #%L * hapi-fhir-spring-boot-sample-server-jersey @@ -19,6 +17,7 @@ package sample.fhir.server.jersey.provider; * limitations under the License. * #L% */ +package sample.fhir.server.jersey.provider; import ca.uhn.fhir.i18n.Msg; import java.util.concurrent.ConcurrentHashMap; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java index 87a0211debd..4475b1338f1 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java @@ -1,3 +1,22 @@ +/*- + * #%L + * HAPI FHIR Server - SQL Migration + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.i18n.Msg; @@ -19,26 +38,6 @@ import java.lang.reflect.InvocationTargetException; import java.sql.Connection; import java.sql.SQLException; -/*- - * #%L - * HAPI FHIR Server - SQL Migration - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public enum DriverTypeEnum { H2_EMBEDDED("org.h2.Driver", false), diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationException.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationException.java index 36ab9c63451..160f451a816 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationException.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; public class HapiMigrationException extends RuntimeException { private MigrationResult myResult; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationLock.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationLock.java index a4db4201aec..caf26fb5744 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationLock.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationLock.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.entity.HapiMigrationEntity; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationStorageSvc.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationStorageSvc.java index dad8d0a4945..7c34144b05f 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationStorageSvc.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrationStorageSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.dao.HapiMigrationDao; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java index 92a71772051..2d948171531 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.dao.HapiMigrationDao; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/IHapiMigrationCallback.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/IHapiMigrationCallback.java index f7f8940fec6..a1aac1ab786 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/IHapiMigrationCallback.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/IHapiMigrationCallback.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.jpa.migrate.taskdef.BaseTask; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java index cd5256b43bf..55fe4497c02 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.taskdef.ColumnTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationResult.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationResult.java index c47aece914c..5fa5d40607a 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationResult.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.jpa.migrate.taskdef.BaseTask; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationTaskList.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationTaskList.java index 22b024cb3f2..e2d6ac16abe 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationTaskList.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationTaskList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.jpa.migrate.taskdef.BaseTask; import org.flywaydb.core.api.MigrationVersion; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationTaskSkipper.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationTaskSkipper.java index 46cfeff6a3c..d3ae989fd31 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationTaskSkipper.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/MigrationTaskSkipper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.jpa.migrate.taskdef.BaseTask; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/SchemaMigrator.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/SchemaMigrator.java index d81bcd5cc37..c821a5f8ae5 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/SchemaMigrator.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/SchemaMigrator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/dao/HapiMigrationDao.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/dao/HapiMigrationDao.java index e119a68fbc2..5a71ab67ed9 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/dao/HapiMigrationDao.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/dao/HapiMigrationDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.dao; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/dao/MigrationQueryBuilder.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/dao/MigrationQueryBuilder.java index 6b378c6f4c8..1e779dff66c 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/dao/MigrationQueryBuilder.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/dao/MigrationQueryBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.dao; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.dao; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.entity.HapiMigrationEntity; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/entity/HapiMigrationEntity.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/entity/HapiMigrationEntity.java index 04c4e5a8180..e596f927edb 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/entity/HapiMigrationEntity.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/entity/HapiMigrationEntity.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.entity; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.entity; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.entity; import ca.uhn.fhir.jpa.migrate.taskdef.BaseTask; import ca.uhn.fhir.util.VersionEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddColumnTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddColumnTask.java index 9c0f0ea1b08..b439e2fc250 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddColumnTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddColumnTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java index 1a5af779c94..5d467fa9192 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIdGeneratorTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIdGeneratorTask.java index ef52c6cd182..60ae864f426 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIdGeneratorTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIdGeneratorTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIndexTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIndexTask.java index 1dd518e9a94..5ebbf1fb778 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIndexTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIndexTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableByColumnTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableByColumnTask.java index 97f56d73047..c9cf308630f 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableByColumnTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableByColumnTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableRawSqlTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableRawSqlTask.java index 1d4664d165f..5d3d1417d7a 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableRawSqlTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableRawSqlTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ArbitrarySqlTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ArbitrarySqlTask.java index 185cfd1ea97..91491e0fd8f 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ArbitrarySqlTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ArbitrarySqlTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.JdbcUtils; import ca.uhn.fhir.util.VersionEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseColumnCalculatorTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseColumnCalculatorTask.java index f4f77d5a6c9..d4f63a26ca3 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseColumnCalculatorTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseColumnCalculatorTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.util.StopWatch; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTask.java index 78c85946cd0..fed25274c61 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTypeTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTypeTask.java index 0ead32f3448..d21f6c10d2b 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTypeTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTypeTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableTask.java index 7d710f8708c..0f963fd05b0 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java index 779a587909c..bf80883d0aa 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTask.java index 9cb707a67a4..387fb04d432 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.JdbcUtils; import ca.uhn.fhir.util.VersionEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateOrdinalDatesTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateOrdinalDatesTask.java index c03c8947e2b..0487c86a4f6 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateOrdinalDatesTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateOrdinalDatesTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.util.VersionEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeEnum.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeEnum.java index ad62b0b2cef..0fb929fded7 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeEnum.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; public enum ColumnTypeEnum { diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeToDriverTypeToSqlType.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeToDriverTypeToSqlType.java index 154e5bee945..054522957b6 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeToDriverTypeToSqlType.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeToDriverTypeToSqlType.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropColumnTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropColumnTask.java index 69a5a95cb03..2f54b1d52f7 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropColumnTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropColumnTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropForeignKeyTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropForeignKeyTask.java index 9624700110a..44476cd1c70 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropForeignKeyTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropForeignKeyTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIdGeneratorTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIdGeneratorTask.java index 746817c227c..0f5a56d29fe 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIdGeneratorTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIdGeneratorTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java index d9ab0310371..7b566a871b4 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropTableTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropTableTask.java index a11cc4fae9d..8a8ccb27c7b 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropTableTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropTableTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.JdbcUtils; import org.intellij.lang.annotations.Language; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ExecuteRawSqlTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ExecuteRawSqlTask.java index 25729258529..425607e6b77 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ExecuteRawSqlTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ExecuteRawSqlTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ForeignKeyContainer.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ForeignKeyContainer.java index aaf0dfb8fdf..f4bf990304d 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ForeignKeyContainer.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ForeignKeyContainer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/InitializeSchemaTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/InitializeSchemaTask.java index a7c6d67c93d..3470ab8b990 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/InitializeSchemaTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/InitializeSchemaTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/MetadataSource.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/MetadataSource.java index 70e5627a84e..f232ab3c694 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/MetadataSource.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/MetadataSource.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/MigratePostgresTextClobToBinaryClobTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/MigratePostgresTextClobToBinaryClobTask.java index 0bdf96f34ef..507c64db7a3 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/MigratePostgresTextClobToBinaryClobTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/MigratePostgresTextClobToBinaryClobTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTask.java index 7b118aa7402..13f268932c8 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/NopTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/NopTask.java index f1dca8ebf6b..5f228998ba9 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/NopTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/NopTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameColumnTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameColumnTask.java index 592b037bf68..af3bbc26aeb 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameColumnTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameColumnTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameIndexTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameIndexTask.java index 2d819104578..4dea9203855 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameIndexTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameIndexTask.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.taskdef; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.taskdef; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; import ca.uhn.fhir.jpa.migrate.JdbcUtils; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java index 538036591f3..a87efbf04ee 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.tasks; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.tasks; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.tasks; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java index e4102a098e1..db3c519f52b 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.tasks.api; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.tasks.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.tasks.api; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.MigrationTaskList; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java index 1c4941322ac..94f007dba3e 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.tasks.api; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.tasks.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.tasks.api; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/ISchemaInitializationProvider.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/ISchemaInitializationProvider.java index 5de2265568a..74c1ecbcafa 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/ISchemaInitializationProvider.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/ISchemaInitializationProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.migrate.tasks.api; - /*- * #%L * HAPI FHIR Server - SQL Migration @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.migrate.tasks.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.migrate.tasks.api; import ca.uhn.fhir.jpa.migrate.DriverTypeEnum; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/config/Batch2JobsConfig.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/config/Batch2JobsConfig.java index fdf969411e3..616efcd3f8a 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/config/Batch2JobsConfig.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/config/Batch2JobsConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.config; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.config; import ca.uhn.fhir.batch2.jobs.export.BulkExportAppCtx; import ca.uhn.fhir.batch2.jobs.expunge.DeleteExpungeAppCtx; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/config/BatchCommonCtx.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/config/BatchCommonCtx.java index bb404e9c66f..ec66750145c 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/config/BatchCommonCtx.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/config/BatchCommonCtx.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.config; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.config; import ca.uhn.fhir.batch2.jobs.parameters.UrlPartitioner; import ca.uhn.fhir.batch2.jobs.services.Batch2JobRunnerImpl; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportAppCtx.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportAppCtx.java index bc359249108..c41295a8b01 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportAppCtx.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportAppCtx.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export; import ca.uhn.fhir.batch2.api.VoidModel; import ca.uhn.fhir.batch2.jobs.export.models.BulkExportBinaryFileId; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportCreateReportStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportCreateReportStep.java index c02353aadb5..629c4e3c6ed 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportCreateReportStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportCreateReportStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export; import ca.uhn.fhir.batch2.api.ChunkExecutionDetails; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportJobParametersValidator.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportJobParametersValidator.java index 5cbc699b929..3257622d17f 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportJobParametersValidator.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportJobParametersValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.batch2.jobs.export.models.BulkExportJobParameters; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportUtil.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportUtil.java index c0102f94abf..a99971b4ed1 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportUtil.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/BulkExportUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export; import ca.uhn.fhir.batch2.model.StatusEnum; import ca.uhn.fhir.jpa.api.svc.IBatch2JobRunner; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/ExpandResourcesStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/ExpandResourcesStep.java index fc4288fb88a..d8e420eb9ce 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/ExpandResourcesStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/ExpandResourcesStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java index 7c7fcf8f10f..499267185e2 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export; import ca.uhn.fhir.batch2.api.IFirstJobStepWorker; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/WriteBinaryStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/WriteBinaryStep.java index 5db127f03df..82271bb95ec 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/WriteBinaryStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/WriteBinaryStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportBinaryFileId.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportBinaryFileId.java index 6e9496092e6..9197adce3ca 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportBinaryFileId.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportBinaryFileId.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export.models; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export.models; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportJobBase.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportJobBase.java index 761ae7e61e4..56d19d35cd7 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportJobBase.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportJobBase.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export.models; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export.models; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportJobParameters.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportJobParameters.java index f17e2a02602..45ffca9926f 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportJobParameters.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/BulkExportJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export.models; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export.models; import ca.uhn.fhir.jpa.api.model.BulkExportParameters; import ca.uhn.fhir.jpa.util.JsonDateDeserializer; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/ExpandedResourcesList.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/ExpandedResourcesList.java index 01cc7e444ee..1c12b495021 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/ExpandedResourcesList.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/ExpandedResourcesList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export.models; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export.models; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/ResourceIdList.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/ResourceIdList.java index 040a22f0644..76059f81e57 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/ResourceIdList.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/models/ResourceIdList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.export.models; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.export.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.export.models; import ca.uhn.fhir.batch2.jobs.models.BatchResourceId; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeAppCtx.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeAppCtx.java index c0ed9931aeb..f5563bf72ac 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeAppCtx.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeAppCtx.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.expunge; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.expunge; import ca.uhn.fhir.batch2.jobs.chunk.PartitionedUrlChunkRangeJson; import ca.uhn.fhir.batch2.jobs.chunk.ResourceIdListWorkChunkJson; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobParameters.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobParameters.java index be346a19a55..d4d1ef58d1e 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobParameters.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.expunge; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.expunge; import ca.uhn.fhir.batch2.jobs.parameters.PartitionedUrlListJobParameters; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobParametersValidator.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobParametersValidator.java index 38505df4fb9..9da64e67f15 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobParametersValidator.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobParametersValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.expunge; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.expunge; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.batch2.jobs.parameters.UrlListValidator; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobSubmitterImpl.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobSubmitterImpl.java index 4da4bf751f7..07b283a0c7c 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobSubmitterImpl.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeJobSubmitterImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.expunge; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.expunge; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.jobs.parameters.UrlPartitioner; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeProvider.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeProvider.java index 053193cb2ba..acfdd8b7fff 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeProvider.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.expunge; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.expunge; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeStep.java index 799f2cee47c..94506081253 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.expunge; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.expunge; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/BulkImportParameterValidator.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/BulkImportParameterValidator.java index 2703cdfde88..e2ed5a6c68e 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/BulkImportParameterValidator.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/BulkImportParameterValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.importpull; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.importpull; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.importpull; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.batch2.importpull.models.Batch2BulkImportPullJobParameters; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/BulkImportPullConfig.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/BulkImportPullConfig.java index d94bab4f07c..3b141e9476a 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/BulkImportPullConfig.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/BulkImportPullConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.importpull; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.importpull; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.importpull; import ca.uhn.fhir.batch2.importpull.models.Batch2BulkImportPullJobParameters; import ca.uhn.fhir.batch2.importpull.models.BulkImportFilePartitionResult; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/FetchPartitionedFilesStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/FetchPartitionedFilesStep.java index 55880d9da58..f9beaa11371 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/FetchPartitionedFilesStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/FetchPartitionedFilesStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.importpull; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.importpull; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.importpull; import ca.uhn.fhir.batch2.api.IFirstJobStepWorker; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/ReadInResourcesFromFileStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/ReadInResourcesFromFileStep.java index 2cc80802468..5a1584a791d 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/ReadInResourcesFromFileStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/ReadInResourcesFromFileStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.importpull; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.importpull; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.importpull; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/WriteBundleForImportStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/WriteBundleForImportStep.java index 9c0aab2cb6a..d0aa6c05521 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/WriteBundleForImportStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/importpull/WriteBundleForImportStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.importpull; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.importpull; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.importpull; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.ILastJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkDataImportProvider.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkDataImportProvider.java index 5072ed9282f..8e165fb7df7 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkDataImportProvider.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkDataImportProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.imprt; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.imprt; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.imprt; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.model.JobInstance; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportAppCtx.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportAppCtx.java index 89a4a122147..7f91e8f1417 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportAppCtx.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportAppCtx.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.imprt; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.imprt; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.imprt; import ca.uhn.fhir.batch2.api.IJobStepWorker; import ca.uhn.fhir.batch2.api.VoidModel; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportFileServlet.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportFileServlet.java index 88b10dafbd9..7ed24659f79 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportFileServlet.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportFileServlet.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.imprt; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.imprt; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.imprt; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportJobParameters.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportJobParameters.java index 2e24dea2ab6..30489962a12 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportJobParameters.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/BulkImportJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.imprt; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.imprt; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.imprt; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ConsumeFilesStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ConsumeFilesStep.java index 38cdde4813d..3bc4cabb47b 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ConsumeFilesStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ConsumeFilesStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.imprt; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.imprt; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.imprt; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.ILastJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/FetchFilesStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/FetchFilesStep.java index 499fcc72214..d9c3755cfa5 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/FetchFilesStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/FetchFilesStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.imprt; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.imprt; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.imprt; import ca.uhn.fhir.batch2.api.IFirstJobStepWorker; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/NdJsonFileJson.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/NdJsonFileJson.java index 479a94831df..481dca3d78f 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/NdJsonFileJson.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/NdJsonFileJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.imprt; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.imprt; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.imprt; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ResourceOrderUtil.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ResourceOrderUtil.java index c4e55e91466..4e6fdfedeb7 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ResourceOrderUtil.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ResourceOrderUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.imprt; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.imprt; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.imprt; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/models/BatchResourceId.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/models/BatchResourceId.java index fc4b7c2fbd4..3f61d5b9288 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/models/BatchResourceId.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/models/BatchResourceId.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.models; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.models; import ca.uhn.fhir.model.api.IModelJson; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexAppCtx.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexAppCtx.java index d33ab6da6e4..d30e77bd40b 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexAppCtx.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexAppCtx.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.reindex; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.reindex; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.jobs.chunk.PartitionedUrlChunkRangeJson; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexJobParameters.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexJobParameters.java index 1f412f4e85e..0c2f011fb23 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexJobParameters.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.reindex; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.reindex; import ca.uhn.fhir.batch2.jobs.parameters.PartitionedUrlListJobParameters; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexJobParametersValidator.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexJobParametersValidator.java index 2e57678626c..3b3bee4b329 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexJobParametersValidator.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexJobParametersValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.reindex; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.reindex; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.batch2.jobs.parameters.PartitionedUrl; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexProvider.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexProvider.java index dbafc5733d4..9a783a3fc8b 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexProvider.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.reindex; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.reindex; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.jobs.parameters.UrlPartitioner; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStep.java index bf40f116b4c..fc4b58a702b 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.reindex; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.reindex; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/services/Batch2JobRunnerImpl.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/services/Batch2JobRunnerImpl.java index 17548aeef8f..06bb21e4380 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/services/Batch2JobRunnerImpl.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/services/Batch2JobRunnerImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.services; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.services; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.services; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.api.JobOperationResultJson; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/TermCodeSystemJobConfig.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/TermCodeSystemJobConfig.java index ac89673951a..643fd641290 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/TermCodeSystemJobConfig.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/TermCodeSystemJobConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem; import ca.uhn.fhir.batch2.api.VoidModel; import ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete.DeleteCodeSystemCompletionHandler; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemCompletionHandler.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemCompletionHandler.java index b9c62cdaa22..7607bb95e2c 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemCompletionHandler.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemCompletionHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; import ca.uhn.fhir.batch2.api.IJobCompletionHandler; import ca.uhn.fhir.batch2.api.JobCompletionDetails; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemConceptsByVersionStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemConceptsByVersionStep.java index 96fe94afde5..abc7475a9e5 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemConceptsByVersionStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemConceptsByVersionStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemStep.java index ccfa731aea0..ac9cd16e853 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; import ca.uhn.fhir.batch2.api.ChunkExecutionDetails; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemVersionStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemVersionStep.java index 31852894414..2dd99624886 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemVersionStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/DeleteCodeSystemVersionStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/ReadTermConceptVersionsStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/ReadTermConceptVersionsStep.java index 3e7e7c5e5ca..8f87b66d6ae 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/ReadTermConceptVersionsStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/ReadTermConceptVersionsStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; import ca.uhn.fhir.batch2.api.IFirstJobStepWorker; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/TermCodeSystemDeleteJobParametersValidator.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/TermCodeSystemDeleteJobParametersValidator.java index cf7f15e9dd8..97ae9b22eef 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/TermCodeSystemDeleteJobParametersValidator.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemdelete/TermCodeSystemDeleteJobParametersValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemdelete; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.jpa.term.models.TermCodeSystemDeleteJobParameters; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionCompletionHandler.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionCompletionHandler.java index 10ab806dc2a..0cc3a889191 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionCompletionHandler.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionCompletionHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; import ca.uhn.fhir.batch2.api.IJobCompletionHandler; import ca.uhn.fhir.batch2.api.JobCompletionDetails; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionFinalStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionFinalStep.java index e3fad781efd..5f7feb62d91 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionFinalStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionFinalStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.ILastJobStepWorker; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionFirstStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionFirstStep.java index d2ddfacc9d5..ba71d516b38 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionFirstStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionFirstStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; import ca.uhn.fhir.batch2.api.IFirstJobStepWorker; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionParameterValidator.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionParameterValidator.java index 4b3078d7b14..7b482a3e790 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionParameterValidator.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/termcodesystem/codesystemversiondelete/DeleteCodeSystemVersionParameterValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; - /*- * #%L * hapi-fhir-storage-batch2-jobs @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.termcodesystem.codesystemversiondelete; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.jpa.term.models.TermCodeSystemDeleteVersionJobParameters; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ChunkExecutionDetails.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ChunkExecutionDetails.java index b1783583cb4..69fc2ebc55d 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ChunkExecutionDetails.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ChunkExecutionDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IFirstJobStepWorker.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IFirstJobStepWorker.java index d6bce08cff0..950565ec16d 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IFirstJobStepWorker.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IFirstJobStepWorker.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobCompletionHandler.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobCompletionHandler.java index 74ed6d056ba..e580a7f8975 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobCompletionHandler.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobCompletionHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobCoordinator.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobCoordinator.java index 52670a02040..df5a3eb2308 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobCoordinator.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobCoordinator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.model.JobInstance; import ca.uhn.fhir.batch2.model.JobInstanceStartRequest; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobDataSink.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobDataSink.java index eab24882d08..ddda024349f 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobDataSink.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobDataSink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.model.WorkChunkData; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobInstance.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobInstance.java index dcbcda32533..7414c2e801e 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobInstance.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobInstance.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.model.StatusEnum; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobMaintenanceService.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobMaintenanceService.java index f3c4a9e2428..606ee1b4458 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobMaintenanceService.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobMaintenanceService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import com.google.common.annotations.VisibleForTesting; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobParametersValidator.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobParametersValidator.java index 8eb144e6052..f0c11e17829 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobParametersValidator.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobParametersValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobPersistence.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobPersistence.java index 361a36a6ebf..4343f69400e 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobPersistence.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobPersistence.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.model.FetchJobInstancesRequest; import ca.uhn.fhir.batch2.model.JobInstance; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobStepWorker.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobStepWorker.java index 9203534ef79..2284d29d76f 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobStepWorker.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobStepWorker.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ILastJobStepWorker.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ILastJobStepWorker.java index 62a8463093a..9a290c51357 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ILastJobStepWorker.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ILastJobStepWorker.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IReductionStepExecutorService.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IReductionStepExecutorService.java index fc3026a364a..8f0a9dfad09 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IReductionStepExecutorService.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IReductionStepExecutorService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.model.JobWorkCursor; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IReductionStepWorker.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IReductionStepWorker.java index 475c6d77003..5a9d6e8797a 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IReductionStepWorker.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IReductionStepWorker.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.model.ChunkOutcome; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IWorkChunkPersistence.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IWorkChunkPersistence.java index fdb3a988d63..d0c573a44a0 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IWorkChunkPersistence.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IWorkChunkPersistence.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.coordinator.BatchWorkChunk; import ca.uhn.fhir.batch2.model.WorkChunk; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobCompletionDetails.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobCompletionDetails.java index 82e0eece27f..0224178eb6b 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobCompletionDetails.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobCompletionDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.model.JobInstance; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobExecutionFailedException.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobExecutionFailedException.java index 879ee83485b..f0ebaae5ebd 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobExecutionFailedException.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobExecutionFailedException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.util.BaseUnrecoverableRuntimeException; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobOperationResultJson.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobOperationResultJson.java index 76a0914bd4e..2f82c48a3ca 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobOperationResultJson.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobOperationResultJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobStepFailedException.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobStepFailedException.java index 593302ce4c2..e46199d0d3e 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobStepFailedException.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/JobStepFailedException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; /** * When a step throws an Exception that is not a {@link JobExecutionFailedException}, diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ReductionStepExecutionDetails.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ReductionStepExecutionDetails.java index 795d4389eb6..db24e40c1cd 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ReductionStepExecutionDetails.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/ReductionStepExecutionDetails.java @@ -1,12 +1,3 @@ -package ca.uhn.fhir.batch2.api; - -import ca.uhn.fhir.batch2.model.JobInstance; -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.model.api.IModelJson; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -26,6 +17,14 @@ import javax.annotation.Nullable; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; + +import ca.uhn.fhir.batch2.model.JobInstance; +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.model.api.IModelJson; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * This class is used for Reduction Step for Batch2 Jobs. diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/RunOutcome.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/RunOutcome.java index 4c0a0e6cc5c..a9def48639b 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/RunOutcome.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/RunOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; /** * Return type for {@link IJobStepWorker#run(StepExecutionDetails, IJobDataSink)} diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/StepExecutionDetails.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/StepExecutionDetails.java index 511bc1e97bf..49735a01e59 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/StepExecutionDetails.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/StepExecutionDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.batch2.model.JobInstance; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/VoidModel.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/VoidModel.java index ea8e4048882..ed6dcf67dca 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/VoidModel.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/VoidModel.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.api; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.api; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/package-info.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/package-info.java index b7edce84964..d7426d10cef 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/package-info.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/package-info.java @@ -1,3 +1,22 @@ +/*- + * #%L + * HAPI FHIR JPA Server - Batch2 Task Processor + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ /** * This package contains the APIs used in the Batch2 framework. *

    @@ -30,23 +49,3 @@ */ package ca.uhn.fhir.batch2.api; -/*- - * #%L - * HAPI FHIR JPA Server - Batch2 Task Processor - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/channel/BatchJobSender.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/channel/BatchJobSender.java index fcd0e9508e8..f7272a0d2de 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/channel/BatchJobSender.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/channel/BatchJobSender.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.channel; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.channel; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.channel; import ca.uhn.fhir.batch2.model.JobWorkNotification; import ca.uhn.fhir.batch2.model.JobWorkNotificationJsonMessage; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/config/BaseBatch2Config.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/config/BaseBatch2Config.java index e4599ab6f00..0a42f3dca91 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/config/BaseBatch2Config.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/config/BaseBatch2Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.config; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.config; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.api.IJobMaintenanceService; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/config/Batch2JobRegisterer.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/config/Batch2JobRegisterer.java index 009db34d98e..68f845a4ef7 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/config/Batch2JobRegisterer.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/config/Batch2JobRegisterer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.config; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.config; import ca.uhn.fhir.IHapiBootOrder; import ca.uhn.fhir.batch2.coordinator.JobDefinitionRegistry; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BaseDataSink.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BaseDataSink.java index 58caedace2f..11f15076678 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BaseDataSink.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BaseDataSink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.model.JobDefinitionStep; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BatchWorkChunk.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BatchWorkChunk.java index e3f7dd13e32..4c19e44c98f 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BatchWorkChunk.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BatchWorkChunk.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.model.JobDefinition; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/FinalStepDataSink.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/FinalStepDataSink.java index 07fcb3d497c..6714a59130a 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/FinalStepDataSink.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/FinalStepDataSink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.JobExecutionFailedException; import ca.uhn.fhir.batch2.api.VoidModel; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobCoordinatorImpl.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobCoordinatorImpl.java index 827b53f8381..9514feeb6fe 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobCoordinatorImpl.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobCoordinatorImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobCoordinator; import ca.uhn.fhir.batch2.api.IJobMaintenanceService; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDataSink.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDataSink.java index 43877e4613c..4011d04206d 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDataSink.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDataSink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.channel.BatchJobSender; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDefinitionRegistry.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDefinitionRegistry.java index 609b6dd0db1..4033f056b41 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDefinitionRegistry.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDefinitionRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.JobExecutionFailedException; import ca.uhn.fhir.batch2.model.JobDefinition; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobParameterJsonValidator.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobParameterJsonValidator.java index aa2e4a6f4e7..3742cf1ee13 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobParameterJsonValidator.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobParameterJsonValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.batch2.model.JobDefinition; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobQuerySvc.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobQuerySvc.java index d01fd98d260..617ae373d2a 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobQuerySvc.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobQuerySvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.model.JobDefinition; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutor.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutor.java index e0bae4cdd16..f03b3533e9b 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutor.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobMaintenanceService; import ca.uhn.fhir.batch2.api.IJobPersistence; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutorFactory.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutorFactory.java index d6cef77975c..8123ad8b458 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutorFactory.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutorFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobMaintenanceService; import ca.uhn.fhir.batch2.api.IJobPersistence; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutorOutput.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutorOutput.java index 1ea8a8202cf..9fa68467328 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutorOutput.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutorOutput.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepChunkProcessingResponse.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepChunkProcessingResponse.java index 3ea08b57bd3..4b8f5aef992 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepChunkProcessingResponse.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepChunkProcessingResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.model.WorkChunk; import org.apache.commons.collections4.CollectionUtils; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java index 2747821bc61..ae6f8abe851 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.api.JobExecutionFailedException; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepExecutorServiceImpl.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepExecutorServiceImpl.java index 71ff72f0f17..54163dcd9bf 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepExecutorServiceImpl.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepExecutorServiceImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.ChunkExecutionDetails; import ca.uhn.fhir.batch2.api.IJobPersistence; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/StepExecutor.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/StepExecutor.java index a65348407db..bbb4318cdf6 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/StepExecutor.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/StepExecutor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChannelMessageHandler.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChannelMessageHandler.java index d10cf18cd5d..3878cd532c7 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChannelMessageHandler.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChannelMessageHandler.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobMaintenanceService; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChunkProcessor.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChunkProcessor.java index a2858fb419e..670e3412d82 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChunkProcessor.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChunkProcessor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.coordinator; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.coordinator; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.coordinator; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/ChunkRangeJson.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/ChunkRangeJson.java index dc8d72633f3..67dbe566459 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/ChunkRangeJson.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/ChunkRangeJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.chunk; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.chunk; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.chunk; import ca.uhn.fhir.jpa.util.JsonDateDeserializer; import ca.uhn.fhir.jpa.util.JsonDateSerializer; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/PartitionedUrlChunkRangeJson.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/PartitionedUrlChunkRangeJson.java index 84be932a54e..c2fc509632d 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/PartitionedUrlChunkRangeJson.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/PartitionedUrlChunkRangeJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.chunk; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.chunk; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.chunk; import ca.uhn.fhir.batch2.jobs.parameters.PartitionedUrl; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/ResourceIdListWorkChunkJson.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/ResourceIdListWorkChunkJson.java index d18cc3950e3..dddd618b41c 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/ResourceIdListWorkChunkJson.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/ResourceIdListWorkChunkJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.chunk; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.chunk; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.chunk; import ca.uhn.fhir.jpa.api.svc.IIdHelperService; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/TypedPidJson.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/TypedPidJson.java index 16aa9b2523f..745c2e81b3f 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/TypedPidJson.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/chunk/TypedPidJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.chunk; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.chunk; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.chunk; import ca.uhn.fhir.jpa.api.pid.TypedResourcePid; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedJobParameters.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedJobParameters.java index fde760a11d2..4cbbfb2fae4 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedJobParameters.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.parameters; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.parameters; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.parameters; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedUrl.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedUrl.java index 16062ca6a4b..ab56e339366 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedUrl.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedUrl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.parameters; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.parameters; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.parameters; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedUrlListJobParameters.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedUrlListJobParameters.java index 55b1c40695b..00487a77376 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedUrlListJobParameters.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/PartitionedUrlListJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.parameters; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.parameters; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.parameters; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/UrlListValidator.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/UrlListValidator.java index f810318c291..018caca3f7b 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/UrlListValidator.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/UrlListValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.parameters; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.parameters; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.parameters; import ca.uhn.fhir.jpa.api.svc.IBatch2DaoSvc; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/UrlPartitioner.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/UrlPartitioner.java index c9bbccd0aef..37d4abcaf76 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/UrlPartitioner.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/parameters/UrlPartitioner.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.parameters; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.parameters; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.parameters; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.partition.IRequestPartitionHelperSvc; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/GenerateRangeChunksStep.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/GenerateRangeChunksStep.java index 85c319ec3ef..053bc9f18ec 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/GenerateRangeChunksStep.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/GenerateRangeChunksStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.step; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.step; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.step; import ca.uhn.fhir.batch2.api.IFirstJobStepWorker; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/IIdChunkProducer.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/IIdChunkProducer.java index 5a2571f4de5..43e177802b9 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/IIdChunkProducer.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/IIdChunkProducer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.step; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.step; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.step; import ca.uhn.fhir.batch2.jobs.chunk.ChunkRangeJson; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/LoadIdsStep.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/LoadIdsStep.java index e8760423d5b..109db92c3e6 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/LoadIdsStep.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/LoadIdsStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.step; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.step; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.step; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/PartitionedUrlListIdChunkProducer.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/PartitionedUrlListIdChunkProducer.java index 588b6f760d7..8cc544c64b6 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/PartitionedUrlListIdChunkProducer.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/PartitionedUrlListIdChunkProducer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.step; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.step; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.step; import ca.uhn.fhir.batch2.jobs.chunk.PartitionedUrlChunkRangeJson; import ca.uhn.fhir.batch2.jobs.parameters.PartitionedUrl; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/ResourceIdListStep.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/ResourceIdListStep.java index a735d9f47f3..eb7bb95cbe1 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/ResourceIdListStep.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/jobs/step/ResourceIdListStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.jobs.step; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.jobs.step; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.jobs.step; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobChunkProgressAccumulator.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobChunkProgressAccumulator.java index 54317d28623..8372042cf64 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobChunkProgressAccumulator.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobChunkProgressAccumulator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.maintenance; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.maintenance; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.maintenance; import ca.uhn.fhir.batch2.model.WorkChunk; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java index c3e8829b673..72801acc68a 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.maintenance; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.maintenance; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.maintenance; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.api.IReductionStepExecutorService; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobMaintenanceServiceImpl.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobMaintenanceServiceImpl.java index 750fc2406cf..8f92fbbdf15 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobMaintenanceServiceImpl.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobMaintenanceServiceImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.maintenance; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.maintenance; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.maintenance; import ca.uhn.fhir.batch2.api.IJobMaintenanceService; import ca.uhn.fhir.batch2.api.IJobPersistence; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/BaseWorkChunkEvent.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/BaseWorkChunkEvent.java index 245c709ab0e..91ae2a46bd8 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/BaseWorkChunkEvent.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/BaseWorkChunkEvent.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/ChunkOutcome.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/ChunkOutcome.java index 53ab5e4b31b..bafcc556bed 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/ChunkOutcome.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/ChunkOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; public class ChunkOutcome { public enum Status { diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/FetchJobInstancesRequest.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/FetchJobInstancesRequest.java index 7160d748624..bfe33b6aaf1 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/FetchJobInstancesRequest.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/FetchJobInstancesRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import javax.annotation.Nonnull; import java.util.HashSet; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinition.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinition.java index a5230b2ab31..8d4b3b52ac5 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinition.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.batch2.api.IJobCompletionHandler; import ca.uhn.fhir.batch2.api.IJobParametersValidator; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinitionReductionStep.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinitionReductionStep.java index 55447d335dd..98a2e5591ff 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinitionReductionStep.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinitionReductionStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.batch2.api.IJobStepWorker; import ca.uhn.fhir.batch2.api.IReductionStepWorker; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinitionStep.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinitionStep.java index 5c4b0b09972..cbdf98bfb20 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinitionStep.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobDefinitionStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.batch2.api.IJobStepWorker; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobInstance.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobInstance.java index 5027b3be688..790dee09b61 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobInstance.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobInstance.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.batch2.api.IJobInstance; import ca.uhn.fhir.jpa.util.JsonDateDeserializer; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobInstanceStartRequest.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobInstanceStartRequest.java index 3f81184571f..6c8427b749f 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobInstanceStartRequest.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobInstanceStartRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.model.api.IModelJson; import ca.uhn.fhir.util.JsonUtil; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkCursor.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkCursor.java index 597e0d95375..b9f97d27457 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkCursor.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkCursor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.batch2.api.VoidModel; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkNotification.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkNotification.java index d2f7d05f8cc..dc369ba06ed 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkNotification.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkNotification.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkNotificationJsonMessage.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkNotificationJsonMessage.java index a77a79d7970..c325e83fe8c 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkNotificationJsonMessage.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/JobWorkNotificationJsonMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.rest.server.messaging.json.BaseJsonMessage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/ListResult.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/ListResult.java index b57cea05573..17c24f0f03b 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/ListResult.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/ListResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/StatusEnum.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/StatusEnum.java index 45f2d53ca6e..4ee874b8700 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/StatusEnum.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/StatusEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.util.Logs; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunk.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunk.java index df20d9667f4..f82977df17b 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunk.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunk.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.jpa.util.JsonDateDeserializer; import ca.uhn.fhir.jpa.util.JsonDateSerializer; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkCompletionEvent.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkCompletionEvent.java index 34d355ffadd..ffd578d5c99 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkCompletionEvent.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkCompletionEvent.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkData.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkData.java index b9df5fd3cc7..89e1644cb90 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkData.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkData.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkErrorEvent.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkErrorEvent.java index f9d440d5196..d75d1fdf35c 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkErrorEvent.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkErrorEvent.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkStatusEnum.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkStatusEnum.java index 7a32122bb41..0e40f6516c5 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkStatusEnum.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkStatusEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.model; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.model; import java.util.EnumMap; import java.util.EnumSet; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/package-info.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/package-info.java index 5188c584ffc..1c8a7ebab55 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/package-info.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/package-info.java @@ -1,14 +1,3 @@ -/** - * Our distributed batch processing library. - * - * WIPMB Plan - * done split status enum - * done move work chunk methods to IWorkChunkPersistence - * wipmb convert work chunk methods to events - requires bump - * wipmb review tx layer - the variety of @Transaction annotations is scary. - */ -package ca.uhn.fhir.batch2; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -28,3 +17,14 @@ package ca.uhn.fhir.batch2; * limitations under the License. * #L% */ +/** + * Our distributed batch processing library. + * + * WIPMB Plan + * done split status enum + * done move work chunk methods to IWorkChunkPersistence + * wipmb convert work chunk methods to events - requires bump + * wipmb review tx layer - the variety of @Transaction annotations is scary. + */ +package ca.uhn.fhir.batch2; + diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/InstanceProgress.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/InstanceProgress.java index 828bd11ce77..924f5ea7472 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/InstanceProgress.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/InstanceProgress.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.progress; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.progress; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.progress; import ca.uhn.fhir.batch2.model.JobInstance; import ca.uhn.fhir.batch2.model.StatusEnum; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/JobInstanceProgressCalculator.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/JobInstanceProgressCalculator.java index 927dc587526..e8b84ae3b57 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/JobInstanceProgressCalculator.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/JobInstanceProgressCalculator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.progress; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.progress; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.progress; import ca.uhn.fhir.batch2.api.IJobPersistence; import ca.uhn.fhir.batch2.coordinator.JobDefinitionRegistry; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/JobInstanceStatusUpdater.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/JobInstanceStatusUpdater.java index 17f1ba76a66..41094e8e989 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/JobInstanceStatusUpdater.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/progress/JobInstanceStatusUpdater.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.progress; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.progress; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.progress; import ca.uhn.fhir.batch2.api.IJobCompletionHandler; import ca.uhn.fhir.batch2.api.IJobPersistence; diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/util/Batch2Constants.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/util/Batch2Constants.java index 8855c5dee24..50802f1bdd6 100644 --- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/util/Batch2Constants.java +++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/util/Batch2Constants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.util; - /*- * #%L * HAPI FHIR JPA Server - Batch2 Task Processor @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.util; import org.hl7.fhir.r4.model.InstantType; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CodeCacheResourceChangeListener.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CodeCacheResourceChangeListener.java index fe3f428d687..eba7f902b08 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CodeCacheResourceChangeListener.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CodeCacheResourceChangeListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CqlExceptionHandlingInterceptor.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CqlExceptionHandlingInterceptor.java index ece96645b47..9e78e9eae3f 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CqlExceptionHandlingInterceptor.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CqlExceptionHandlingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CqlForkJoinWorkerThreadFactory.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CqlForkJoinWorkerThreadFactory.java index 3b53ec45231..230fc762fff 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CqlForkJoinWorkerThreadFactory.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/CqlForkJoinWorkerThreadFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ElmCacheResourceChangeListener.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ElmCacheResourceChangeListener.java index 5d5a322c9b8..4b0e55139dc 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ElmCacheResourceChangeListener.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ElmCacheResourceChangeListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirDal.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirDal.java index 119a13e7f3e..2b722913cc8 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirDal.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirDal.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirRetrieveProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirRetrieveProvider.java index c7ad9e20dde..4c205d5a015 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirRetrieveProvider.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiFhirRetrieveProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.model.api.IQueryParameterType; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiLibrarySourceProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiLibrarySourceProvider.java index 18a555f307d..550c1dd510d 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiLibrarySourceProvider.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiLibrarySourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiTerminologyProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiTerminologyProvider.java index 367b332890b..d3f5383f9bb 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiTerminologyProvider.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/HapiTerminologyProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IDaoRegistryUser.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IDaoRegistryUser.java index be299555977..a4d987b447c 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IDaoRegistryUser.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IDaoRegistryUser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IDataProviderFactory.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IDataProviderFactory.java index a14be2759fb..3c413501456 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IDataProviderFactory.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IDataProviderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.rest.api.server.RequestDetails; import org.opencds.cqf.cql.engine.data.DataProvider; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IFhirDalFactory.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IFhirDalFactory.java index 463c92a6fa3..790daa0e5f4 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IFhirDalFactory.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/IFhirDalFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.rest.api.server.RequestDetails; import org.opencds.cqf.cql.evaluator.fhir.dal.FhirDal; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibraryLoaderFactory.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibraryLoaderFactory.java index 9a5fb20908c..2c64e4312ff 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibraryLoaderFactory.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibraryLoaderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import org.cqframework.cql.cql2elm.LibrarySourceProvider; import org.opencds.cqf.cql.engine.execution.LibraryLoader; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibraryManagerFactory.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibraryManagerFactory.java index e4cc2be5dc9..ffb3f20b19c 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibraryManagerFactory.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibraryManagerFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import org.cqframework.cql.cql2elm.LibraryManager; import org.cqframework.cql.cql2elm.LibrarySourceProvider; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibrarySourceProviderFactory.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibrarySourceProviderFactory.java index 35af240e5ed..6cd3ecd42cf 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibrarySourceProviderFactory.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ILibrarySourceProviderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ITerminologyProviderFactory.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ITerminologyProviderFactory.java index feeef28ade0..af447178971 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ITerminologyProviderFactory.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/ITerminologyProviderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/PreExpandedValidationSupport.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/PreExpandedValidationSupport.java index f9a3a2638c8..58ebe97567f 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/PreExpandedValidationSupport.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/PreExpandedValidationSupport.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/Searches.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/Searches.java index d3bb0d4acc4..ca2d251aed5 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/Searches.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/Searches.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.model.api.IQueryParameterType; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/SupplementalDataConstants.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/SupplementalDataConstants.java index 0472ddf68bb..52006a978f8 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/SupplementalDataConstants.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/SupplementalDataConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; public class SupplementalDataConstants { diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/TypedBundleProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/TypedBundleProvider.java index 05bf8e09ec4..da6fd4f774d 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/TypedBundleProvider.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/common/TypedBundleProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.common; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.common; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.common; import ca.uhn.fhir.rest.api.server.IBundleProvider; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java index b11f6cd6204..3bfa8d5e1f9 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/BaseClinicalReasoningConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.config; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrDstu3Config.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrDstu3Config.java index a7309da726e..b9429fb17b3 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrDstu3Config.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrDstu3Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.config; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.config; import ca.uhn.fhir.cr.dstu3.measure.MeasureOperationsProvider; import ca.uhn.fhir.cr.dstu3.measure.MeasureService; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java index 49ffc3f61c4..4b91777b07d 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProperties.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.config; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.config; import org.cqframework.cql.cql2elm.CqlTranslatorOptions; import org.opencds.cqf.cql.evaluator.CqlOptions; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProviderFactory.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProviderFactory.java index 74f6dba89c1..d785ab2e6a0 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProviderFactory.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProviderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.config; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.config; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProviderLoader.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProviderLoader.java index ffc243d62be..b0a45b60420 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProviderLoader.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrProviderLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.config; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.config; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrR4Config.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrR4Config.java index 7fe66c9695d..b3eb76c3a41 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrR4Config.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/CrR4Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.config; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.config; import ca.uhn.fhir.cr.r4.measure.MeasureOperationsProvider; import ca.uhn.fhir.cr.r4.measure.MeasureService; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/PreExpandedValidationSupportLoader.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/PreExpandedValidationSupportLoader.java index 33589c7afe9..8c410c131e7 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/PreExpandedValidationSupportLoader.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/PreExpandedValidationSupportLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.config; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/ISupplementalDataSearchParamUser.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/ISupplementalDataSearchParamUser.java index f3647f17ecc..d025467b497 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/ISupplementalDataSearchParamUser.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/ISupplementalDataSearchParamUser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.dstu3; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.dstu3; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.dstu3; import ca.uhn.fhir.cr.common.IDaoRegistryUser; import ca.uhn.fhir.cr.common.Searches; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureOperationsProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureOperationsProvider.java index 5ae3ee459b7..5ab96c6460b 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureOperationsProvider.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureOperationsProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.dstu3.measure; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.dstu3.measure; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.dstu3.measure; import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.Operation; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java index 090d3f90b5b..fb7bc31bb23 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/dstu3/measure/MeasureService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.dstu3.measure; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.dstu3.measure; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.dstu3.measure; import ca.uhn.fhir.cr.common.IDataProviderFactory; import ca.uhn.fhir.cr.common.IFhirDalFactory; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/ISupplementalDataSearchParamUser.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/ISupplementalDataSearchParamUser.java index e2d5296da6e..9be9405ae09 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/ISupplementalDataSearchParamUser.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/ISupplementalDataSearchParamUser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.r4; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.r4; import ca.uhn.fhir.cr.common.IDaoRegistryUser; import ca.uhn.fhir.cr.common.Searches; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java index 880cd6ff75d..8d11c9951eb 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureOperationsProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.r4.measure; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.r4.measure; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.r4.measure; import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.Operation; diff --git a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java index 21e86424f02..3ebce00a666 100644 --- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java +++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/r4/measure/MeasureService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.cr.r4.measure; - /*- * #%L * HAPI FHIR - Clinical Reasoning @@ -19,6 +17,7 @@ package ca.uhn.fhir.cr.r4.measure; * limitations under the License. * #L% */ +package ca.uhn.fhir.cr.r4.measure; import ca.uhn.fhir.cr.common.IDataProviderFactory; import ca.uhn.fhir.cr.common.IFhirDalFactory; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java index f6c5fa38d8b..e3c8f86868e 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.mdm.interceptor; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.mdm.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.mdm.interceptor; import ca.uhn.fhir.interceptor.api.IInterceptorService; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/LoadGoldenIdsStep.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/LoadGoldenIdsStep.java index 79eaf96f395..04f8275a06d 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/LoadGoldenIdsStep.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/LoadGoldenIdsStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmBatch2Config.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmBatch2Config.java index f441b418989..25824b207d4 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmBatch2Config.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmBatch2Config.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2; import ca.uhn.fhir.batch2.coordinator.JobDefinitionRegistry; import ca.uhn.fhir.batch2.model.JobDefinition; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmChunkRangeJson.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmChunkRangeJson.java index 0fed42d2870..54a89cd63b9 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmChunkRangeJson.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmChunkRangeJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2; import ca.uhn.fhir.batch2.jobs.chunk.ChunkRangeJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmGenerateRangeChunksStep.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmGenerateRangeChunksStep.java index 9f153bd63ba..10f96281e6b 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmGenerateRangeChunksStep.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmGenerateRangeChunksStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2; import ca.uhn.fhir.batch2.api.IFirstJobStepWorker; import ca.uhn.fhir.batch2.api.IJobDataSink; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmIdChunkProducer.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmIdChunkProducer.java index db72c6d543d..cb46b1edba0 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmIdChunkProducer.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmIdChunkProducer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2; import ca.uhn.fhir.batch2.jobs.step.IIdChunkProducer; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmJobDefinitionLoader.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmJobDefinitionLoader.java index bbc1845876b..7fd07bfa4a0 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmJobDefinitionLoader.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmJobDefinitionLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2; import ca.uhn.fhir.batch2.coordinator.JobDefinitionRegistry; import ca.uhn.fhir.batch2.model.JobDefinition; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearAppCtx.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearAppCtx.java index df3f5bf2f8f..be5007f7053 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearAppCtx.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearAppCtx.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2.clear; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2.clear; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2.clear; import ca.uhn.fhir.batch2.jobs.chunk.ResourceIdListWorkChunkJson; import ca.uhn.fhir.batch2.model.JobDefinition; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearJobParameters.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearJobParameters.java index 3856f0ea105..97916a03fb7 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearJobParameters.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2.clear; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2.clear; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2.clear; import ca.uhn.fhir.batch2.jobs.parameters.PartitionedJobParameters; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearJobParametersValidator.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearJobParametersValidator.java index 980977d974c..1ef686d17b4 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearJobParametersValidator.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearJobParametersValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2.clear; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2.clear; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2.clear; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearStep.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearStep.java index 9d7a6af7ca8..bfce619fca1 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearStep.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/clear/MdmClearStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2.clear; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2.clear; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2.clear; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmInflateAndSubmitResourcesStep.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmInflateAndSubmitResourcesStep.java index b27c88151f3..97967e7ddc4 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmInflateAndSubmitResourcesStep.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmInflateAndSubmitResourcesStep.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2.submit; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2.submit; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2.submit; import ca.uhn.fhir.batch2.api.IJobDataSink; import ca.uhn.fhir.batch2.api.IJobStepWorker; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitAppCtx.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitAppCtx.java index 3744cd4ff35..8734a75ed6a 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitAppCtx.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitAppCtx.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2.submit; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2.submit; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2.submit; import ca.uhn.fhir.batch2.jobs.chunk.PartitionedUrlChunkRangeJson; import ca.uhn.fhir.batch2.jobs.chunk.ResourceIdListWorkChunkJson; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitJobParameters.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitJobParameters.java index 41ea1ee9d43..3196409324a 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitJobParameters.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2.submit; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2.submit; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2.submit; import ca.uhn.fhir.batch2.jobs.parameters.PartitionedUrlListJobParameters; diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitJobParametersValidator.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitJobParametersValidator.java index 15c807810f5..3bfe2f12525 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitJobParametersValidator.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitJobParametersValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.batch2.submit; - /*- * #%L * hapi-fhir-storage-mdm @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.batch2.submit; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.batch2.submit; import ca.uhn.fhir.batch2.api.IJobParametersValidator; import ca.uhn.fhir.batch2.jobs.parameters.PartitionedUrl; diff --git a/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseDateSearchDaoTests.java b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseDateSearchDaoTests.java index f4bd42cb137..2c64e50f4b8 100644 --- a/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseDateSearchDaoTests.java +++ b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseDateSearchDaoTests.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.storage.test; - /*- * #%L * hapi-fhir-storage-test-utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.storage.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.storage.test; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.conformance.DateSearchTestCase; diff --git a/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/DaoTestDataBuilder.java b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/DaoTestDataBuilder.java index d0f7997aeb2..04f5b7de563 100644 --- a/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/DaoTestDataBuilder.java +++ b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/DaoTestDataBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.storage.test; - /*- * #%L * hapi-fhir-storage-test-utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.storage.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.storage.test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/Batch2BulkImportPullJobParameters.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/Batch2BulkImportPullJobParameters.java index d1553429ee5..591ac370f90 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/Batch2BulkImportPullJobParameters.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/Batch2BulkImportPullJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.importpull.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.importpull.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.importpull.models; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/BulkImportFilePartitionResult.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/BulkImportFilePartitionResult.java index cd6053b9c1c..8bdcaeeaed3 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/BulkImportFilePartitionResult.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/BulkImportFilePartitionResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.importpull.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.importpull.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.importpull.models; import ca.uhn.fhir.jpa.bulk.imprt.model.JobFileRowProcessingModeEnum; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/BulkImportRecord.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/BulkImportRecord.java index 68a43869581..bb0d7ebaa19 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/BulkImportRecord.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/importpull/models/BulkImportRecord.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.importpull.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.importpull.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.importpull.models; import ca.uhn.fhir.jpa.bulk.imprt.model.JobFileRowProcessingModeEnum; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/models/JobInstanceFetchRequest.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/models/JobInstanceFetchRequest.java index f58ea2a8112..818b9759dd4 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/models/JobInstanceFetchRequest.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/batch2/models/JobInstanceFetchRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.batch2.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.batch2.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.batch2.models; import org.springframework.data.domain.Sort; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/exception/TokenParamFormatInvalidRequestException.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/exception/TokenParamFormatInvalidRequestException.java index 203df68c3d4..b75ef905e45 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/exception/TokenParamFormatInvalidRequestException.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/exception/TokenParamFormatInvalidRequestException.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.exception; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.exception; * limitations under the License. * #L% */ +package ca.uhn.fhir.exception; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/IDaoRegistry.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/IDaoRegistry.java index e55161fc900..0e657c027cc 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/IDaoRegistry.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/IDaoRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api; public interface IDaoRegistry { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/config/JpaStorageSettings.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/config/JpaStorageSettings.java index 65e14aead7e..e56ce939161 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/config/JpaStorageSettings.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/config/JpaStorageSettings.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR Storage api + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.api.config; import ca.uhn.fhir.jpa.api.model.HistoryCountModeEnum; @@ -26,26 +45,6 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -/* - * #%L - * HAPI FHIR Storage api - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - @SuppressWarnings("JavadocLinkAsPlainText") public class JpaStorageSettings extends StorageSettings { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/config/ThreadPoolFactoryConfig.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/config/ThreadPoolFactoryConfig.java index 710fdc24338..04ef826bf9d 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/config/ThreadPoolFactoryConfig.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/config/ThreadPoolFactoryConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.config; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.config; import ca.uhn.fhir.jpa.dao.ThreadPoolFactory; import org.springframework.context.annotation.Bean; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/DaoRegistry.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/DaoRegistry.java index cd69307e790..b73c957a571 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/DaoRegistry.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/DaoRegistry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IDao.java index b31652ea87f..5fb009fdf56 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IDao.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - -import ca.uhn.fhir.context.FhirContext; - /* * #%L * HAPI FHIR Storage api @@ -21,6 +17,9 @@ import ca.uhn.fhir.context.FhirContext; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; + +import ca.uhn.fhir.context.FhirContext; /** * Note that this interface is not considered a stable interface. While it is possible to build applications diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java index 0995e2c5b04..f2f08bc7534 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java index 659c13a86ca..d75ec26f68e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java @@ -1,21 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.context.support.IValidationSupport; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.util.ParametersUtil; -import org.hl7.fhir.instance.model.api.IBaseCoding; -import org.hl7.fhir.instance.model.api.IBaseDatatype; -import org.hl7.fhir.instance.model.api.IBaseParameters; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; -import org.hl7.fhir.instance.model.api.IPrimitiveType; -import org.hl7.fhir.r4.model.codesystems.ConceptSubsumptionOutcome; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Nonnull; -import java.util.List; - /* * #%L * HAPI FHIR Storage api @@ -35,6 +17,23 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.support.IValidationSupport; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.util.ParametersUtil; +import org.hl7.fhir.instance.model.api.IBaseCoding; +import org.hl7.fhir.instance.model.api.IBaseDatatype; +import org.hl7.fhir.instance.model.api.IBaseParameters; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; +import org.hl7.fhir.r4.model.codesystems.ConceptSubsumptionOutcome; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Nonnull; +import java.util.List; public interface IFhirResourceDaoCodeSystem extends IFhirResourceDao { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoComposition.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoComposition.java index 1abb13ec029..eda1f36d0cf 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoComposition.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoComposition.java @@ -1,15 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - -import ca.uhn.fhir.rest.api.SortSpec; -import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.param.DateRangeParam; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; -import org.hl7.fhir.instance.model.api.IPrimitiveType; - -import javax.servlet.http.HttpServletRequest; - /* * #%L * HAPI FHIR Storage api @@ -29,6 +17,17 @@ import javax.servlet.http.HttpServletRequest; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; + +import ca.uhn.fhir.rest.api.SortSpec; +import ca.uhn.fhir.rest.api.server.IBundleProvider; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.param.DateRangeParam; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; + +import javax.servlet.http.HttpServletRequest; public interface IFhirResourceDaoComposition extends IFhirResourceDao { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoConceptMap.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoConceptMap.java index 9228ea6dc5a..ca0ad06be01 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoConceptMap.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoConceptMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.context.support.TranslateConceptResults; import ca.uhn.fhir.jpa.api.model.TranslationRequest; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java index 46605aca205..dedecbfe208 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java @@ -1,14 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - -import ca.uhn.fhir.rest.api.SortSpec; -import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.param.DateRangeParam; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; -import org.hl7.fhir.instance.model.api.IPrimitiveType; - -import javax.servlet.http.HttpServletRequest; - /* * #%L * HAPI FHIR Storage api @@ -28,6 +17,16 @@ import javax.servlet.http.HttpServletRequest; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; + +import ca.uhn.fhir.rest.api.SortSpec; +import ca.uhn.fhir.rest.api.server.IBundleProvider; +import ca.uhn.fhir.rest.param.DateRangeParam; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; + +import javax.servlet.http.HttpServletRequest; public interface IFhirResourceDaoEncounter extends IFhirResourceDao { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoObservation.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoObservation.java index 338b11e49dc..9abdd6c4b5f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoObservation.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoObservation.java @@ -1,12 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - -import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; -import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import org.hl7.fhir.instance.model.api.IBaseResource; - -import javax.servlet.http.HttpServletResponse; - /* * #%L * HAPI FHIR Storage api @@ -26,6 +17,14 @@ import javax.servlet.http.HttpServletResponse; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; + +import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.rest.api.server.IBundleProvider; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import org.hl7.fhir.instance.model.api.IBaseResource; + +import javax.servlet.http.HttpServletResponse; public interface IFhirResourceDaoObservation extends IFhirResourceDao { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoPatient.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoPatient.java index 9ac669f6e02..7e7b3604c7b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoPatient.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoPatient.java @@ -1,13 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - -import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.param.TokenOrListParam; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; - -import javax.servlet.http.HttpServletRequest; - /* * #%L * HAPI FHIR Storage api @@ -27,6 +17,15 @@ import javax.servlet.http.HttpServletRequest; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; + +import ca.uhn.fhir.rest.api.server.IBundleProvider; +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.param.TokenOrListParam; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; + +import javax.servlet.http.HttpServletRequest; public interface IFhirResourceDaoPatient extends IFhirResourceDao { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSearchParameter.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSearchParameter.java index b558d3187b2..d47049c885f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSearchParameter.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSearchParameter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoStructureDefinition.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoStructureDefinition.java index 1f99bbd7e2b..0eec42e4049 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoStructureDefinition.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoStructureDefinition.java @@ -1,7 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - -import org.hl7.fhir.instance.model.api.IBaseResource; - /* * #%L * HAPI FHIR Storage api @@ -21,6 +17,9 @@ import org.hl7.fhir.instance.model.api.IBaseResource; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; + +import org.hl7.fhir.instance.model.api.IBaseResource; public interface IFhirResourceDaoStructureDefinition extends IFhirResourceDao { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSubscription.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSubscription.java index 7090e281a58..89c892c34f9 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSubscription.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSubscription.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - -import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.api.server.storage.TransactionDetails; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; - /* * #%L * HAPI FHIR Storage api @@ -24,6 +17,12 @@ import org.hl7.fhir.instance.model.api.IIdType; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; + +import ca.uhn.fhir.rest.api.server.RequestDetails; +import ca.uhn.fhir.rest.api.server.storage.TransactionDetails; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; public interface IFhirResourceDaoSubscription extends IFhirResourceDao { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoValueSet.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoValueSet.java index a44aad46699..7953a9da81c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoValueSet.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoValueSet.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.context.support.ValueSetExpansionOptions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirSystemDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirSystemDao.java index 6ab835f88d6..e2fc03ce1af 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirSystemDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirSystemDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.model.ExpungeOptions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java index 62c2e386ab7..2f9bad0ec21 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyCurrentlyReindexing.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyCurrentlyReindexing.java index 6fa4385558b..ef1e44f0340 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyCurrentlyReindexing.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyCurrentlyReindexing.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyResourcePid.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyResourcePid.java index e9f6413da39..3901a75abe4 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyResourcePid.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyResourcePid.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/PatientEverythingParameters.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/PatientEverythingParameters.java index 3739b8d539c..79fc7647817 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/PatientEverythingParameters.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/PatientEverythingParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.dao; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.rest.api.SortSpec; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/Batch2JobInfo.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/Batch2JobInfo.java index 96749be2c00..77a0ea03403 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/Batch2JobInfo.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/Batch2JobInfo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.jpa.bulk.export.model.BulkExportJobStatusEnum; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/Batch2JobOperationResult.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/Batch2JobOperationResult.java index 89a4e417866..07b9e2fc1b8 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/Batch2JobOperationResult.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/Batch2JobOperationResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; public class Batch2JobOperationResult { // operation name diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportJobInfo.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportJobInfo.java index 4e7678f3db4..aeeb550af92 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportJobInfo.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportJobInfo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import java.util.Collection; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportJobResults.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportJobResults.java index 2a48e435057..908682f1276 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportJobResults.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportJobResults.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportParameters.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportParameters.java index 70ab22b1461..c9d329dbf53 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportParameters.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/BulkExportParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.jpa.batch.models.Batch2BaseJobParameters; import ca.uhn.fhir.rest.api.server.bulk.BulkDataExportOptions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java index e95ced9aca5..f6e18ccb069 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import ca.uhn.fhir.rest.api.MethodOutcome; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflict.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflict.java index e856b5f4152..81a008626e8 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflict.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflict.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.model.primitive.IdDt; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java index 91392bb99c8..a03ba4893ca 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import org.apache.commons.lang3.Validate; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteMethodOutcome.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteMethodOutcome.java index e7b0ab1e0e3..1719f126097 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteMethodOutcome.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteMethodOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import ca.uhn.fhir.rest.api.MethodOutcome; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOptions.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOptions.java index 4d6af5ee1d4..c05ebe5d6a5 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOptions.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOptions.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOutcome.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOutcome.java index c597688e280..2bd3ae1bb87 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOutcome.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; public class ExpungeOutcome { private int myDeletedCount; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/HistoryCountModeEnum.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/HistoryCountModeEnum.java index f85c30604bd..ff9428cbcdd 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/HistoryCountModeEnum.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/HistoryCountModeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; public enum HistoryCountModeEnum { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/LazyDaoMethodOutcome.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/LazyDaoMethodOutcome.java index 0f24e87463e..b5636e6d5a2 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/LazyDaoMethodOutcome.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/LazyDaoMethodOutcome.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/PersistentIdToForcedIdMap.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/PersistentIdToForcedIdMap.java index 3b9757a2cea..356374bef13 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/PersistentIdToForcedIdMap.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/PersistentIdToForcedIdMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ResourceVersionConflictResolutionStrategy.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ResourceVersionConflictResolutionStrategy.java index aab7c55714f..74ba6a99d43 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ResourceVersionConflictResolutionStrategy.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/ResourceVersionConflictResolutionStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationQuery.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationQuery.java index 9e1786dd739..6f6bf0fa310 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationQuery.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationQuery.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationRequest.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationRequest.java index b3fee7601c4..0446ddb30a6 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationRequest.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationRequest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import ca.uhn.fhir.context.support.IValidationSupport; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/WarmCacheEntry.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/WarmCacheEntry.java index bdb38bc350b..03e37e33fdb 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/WarmCacheEntry.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/WarmCacheEntry.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.model; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/BaseResourcePidList.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/BaseResourcePidList.java index afeeba2106c..99cd18ed7e1 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/BaseResourcePidList.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/BaseResourcePidList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.pid; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.pid; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.pid; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/EmptyResourcePidList.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/EmptyResourcePidList.java index e0e2533c99e..086b4099620 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/EmptyResourcePidList.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/EmptyResourcePidList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.pid; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.pid; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.pid; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/HomogeneousResourcePidList.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/HomogeneousResourcePidList.java index 3d87c7a2aa5..98fd3080617 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/HomogeneousResourcePidList.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/HomogeneousResourcePidList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.pid; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.pid; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.pid; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/IResourcePidList.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/IResourcePidList.java index c5300cb3a86..64381521e4c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/IResourcePidList.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/IResourcePidList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.pid; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.pid; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.pid; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/MixedResourcePidList.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/MixedResourcePidList.java index ef3de7a0c33..da4a1877828 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/MixedResourcePidList.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/MixedResourcePidList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.pid; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.pid; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.pid; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/ResourcePidListBuilder.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/ResourcePidListBuilder.java index b6ba384c8a7..6379703e5c3 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/ResourcePidListBuilder.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/ResourcePidListBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.pid; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.pid; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.pid; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/TypedResourcePid.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/TypedResourcePid.java index d4bcec869a8..cf814cc3019 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/TypedResourcePid.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/TypedResourcePid.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.pid; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.pid; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.pid; import ca.uhn.fhir.jpa.model.dao.JpaPid; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IBatch2DaoSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IBatch2DaoSvc.java index ab1dfbd32b6..81d4329024d 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IBatch2DaoSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IBatch2DaoSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.svc; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.pid.IResourcePidList; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IBatch2JobRunner.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IBatch2JobRunner.java index 077b29c4a7e..452e9a6dc34 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IBatch2JobRunner.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IBatch2JobRunner.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.svc; import ca.uhn.fhir.jpa.api.model.Batch2JobInfo; import ca.uhn.fhir.jpa.api.model.Batch2JobOperationResult; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IDeleteExpungeSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IDeleteExpungeSvc.java index 3c79fe92854..658047e7110 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IDeleteExpungeSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IDeleteExpungeSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.svc; import ca.uhn.fhir.jpa.model.dao.JpaPid; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IGoldenResourceSearchSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IGoldenResourceSearchSvc.java index d0b966ed899..d2b9fe538ed 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IGoldenResourceSearchSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IGoldenResourceSearchSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.svc; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.pid.IResourcePidList; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IIdHelperService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IIdHelperService.java index df5e5fca7b8..eb31a6dca92 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IIdHelperService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IIdHelperService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchCoordinatorSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchCoordinatorSvc.java index 6fa0e69aaa0..0aaae572b07 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchCoordinatorSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchCoordinatorSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.svc; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchSvc.java index f48c0543563..d830c2d23e7 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.svc; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchUrlJobMaintenanceSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchUrlJobMaintenanceSvc.java index bfeb71d0bd0..7d4ad71c27b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchUrlJobMaintenanceSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchUrlJobMaintenanceSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.api.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.api.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.api.svc; public interface ISearchUrlJobMaintenanceSvc { void removeStaleEntries(); diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/batch/models/Batch2BaseJobParameters.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/batch/models/Batch2BaseJobParameters.java index 5808caf832f..686823ef83a 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/batch/models/Batch2BaseJobParameters.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/batch/models/Batch2BaseJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.batch.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.batch.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.batch.models; import javax.annotation.Nonnull; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/batch/models/Batch2JobStartResponse.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/batch/models/Batch2JobStartResponse.java index 7f71267d9b6..f1e044e31c4 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/batch/models/Batch2JobStartResponse.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/batch/models/Batch2JobStartResponse.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.batch.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.batch.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.batch.models; public class Batch2JobStartResponse { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/IBinaryStorageSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/IBinaryStorageSvc.java index 48173309c17..312735cec7b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/IBinaryStorageSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/IBinaryStorageSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binary.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binary.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binary.api; import org.hl7.fhir.instance.model.api.IBaseBinary; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/IBinaryTarget.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/IBinaryTarget.java index f00f7883b92..30aa9bf57be 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/IBinaryTarget.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/IBinaryTarget.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binary.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binary.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binary.api; import ca.uhn.fhir.util.HapiExtensions; import org.hl7.fhir.instance.model.api.IBaseHasExtensions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/StoredDetails.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/StoredDetails.java index f4f98cd42ab..7a082434d04 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/StoredDetails.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/api/StoredDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binary.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binary.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binary.api; import ca.uhn.fhir.jpa.util.JsonDateDeserializer; import ca.uhn.fhir.jpa.util.JsonDateSerializer; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/interceptor/BinaryStorageInterceptor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/interceptor/BinaryStorageInterceptor.java index cfe460f941f..95c56bae310 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/interceptor/BinaryStorageInterceptor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/interceptor/BinaryStorageInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binary.interceptor; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binary.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binary.interceptor; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/provider/BinaryAccessProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/provider/BinaryAccessProvider.java index a9b8575a1e1..87bfae4f76e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/provider/BinaryAccessProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/provider/BinaryAccessProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binary.provider; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binary.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binary.provider; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/BaseBinaryStorageSvcImpl.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/BaseBinaryStorageSvcImpl.java index 87ec98d7261..e7415adcda3 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/BaseBinaryStorageSvcImpl.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/BaseBinaryStorageSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binary.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binary.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binary.svc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/NullBinaryStorageSvcImpl.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/NullBinaryStorageSvcImpl.java index f948a962053..3d90c9969db 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/NullBinaryStorageSvcImpl.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/NullBinaryStorageSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binary.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binary.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binary.svc; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binstore/FilesystemBinaryStorageSvcImpl.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binstore/FilesystemBinaryStorageSvcImpl.java index 25daa4dd4c2..ca8d45adc8b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binstore/FilesystemBinaryStorageSvcImpl.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binstore/FilesystemBinaryStorageSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binstore; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binstore; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binstore; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binstore/MemoryBinaryStorageSvcImpl.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binstore/MemoryBinaryStorageSvcImpl.java index e2931d6e567..04dde589942 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binstore/MemoryBinaryStorageSvcImpl.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binstore/MemoryBinaryStorageSvcImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.binstore; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.binstore; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.binstore; import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc; import ca.uhn.fhir.jpa.binary.api.StoredDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/api/IBulkDataExportJobSchedulingHelper.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/api/IBulkDataExportJobSchedulingHelper.java index dc0535f27ee..5bc1fed9476 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/api/IBulkDataExportJobSchedulingHelper.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/api/IBulkDataExportJobSchedulingHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.api; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/api/IBulkExportProcessor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/api/IBulkExportProcessor.java index dd6552e6f4d..561142910eb 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/api/IBulkExportProcessor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/api/IBulkExportProcessor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.api; import ca.uhn.fhir.jpa.bulk.export.model.ExportPIDIteratorParameters; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/BulkExportJobStatusEnum.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/BulkExportJobStatusEnum.java index 1e97d27aace..d5c7a4375bd 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/BulkExportJobStatusEnum.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/BulkExportJobStatusEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/BulkExportResponseJson.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/BulkExportResponseJson.java index 6402036fb69..e22fee79be7 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/BulkExportResponseJson.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/BulkExportResponseJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.model; import ca.uhn.fhir.jpa.util.JsonDateDeserializer; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/ExportPIDIteratorParameters.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/ExportPIDIteratorParameters.java index c78923064ab..c5d8952743e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/ExportPIDIteratorParameters.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/model/ExportPIDIteratorParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.model; import ca.uhn.fhir.rest.api.server.bulk.BulkDataExportOptions; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/provider/BulkDataExportProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/provider/BulkDataExportProvider.java index dd5dba1e717..0d88d751d61 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/provider/BulkDataExportProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/provider/BulkDataExportProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.provider; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.provider; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/provider/JobInfo.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/provider/JobInfo.java index c249a264ea7..bd6d51f6e50 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/provider/JobInfo.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/provider/JobInfo.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.provider; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.provider; import ca.uhn.fhir.jpa.bulk.export.model.BulkExportJobStatusEnum; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/BulkExportHelperService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/BulkExportHelperService.java index 0236041a719..ca7105dd64e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/BulkExportHelperService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/BulkExportHelperService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.export.svc; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.export.svc; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.export.svc; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/api/IBulkDataImportSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/api/IBulkDataImportSvc.java index 28235e0ad52..87c01f4750f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/api/IBulkDataImportSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/api/IBulkDataImportSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.imprt.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.imprt.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.imprt.api; import ca.uhn.fhir.jpa.bulk.imprt.model.ActivateJobResult; import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobFileJson; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/ActivateJobResult.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/ActivateJobResult.java index f6700197a17..35b129ba98e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/ActivateJobResult.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/ActivateJobResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.imprt.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.imprt.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.imprt.model; import javax.annotation.Nullable; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobFileJson.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobFileJson.java index 4b11af99438..b732905cdf4 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobFileJson.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobFileJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.imprt.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.imprt.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.imprt.model; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobJson.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobJson.java index bca3db58f6a..6beb9d93a8e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobJson.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobJson.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.imprt.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.imprt.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.imprt.model; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobStatusEnum.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobStatusEnum.java index 5496ce27969..cba8e4230ac 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobStatusEnum.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/BulkImportJobStatusEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.imprt.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.imprt.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.imprt.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/JobFileRowProcessingModeEnum.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/JobFileRowProcessingModeEnum.java index bc9dca88ec7..4cfb1938103 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/JobFileRowProcessingModeEnum.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/JobFileRowProcessingModeEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.imprt.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.imprt.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.imprt.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/ParsedBulkImportRecord.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/ParsedBulkImportRecord.java index df786db5a52..af5fccf233c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/ParsedBulkImportRecord.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/model/ParsedBulkImportRecord.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.bulk.imprt.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.bulk.imprt.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.bulk.imprt.model; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java index 61fb51910b2..bb1b10012bb 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java index d1e8f71b61b..6c345ec9613 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java index 97f0c2cb6c3..7c7eba89a51 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/DaoFailureUtil.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/DaoFailureUtil.java index 52593553f8f..6bdeb1625e7 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/DaoFailureUtil.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/DaoFailureUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import org.apache.commons.lang3.StringUtils; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/DaoSearchParamProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/DaoSearchParamProvider.java index ee94349d5f4..7aa042a5d13 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/DaoSearchParamProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/DaoSearchParamProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/EntriesToProcessMap.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/EntriesToProcessMap.java index 533afa8c718..64d085e7ac8 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/EntriesToProcessMap.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/EntriesToProcessMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/GZipUtil.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/GZipUtil.java index 9c274c193a5..8e9907ca0dc 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/GZipUtil.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/GZipUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.parser.DataFormatException; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IResultIterator.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IResultIterator.java index 087609d1d7c..313ac21f8fc 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IResultIterator.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IResultIterator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ISearchBuilder.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ISearchBuilder.java index 7abbc870ae4..4dc7ea439f9 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ISearchBuilder.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ISearchBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IStorageResourceParser.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IStorageResourceParser.java index f08863672c8..d75e34c839e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IStorageResourceParser.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IStorageResourceParser.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ITransactionProcessorVersionAdapter.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ITransactionProcessorVersionAdapter.java index 8ca74310a6b..ad5cda39f0c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ITransactionProcessorVersionAdapter.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ITransactionProcessorVersionAdapter.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IdSubstitutionMap.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IdSubstitutionMap.java index 4f12d7f4cb6..91ef845c8f6 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IdSubstitutionMap.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/IdSubstitutionMap.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/MatchResourceUrlService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/MatchResourceUrlService.java index c0a239a7bf6..86ba075d39f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/MatchResourceUrlService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/MatchResourceUrlService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilderFactory.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilderFactory.java index 07e79f61c97..204417fb644 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilderFactory.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilderFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.api.dao.IDao; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ThreadPoolFactory.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ThreadPoolFactory.java index eafa150205e..1401a653a80 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ThreadPoolFactory.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/ThreadPoolFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.util.ThreadPoolUtil; import org.springframework.core.task.AsyncTaskExecutor; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/TransactionProcessorVersionAdapterDstu3.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/TransactionProcessorVersionAdapterDstu3.java index 9252f1ba3f6..5cd6c81ad0d 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/TransactionProcessorVersionAdapterDstu3.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/TransactionProcessorVersionAdapterDstu3.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.dstu3; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeOperation.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeOperation.java index 2bc78e4ad71..a61a3d9dc3c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeOperation.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeOperation.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.api.model.ExpungeOptions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeService.java index 6d04ca53b98..d653c77cb6e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.model.ExpungeOptions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/IExpungeEverythingService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/IExpungeEverythingService.java index 120e77b3138..c2e75e14c03 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/IExpungeEverythingService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/IExpungeEverythingService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/IResourceExpungeService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/IResourceExpungeService.java index 2ddb4f521e1..bb0101a3231 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/IResourceExpungeService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/IResourceExpungeService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/PartitionRunner.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/PartitionRunner.java index 323e41e23db..2a5d80597b9 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/PartitionRunner.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/PartitionRunner.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.expunge; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.expunge; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.expunge; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.dao.tx.HapiTransactionService; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java index 06dd04c9935..f85f715eb65 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.index; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.index; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.index; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/r4/TransactionProcessorVersionAdapterR4.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/r4/TransactionProcessorVersionAdapterR4.java index 095d1a212ca..ffc07301640 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/r4/TransactionProcessorVersionAdapterR4.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/r4/TransactionProcessorVersionAdapterR4.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.r4; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.r4; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java index 022998369a1..41f5768bf08 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.tx; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.tx; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.tx; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/IHapiTransactionService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/IHapiTransactionService.java index 6824ca6a2d1..3a710bdc07d 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/IHapiTransactionService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/IHapiTransactionService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.tx; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.tx; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.tx; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/NonTransactionalHapiTransactionService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/NonTransactionalHapiTransactionService.java index 42df6d1ef60..5f81e525c4c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/NonTransactionalHapiTransactionService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/tx/NonTransactionalHapiTransactionService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.tx; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.tx; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.tx; import org.springframework.transaction.support.TransactionCallback; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/validation/SearchParameterDaoValidator.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/validation/SearchParameterDaoValidator.java index 175a79a15fe..284cff1dae2 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/validation/SearchParameterDaoValidator.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/validation/SearchParameterDaoValidator.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.dao.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.dao.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.dao.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictUtil.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictUtil.java index 77888aae816..cb5a4964d46 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictUtil.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/delete/DeleteConflictUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.delete; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.delete; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.delete; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServices.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServices.java index 700532f46bb..33c02a6528f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServices.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServices.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.graphql; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.graphql; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.graphql; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProvider.java index 809455786f5..3e0abc1f75f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.graphql; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.graphql; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.graphql; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptor.java index d9391a4d7e7..73a4f52cb8f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/UserRequestRetryVersionConflictsInterceptor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/UserRequestRetryVersionConflictsInterceptor.java index 6f1f5500102..44747a9b1bf 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/UserRequestRetryVersionConflictsInterceptor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/UserRequestRetryVersionConflictsInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/BaseTypedRule.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/BaseTypedRule.java index aed61745004..14ad874390c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/BaseTypedRule.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/BaseTypedRule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.validation; import ca.uhn.fhir.context.FhirContext; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/IRepositoryValidatingRule.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/IRepositoryValidatingRule.java index 01b2c7e207b..a264114a17f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/IRepositoryValidatingRule.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/IRepositoryValidatingRule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.validation; import ca.uhn.fhir.rest.api.server.RequestDetails; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/IRuleRoot.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/IRuleRoot.java index 6ea536efecb..265486c14c3 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/IRuleRoot.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/IRuleRoot.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.validation; import java.util.List; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptor.java index fb697cdc4f1..0853db0c7ad 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.validation; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingRuleBuilder.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingRuleBuilder.java index 1c4e1f9ba0e..b83767a13b2 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingRuleBuilder.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingRuleBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RequireValidationRule.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RequireValidationRule.java index 321860c19e7..8732729c5f1 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RequireValidationRule.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RequireValidationRule.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RuleDisallowProfile.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RuleDisallowProfile.java index 58598e6c228..a1358261910 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RuleDisallowProfile.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RuleDisallowProfile.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RuleRequireProfileDeclaration.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RuleRequireProfileDeclaration.java index bb350934a38..575571928f3 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RuleRequireProfileDeclaration.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/validation/RuleRequireProfileDeclaration.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.interceptor.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.interceptor.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/model/search/SearchRuntimeDetails.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/model/search/SearchRuntimeDetails.java index 4a7a58f5016..e5b925da3bd 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/model/search/SearchRuntimeDetails.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/model/search/SearchRuntimeDetails.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.util.StopWatch; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/model/search/SearchStatusEnum.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/model/search/SearchStatusEnum.java index 5d5be1f3f5d..292e7deb639 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/model/search/SearchStatusEnum.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/model/search/SearchStatusEnum.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.model.search; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.model.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.model.search; public enum SearchStatusEnum { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/partition/BaseRequestPartitionHelperSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/partition/BaseRequestPartitionHelperSvc.java index 34c84c12f65..f67b96ae382 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/partition/BaseRequestPartitionHelperSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/partition/BaseRequestPartitionHelperSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.partition; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.partition; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.partition; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/FhirPatch.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/FhirPatch.java index 4216114b6a9..a4e077b3ad9 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/FhirPatch.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/FhirPatch.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.patch; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.patch; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.patch; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/JsonPatchUtils.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/JsonPatchUtils.java index c7e266bb4b5..e259286440a 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/JsonPatchUtils.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/JsonPatchUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.patch; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.patch; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.patch; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/XmlPatchUtils.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/XmlPatchUtils.java index d0f0bf648d4..4dcc84086e7 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/XmlPatchUtils.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/XmlPatchUtils.java @@ -1,18 +1,3 @@ -package ca.uhn.fhir.jpa.patch; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; -import com.github.dnault.xmlpatch.Patcher; -import org.hl7.fhir.instance.model.api.IBaseResource; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -import static ca.uhn.fhir.util.StringUtil.toUtf8String; - /* * #%L * HAPI FHIR Storage api @@ -32,6 +17,20 @@ import static ca.uhn.fhir.util.StringUtil.toUtf8String; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.patch; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.i18n.Msg; +import ca.uhn.fhir.rest.api.Constants; +import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; +import com.github.dnault.xmlpatch.Patcher; +import org.hl7.fhir.instance.model.api.IBaseResource; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +import static ca.uhn.fhir.util.StringUtil.toUtf8String; public class XmlPatchUtils { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaProvider.java index c1dd9a15f0b..9edb0237a7a 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaProvider.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR Storage api + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.FhirContext; @@ -22,26 +41,6 @@ import java.util.Enumeration; import java.util.Set; import java.util.TreeSet; -/* - * #%L - * HAPI FHIR Storage api - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - public abstract class BaseJpaProvider { public static final String REMOTE_ADDR = "req.remoteAddr"; public static final String REMOTE_UA = "req.userAgent"; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProvider.java index f6d0ab5a5d2..8186242c64b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseStorageSystemProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseStorageSystemProvider.java index 23b80d0d6d8..a125ba73dbf 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseStorageSystemProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/BaseStorageSystemProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.api.model.ExpungeOptions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/DaoRegistryResourceSupportedSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/DaoRegistryResourceSupportedSvc.java index 6d47f049e75..a68b1536a4f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/DaoRegistryResourceSupportedSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/DaoRegistryResourceSupportedSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.jpa.api.IDaoRegistry; import ca.uhn.fhir.rest.api.IResourceSupportedSvc; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/IJpaSystemProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/IJpaSystemProvider.java index 98c1f3429ed..856fb689c4e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/IJpaSystemProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/IJpaSystemProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; /** * Marker interface for the JPA system provider diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionTriggeringProvider.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionTriggeringProvider.java index af6ace75696..0b660167bf6 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionTriggeringProvider.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionTriggeringProvider.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.provider; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.provider; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.provider; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.model.util.JpaConstants; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/search/SearchConstants.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/search/SearchConstants.java index 5dbcda4e1f3..1075dab219f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/search/SearchConstants.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/search/SearchConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search; public final class SearchConstants { public static final int MAX_PAGE_SIZE = 800; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/search/reindex/BlockPolicy.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/search/reindex/BlockPolicy.java index 25ff4a55d3f..79b480fbd1e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/search/reindex/BlockPolicy.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/search/reindex/BlockPolicy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.search.reindex; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.search.reindex; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.search.reindex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamWithInlineReferencesExtractor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamWithInlineReferencesExtractor.java index b7effb9bffb..328d7d2f64d 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamWithInlineReferencesExtractor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamWithInlineReferencesExtractor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamWithInlineReferencesExtractor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamWithInlineReferencesExtractor.java index 8a4d99a9d65..3dfd765000e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamWithInlineReferencesExtractor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamWithInlineReferencesExtractor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.extractor; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.extractor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.extractor; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.api.server.storage.TransactionDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/config/SearchParamSubmitterConfig.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/config/SearchParamSubmitterConfig.java index 8782810599a..f00c470e2d5 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/config/SearchParamSubmitterConfig.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/config/SearchParamSubmitterConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.submit.config; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.submit.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.submit.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.searchparam.registry.SearchParameterCanonicalizer; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamSubmitInterceptorLoader.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamSubmitInterceptorLoader.java index 32c68169bc9..7768865e02f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamSubmitInterceptorLoader.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamSubmitInterceptorLoader.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.submit.interceptor; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.submit.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.submit.interceptor; import ca.uhn.fhir.IHapiBootOrder; import ca.uhn.fhir.interceptor.api.IInterceptorService; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamValidatingInterceptor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamValidatingInterceptor.java index a077fe5cec8..85346c506bf 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamValidatingInterceptor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/searchparam/submit/interceptor/SearchParamValidatingInterceptor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.searchparam.submit.interceptor; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.searchparam.submit.interceptor; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.searchparam.submit.interceptor; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeSearchParam; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/BaseChannelSettings.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/BaseChannelSettings.java index b6d4a9b06b2..079490e85a9 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/BaseChannelSettings.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/BaseChannelSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.api; import ca.uhn.fhir.jpa.subscription.model.ChannelRetryConfiguration; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelConsumerSettings.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelConsumerSettings.java index 27c77fa8ee1..89a32cc05bf 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelConsumerSettings.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelConsumerSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.api; public class ChannelConsumerSettings extends BaseChannelSettings { public static final Integer DEFAULT_CHANNEL_CONSUMERS = 2; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelProducerSettings.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelProducerSettings.java index 4f675bde9c6..3e16c009bd4 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelProducerSettings.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelProducerSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.api; public class ChannelProducerSettings extends BaseChannelSettings { public static final Integer DEFAULT_CHANNEL_CONSUMERS = 2; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelFactory.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelFactory.java index b3a62aa53f2..79e7c9eef68 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelFactory.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.api; import ca.uhn.fhir.jpa.subscription.channel.subscription.IChannelNamer; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelProducer.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelProducer.java index 6676d405586..36ece0efb91 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelProducer.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelProducer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.api; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.InterceptableChannel; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelReceiver.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelReceiver.java index 325f5a3c98d..e558a93ca78 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelReceiver.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelReceiver.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.api; import org.springframework.beans.factory.DisposableBean; import org.springframework.messaging.SubscribableChannel; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelSettings.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelSettings.java index 0d75937a200..4ad441480d6 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelSettings.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.api; public interface IChannelSettings { boolean isQualifyChannelName(); diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/config/SubscriptionChannelConfig.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/config/SubscriptionChannelConfig.java index 9aba49dd607..a67c1fb8a4d 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/config/SubscriptionChannelConfig.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/config/SubscriptionChannelConfig.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.config; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.config; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.config; import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory; import ca.uhn.fhir.jpa.subscription.channel.impl.LinkedBlockingChannelFactory; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannel.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannel.java index 3c4e9e6a5e5..9ab977f821f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannel.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannel.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.impl; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.impl; import ca.uhn.fhir.jpa.subscription.channel.api.IChannelProducer; import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannelFactory.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannelFactory.java index cecab4366b3..05c9cc0cb00 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannelFactory.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannelFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.impl; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.impl; import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings; import ca.uhn.fhir.jpa.subscription.channel.api.ChannelProducerSettings; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/RetryingMessageHandlerWrapper.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/RetryingMessageHandlerWrapper.java index afba7b8a2e8..a538369c1ca 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/RetryingMessageHandlerWrapper.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/RetryingMessageHandlerWrapper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.impl; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.impl; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.impl; import ca.uhn.fhir.util.BaseUnrecoverableRuntimeException; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/BroadcastingSubscribableChannelWrapper.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/BroadcastingSubscribableChannelWrapper.java index fe319044aa8..0d671f2559f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/BroadcastingSubscribableChannelWrapper.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/BroadcastingSubscribableChannelWrapper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/IChannelNamer.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/IChannelNamer.java index b12fddef5d6..100259e2d8f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/IChannelNamer.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/IChannelNamer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.channel.api.IChannelSettings; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelFactory.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelFactory.java index 0691b55e7cf..db915bca2d0 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelFactory.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.channel.subscription; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.channel.subscription; import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings; import ca.uhn.fhir.jpa.subscription.channel.api.ChannelProducerSettings; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/IResourceModifiedConsumer.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/IResourceModifiedConsumer.java index f04bdb3dbcd..d60c2402828 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/IResourceModifiedConsumer.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/IResourceModifiedConsumer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.matching; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.matching; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.matching; import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedMessage; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/SubscriptionMatchingStrategy.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/SubscriptionMatchingStrategy.java index 00abb889ca7..98fe5bf164a 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/SubscriptionMatchingStrategy.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/matcher/matching/SubscriptionMatchingStrategy.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.matcher.matching; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.matcher.matching; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.matcher.matching; public enum SubscriptionMatchingStrategy { /** diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionCanonicalizer.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionCanonicalizer.java index ba93702899a..33fa3ee8b8e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionCanonicalizer.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionCanonicalizer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.registry; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.registry; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionConstants.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionConstants.java index 1275e61bfa6..34499ddec41 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionConstants.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.match.registry; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.match.registry; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.match.registry; import org.hl7.fhir.dstu2.model.Subscription; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/CanonicalSubscription.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/CanonicalSubscription.java index 50166611f86..bcbd49a7f66 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/CanonicalSubscription.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/CanonicalSubscription.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.model; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/CanonicalSubscriptionChannelType.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/CanonicalSubscriptionChannelType.java index 531f1c71600..6327d9d238b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/CanonicalSubscriptionChannelType.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/CanonicalSubscriptionChannelType.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.model; import ca.uhn.fhir.i18n.Msg; import org.hl7.fhir.dstu2.model.Subscription; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ChannelRetryConfiguration.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ChannelRetryConfiguration.java index a01760b3a5c..f023d4da8ec 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ChannelRetryConfiguration.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ChannelRetryConfiguration.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.model; public class ChannelRetryConfiguration { /** diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceDeliveryJsonMessage.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceDeliveryJsonMessage.java index 6676ed918e0..d283503767b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceDeliveryJsonMessage.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceDeliveryJsonMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.model; import ca.uhn.fhir.rest.server.messaging.json.BaseJsonMessage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceDeliveryMessage.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceDeliveryMessage.java index 97d068e982a..991d4189baa 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceDeliveryMessage.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceDeliveryMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.model; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceModifiedJsonMessage.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceModifiedJsonMessage.java index 1f4032540ef..7f1db745713 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceModifiedJsonMessage.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceModifiedJsonMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.model; import ca.uhn.fhir.rest.server.messaging.json.BaseJsonMessage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceModifiedMessage.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceModifiedMessage.java index 21e8dc260cf..011456eb5e0 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceModifiedMessage.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/model/ResourceModifiedMessage.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.model; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.model; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.model; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.model.RequestPartitionId; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/ISubscriptionTriggeringSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/ISubscriptionTriggeringSvc.java index 9374b3776cb..d8b7cdc3163 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/ISubscriptionTriggeringSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/ISubscriptionTriggeringSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.subscription.triggering; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.subscription.triggering; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.subscription.triggering; import ca.uhn.fhir.rest.annotation.IdParam; import org.hl7.fhir.instance.model.api.IBaseParameters; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/UploadStatistics.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/UploadStatistics.java index da6144edb2d..1a84f657d0b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/UploadStatistics.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/UploadStatistics.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemDeleteJobSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemDeleteJobSvc.java index df30ddf9a43..a7b9f758a8a 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemDeleteJobSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemDeleteJobSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; import ca.uhn.fhir.jpa.term.models.CodeSystemConceptsDeleteResult; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/api/ITermLoaderSvc.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/api/ITermLoaderSvc.java index 490cb9dc2a8..534bb5fdeb1 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/api/ITermLoaderSvc.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/api/ITermLoaderSvc.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.api; - /* * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.api; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.api; import ca.uhn.fhir.jpa.term.UploadStatistics; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/CodeSystemConceptsDeleteResult.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/CodeSystemConceptsDeleteResult.java index 8579fbee3ec..b37a6b84240 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/CodeSystemConceptsDeleteResult.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/CodeSystemConceptsDeleteResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.models; public class CodeSystemConceptsDeleteResult { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/CodeSystemVersionPIDResult.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/CodeSystemVersionPIDResult.java index 8581e9dcd6f..3bb5810575b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/CodeSystemVersionPIDResult.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/CodeSystemVersionPIDResult.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.models; import ca.uhn.fhir.model.api.IModelJson; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/DeleteCodeSystemBaseParameters.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/DeleteCodeSystemBaseParameters.java index c7a1deb93b4..69f21f9f02e 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/DeleteCodeSystemBaseParameters.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/DeleteCodeSystemBaseParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.models; import ca.uhn.fhir.model.api.IModelJson; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/TermCodeSystemDeleteJobParameters.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/TermCodeSystemDeleteJobParameters.java index 8e107585710..a86762f38d6 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/TermCodeSystemDeleteJobParameters.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/TermCodeSystemDeleteJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.models; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/TermCodeSystemDeleteVersionJobParameters.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/TermCodeSystemDeleteVersionJobParameters.java index c79723cfa93..23bc1708bff 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/TermCodeSystemDeleteVersionJobParameters.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/term/models/TermCodeSystemDeleteVersionJobParameters.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.term.models; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.term.models; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.term.models; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/BaseCaptureQueriesListener.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/BaseCaptureQueriesListener.java index 883a4c92824..9e647974b6d 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/BaseCaptureQueriesListener.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/BaseCaptureQueriesListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.jpa.dao.tx.HapiTransactionService; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/BulkExportUtils.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/BulkExportUtils.java index 73844605e1a..c62bea31323 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/BulkExportUtils.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/BulkExportUtils.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.jpa.api.model.BulkExportParameters; import ca.uhn.fhir.rest.api.server.bulk.BulkDataExportOptions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/CircularQueueCaptureQueriesListener.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/CircularQueueCaptureQueriesListener.java index 73c3ef6f227..adcac87a9f4 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/CircularQueueCaptureQueriesListener.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/CircularQueueCaptureQueriesListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.util.StopWatch; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/CurrentThreadCaptureQueriesListener.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/CurrentThreadCaptureQueriesListener.java index ba32d6643ea..1020fddb4f8 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/CurrentThreadCaptureQueriesListener.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/CurrentThreadCaptureQueriesListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/JsonDateDeserializer.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/JsonDateDeserializer.java index f3d64796828..8def38a9692 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/JsonDateDeserializer.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/JsonDateDeserializer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/JsonDateSerializer.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/JsonDateSerializer.java index 9e2bdd82ae4..564dc68d43b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/JsonDateSerializer.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/JsonDateSerializer.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/MemoryCacheService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/MemoryCacheService.java index fda4305fb38..d25f5862687 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/MemoryCacheService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/MemoryCacheService.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; import ca.uhn.fhir.jpa.api.model.TranslationQuery; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/SqlQuery.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/SqlQuery.java index 334bd9b5e21..ff20c087f6d 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/SqlQuery.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/SqlQuery.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import ca.uhn.fhir.interceptor.model.RequestPartitionId; import ca.uhn.fhir.util.UrlUtil; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/SqlQueryList.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/SqlQueryList.java index 52740598316..7836afbb860 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/SqlQueryList.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/util/SqlQueryList.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.util; import java.util.ArrayList; import java.util.Queue; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ResourceLoaderImpl.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ResourceLoaderImpl.java index 57ce080415b..75d503cbcd2 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ResourceLoaderImpl.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ResourceLoaderImpl.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.validation; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.rest.api.server.SystemRequestDetails; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidationSettings.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidationSettings.java index 6ee636ec7be..c2dd2c28c53 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidationSettings.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidationSettings.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.validation; import org.hl7.fhir.r5.utils.validation.constants.ReferenceValidationPolicy; import org.thymeleaf.util.Validate; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorPolicyAdvisor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorPolicyAdvisor.java index 3eceb3f4db4..1cb484c11d9 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorPolicyAdvisor.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorPolicyAdvisor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.validation; import ca.uhn.fhir.context.FhirContext; import org.hl7.fhir.r5.elementmodel.Element; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorResourceFetcher.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorResourceFetcher.java index c3b9591bf67..799e3fd8c60 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorResourceFetcher.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorResourceFetcher.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.validation; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.validation; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.validation; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.support.IValidationSupport; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/mdm/log/Logs.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/mdm/log/Logs.java index c546655e3d2..dc7697e4073 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/mdm/log/Logs.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/mdm/log/Logs.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.mdm.log; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.mdm.log; * limitations under the License. * #L% */ +package ca.uhn.fhir.mdm.log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/Batch2JobDefinitionConstants.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/Batch2JobDefinitionConstants.java index 0d17ff9a8bb..b0e35d1813f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/Batch2JobDefinitionConstants.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/Batch2JobDefinitionConstants.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; public class Batch2JobDefinitionConstants { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/CanonicalIdentifier.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/CanonicalIdentifier.java index 5ac9be8c82e..6f678768ac7 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/CanonicalIdentifier.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/CanonicalIdentifier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.IElement; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/ThreadPoolUtil.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/ThreadPoolUtil.java index 3b957bb216d..faac13b042f 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/ThreadPoolUtil.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/util/ThreadPoolUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.util; - /*- * #%L * HAPI FHIR Storage api @@ -19,6 +17,7 @@ package ca.uhn.fhir.util; * limitations under the License. * #L% */ +package ca.uhn.fhir.util; import ca.uhn.fhir.jpa.search.reindex.BlockPolicy; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java index 5cf986b3832..6f3d89da9af 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.dstu2016may.hapi.ctx; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.dstu2016may.hapi.ctx; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu2016may.hapi.ctx; import ca.uhn.fhir.i18n.Msg; import java.io.InputStream; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/Dstu2_1BundleFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/Dstu2_1BundleFactory.java index e6a0a761510..1afe308989e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/Dstu2_1BundleFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/Dstu2_1BundleFactory.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.dstu2016may.hapi.rest.server; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.dstu2016may.hapi.rest.server; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu2016may.hapi.rest.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.api.BundleInclusionRule; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/ServerConformanceProvider.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/ServerConformanceProvider.java index d48a13bb703..e69f1974909 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/ServerConformanceProvider.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/ServerConformanceProvider.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) + * %% + * Copyright (C) 2014 - 2015 University Health Network + * %% + * 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 + * + * http://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. + * #L% + */ package org.hl7.fhir.dstu2016may.hapi.rest.server; import ca.uhn.fhir.i18n.Msg; @@ -37,26 +56,6 @@ import java.util.Map.Entry; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * 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 - * - * http://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. - * #L% - */ - /** * Server FHIR Provider which serves the conformance statement for a RESTful server implementation */ diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java index f189c8e3208..e58e425902b 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.dstu2; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.dstu2; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2; import ca.uhn.fhir.i18n.Msg; import java.io.InputStream; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirServerDstu2.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirServerDstu2.java index 2584d827cfe..8062ad09970 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirServerDstu2.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirServerDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.dstu2; - /*- * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.dstu2; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2; import ca.uhn.fhir.rest.api.server.IFhirVersionServer; import ca.uhn.fhir.rest.server.RestfulServer; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java index b4e0183c9da..f2ea9ccc2c8 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; -import ca.uhn.fhir.model.primitive.IntegerDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -23,6 +17,11 @@ import ca.uhn.fhir.model.primitive.IntegerDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; +import ca.uhn.fhir.model.primitive.IntegerDt; @DatatypeDef(name="AgeDt", profileOf=QuantityDt.class) public class AgeDt extends QuantityDt { diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java index 431a07dfc9d..546c8eec445 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.dstu2.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; import static org.apache.commons.lang3.StringUtils.defaultString; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ContainedDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ContainedDt.java index d27b95fe240..55fdf7c9054 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ContainedDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ContainedDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.dstu2.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; import ca.uhn.fhir.i18n.Msg; import java.util.ArrayList; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java index eedb1108e6c..7b5ff9fade3 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; @DatatypeDef(name="CountDt", profileOf=QuantityDt.class) public class CountDt extends QuantityDt { diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java index 1e7eceec466..0faf303ede8 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; -import ca.uhn.fhir.model.primitive.IntegerDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -23,6 +17,11 @@ import ca.uhn.fhir.model.primitive.IntegerDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; +import ca.uhn.fhir.model.primitive.IntegerDt; @DatatypeDef(name="DistanceDt", profileOf=QuantityDt.class) public class DistanceDt extends QuantityDt { diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java index 04c9b91ed14..84aa3255894 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; @DatatypeDef(name="DurationDt", profileOf=QuantityDt.class) public class DurationDt extends QuantityDt { diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java index 32bab259c00..7da7f80066f 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.SimpleSetter; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.api.annotation.SimpleSetter; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.SimpleSetter; @DatatypeDef(name="Money", profileOf=QuantityDt.class) public class MoneyDt extends QuantityDt { diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/NarrativeDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/NarrativeDt.java index 45df35af478..d6378c118e6 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/NarrativeDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/NarrativeDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.dstu2.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; import java.util.List; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ResourceReferenceDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ResourceReferenceDt.java index 265b6fce39e..cfca3417da4 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ResourceReferenceDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ResourceReferenceDt.java @@ -1,21 +1,3 @@ - - - - - - - - - - - - - - - - -package ca.uhn.fhir.model.dstu2.composite; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -36,6 +18,23 @@ package ca.uhn.fhir.model.dstu2.composite; * #L% */ + + + + + + + + + + + + + + + +package ca.uhn.fhir.model.dstu2.composite; + import java.util.List; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java index d07d349e877..50dc4d666a0 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.SimpleSetter; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; -import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -24,6 +17,12 @@ import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.SimpleSetter; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; +import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; @DatatypeDef(name="SimpleQuantity", profileOf=QuantityDt.class) public class SimpleQuantityDt extends QuantityDt { diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java index a966109009f..dfdb3afb668 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java @@ -1,11 +1,3 @@ -package ca.uhn.fhir.model.dstu2.resource; - -import ca.uhn.fhir.i18n.Msg; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -25,6 +17,13 @@ import java.util.List; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.resource; + +import ca.uhn.fhir.i18n.Msg; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java index c6325db4ef9..973678846ad 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.provider.dstu2; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.provider.dstu2; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.provider.dstu2; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.api.BundleInclusionRule; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java index 844f7d26063..61d97987c27 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 + * + * http://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. + * #L% + */ package ca.uhn.fhir.rest.server.provider.dstu2; import ca.uhn.fhir.i18n.Msg; @@ -38,26 +57,6 @@ import java.util.Map.Entry; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; -/* - * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) - * %% - * Copyright (C) 2014 - 2023 Smile CDR, Inc. - * %% - * 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 - * - * http://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. - * #L% - */ - /** * Server FHIR Provider which serves the conformance statement for a RESTful server implementation */ diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java index caa9e496f32..b8baa3241b9 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.dstu3.hapi.ctx; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.dstu3.hapi.ctx; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu3.hapi.ctx; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/Dstu3BundleFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/Dstu3BundleFactory.java index 89a95603686..bc8ac06e41b 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/Dstu3BundleFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/Dstu3BundleFactory.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.dstu3.hapi.rest.server; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.dstu3.hapi.rest.server; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu3.hapi.rest.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.api.BundleInclusionRule; diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java index 9557beed90e..6fae8f93a95 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java @@ -1,3 +1,22 @@ +/* + * #%L + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) + * %% + * Copyright (C) 2014 - 2015 University Health Network + * %% + * 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 + * + * http://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. + * #L% + */ package org.hl7.fhir.dstu3.hapi.rest.server; import ca.uhn.fhir.i18n.Msg; @@ -37,26 +56,6 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; import ca.uhn.fhir.context.FhirContext; -/* - * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * 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 - * - * http://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. - * #L% - */ - /** * Server FHIR Provider which serves the conformance statement for a RESTful server implementation * diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java index 91d1c4fd87c..04d2846090c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.provider.dstu2hl7org; - /* * #%L * HAPI FHIR Structures - HL7.org DSTU2 @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.provider.dstu2hl7org; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.provider.dstu2hl7org; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.api.BundleInclusionRule; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/dstu2/hapi/ctx/FhirDstu2Hl7Org.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/dstu2/hapi/ctx/FhirDstu2Hl7Org.java index 9344041e01b..56f3b3e9320 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/dstu2/hapi/ctx/FhirDstu2Hl7Org.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/dstu2/hapi/ctx/FhirDstu2Hl7Org.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.dstu2.hapi.ctx; - /* * #%L * HAPI FHIR Structures - HL7.org DSTU2 @@ -19,6 +17,7 @@ package org.hl7.fhir.dstu2.hapi.ctx; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu2.hapi.ctx; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/dstu2/hapi/rest/server/ServerConformanceProvider.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/dstu2/hapi/rest/server/ServerConformanceProvider.java index 00d0a1ee429..676f1fdbceb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/dstu2/hapi/rest/server/ServerConformanceProvider.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/dstu2/hapi/rest/server/ServerConformanceProvider.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.dstu2.hapi.rest.server; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.dstu2.hapi.rest.server; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu2.hapi.rest.server; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java index 146a1eb4e65..9cd17887c38 100644 --- a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java +++ b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.r4.hapi.ctx; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.r4.hapi.ctx; * limitations under the License. * #L% */ +package org.hl7.fhir.r4.hapi.ctx; import ca.uhn.fhir.i18n.Msg; import java.io.InputStream; diff --git a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/rest/server/R4BundleFactory.java b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/rest/server/R4BundleFactory.java index c66f054de0f..4924dee5b58 100644 --- a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/rest/server/R4BundleFactory.java +++ b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/rest/server/R4BundleFactory.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.r4.hapi.rest.server; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.r4.hapi.rest.server; * limitations under the License. * #L% */ +package org.hl7.fhir.r4.hapi.rest.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.api.BundleInclusionRule; diff --git a/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java b/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java index 999c0a7b3bc..854929c4fd0 100644 --- a/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java +++ b/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.r4b.hapi.ctx; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.r4b.hapi.ctx; * limitations under the License. * #L% */ +package org.hl7.fhir.r4b.hapi.ctx; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/rest/server/R4BBundleFactory.java b/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/rest/server/R4BBundleFactory.java index ab07c2fc5ac..0271770a582 100644 --- a/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/rest/server/R4BBundleFactory.java +++ b/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/rest/server/R4BBundleFactory.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.r4b.hapi.rest.server; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.r4b.hapi.rest.server; * limitations under the License. * #L% */ +package org.hl7.fhir.r4b.hapi.rest.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.api.BundleInclusionRule; diff --git a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java index 708947216e7..1eb973e3e38 100644 --- a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java +++ b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.r5.hapi.ctx; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.r5.hapi.ctx; * limitations under the License. * #L% */ +package org.hl7.fhir.r5.hapi.ctx; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/rest/server/R5BundleFactory.java b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/rest/server/R5BundleFactory.java index 59cb0aedbea..df4385e0f08 100644 --- a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/rest/server/R5BundleFactory.java +++ b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/rest/server/R5BundleFactory.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.r5.hapi.rest.server; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package org.hl7.fhir.r5.hapi.rest.server; * limitations under the License. * #L% */ +package org.hl7.fhir.r5.hapi.rest.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.api.BundleInclusionRule; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/jpa/conformance/DateSearchTestCase.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/jpa/conformance/DateSearchTestCase.java index 861886d74b2..05b4babdf17 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/jpa/conformance/DateSearchTestCase.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/jpa/conformance/DateSearchTestCase.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.jpa.conformance; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.jpa.conformance; * limitations under the License. * #L% */ +package ca.uhn.fhir.jpa.conformance; import ca.uhn.fhir.util.CollectionUtil; import org.junit.jupiter.params.provider.Arguments; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/jpa/conformance/package-info.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/jpa/conformance/package-info.java index 4aa35bfc284..914c38385d8 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/jpa/conformance/package-info.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/jpa/conformance/package-info.java @@ -1,10 +1,3 @@ -/** - * Collection of fhir standard behaviour tests. - * - * These require binding into specific contexts (JPA Spring test, full server IT, etc.) - */ -package ca.uhn.fhir.jpa.conformance; - /*- * #%L * HAPI FHIR Test Utilities @@ -24,3 +17,10 @@ package ca.uhn.fhir.jpa.conformance; * limitations under the License. * #L% */ +/** + * Collection of fhir standard behaviour tests. + * + * These require binding into specific contexts (JPA Spring test, full server IT, etc.) + */ +package ca.uhn.fhir.jpa.conformance; + diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/OperationRuleTestUtil.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/OperationRuleTestUtil.java index f4a5fbd5705..de3dd9ea9a4 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/OperationRuleTestUtil.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/OperationRuleTestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.rest.server.interceptor.auth; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.rest.server.interceptor.auth; * limitations under the License. * #L% */ +package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.rest.api.server.bulk.BulkDataExportOptions; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/system/HapiTestSystemProperties.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/system/HapiTestSystemProperties.java index 817a3dc0578..43b4398417c 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/system/HapiTestSystemProperties.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/system/HapiTestSystemProperties.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.system; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.system; * limitations under the License. * #L% */ +package ca.uhn.fhir.system; public final class HapiTestSystemProperties { private static final String MASS_INGESTION_MODE = "mass_ingestion_mode"; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/BaseFhirVersionParameterizedTest.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/BaseFhirVersionParameterizedTest.java index 6ca4e2f20e7..e35f6e5f431 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/BaseFhirVersionParameterizedTest.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/BaseFhirVersionParameterizedTest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/BaseTest.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/BaseTest.java index e0e66c05026..289a215816b 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/BaseTest.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/BaseTest.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test; * limitations under the License. * #L% */ +package ca.uhn.fhir.test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.util.ClasspathUtil; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/BaseRestServerHelper.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/BaseRestServerHelper.java index 6b68054d2d4..3737fc0b0d2 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/BaseRestServerHelper.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/BaseRestServerHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/CustomMatchersUtil.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/CustomMatchersUtil.java index 6d35a44817b..fbc5dffb95c 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/CustomMatchersUtil.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/CustomMatchersUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import java.util.List; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/HtmlUtil.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/HtmlUtil.java index 06a8f6801b2..2f90b77abe0 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/HtmlUtil.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/HtmlUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import com.gargoylesoftware.htmlunit.BrowserVersion; import com.gargoylesoftware.htmlunit.StringWebResponse; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/HttpClientExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/HttpClientExtension.java index 761df2c80d8..f45fcc1cfeb 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/HttpClientExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/HttpClientExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ITestDataBuilder.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ITestDataBuilder.java index e383ec148cd..1f6f97a80cf 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ITestDataBuilder.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ITestDataBuilder.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/JettyUtil.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/JettyUtil.java index ac4c7e1ea5f..1485648ff78 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/JettyUtil.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/JettyUtil.java @@ -1,6 +1,3 @@ - -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -21,6 +18,8 @@ package ca.uhn.fhir.test.utilities; * #L% */ +package ca.uhn.fhir.test.utilities; + import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/LogbackLevelOverrideExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/LogbackLevelOverrideExtension.java index 6223ef75f7f..54fb6078c80 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/LogbackLevelOverrideExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/LogbackLevelOverrideExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/LoggingExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/LoggingExtension.java index ac6c236364b..400794c570f 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/LoggingExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/LoggingExtension.java @@ -1,21 +1,3 @@ -/* - * Copyright 2013 Brian Thomas Matthews - * - * 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 - * - * http://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 ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -35,6 +17,23 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +/* + * Copyright 2013 Brian Thomas Matthews + * + * 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 + * + * http://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 ca.uhn.fhir.test.utilities; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ProxyUtil.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ProxyUtil.java index a72370927c5..bec3739ba25 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ProxyUtil.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ProxyUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import org.apache.commons.lang3.Validate; import org.springframework.aop.framework.AopProxyUtils; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RangeTestHelper.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RangeTestHelper.java index 114a15f52c1..1a79ba8c1f8 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RangeTestHelper.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RangeTestHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.both; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RequestDetailsHelper.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RequestDetailsHelper.java index 5362fcfd26b..42e5ee7cbe4 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RequestDetailsHelper.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RequestDetailsHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.RestfulServer; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerDstu3Helper.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerDstu3Helper.java index 1150bfa416f..d91310fe323 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerDstu3Helper.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerDstu3Helper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerR4Helper.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerR4Helper.java index 7ecc0c43b9d..969e704d7d0 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerR4Helper.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerR4Helper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/SearchTestUtil.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/SearchTestUtil.java index c8ebfa6e7b7..baf641553ed 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/SearchTestUtil.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/SearchTestUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.util.BundleUtil; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/TlsAuthenticationTestHelper.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/TlsAuthenticationTestHelper.java index c18bfb579b8..5c9878c0869 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/TlsAuthenticationTestHelper.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/TlsAuthenticationTestHelper.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.tls.KeyStoreInfo; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/UnregisterScheduledProcessor.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/UnregisterScheduledProcessor.java index 0a7b11a373a..24db3e03231 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/UnregisterScheduledProcessor.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/UnregisterScheduledProcessor.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/docker/DockerRequiredCondition.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/docker/DockerRequiredCondition.java index 37bb3d00bc4..2f4eb6db813 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/docker/DockerRequiredCondition.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/docker/DockerRequiredCondition.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.docker; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.docker; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.docker; import org.junit.jupiter.api.extension.ConditionEvaluationResult; import org.junit.jupiter.api.extension.ExecutionCondition; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/docker/RequiresDocker.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/docker/RequiresDocker.java index d9fee8570bd..aa0b9e97b1d 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/docker/RequiresDocker.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/docker/RequiresDocker.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.docker; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.docker; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.docker; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/getMethodNameUtil.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/getMethodNameUtil.java index d8174c89bcb..8feef7fb7f8 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/getMethodNameUtil.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/getMethodNameUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities; public class getMethodNameUtil { public static String getTestName() { diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/jpa/JpaModelScannerAndVerifier.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/jpa/JpaModelScannerAndVerifier.java index a64d97e1ba4..de6732ed017 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/jpa/JpaModelScannerAndVerifier.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/jpa/JpaModelScannerAndVerifier.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.jpa; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.jpa; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.jpa; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/BaseJettyServerExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/BaseJettyServerExtension.java index 4214a299f88..ca85bf29ed9 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/BaseJettyServerExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/BaseJettyServerExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.test.utilities.JettyUtil; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HashMapResourceProviderExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HashMapResourceProviderExtension.java index ae513a65fdc..1780bd05194 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HashMapResourceProviderExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HashMapResourceProviderExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HttpServletExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HttpServletExtension.java index 597cdcf8847..612d7fb0c94 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HttpServletExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HttpServletExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import org.apache.commons.lang3.Validate; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/MockServletUtil.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/MockServletUtil.java index f0ab5c831c6..073b1955c63 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/MockServletUtil.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/MockServletUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import javax.servlet.ServletConfig; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/ResourceProviderExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/ResourceProviderExtension.java index 5e3926fe72e..0ac2f7162f4 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/ResourceProviderExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/ResourceProviderExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import org.apache.commons.lang3.Validate; import org.junit.jupiter.api.extension.AfterEachCallback; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerConfigurerExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerConfigurerExtension.java index f1927cf653e..cc8b46dd667 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerConfigurerExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerConfigurerExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import ca.uhn.fhir.rest.server.RestfulServer; import org.junit.jupiter.api.extension.BeforeEachCallback; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerExtension.java index 40fe36a1e35..f16e3ba8ae7 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/SpringContextGrabbingTestExecutionListener.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/SpringContextGrabbingTestExecutionListener.java index 0117fffae8a..6af0116925f 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/SpringContextGrabbingTestExecutionListener.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/SpringContextGrabbingTestExecutionListener.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import org.springframework.context.ApplicationContext; import org.springframework.test.context.TestContext; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/TransactionCapturingProviderExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/TransactionCapturingProviderExtension.java index cd46a1f3a3c..f43495c780a 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/TransactionCapturingProviderExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/TransactionCapturingProviderExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.test.utilities.server; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.fhir.test.utilities.server; * limitations under the License. * #L% */ +package ca.uhn.fhir.test.utilities.server; import ca.uhn.fhir.rest.annotation.Transaction; import ca.uhn.fhir.rest.annotation.TransactionParam; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/FhirObjectPrinter.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/FhirObjectPrinter.java index dd7c93cd474..8ea7afb60fd 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/FhirObjectPrinter.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/FhirObjectPrinter.java @@ -1,5 +1,3 @@ -package ca.uhn.test.concurrency; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.test.concurrency; * limitations under the License. * #L% */ +package ca.uhn.test.concurrency; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/IPointcutLatch.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/IPointcutLatch.java index 7ebfcba05e6..8033b4f4136 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/IPointcutLatch.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/IPointcutLatch.java @@ -1,5 +1,3 @@ -package ca.uhn.test.concurrency; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.test.concurrency; * limitations under the License. * #L% */ +package ca.uhn.test.concurrency; import ca.uhn.fhir.interceptor.api.HookParams; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/LatchTimedOutError.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/LatchTimedOutError.java index cd850a6ec25..0bd6e1b375a 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/LatchTimedOutError.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/LatchTimedOutError.java @@ -1,5 +1,3 @@ -package ca.uhn.test.concurrency; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.test.concurrency; * limitations under the License. * #L% */ +package ca.uhn.test.concurrency; public class LatchTimedOutError extends AssertionError { public LatchTimedOutError(String theMessage) { diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/LockstepEnumPhaser.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/LockstepEnumPhaser.java index 9d59197c505..4d705099a16 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/LockstepEnumPhaser.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/LockstepEnumPhaser.java @@ -1,5 +1,3 @@ -package ca.uhn.test.concurrency; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.test.concurrency; * limitations under the License. * #L% */ +package ca.uhn.test.concurrency; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/PointcutLatch.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/PointcutLatch.java index a8f7a2b0130..386205b2a16 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/PointcutLatch.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/concurrency/PointcutLatch.java @@ -1,5 +1,3 @@ -package ca.uhn.test.concurrency; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.test.concurrency; * limitations under the License. * #L% */ +package ca.uhn.test.concurrency; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/util/LogbackCaptureTestExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/util/LogbackCaptureTestExtension.java index d115e3bb9fc..2d345334665 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/util/LogbackCaptureTestExtension.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/test/util/LogbackCaptureTestExtension.java @@ -1,5 +1,3 @@ -package ca.uhn.test.util; - /*- * #%L * HAPI FHIR Test Utilities @@ -19,6 +17,7 @@ package ca.uhn.test.util; * limitations under the License. * #L% */ +package ca.uhn.test.util; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; diff --git a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/util/WebUtil.java b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/util/WebUtil.java index ef2de475591..32019e859ca 100644 --- a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/util/WebUtil.java +++ b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/util/WebUtil.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.to.util; - /* * #%L * Smile CDR - CDR @@ -9,6 +7,7 @@ package ca.uhn.fhir.to.util; * All rights reserved. * #L% */ +package ca.uhn.fhir.to.util; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.ConfigurationException; diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/LocalFileValidationSupport.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/LocalFileValidationSupport.java index 5fff4292dc6..e8c47f9bb1a 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/LocalFileValidationSupport.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/LocalFileValidationSupport.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.common.hapi.validation.support; - /*- * #%L * HAPI FHIR - Command Line Client - API @@ -19,6 +17,7 @@ package org.hl7.fhir.common.hapi.validation.support; * limitations under the License. * #L% */ +package org.hl7.fhir.common.hapi.validation.support; import ca.uhn.fhir.context.FhirContext; import org.apache.commons.io.IOUtils; diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/ValidationConstants.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/ValidationConstants.java index 4c7d91f76f0..505d5e720f1 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/ValidationConstants.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/ValidationConstants.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.common.hapi.validation.support; - /*- * #%L * HAPI FHIR JPA Server @@ -19,6 +17,7 @@ package org.hl7.fhir.common.hapi.validation.support; * limitations under the License. * #L% */ +package org.hl7.fhir.common.hapi.validation.support; public class ValidationConstants { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java index 6d3403cd807..f862b0d17c5 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.dstu2; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.dstu2; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2; import ca.uhn.fhir.i18n.Msg; import java.io.InputStream; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java index 97d3bab7e2d..903815d2520 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; -import ca.uhn.fhir.model.primitive.IntegerDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -23,6 +17,11 @@ import ca.uhn.fhir.model.primitive.IntegerDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; +import ca.uhn.fhir.model.primitive.IntegerDt; @DatatypeDef(name="AgeDt", profileOf=QuantityDt.class) public class AgeDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java index c043ac8f5ca..47e0595b9a5 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; @DatatypeDef(name="CountDt", profileOf=QuantityDt.class) public class CountDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java index 81783e21640..bd82c4e5dc3 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; -import ca.uhn.fhir.model.primitive.IntegerDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -23,6 +17,11 @@ import ca.uhn.fhir.model.primitive.IntegerDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; +import ca.uhn.fhir.model.primitive.IntegerDt; @DatatypeDef(name="DistanceDt", profileOf=QuantityDt.class) public class DistanceDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java index 2829d974b34..84cb62d7815 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; @DatatypeDef(name="DurationDt", profileOf=QuantityDt.class) public class DurationDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java index 44c0fbfa7c8..eb88044a80d 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; @DatatypeDef(name="Money", profileOf=QuantityDt.class) public class MoneyDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java index 9d6d1f3d655..1a0d8567843 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java @@ -1,10 +1,3 @@ -package ca.uhn.fhir.model.dstu2.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.SimpleSetter; -import ca.uhn.fhir.model.dstu2.composite.QuantityDt; -import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -24,6 +17,12 @@ import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu2.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.SimpleSetter; +import ca.uhn.fhir.model.dstu2.composite.QuantityDt; +import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; @DatatypeDef(name="SimpleQuantity", profileOf=QuantityDt.class) public class SimpleQuantityDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/AgeDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/AgeDt.java index 35216b9ddfc..31815ebb538 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/AgeDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/AgeDt.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.dstu3.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu3.composite.QuantityDt; -import ca.uhn.fhir.model.primitive.IntegerDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -23,6 +17,11 @@ import ca.uhn.fhir.model.primitive.IntegerDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu3.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; +import ca.uhn.fhir.model.primitive.IntegerDt; @DatatypeDef(name="AgeDt") public class AgeDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/BoundCodeableConceptDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/BoundCodeableConceptDt.java index a76446c93bf..d50b200bd36 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/BoundCodeableConceptDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/BoundCodeableConceptDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.dstu3.composite; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.dstu3.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu3.composite; import static org.apache.commons.lang3.StringUtils.defaultString; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ContainedDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ContainedDt.java index 3eea7cac8c0..aee63781637 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ContainedDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ContainedDt.java @@ -1,5 +1,3 @@ -package ca.uhn.fhir.model.dstu3.composite; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -19,6 +17,7 @@ package ca.uhn.fhir.model.dstu3.composite; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu3.composite; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.model.api.IResource; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CountDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CountDt.java index b8443caa1dd..ffc5c318b89 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CountDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CountDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu3.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu3.composite.QuantityDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.dstu3.composite.QuantityDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu3.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; @DatatypeDef(name="CountDt") public class CountDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DistanceDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DistanceDt.java index e1a3b3e5384..865abad63f9 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DistanceDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DistanceDt.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.dstu3.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu3.composite.QuantityDt; -import ca.uhn.fhir.model.primitive.IntegerDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -23,6 +17,11 @@ import ca.uhn.fhir.model.primitive.IntegerDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu3.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; +import ca.uhn.fhir.model.primitive.IntegerDt; @DatatypeDef(name="DistanceDt") public class DistanceDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DurationDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DurationDt.java index a7447f3e15f..e59cd07f3d6 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DurationDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DurationDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu3.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu3.composite.QuantityDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.dstu3.composite.QuantityDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu3.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; @DatatypeDef(name="DurationDt") public class DurationDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/MoneyDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/MoneyDt.java index 45dcb6810f1..b4decdac793 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/MoneyDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/MoneyDt.java @@ -1,8 +1,3 @@ -package ca.uhn.fhir.model.dstu3.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu3.composite.QuantityDt; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -22,6 +17,10 @@ import ca.uhn.fhir.model.dstu3.composite.QuantityDt; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu3.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; @DatatypeDef(name="Money") public class MoneyDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/NarrativeDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/NarrativeDt.java index a0dc4c371d6..eb931400674 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/NarrativeDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/NarrativeDt.java @@ -1,21 +1,3 @@ - - - - - - - - - - - - - - - - -package ca.uhn.fhir.model.dstu3.composite; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -36,6 +18,23 @@ package ca.uhn.fhir.model.dstu3.composite; * #L% */ + + + + + + + + + + + + + + + +package ca.uhn.fhir.model.dstu3.composite; + import java.util.List; import ca.uhn.fhir.model.api.IElement; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ResourceReferenceDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ResourceReferenceDt.java index 6446a7d2952..a95ca5fefed 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ResourceReferenceDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ResourceReferenceDt.java @@ -1,21 +1,3 @@ - - - - - - - - - - - - - - - - -package ca.uhn.fhir.model.dstu3.composite; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -36,6 +18,23 @@ package ca.uhn.fhir.model.dstu3.composite; * #L% */ + + + + + + + + + + + + + + + +package ca.uhn.fhir.model.dstu3.composite; + import java.util.List; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/SimpleQuantityDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/SimpleQuantityDt.java index 48ebdaf57ab..a40aae9768f 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/SimpleQuantityDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/SimpleQuantityDt.java @@ -1,9 +1,3 @@ -package ca.uhn.fhir.model.dstu3.composite; - -import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.api.annotation.SimpleSetter; -import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; - /* * #%L * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) @@ -23,6 +17,11 @@ import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; * limitations under the License. * #L% */ +package ca.uhn.fhir.model.dstu3.composite; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.SimpleSetter; +import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; @DatatypeDef(name="SimpleQuantity") public class SimpleQuantityDt extends QuantityDt { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/AbstractGenerator.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/AbstractGenerator.java index 7905b104f88..c7ab26b2c80 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/AbstractGenerator.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/AbstractGenerator.java @@ -1,4 +1,3 @@ -package ca.uhn.fhir.tinder; /* * #%L * HAPI FHIR Tinder Plug-In @@ -18,7 +17,7 @@ package ca.uhn.fhir.tinder; * limitations under the License. * #L% */ - +package ca.uhn.fhir.tinder; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/GeneratorContext.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/GeneratorContext.java index 00ab8acb86b..21afe9fb9ee 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/GeneratorContext.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/GeneratorContext.java @@ -1,4 +1,3 @@ -package ca.uhn.fhir.tinder; /* * #%L * HAPI FHIR Tinder Plug-In @@ -18,7 +17,7 @@ package ca.uhn.fhir.tinder; * limitations under the License. * #L% */ - +package ca.uhn.fhir.tinder; import ca.uhn.fhir.i18n.Msg; import java.util.List; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/VelocityHelper.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/VelocityHelper.java index 7ab9adbb8f0..6cc45dff959 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/VelocityHelper.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/VelocityHelper.java @@ -1,4 +1,3 @@ -package ca.uhn.fhir.tinder; /* * #%L * HAPI FHIR Tinder Plug-In @@ -18,7 +17,7 @@ package ca.uhn.fhir.tinder; * limitations under the License. * #L% */ - +package ca.uhn.fhir.tinder; import ca.uhn.fhir.i18n.Msg; import java.io.File; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ant/TinderGeneratorTask.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ant/TinderGeneratorTask.java index cf582148d23..da6c9c6ada0 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ant/TinderGeneratorTask.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ant/TinderGeneratorTask.java @@ -1,4 +1,3 @@ -package ca.uhn.fhir.tinder.ant; /* * #%L * HAPI Tinder Plugin @@ -18,7 +17,7 @@ package ca.uhn.fhir.tinder.ant; * limitations under the License. * #L% */ - +package ca.uhn.fhir.tinder.ant; import ca.uhn.fhir.i18n.Msg; import java.io.File; import java.io.FileInputStream; diff --git a/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IBase.java b/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IBase.java index 1aab86caff7..ba982b103e5 100644 --- a/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IBase.java +++ b/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IBase.java @@ -1,5 +1,3 @@ -package org.hl7.fhir.dstu2.model; - /* * #%L * HAPI FHIR - Core Library @@ -19,6 +17,7 @@ package org.hl7.fhir.dstu2.model; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu2.model; /** * This interface is a simple marker for anything which is an HL7 diff --git a/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IBaseResource.java b/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IBaseResource.java index bee7c1da332..e3145028425 100644 --- a/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IBaseResource.java +++ b/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IBaseResource.java @@ -1,6 +1,3 @@ -package org.hl7.fhir.dstu2.model; - - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,8 @@ package org.hl7.fhir.dstu2.model; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu2.model; + /** * For now, this is a simple marker interface indicating that a class is a resource type. diff --git a/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IIdType.java b/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IIdType.java index e0d19110aae..7949ba6d0a7 100644 --- a/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IIdType.java +++ b/hapi-tinder-plugin/src/main/java/org/hl7/fhir/instance/model/IIdType.java @@ -1,6 +1,3 @@ -package org.hl7.fhir.dstu2.model; - - /* * #%L * HAPI FHIR - Core Library @@ -20,6 +17,8 @@ package org.hl7.fhir.dstu2.model; * limitations under the License. * #L% */ +package org.hl7.fhir.dstu2.model; + public interface IIdType extends IBase {