tidy up fixmes

This commit is contained in:
Grahame Grieve 2024-01-12 10:10:18 +11:00
parent 362e7e2600
commit 5b0f154620
10 changed files with 13 additions and 25 deletions

View File

@ -87,7 +87,7 @@ public class TerminologyClientR4 implements TerminologyClient {
@Override @Override
public void setTimeout(int i) { public void setTimeout(int i) {
client.setTimeoutNormal(i); // #FIXME client.setTimeoutNormal(i);
} }
@Override @Override

View File

@ -127,7 +127,7 @@ public abstract class ParserBase {
public abstract void compose(Element e, OutputStream destination, OutputStyle style, String base) public abstract void compose(Element e, OutputStream destination, OutputStyle style, String base)
throws FHIRException, IOException; throws FHIRException, IOException;
// FIXME: i18n should be done here // TODO: i18n should be done here ?
public void logError(int line, int col, String path, IssueType type, String message, IssueSeverity level) public void logError(int line, int col, String path, IssueType type, String message, IssueSeverity level)
throws FHIRFormatError { throws FHIRFormatError {
if (errors != null) { if (errors != null) {

View File

@ -110,7 +110,7 @@ public class TestingUtilities extends BaseTestingUtilities {
if (!Utilities.noString(s)) if (!Utilities.noString(s))
return s; return s;
s = "C:\\work\\org.hl7.fhir\\build"; s = "C:\\work\\org.hl7.fhir\\build";
// FIXME: change this back // #TODO - what should we do with this?
s = "/Users/jamesagnew/git/fhir"; s = "/Users/jamesagnew/git/fhir";
if (new File(s).exists()) if (new File(s).exists())
return s; return s;

View File

@ -236,10 +236,6 @@ public interface IResourceValidator {
public void setWantCheckSnapshotUnchanged(boolean wantCheckSnapshotUnchanged); public void setWantCheckSnapshotUnchanged(boolean wantCheckSnapshotUnchanged);
// FIXME: don't need that, gets never used?
// public String getValidationLanguage();
// public void setValidationLanguage(String value);
/** /**
* It's common to see references such as Patient/234234 - these usually mean a * It's common to see references such as Patient/234234 - these usually mean a
* reference to a Patient resource. But there's no actual technical rule that it * reference to a Patient resource. But there's no actual technical rule that it

View File

@ -2748,7 +2748,7 @@ public class FHIRPathEngine {
p = worker.getUcumService().multiply(pl, pr); p = worker.getUcumService().multiply(pl, pr);
result.add(pairToQty(p)); result.add(pairToQty(p));
} catch (UcumException e) { } catch (UcumException e) {
throw new PathEngineException(e.getMessage(), null, expr.getOpStart(), expr.toString(), e); // #FIXME throw new PathEngineException(e.getMessage(), null, expr.getOpStart(), expr.toString(), e); // #TODO: i18n
} }
} else { } else {
throw makeException(expr, I18nConstants.FHIRPATH_OP_INCOMPATIBLE, "*", left.get(0).fhirType(), right.get(0).fhirType()); throw makeException(expr, I18nConstants.FHIRPATH_OP_INCOMPATIBLE, "*", left.get(0).fhirType(), right.get(0).fhirType());
@ -4977,10 +4977,10 @@ public class FHIRPathEngine {
tn = "FHIR."+expr.getParameters().get(0).getName(); tn = "FHIR."+expr.getParameters().get(0).getName();
} }
if (!isKnownType(tn)) { if (!isKnownType(tn)) {
throw new PathEngineException(worker.formatMessage(I18nConstants.FHIRPATH_INVALID_TYPE, tn), I18nConstants.FHIRPATH_INVALID_TYPE); // #FIXME throw new PathEngineException(worker.formatMessage(I18nConstants.FHIRPATH_INVALID_TYPE, tn), I18nConstants.FHIRPATH_INVALID_TYPE);
} }
if (!doNotEnforceAsSingletonRule && focus.size() > 1) { if (!doNotEnforceAsSingletonRule && focus.size() > 1) {
throw new PathEngineException(worker.formatMessage(I18nConstants.FHIRPATH_AS_COLLECTION, focus.size(), expr.toString()), I18nConstants.FHIRPATH_AS_COLLECTION); // #FIXME throw new PathEngineException(worker.formatMessage(I18nConstants.FHIRPATH_AS_COLLECTION, focus.size(), expr.toString()), I18nConstants.FHIRPATH_AS_COLLECTION);
} }
for (Base b : focus) { for (Base b : focus) {
@ -5020,7 +5020,7 @@ public class FHIRPathEngine {
tn = "FHIR."+expr.getParameters().get(0).getName(); tn = "FHIR."+expr.getParameters().get(0).getName();
} }
if (!isKnownType(tn)) { if (!isKnownType(tn)) {
throw new PathEngineException(worker.formatMessage(I18nConstants.FHIRPATH_INVALID_TYPE, tn), I18nConstants.FHIRPATH_INVALID_TYPE); // #FIXME throw new PathEngineException(worker.formatMessage(I18nConstants.FHIRPATH_INVALID_TYPE, tn), I18nConstants.FHIRPATH_INVALID_TYPE);
} }

View File

@ -140,7 +140,7 @@ public class TestingUtilities extends BaseTestingUtilities {
if (!Utilities.noString(s)) if (!Utilities.noString(s))
return s; return s;
s = "C:\\work\\org.hl7.fhir\\build"; s = "C:\\work\\org.hl7.fhir\\build";
// FIXME: change this back // #TODO - what should we do with this?
s = "/Users/jamesagnew/git/fhir"; s = "/Users/jamesagnew/git/fhir";
if (new File(s).exists()) if (new File(s).exists())
return s; return s;

View File

@ -658,7 +658,7 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
try { try {
getCapabilitiesStatementQuick(); getCapabilitiesStatementQuick();
} catch (Throwable e) { } catch (Throwable e) {
//FIXME This is creepy. Shouldn't we report this at some level? //#TODO This is creepy. Shouldn't we report this at some level?
} }
} }
return capabilities == null ? null : capabilities.getSoftware().getVersion(); return capabilities == null ? null : capabilities.getSoftware().getVersion();

View File

@ -671,7 +671,7 @@ public class HierarchicalTableGenerator extends TranslatingUtilities {
model.setAlternating(true); model.setAlternating(true);
if (mode == TableGenerationMode.XML) { if (mode == TableGenerationMode.XML) {
model.setDocoImg(help16AsData()); // #FIXME model.setDocoImg(help16AsData());
} else { } else {
model.setDocoImg(Utilities.pathURL(prefix, "help16.png")); model.setDocoImg(Utilities.pathURL(prefix, "help16.png"));
} }

View File

@ -7264,21 +7264,13 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
public ValidationResult checkCodeOnServer(NodeStack stack, ValueSet valueset, Coding c) { public ValidationResult checkCodeOnServer(NodeStack stack, ValueSet valueset, Coding c) {
codingObserver.seeCode(stack, c); codingObserver.seeCode(stack, c);
if (false) { // #FIXME
return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()).withCheckValueSetOnly(), c, valueset)), c);
} else {
return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()), c, valueset)), c); return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()), c, valueset)), c);
} }
}
public ValidationResult checkCodeOnServer(NodeStack stack, ValueSet valueset, CodeableConcept cc) { public ValidationResult checkCodeOnServer(NodeStack stack, ValueSet valueset, CodeableConcept cc) {
codingObserver.seeCode(stack, cc); codingObserver.seeCode(stack, cc);
if (false) { // #FIXME
return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()).withCheckValueSetOnly(), cc, valueset)), cc);
} else {
return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()), cc, valueset)), cc); return checkForInactive(filterOutSpecials(stack.getLiteralPath(), valueset, context.validateCode(baseOptions.withLanguage(stack.getWorkingLang()), cc, valueset)), cc);
} }
}
private ValidationResult filterOutSpecials(String path, ValueSet vs, ValidationResult vr) { private ValidationResult filterOutSpecials(String path, ValueSet vs, ValidationResult vr) {
// this is where we hack around problems in the infrastructure that lead to technically correct errors // this is where we hack around problems in the infrastructure that lead to technically correct errors

View File

@ -125,7 +125,7 @@ public class UtilitiesXTests {
if (!Utilities.noString(s)) if (!Utilities.noString(s))
return s; return s;
s = "C:\\work\\org.hl7.fhir\\build"; s = "C:\\work\\org.hl7.fhir\\build";
// FIXME: change this back // TODO - what should we do here?
s = "/Users/jamesagnew/git/fhir"; s = "/Users/jamesagnew/git/fhir";
if (new File(s).exists()) if (new File(s).exists())
return s; return s;