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

Replace proprietary notnull with javax.annotation.Nonnull (#584) 

* Replace proprietary notnull with javax.annotation.Nonnull

* wip

Co-authored-by: markiantorno <markiantorno@gmail.com>
This commit is contained in:
Tadgh 2021-08-25 08:39:44 -04:00 committed by GitHub
parent 1d5fb74fc6
commit 5ca6d19c69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter102.java
View File

@ -41,7 +41,7 @@ import org.hl7.fhir.dstu3.model.ValueSet;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r5.model.FhirPublication;
import org.hl7.fhir.utilities.Utilities;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.io.File;
import java.io.FileInputStream;
@ -84,18 +84,18 @@ public class IGPackConverter102 extends BaseAdvisor_10_30 {
}
@Override
public boolean ignoreEntry(@NotNull BundleEntryComponent src, @NotNull FhirPublication publication) {
public boolean ignoreEntry(@Nonnull BundleEntryComponent src, @Nonnull FhirPublication publication) {
return false;
}
@Override
public void handleCodeSystem(@NotNull CodeSystem tgtcs, @NotNull ValueSet vs) {
public void handleCodeSystem(@Nonnull CodeSystem tgtcs, @Nonnull ValueSet vs) {
cslist.addEntry().setFullUrl(tgtcs.getUrl()).setResource(tgtcs);
}
@Override
public CodeSystem getCodeSystem(@NotNull ValueSet src) {
public CodeSystem getCodeSystem(@Nonnull ValueSet src) {
return null;
}

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGR2ConvertorAdvisor.java
View File

@ -32,11 +32,11 @@ package org.hl7.fhir.convertors.misc;
import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_10_40;
import org.hl7.fhir.r4.model.CodeSystem;
import org.hl7.fhir.r4.model.ValueSet;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
public class IGR2ConvertorAdvisor extends BaseAdvisor_10_40 {
@Override
public void handleCodeSystem(@NotNull CodeSystem cs, @NotNull ValueSet vs) {
public void handleCodeSystem(@Nonnull CodeSystem cs, @Nonnull ValueSet vs) {
cs.setId(vs.getId());
}
}

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGR2ConvertorAdvisor5.java
View File

@ -33,12 +33,12 @@ package org.hl7.fhir.convertors.misc;
import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_10_50;
import org.hl7.fhir.r5.model.CodeSystem;
import org.hl7.fhir.r5.model.ValueSet;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
public class IGR2ConvertorAdvisor5 extends BaseAdvisor_10_50 {
@Override
public void handleCodeSystem(@NotNull CodeSystem cs, @NotNull ValueSet vs) {
public void handleCodeSystem(@Nonnull CodeSystem cs, @Nonnull ValueSet vs) {
cs.setId(vs.getId());
}
}

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/RetryInterceptor.java
View File

@ -3,7 +3,7 @@ package org.hl7.fhir.r5.utils.client.network;
import okhttp3.Interceptor;
import okhttp3.Request;
import okhttp3.Response;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.io.IOException;
@ -27,7 +27,7 @@ public class RetryInterceptor implements Interceptor {
}
@Override
public @NotNull Response intercept(Interceptor.Chain chain) throws IOException {
public Response intercept(Interceptor.Chain chain) throws IOException {
Request request = chain.request();
Response response = null;

6
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/NativeHostServices.java
View File

@ -78,7 +78,7 @@ import org.hl7.fhir.utilities.VersionUtilities;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
/**
* This class allows you to host the java validator in another service, and use the services it has in a wider context. The way it works is
@ -106,10 +106,10 @@ public class NativeHostServices {
private class NH_10_50_Advisor extends BaseAdvisor_10_50 {
@Override
public void handleCodeSystem(@NotNull CodeSystem tgtcs, @NotNull ValueSet source) throws FHIRException {}
public void handleCodeSystem(@Nonnull CodeSystem tgtcs, @Nonnull ValueSet source) throws FHIRException {}
@Override
public CodeSystem getCodeSystem(@NotNull ValueSet src) throws FHIRException {
public CodeSystem getCodeSystem(@Nonnull ValueSet src) throws FHIRException {
throw new FHIRException("Code systems cannot be handled at this time"); // what to do? need thread local storage?
}
}