Merge branch 'develop' into master

gt-health · Mar 17, 2017 · 353ba85 · 353ba85
2 parents 274edae + 23256d2
commit 353ba85
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/gt-fhir-entities/src/main/java/edu/gatech/i3l/fhir/dstu2/entities/PersonComplement.java b/gt-fhir-entities/src/main/java/edu/gatech/i3l/fhir/dstu2/entities/PersonComplement.java
@@ -65,7 +65,7 @@ public class PersonComplement extends Person{
 	private String maritalStatus;
 
 	@Column(name="active")
-	private short active;
+	private Short active;
 
 	@Column(name="contact_point1")
 	String contactPoint1;
@@ -144,11 +144,11 @@ public void setMaritalStatus(String maritalStatus) {
 		this.maritalStatus = maritalStatus;
 	}
 
-	public short getActive() {
+	public Short getActive() {
 		return active;
 	}
 
-	public void setActive(short active) {
+	public void setActive(Short active) {
 		this.active = active;
 	}
 
@@ -183,7 +183,7 @@ public Patient getRelatedResource() {
 		if(this.givenName2 != null)
 			patient.getName().get(0).addGiven(this.givenName2);
 //		short active = this.active != null ? this.active : 0;
-		if (this.active == 0)
+		if (this.active == null || this.active == 0)
 			patient.setActive(false);
 		else
 			patient.setActive(true);

diff --git a/gt-fhir-webapp/src/main/java/edu/gatech/i3l/fhir/servlet/DefaultServer.java b/gt-fhir-webapp/src/main/java/edu/gatech/i3l/fhir/servlet/DefaultServer.java
@@ -100,7 +100,7 @@ protected void initialize() throws ServletException {
 		 * helpful for testing and troubleshooting since it means you can look
 		 * at FHIR URLs directly in a browser.
 		 */
-		setUseBrowserFriendlyContentTypes(true);
+//		setUseBrowserFriendlyContentTypes(true);
 
 		/*
 		 * Default to JSON and pretty printing

diff --git a/gt-fhir-webapp/src/main/java/edu/gatech/i3l/fhir/smart/servlet/SmartLaunchContext.java b/gt-fhir-webapp/src/main/java/edu/gatech/i3l/fhir/smart/servlet/SmartLaunchContext.java
@@ -22,7 +22,7 @@ public class SmartLaunchContext implements Serializable {
 
 	@Id
 	@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="smart_launch_context_launch_id_gen")
-	@SequenceGenerator(name="smart_launch_context_launch_id_gen", sequenceName="smart_launch_context_launch_id_seq", allocationSize=1)
+	@SequenceGenerator(name="smart_launch_context_launch_id_gen", sequenceName="smart_launch_context_seq", allocationSize=1)
 	@Column(name="launch_id")
 	private Long launchId;
 

diff --git a/pom.xml b/pom.xml
@@ -260,12 +260,6 @@
 			<version>${jetty_version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-util</artifactId>