Get everything building for 2.3 release

august-zou · Dec 19, 2016 · 5807cb5 · 5807cb5
1 parent 62b53e7
commit 5807cb5
Show file tree

Hide file tree

Showing 90 changed files with 915 additions and 1,446 deletions.
diff --git a/.project b/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/hapi-base/.classpath b/hapi-base/.classpath
@@ -6,17 +6,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/*.java" including="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.6/slf4j-log4j12-1.6.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -26,7 +20,11 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/hapi-base/.project b/hapi-base/.project
@@ -1,41 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>hapi-base</name>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>hapi-base</name>
 	<comment>HAPI (HL7 application programming interface; pronounced &quot;happy&quot;) is an open-source, 
 		object-oriented HL7 2.x parser for Java.  HL7 (http://hl7org)  is a messaging 
 		specification for healthcare information systems.  This project is not affiliated with 
 		the HL7 organization; we are just writing some software that conforms to their 
 		specification.  The project was initiated by University Health Network 
-		(a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+		(a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/hapi-base/.settings/org.eclipse.core.resources.prefs b/hapi-base/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/hapi-base/.settings/org.eclipse.jdt.core.prefs b/hapi-base/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/hapi-base/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-base/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="java" version="1.5"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="java" version="1.6"/>
 </faceted-project>
diff --git a/hapi-base/pom.xml b/hapi-base/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.3-alpha1</version>
+		<version>2.3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -50,7 +50,6 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven.javadoc.plugin.version}</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>
@@ -180,7 +179,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>${maven.javadoc.plugin.version}</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -229,7 +227,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>${maven.javadoc.plugin.version}</version>
 						<executions>
 							<execution>
 								<phase>package</phase>

diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/Version.java b/hapi-base/src/main/java/ca/uhn/hl7v2/Version.java
@@ -34,19 +34,18 @@ GNU General Public License (the  "GPL"), in which case the provisions of the GPL
 
 public enum Version {
 
-	V21("2.1"),
-	V22("2.2"),
-	V23("2.3"),
-	V231("2.3.1"),
-	V24("2.4"),
-	V25("2.5"),
-	V251("2.5.1"),
-	V26("2.6"),
-    V27("2.7"),
-    V271("2.7.1"),
-    V28("2.8"),
-    V281("2.8.1");
-
+	V21("2.1"), // -
+	V22("2.2"), // -
+	V23("2.3"), // -
+	V231("2.3.1"), // -
+	V24("2.4"), // -
+	V25("2.5"), // -
+	V251("2.5.1"), // -
+	V26("2.6"), // -
+	V27("2.7"), // -
+	V271("2.7.1"), // -
+	V28("2.8"), // -
+	V281("2.8.1"); // -
 
 	private String version;
 	private static ArrayList<Version> ourVersionsOnClasspath;
@@ -252,6 +251,14 @@ public GenericMessage newGenericMessage(ModelClassFactory mcf) {
 			return new GenericMessage.V251(mcf);
 		case V26:
 			return new GenericMessage.V26(mcf);
+		case V27:
+			return new GenericMessage.V27(mcf);
+		case V271:
+			return new GenericMessage.V271(mcf);
+		case V28:
+			return new GenericMessage.V28(mcf);
+		case V281:
+			return new GenericMessage.V281(mcf);
 		default:
 			throw new Error("Unknown version (this is a HAPI bug): " + this.getVersion());
 		}

diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/GenericMessage.java b/hapi-base/src/main/java/ca/uhn/hl7v2/model/GenericMessage.java
@@ -138,31 +138,35 @@ public V26(ModelClassFactory factory) {
     }
 
     public static class V27 extends GenericMessage {
-        public V27(ModelClassFactory factory) {
+		private static final long serialVersionUID = -1693277295151324396L;
+		public V27(ModelClassFactory factory) {
             super(factory);
         }
         public String getVersion() { return Version.V27.getVersion(); }
     }
 
     public static class V271 extends GenericMessage {
-        public V271(ModelClassFactory factory) {
+		private static final long serialVersionUID = -1693277295151324396L;
+		public V271(ModelClassFactory factory) {
             super(factory);
         }
         public String getVersion() { return Version.V271.getVersion(); }
     }
 
     public static class V28 extends GenericMessage {
-        public V28(ModelClassFactory factory) {
+		private static final long serialVersionUID = -1693277295151324396L;
+		public V28(ModelClassFactory factory) {
             super(factory);
         }
         public String getVersion() { return Version.V28.getVersion(); }
     }
 
     public static class V281 extends GenericMessage {
-        public V281(ModelClassFactory factory) {
+		private static final long serialVersionUID = -1693277295151324396L;
+		public V281(ModelClassFactory factory) {
             super(factory);
         }
         public String getVersion() { return Version.V281.getVersion(); }
     }
-    
+
 }
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/SuperStructure.java b/hapi-base/src/main/java/ca/uhn/hl7v2/model/SuperStructure.java
@@ -13,5 +13,11 @@ public interface SuperStructure extends Group {
 	Set<String> getStructuresWhichChildAppliesTo(String theChildName);
 
 	List<String> getChildNamesForStructure(String theStructure);
+
+	/**
+	 * Returns a set containing any non-standard element names that were added
+	 * to this structure
+	 */
+	Set<String> getNonStandardNames();
 
 }
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/parser/FixFieldDataType.java b/hapi-base/src/main/java/ca/uhn/hl7v2/parser/FixFieldDataType.java
@@ -154,7 +154,7 @@ public static void fix(Segment segment, int typeField, int dataField, String def
                 Varies v = (Varies)rep;
                 if (type.getValue() == null) {
                     if (defaultType != null) {
-                        LOG.debug("setting default {}-{} type to {}", segment.getName(), typeField, defaultType);
+                        LOG.debug("setting default {}-{} type to {}", new Object[] {segment.getName(), typeField, defaultType});
                         type.setValue(defaultType);
                     }
                 } // if

diff --git a/...va/ca/uhn/hl7v2/validation/builder/support/OnlyAllowableSegmentsInSuperstructureRule.java b/...va/ca/uhn/hl7v2/validation/builder/support/OnlyAllowableSegmentsInSuperstructureRule.java
@@ -60,9 +60,13 @@ public ValidationException[] apply(Message msg) {
 
 	private void checkStructure(SuperStructure theMsg, List<ValidationException> theExceptions) {
 		String messageStructure = theMsg.getMessage().getName();
+		Set<String> nonStandardNames = theMsg.getNonStandardNames();
 
 		FORNAME:
 		for (String name : theMsg.getNames()) {
+			if (nonStandardNames != null && nonStandardNames.contains(name)) {
+				continue;
+			}
 
 			try {
 				for (Structure rep : theMsg.getAll(name)) {

diff --git a/hapi-dist/.project b/hapi-dist/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/hapi-dist/pom.xml b/hapi-dist/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.3-alpha1</version>
+		<version>2.3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/hapi-examples/.project b/hapi-examples/.project
@@ -1,24 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>hapi-examples</name>
-  <comment>HAPI (HL7 application programming interface; pronounced &quot;happy&quot;) is an open-source, 
+	<name>hapi-examples</name>
+	<comment>HAPI (HL7 application programming interface; pronounced &quot;happy&quot;) is an open-source, 
 		object-oriented HL7 2.x parser for Java.  HL7 (http://hl7org)  is a messaging 
 		specification for healthcare information systems.  This project is not affiliated with 
 		the HL7 organization; we are just writing some software that conforms to their 
 		specification.  The project was initiated by University Health Network 
 		(a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects>
-    <project>hapi-hl7overhttp</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.maven.ide.eclipse.maven2Builder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.maven.ide.eclipse.maven2Nature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
+	<projects>
+		<project>hapi-hl7overhttp</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/hapi-examples/pom.xml b/hapi-examples/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.3-alpha1</version>
+		<version>2.3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>