honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2561 from hapifhir/issue-2556-bulk-export-bug 

Remove jetbrains annotation
This commit is contained in:
Tadgh 2021-04-19 11:54:22 -04:00 committed by GitHub
parent 48f93f5555 2ed4b01eb8
commit b91a85cc2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java
View File

@ -35,7 +35,6 @@ import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IBaseResource;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -138,8 +137,7 @@ public class RequestPartitionHelperSvc implements IRequestPartitionHelperSvc {
* @param theNonPartitionableResource * @param theNonPartitionableResource
* @return * @return
*/ */
@NotNull private RequestPartitionId getSystemRequestPartitionId(RequestDetails theRequest, boolean theNonPartitionableResource) {
private RequestPartitionId getSystemRequestPartitionId(@NotNull RequestDetails theRequest, boolean theNonPartitionableResource) {
RequestPartitionId requestPartitionId; RequestPartitionId requestPartitionId;
requestPartitionId = getSystemRequestPartitionId(theRequest); requestPartitionId = getSystemRequestPartitionId(theRequest);
if (theNonPartitionableResource && !requestPartitionId.isDefaultPartition()) { if (theNonPartitionableResource && !requestPartitionId.isDefaultPartition()) {
@ -158,8 +156,8 @@ public class RequestPartitionHelperSvc implements IRequestPartitionHelperSvc {
* @param theRequest The {@link SystemRequestDetails} * @param theRequest The {@link SystemRequestDetails}
* @return the {@link RequestPartitionId} to be used for this request. * @return the {@link RequestPartitionId} to be used for this request.
*/ */
@NotNull @Nonnull
private RequestPartitionId getSystemRequestPartitionId(@NotNull RequestDetails theRequest) { private RequestPartitionId getSystemRequestPartitionId(@Nonnull RequestDetails theRequest) {
if (theRequest.getTenantId() != null) { if (theRequest.getTenantId() != null) {
if (theRequest.getTenantId().equals(ALL_PARTITIONS_NAME)) { if (theRequest.getTenantId().equals(ALL_PARTITIONS_NAME)) {
return RequestPartitionId.allPartitions(); return RequestPartitionId.allPartitions();

2
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParamExtractorR4Test.java
View File

@ -37,12 +37,12 @@ import org.hl7.fhir.r4.model.Quantity;
import org.hl7.fhir.r4.model.Reference; import org.hl7.fhir.r4.model.Reference;
import org.hl7.fhir.r4.model.SearchParameter; import org.hl7.fhir.r4.model.SearchParameter;
import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.StringType;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;

10
src/checkstyle/checkstyle.xml
View File

@ -30,6 +30,16 @@
<property name="ignorePattern" <property name="ignorePattern"
value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
</module> </module>
<module name="RegexpSingleline">
<property name="format" value="org.jetbrains.annotations.NotNull"/>
<property name="message" value="Incorrect NotNull annotation used: The &quot;javax.annotation.Nonnull&quot; 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 &quot;javax.annotation.Nullable&quot; annotation should be used for nullable things"/>
</module>
<!--<module name="AvoidStarImport"/> --> <!--<module name="AvoidStarImport"/> -->
<module name="OneTopLevelClass"/> <module name="OneTopLevelClass"/>
<module name="NoLineWrap"/> <module name="NoLineWrap"/>