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

Give securityevent a common parent

This commit is contained in:
James Agnew 2014-11-04 13:29:21 -05:00
parent 1bd51f6118
commit 4e769da4ca
6 changed files with 69 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java
View File

@ -39,21 +39,19 @@ public abstract class BaseOperationOutcome extends BaseResource implements IReso
public abstract BaseIssue getIssueFirstRep();
public static abstract class BaseIssue extends BaseIdentifiableElement implements IResourceBlock {
public abstract CodeDt getSeverityElement();
public abstract StringDt getDetailsElement();
public abstract BaseCodingDt getType();
public abstract BaseIssue addLocation( String theString);
public abstract BaseIssue addLocation(String theString);
public abstract BaseIssue setDetails(String theString);
public abstract StringDt getLocationFirstRep();
}
}

28
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java Normal file
View File

@ -0,0 +1,28 @@
package ca.uhn.fhir.model.base.resource;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import ca.uhn.fhir.model.api.BaseResource;
import ca.uhn.fhir.model.api.IResource;
public abstract class BaseSecurityEvent extends BaseResource implements IResource {
}

1
hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java
View File

@ -15,7 +15,6 @@ import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.ReaderInputStream;

2
hapi-tinder-plugin/src/main/resources/vm/resource.vm
View File

@ -40,7 +40,7 @@ import ${import};
*/
@ResourceDef(name="${elementName}", profile="${profile}", id="${id}")
public class ${className}
extends #{if}( ${className}=="OperationOutcome" || ${className}=="Conformance" ) ca.uhn.fhir.model.base.resource.Base${className} #{else} BaseResource #{end}
extends #{if}( ${className}=="OperationOutcome" || ${className}=="Conformance" || ${className}=="SecurityEvent" ) ca.uhn.fhir.model.base.resource.Base${className} #{else} BaseResource #{end}
implements IResource {
#foreach ( $param in $searchParams )

2
hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
View File

@ -39,7 +39,7 @@ import ${import};
*/
@ResourceDef(name="${elementName}", profile="${profile}", id="${id}")
public class ${className}
extends #{if}( ${className}=="OperationOutcome" || ${className}=="Conformance" ) ca.uhn.fhir.model.base.resource.Base${className} #{else} BaseResource #{end}
extends #{if}( ${className}=="OperationOutcome" || ${className}=="Conformance" || ${className}=="SecurityEvent" ) ca.uhn.fhir.model.base.resource.Base${className} #{else} BaseResource #{end}
implements IResource {
#foreach ( $param in $searchParams )

35
src/site/xdoc/doc_upgrading.xml
View File

@ -13,6 +13,41 @@
<macro name="toc">
</macro>
<p>
<b>This section is still incomplete: </b> Note that HAPI 0.8 has not
yet been released. This section provides details about how to use the
latest SNAPSHOT release, but it will continue to be enhanced as we move towards
the final 0.8 release.
</p>
<subsection name="Importing Resources">
<p>
Beginning in HAPI-FHIR 0.8, the main distribution has been split from one
JAR to a set of JAR files. You will need at least two to use HAPI:
</p>
<ul>
<li>
The <code>hapi-fhir-base-[version].jar</code> file containing the core library.
</li>
<li>
The <code>hapi-fhir-structures-dstu-[version].jar</code> file containing the FHIR model classes
for DSTU1 (all contents of this JAR were previously found in hapi-fhir-base).
</li>
<li>
<i>Optionally: </i>You may also choose to include the
<code>hapi-fhir-structures-dev-[version].jar</code>. This JAR contains structures for the
latest DEV version of FHIR. You may create a client/server which supports either DSTU1 or DEV
resources, or both depending on your needs. Note that using DEV resources may introduce
incompatibilities with other frameworks however.<br/><br/>
<b>You must also include hapi-fhir-structures-dstu-[version].jar</b> if you include
the dev structures JAR at this time. Hopefully at some point soon this requirement
will be relaxed.
</li>
</ul>
</subsection>
<subsection name="Tinder Plugin">
<p>