Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Issue 3: Support Broadcasting the FHIR ValueSet #5

Merged
merged 1 commit into from
Jan 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Cerner Corporation
[Contributor Names Follow]

Cerner Corporation
Expand All @@ -7,4 +6,4 @@ Cerner Corporation
- Aleksander Eskilson [@bdrillard]

[@rbrush]: https://github.com/rbrush
[@bdrillard] https://github.com/bdrillard
[@bdrillard]: https://github.com/bdrillard
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.cerner.bunsen;

import com.cerner.bunsen.mappings.broadcast.BroadcastableValueSets;
import com.cerner.bunsen.mappings.broadcast.BroadcastableValueSets;
import java.util.ArrayDeque;
import java.util.Deque;
Expand Down
101 changes: 50 additions & 51 deletions bunsen-core/src/main/java/com/cerner/bunsen/mappings/Ancestor.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
public class Ancestor implements Serializable {

private String conceptMapUri;
private String uri;

private String conceptMapVersion;
private String version;

private String descendantSystem;

Expand All @@ -22,139 +22,138 @@ public class Ancestor implements Serializable {
private String ancestorValue;

/**
* Nullary constructor so Spark can encode this as a bean.
* Nullary constructor so Spark can encode this class as a bean.
*/
public Ancestor() {
}

/**
* Constructs an ancestor bean.
* Constructs a {@link Ancestor} instance.
*
* @param conceptMapUri the URI of the concept map defining this relationship
* @param conceptMapVersion the version of the concept map defining this relationship
* @param descendantSystem the code system of the descendant
* @param descendantValue the code value of the descendant
* @param ancestorSystem the code system of the ancestor
* @param ancestorValue the code value of the ancestor
* @param uri the hierarchy uri that owns this value
* @param version the hierarchy version that owns this value
* @param descendantSystem the code system of the descendant value
* @param descendantValue the descendant value
* @param ancestorSystem the code system of the ancestor value
* @param ancestorValue the ancestor value
*/
public Ancestor(String conceptMapUri,
String conceptMapVersion,
public Ancestor(String uri,
String version,
String descendantSystem,
String descendantValue,
String ancestorSystem,
String ancestorValue) {

this.conceptMapUri = conceptMapUri;
this.conceptMapVersion = conceptMapVersion;
this.uri = uri;
this.version = version;
this.descendantSystem = descendantSystem;
this.descendantValue = descendantValue;
this.ancestorSystem = ancestorSystem;
this.ancestorValue = ancestorValue;
}

/**
* Returns the URI of the concept map that defines this relationship.
* Returns the hierarchy URI that owns this value.
*
* @return the URI of the concept map
* @return the hierarchy URI that owns this value.
*/
public String getConceptMapUri() {
return conceptMapUri;
public String getUri() {
return uri;
}

/**
* Sets the URI of the concept map that defines this relationship.
* Sets the hierarchy URI that owns this value.
*
* @param conceptMapUri the URI of the concept map
* @param uri the hierarchy URI that owns this value
*/
public void setConceptMapUri(String conceptMapUri) {
this.conceptMapUri = conceptMapUri;
public void setUri(String uri) {
this.uri = uri;
}

/**
* Returns the version of the concept map that defines this relationship.
* Returns the hierarchy version that owns this value.
*
* @return the version of the concept map.
* @return the hierarchy version that owns this value.
*/
public String getConceptMapVersion() {
return conceptMapVersion;
public String getVersion() {
return version;
}

/**
* Sets the version of the concept map that defines this relationship.
* Sets the hierarchy version that owns this value.
*
* @param conceptMapVersion the version of the concept map.
* @param version the hierarchy version that owns this value
*/
public void setConceptMapVersion(String conceptMapVersion) {
this.conceptMapVersion = conceptMapVersion;
public void setVersion(String version) {
this.version = version;
}

/**
* Returns the system of the descendant code.
* Returns the code system that owns the descendant value.
*
* @return the system of the descendant code
* @return the code system that owns the descendant value.
*/
public String getDescendantSystem() {
return descendantSystem;
}

/**
* Sets the system of the descendant code.
* Sets the code system that owns the descendant value.
*
* @param descendantSystem the system of the descendant code.
* @param descendantSystem the code system that owns the descendant value
*/
public void setDescendantSystem(String descendantSystem) {
this.descendantSystem = descendantSystem;
}

/**
* Returns the value of the descendant code.
* Returns the descendant value.
*
* @return the value of the descendant code.
* @return the descendant value.
*/
public String getDescendantValue() {
return descendantValue;
}

/**
* Sets the value of the descendant code.
* Sets the descendant value.
*
* @param descendantValue the value of the descendant code.
* @param descendantValue the descendant value
*/
public void setDescendantValue(String descendantValue) {
this.descendantValue = descendantValue;
}

/**
* Returns the system of the ancestor code.
* Returns the code system that owns the ancestor value.
*
* @return the system of the ancestor code
* @return the code system that owns the ancestor value.
*/
public String getAncestorSystem() {
return ancestorSystem;
}

/**
* Sets the system of the ancestor code.
* Sets the code system that owns the ancestor value.
*
* @param ancestorSystem the system of the ancestor code.
* @param ancestorSystem the code system that owns the ancestor value
*/
public void setAncestorSystem(String ancestorSystem) {
this.ancestorSystem = ancestorSystem;
}

/**
* Returns the value of the ancestor code.
* Returns the ancestor value.
*
* @return the value of the ancestor code.
* @return the ancestor value.
*/
public String getAncestorValue() {
return ancestorValue;
}

/**
* Sets the value of the ancestor code.
* Sets the ancestor value.
*
* @param ancestorValue the value of the ancestor code.
* @param ancestorValue the ancestor value
*/
public void setAncestorValue(String ancestorValue) {
this.ancestorValue = ancestorValue;
Expand All @@ -169,8 +168,8 @@ public boolean equals(Object obj) {

Ancestor that = (Ancestor) obj;

return Objects.equals(this.conceptMapUri, that.conceptMapUri)
&& Objects.equals(this.conceptMapVersion, that.conceptMapVersion)
return Objects.equals(this.uri, that.uri)
&& Objects.equals(this.version, that.version)
&& Objects.equals(this.descendantSystem, that.descendantSystem)
&& Objects.equals(this.descendantValue, that.descendantValue)
&& Objects.equals(this.ancestorSystem, that.ancestorSystem)
Expand All @@ -180,8 +179,8 @@ public boolean equals(Object obj) {
@Override
public int hashCode() {
return 37
* Objects.hashCode(this.conceptMapUri)
* Objects.hashCode(this.conceptMapVersion)
* Objects.hashCode(this.uri)
* Objects.hashCode(this.version)
* Objects.hashCode(this.descendantSystem)
* Objects.hashCode(this.descendantValue)
* Objects.hashCode(this.ancestorSystem)
Expand Down
Loading