From abdfb50b40257a67115fc955185eef2652dcae15 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Fri, 4 Sep 2015 13:59:57 -0400 Subject: [PATCH] Fix a few tests and don't crash on old Woodstox --- hapi-fhir-base-test-mindeps-client/pom.xml | 14 +++++++++----- hapi-fhir-base-test-mindeps-server/pom.xml | 11 +++++++++++ .../java/ca/uhn/fhir/testmindeps/SetupTest.java | 5 ++--- .../ca/uhn/fhir/testmindeps/ValidatorTest.java | 8 +++++++- .../src/main/java/ca/uhn/fhir/util/XmlUtil.java | 6 +++++- .../java/ca/uhn/fhir/model/dstu2/FhirDstu2.java | 2 +- .../ca/uhn/fhir/model/dstu2/composite/AgeDt.java | 2 +- .../dstu2/composite/BoundCodeableConceptDt.java | 2 +- .../fhir/model/dstu2/composite/ContainedDt.java | 2 +- .../ca/uhn/fhir/model/dstu2/composite/CountDt.java | 2 +- .../uhn/fhir/model/dstu2/composite/DistanceDt.java | 2 +- .../uhn/fhir/model/dstu2/composite/DurationDt.java | 2 +- .../ca/uhn/fhir/model/dstu2/composite/MoneyDt.java | 2 +- .../fhir/model/dstu2/composite/NarrativeDt.java | 2 +- .../model/dstu2/composite/ResourceReferenceDt.java | 2 +- .../model/dstu2/composite/SimpleQuantityDt.java | 2 +- .../fhir/model/dstu2/resource/BaseResource.java | 2 +- .../server/provider/dstu2/Dstu2BundleFactory.java | 2 +- .../provider/dstu2/ServerConformanceProvider.java | 2 +- .../provider/dstu2/ServerProfileProvider.java | 2 +- hapi-fhir-tutorial/simple-server/pom.xml | 11 ++--------- restful-server-example/.classpath | 1 - src/changes/changes.xml | 5 +++++ 23 files changed, 56 insertions(+), 35 deletions(-) diff --git a/hapi-fhir-base-test-mindeps-client/pom.xml b/hapi-fhir-base-test-mindeps-client/pom.xml index 4c702fbcab5..725a1503a97 100644 --- a/hapi-fhir-base-test-mindeps-client/pom.xml +++ b/hapi-fhir-base-test-mindeps-client/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 @@ -19,14 +18,19 @@ org.slf4j slf4j-api - 1.6.0 + 1.6.0 org.slf4j slf4j-simple 1.6.0 - + + ca.uhn.hapi.fhir hapi-fhir-base @@ -64,7 +68,7 @@ - + diff --git a/hapi-fhir-base-test-mindeps-server/pom.xml b/hapi-fhir-base-test-mindeps-server/pom.xml index a852f28a8df..5c3e57f71cf 100644 --- a/hapi-fhir-base-test-mindeps-server/pom.xml +++ b/hapi-fhir-base-test-mindeps-server/pom.xml @@ -26,6 +26,17 @@ 1.7.7 + + + org.codehaus.woodstox + wstx-asl + 3.0.0 + + ca.uhn.hapi.fhir hapi-fhir-base diff --git a/hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/testmindeps/SetupTest.java b/hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/testmindeps/SetupTest.java index 2904f836dec..ec6851d0a94 100644 --- a/hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/testmindeps/SetupTest.java +++ b/hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/testmindeps/SetupTest.java @@ -5,10 +5,9 @@ import org.junit.Test; public class SetupTest { /** - * Ensure that Woodstox is not on the classpath (we're testing that the library works ok without it - * elsewhere) + * Ensure that Woodstox is on the classpath */ - @Test(expected=ClassNotFoundException.class) + @Test() public void testValidateEnvironment() throws ClassNotFoundException { Class.forName("com.ctc.wstx.stax.WstxOutputFactory"); } diff --git a/hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/testmindeps/ValidatorTest.java b/hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/testmindeps/ValidatorTest.java index f83848dd45b..14cfd9c065c 100644 --- a/hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/testmindeps/ValidatorTest.java +++ b/hapi-fhir-base-test-mindeps-server/src/test/java/ca/uhn/fhir/testmindeps/ValidatorTest.java @@ -1,10 +1,14 @@ package ca.uhn.fhir.testmindeps; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.junit.Test; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.model.dstu2.resource.Patient; import ca.uhn.fhir.validation.FhirValidator; public class ValidatorTest { @@ -15,6 +19,8 @@ public class ValidatorTest { FhirContext ctx = new FhirContext(); FhirValidator val = ctx.newValidator(); + val.validateWithResult(new Patient()); + // Phloc is not onthe classpath assertTrue(val.isValidateAgainstStandardSchema()); assertFalse(val.isValidateAgainstStandardSchematron()); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java index 264a9b77e9a..728f0113068 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java @@ -1575,7 +1575,11 @@ public class XmlUtil { if (inputFactory instanceof com.ctc.wstx.stax.WstxInputFactory) { // inputFactory.setProperty(WstxInputFactory.IS_REPLACING_ENTITY_REFERENCES, false); inputFactory.setProperty(WstxInputProperties.P_UNDECLARED_ENTITY_RESOLVER, XML_RESOLVER); - inputFactory.setProperty(WstxInputProperties.P_MAX_ATTRIBUTE_SIZE, "100000000"); + try { + inputFactory.setProperty(WstxInputProperties.P_MAX_ATTRIBUTE_SIZE, "100000000"); + } catch (IllegalArgumentException e) { + // ignore + } } } catch (ClassNotFoundException e) { ourLog.debug("WstxOutputFactory (Woodstox) not found on classpath"); diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java index 15dcd6b5f6c..df216e923bc 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu2; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java index 9c431063e1c..8ce3268626a 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java @@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java index 13d3f94ba82..a19a4cf87c3 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu2.composite; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ContainedDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ContainedDt.java index 79fbda49295..95244f481c4 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ContainedDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ContainedDt.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu2.composite; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java index eca7cead03c..47814de5451 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java @@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java index a2972631931..8c67740d022 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java @@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java index 7afd82cd2a9..20ba6bcc2d6 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java @@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java index 25357804e45..85ad3917bfa 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java @@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/NarrativeDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/NarrativeDt.java index 4e48daa240a..a8c20a0df77 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/NarrativeDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/NarrativeDt.java @@ -18,7 +18,7 @@ package ca.uhn.fhir.model.dstu2.composite; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ResourceReferenceDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ResourceReferenceDt.java index 09e19c868b9..ecceb4d5705 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ResourceReferenceDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/ResourceReferenceDt.java @@ -18,7 +18,7 @@ package ca.uhn.fhir.model.dstu2.composite; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java index da47881d916..a10189ed990 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/SimpleQuantityDt.java @@ -7,7 +7,7 @@ import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java index 74d55b1d195..92b6eaace6f 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu2.resource; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java index d32f16589f3..999dda1d161 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu2; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java index a1188da2ff6..ad6cb315a18 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu2; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerProfileProvider.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerProfileProvider.java index 5749d4a583c..167e075ce4e 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerProfileProvider.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerProfileProvider.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu2; /* * #%L - * HAPI FHIR Structures - DSTU2 (FHIR v0.5.0) + * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0) * %% * Copyright (C) 2014 - 2015 University Health Network * %% diff --git a/hapi-fhir-tutorial/simple-server/pom.xml b/hapi-fhir-tutorial/simple-server/pom.xml index 34036d1c1f1..58a92a3ed58 100644 --- a/hapi-fhir-tutorial/simple-server/pom.xml +++ b/hapi-fhir-tutorial/simple-server/pom.xml @@ -35,20 +35,13 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.7 + 1.2-SNAPSHOT - - -