Merge branch 'hotfix/oxygen-saturation-schema-id'

openmhealth · Feb 8, 2016 · 16c3a62 · 16c3a62
2 parents 4a60bc3 + 06263b5
commit 16c3a62
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/java-schema-sdk/build.gradle b/java-schema-sdk/build.gradle
@@ -24,7 +24,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray' // see https://github.com/bintray/gradle-bintray-plugin for details
 
 archivesBaseName = 'omh-schema-sdk'
-version = '1.0.5-SNAPSHOT'
+version = '1.0.5'
 
 ext {
     jacksonVersion = '2.6.3'

diff --git a/java-schema-sdk/src/main/java/org/openmhealth/schema/domain/omh/OxygenSaturation.java b/java-schema-sdk/src/main/java/org/openmhealth/schema/domain/omh/OxygenSaturation.java
@@ -44,7 +44,7 @@
 @JsonNaming(PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy.class)
 public class OxygenSaturation extends Measure {
 
-    private static final SchemaId SCHEMA_ID = new SchemaId(OMH_NAMESPACE, "oxygen-saturation", "1.0");
+    public static final SchemaId SCHEMA_ID = new SchemaId(OMH_NAMESPACE, "oxygen-saturation", "1.0");
 
 
     /**

diff --git a/...schema-sdk/src/test/java/org/openmhealth/schema/domain/omh/OxygenSaturationUnitTests.java b/...schema-sdk/src/test/java/org/openmhealth/schema/domain/omh/OxygenSaturationUnitTests.java
@@ -28,6 +28,7 @@
 import static org.openmhealth.schema.domain.omh.OxygenSaturation.MeasurementSystem.PERIPHERAL_CAPILLARY;
 import static org.openmhealth.schema.domain.omh.OxygenSaturation.SupplementalOxygenAdministrationMode.NASAL_CANNULA;
 import static org.openmhealth.schema.domain.omh.PercentUnit.PERCENT;
+import static org.openmhealth.schema.domain.omh.SchemaSupport.OMH_NAMESPACE;
 import static org.openmhealth.schema.domain.omh.TimeFrameFactory.FIXED_MONTH;
 import static org.openmhealth.schema.domain.omh.TimeFrameFactory.FIXED_POINT_IN_TIME;
 
@@ -124,6 +125,13 @@ public void measureShouldSerializeCorrectly() throws Exception {
         deserializationShouldCreateValidObject(expectedDocument, oxygenSaturation);
     }
 
+    @Test
+    public void schemaIdShouldReturnCorrectValues() {
+
+        assertThat(OxygenSaturation.SCHEMA_ID.getName(), equalTo("oxygen-saturation"));
+        assertThat(OxygenSaturation.SCHEMA_ID.getNamespace(), equalTo(OMH_NAMESPACE));
+    }
+
     @Test
     public void equalsShouldReturnCorrectComparison() {