Merge pull request #2561 from hapifhir/issue-2556-bulk-export-bug
Remove jetbrains annotation
This commit is contained in:
commit
b91a85cc2b
|
@ -35,7 +35,6 @@ import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
|
|||
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
|
||||
import org.apache.commons.lang3.Validate;
|
||||
import org.hl7.fhir.instance.model.api.IBaseResource;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.slf4j.Logger;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
|
@ -138,8 +137,7 @@ public class RequestPartitionHelperSvc implements IRequestPartitionHelperSvc {
|
|||
* @param theNonPartitionableResource
|
||||
* @return
|
||||
*/
|
||||
@NotNull
|
||||
private RequestPartitionId getSystemRequestPartitionId(@NotNull RequestDetails theRequest, boolean theNonPartitionableResource) {
|
||||
private RequestPartitionId getSystemRequestPartitionId(RequestDetails theRequest, boolean theNonPartitionableResource) {
|
||||
RequestPartitionId requestPartitionId;
|
||||
requestPartitionId = getSystemRequestPartitionId(theRequest);
|
||||
if (theNonPartitionableResource && !requestPartitionId.isDefaultPartition()) {
|
||||
|
@ -158,8 +156,8 @@ public class RequestPartitionHelperSvc implements IRequestPartitionHelperSvc {
|
|||
* @param theRequest The {@link SystemRequestDetails}
|
||||
* @return the {@link RequestPartitionId} to be used for this request.
|
||||
*/
|
||||
@NotNull
|
||||
private RequestPartitionId getSystemRequestPartitionId(@NotNull RequestDetails theRequest) {
|
||||
@Nonnull
|
||||
private RequestPartitionId getSystemRequestPartitionId(@Nonnull RequestDetails theRequest) {
|
||||
if (theRequest.getTenantId() != null) {
|
||||
if (theRequest.getTenantId().equals(ALL_PARTITIONS_NAME)) {
|
||||
return RequestPartitionId.allPartitions();
|
||||
|
|
|
@ -37,12 +37,12 @@ import org.hl7.fhir.r4.model.Quantity;
|
|||
import org.hl7.fhir.r4.model.Reference;
|
||||
import org.hl7.fhir.r4.model.SearchParameter;
|
||||
import org.hl7.fhir.r4.model.StringType;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
|
|
|
@ -30,6 +30,16 @@
|
|||
<property name="ignorePattern"
|
||||
value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
|
||||
</module>
|
||||
|
||||
<module name="RegexpSingleline">
|
||||
<property name="format" value="org.jetbrains.annotations.NotNull"/>
|
||||
<property name="message" value="Incorrect NotNull annotation used: The "javax.annotation.Nonnull" annotation should be used for non-null things"/>
|
||||
</module>
|
||||
|
||||
<module name="RegexpSingleline">
|
||||
<property name="format" value="org.jetbrains.annotations.Nullable"/>
|
||||
<property name="message" value="Incorrect Nullable annotation used: The "javax.annotation.Nullable" annotation should be used for nullable things"/>
|
||||
</module>
|
||||
<!--<module name="AvoidStarImport"/> -->
|
||||
<module name="OneTopLevelClass"/>
|
||||
<module name="NoLineWrap"/>
|
||||
|
|
Loading…
Reference in New Issue