Skip to content

Commit

Permalink
compile fixes for changes to core
Browse files Browse the repository at this point in the history
  • Loading branch information
Grahame Grieve committed Oct 14, 2024
1 parent 3628275 commit f0fd823
Show file tree
Hide file tree
Showing 5 changed files with 147 additions and 5 deletions.
10 changes: 10 additions & 0 deletions ....fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/ValidationServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,4 +468,14 @@ public List<StructureDefinition> getImpliedProfilesForResource(IResourceValidato
return new BasePolicyAdvisorForFullValidation(ReferenceValidationPolicy.CHECK_VALID).getImpliedProfilesForResource(validator, appContext, stackPath,
definition, structure, resource, valid, msgServices, messages);
}

@Override
public boolean isSuppressMessageId(String path, String messageId) {
return false;
}

@Override
public ReferenceValidationPolicy getReferencePolicy() {
return ReferenceValidationPolicy.CHECK_VALID;
}
}
21 changes: 18 additions & 3 deletions ...fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/ValidationPresenter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.hl7.fhir.r5.terminologies.client.TerminologyClientContext;
import org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.TerminologyClientContextUseCount;
import org.hl7.fhir.r5.terminologies.client.TerminologyClientManager;
import org.hl7.fhir.r5.terminologies.client.TerminologyClientManager.InternalLogEvent;
import org.hl7.fhir.r5.utils.OperationOutcomeUtilities;
import org.hl7.fhir.r5.utils.ToolingExtensions;
import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;
Expand Down Expand Up @@ -481,12 +482,24 @@ private void genTXServerQA(String title, String path) throws IOException {
}
}
x.h2().tx("Tx Manager report for '"+txServers.getMonitorServiceURL()+"'");
ul = x.ul();
if (txServers.getInternalLog().isEmpty()) {
ul = x.ul();
ul.li().tx("(No Errors/Reports - all good)");
} else {
for (String s : txServers.getInternalLog()) {
ul.li().tx(s);
XhtmlNode tbl = x.table("grid");
XhtmlNode tr = tbl.tr();
tr.td().b().tx("Message");
tr.td().b().tx("Server");
tr.td().b().tx("ValueSet");
tr.td().b().tx("Systems");
tr.td().b().tx("Choices");
for (InternalLogEvent log : txServers.getInternalLog()) {
tr = tbl.tr();
tr.td().tx(log.getMessage());
tr.td().tx(log.getServer());
tr.td().tx(log.getVs());
tr.td().tx(log.getSystems());
tr.td().tx(log.getChoices());
}
}

Expand Down Expand Up @@ -1533,6 +1546,8 @@ private String genDetails(ValidationMessage vm, int id) {
private String getServer(String server) {
if (txServers.getServerMap().containsKey(server)) {
return txServers.getServerMap().get(server).getClient().getAddress();
} else if (Utilities.noString(server)) {
return "server";
} else {
return server;
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<packaging>pom</packaging>

<properties>
<core_version>6.3.31</core_version>
<core_version>6.3.32-SNAPSHOT</core_version>
<maven_surefire_version>3.0.0-M5</maven_surefire_version>
<apache_poi_version>5.2.1</apache_poi_version>
<okhttp.version>4.11.0</okhttp.version>
Expand Down
3 changes: 2 additions & 1 deletion test-statistics.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ Version,example.fhir.uv.myig,fhir.base.template.ig,hl7.base.template.ig,hl7.cda.
1.6.26,53409,1020,97,97894,365927,719,1406228,511680,610953,18353,54422,483717,481296,41347,185828
1.6.27,35258,918,93,96811,351102,971,1328428,695658,620521,19876,55053,423385,457937,43988,180722
1.6.29,67968,832,68,119760,295832,847,2330803,1307584,642291,45604,111684,587179,573832,70637,246058
1.6.30,70326,887,99,108146,319183,927,1601631,856561,,33073,95073,556207,585633,58332,256680
1.6.30,70326,887,99,108146,319183,927,1601631,856561,635813,33073,95073,556207,585633,58332,256680
1.6.31,74408,934,88,116831,302345,1085,1563643,925565,613025,42689,151744,864504,634988,81602,234197
116 changes: 116 additions & 0 deletions test-statistics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3578,6 +3578,122 @@
"hints" : 3,
"time" : 1601631,
"memory" : 14437140424
},
"hl7.fhir.uv.extensions" : {
"errors" : 1079,
"warnings" : 822,
"hints" : 1612,
"time" : 635813,
"memory" : 6367143816
}
},
"1.6.31" : {
"sync-date" : "2024-06-30",
"date" : "2024-10-14",
"hl7.fhir.template.ig" : {
"errors" : 0,
"warnings" : 0,
"hints" : 0,
"time" : 1085,
"memory" : 20436504
},
"hl7.cda.uv.core" : {
"errors" : 0,
"warnings" : 148,
"hints" : 0,
"time" : 116831,
"memory" : 1838978408
},
"hl7.fhir.us.ecr" : {
"errors" : 4591,
"warnings" : 375,
"hints" : 67,
"time" : 925565,
"memory" : 11106402144
},
"hl7.fhir.uv.ipa" : {
"errors" : 24,
"warnings" : 9,
"hints" : 37,
"time" : 151744,
"memory" : 2453083952
},
"hl7.fhir.uv.ips" : {
"errors" : 0,
"warnings" : 26,
"hints" : 26,
"time" : 864504,
"memory" : 1759359376
},
"ihe.mhd.fhir" : {
"errors" : 0,
"warnings" : 3,
"hints" : 0,
"time" : 234197,
"memory" : 4744114512
},
"hl7.fhir.uv.sdc" : {
"errors" : 45,
"warnings" : 80,
"hints" : 408,
"time" : 634988,
"memory" : 1406446648
},
"hl7.fhir.uv.tools" : {
"errors" : 0,
"warnings" : 2,
"hints" : 0,
"time" : 81602,
"memory" : 1573179808
},
"hl7.base.template.ig" : {
"errors" : 0,
"warnings" : 0,
"hints" : 0,
"time" : 88,
"memory" : 6883304
},
"hl7.fhir.uv.howto" : {
"errors" : 1,
"warnings" : 5,
"hints" : 1,
"time" : 42689,
"memory" : 1535855128
},
"fhir.base.template.ig" : {
"errors" : 0,
"warnings" : 0,
"hints" : 0,
"time" : 934,
"memory" : 185609000
},
"hl7.fhir.au.base" : {
"errors" : 13,
"warnings" : 143,
"hints" : 71,
"time" : 302345,
"memory" : 2776480832
},
"example.fhir.uv.myig" : {
"errors" : 21,
"warnings" : 18,
"hints" : 4,
"time" : 74408,
"memory" : 1535117312
},
"hl7.fhir.us.core" : {
"errors" : 30,
"warnings" : 32,
"hints" : 3,
"time" : 1563643,
"memory" : 14476234944
},
"hl7.fhir.uv.extensions" : {
"errors" : 1079,
"warnings" : 822,
"hints" : 1612,
"time" : 613025,
"memory" : 8349909648
}
}
}

0 comments on commit f0fd823

Please sign in to comment.