honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

This commit is contained in:
James Agnew 2018-07-16 08:16:40 -04:00
parent 401a4cd738
commit 4b3287c6a9
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseHasResource.java
View File

@ -63,6 +63,7 @@ public abstract class BaseHasResource implements IBaseResourceEntity {
public abstract BaseTag addTag(TagDefinition theDef);
@Override
public Date getDeleted() {
return myDeleted;
}
@ -72,6 +73,7 @@ public abstract class BaseHasResource implements IBaseResourceEntity {
}
@Override
public FhirVersionEnum getFhirVersion() {
return myFhirVersion;
}
@ -88,10 +90,13 @@ public abstract class BaseHasResource implements IBaseResourceEntity {
myForcedId = theForcedId;
}
@Override
public abstract Long getId();
@Override
public abstract IdDt getIdDt();
@Override
public InstantDt getPublished() {
if (myPublished != null) {
return new InstantDt(myPublished);
@ -104,12 +109,15 @@ public abstract class BaseHasResource implements IBaseResourceEntity {
myPublished = thePublished;
}
@Override
public abstract Long getResourceId();
@Override
public abstract String getResourceType();
public abstract Collection<? extends BaseTag> getTags();
@Override
public InstantDt getUpdated() {
return new InstantDt(myUpdated);
}
@ -118,12 +126,15 @@ public abstract class BaseHasResource implements IBaseResourceEntity {
myUpdated = theUpdated;
}
@Override
public Date getUpdatedDate() {
return myUpdated;
}
@Override
public abstract long getVersion();
@Override
public boolean isHasTags() {
return myHasTags;
}

19
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceIndexedSearchParamToken.java
View File

@ -62,7 +62,8 @@ public class ResourceIndexedSearchParamToken extends BaseResourceIndexedSearchPa
public String mySystem;
@Field()
@Column(name = "SP_VALUE", nullable = true, length = MAX_LENGTH)
public String myValue;
private String myValue;
@SuppressWarnings("unused")
@Id
@SequenceGenerator(name = "SEQ_SPIDX_TOKEN", sequenceName = "SEQ_SPIDX_TOKEN")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_SPIDX_TOKEN")
@ -152,40 +153,40 @@ public class ResourceIndexedSearchParamToken extends BaseResourceIndexedSearchPa
return b.isEquals();
}
public Long getHashSystem() {
Long getHashSystem() {
calculateHashes();
return myHashSystem;
}
public Long getHashIdentity() {
private Long getHashIdentity() {
calculateHashes();
return myHashIdentity;
}
public void setHashIdentity(Long theHashIdentity) {
private void setHashIdentity(Long theHashIdentity) {
myHashIdentity = theHashIdentity;
}
public void setHashSystem(Long theHashSystem) {
private void setHashSystem(Long theHashSystem) {
myHashSystem = theHashSystem;
}
public Long getHashSystemAndValue() {
Long getHashSystemAndValue() {
calculateHashes();
return myHashSystemAndValue;
}
public void setHashSystemAndValue(Long theHashSystemAndValue) {
private void setHashSystemAndValue(Long theHashSystemAndValue) {
calculateHashes();
myHashSystemAndValue = theHashSystemAndValue;
}
public Long getHashValue() {
Long getHashValue() {
calculateHashes();
return myHashValue;
}
public void setHashValue(Long theHashValue) {
private void setHashValue(Long theHashValue) {
myHashValue = theHashValue;
}