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

Fix unit tests and add changelog

This commit is contained in:
jamesagnew 2014-04-23 15:24:31 -04:00
parent 2fcd4cee2c
commit 9ab7f8facc
9 changed files with 337 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hapi-fhir-base/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>0.1</version>
<version>0.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -194,6 +194,31 @@
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.10</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
<reports>
<report>changes-report</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<feedType>atom_1.0</feedType>
<issueLinkTemplatePerSystem>
<default>http://sourceforge.net/support/tracker.php?aid=%ISSUE%</default>
<newbugs>https://sourceforge.net/p/hl7api/bugs/%ISSUE%/</newbugs>
<newfeatures>https://sourceforge.net/p/hl7api/feature-requests/%ISSUE%/</newfeatures>
</issueLinkTemplatePerSystem>
<escapeHTML>false</escapeHTML>
</configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>

20
hapi-fhir-base/src/changes/changes.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0"?>
<document xmlns="http://maven.apache.org/changes/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 ./changes.xsd">
<properties>
<author>James Agnew</author>
<title>HAPI FHIR Changelog</title>
</properties>
<body>
<release version="0.3" date="TBD">
<action type="fix" dev="Josh Mandel">
Make it easier to add HTTP Basic Authorization headers to RESTful client requests
and <![CDATA[<a href="./doc_rest_client.html#HTTP_Basic_Authorization">an example</a>]]>
illustrating how it works
</action>
<action type="fix" dev="Josh Mandel">
Correct a dependency on commons-io that was causing issues with the Tinder build
</action>
</release>
</body>
</document>

263
hapi-fhir-base/src/changes/changes.xsd Normal file
View File

@ -0,0 +1,263 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/changes/1.0.0" targetNamespace="http://maven.apache.org/changes/1.0.0">
<xs:element name="document" type="ChangesDocument">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
Record every release with their subsequent changes.
</xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="ChangesDocument">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
Record every release with their subsequent changes.
</xs:documentation>
</xs:annotation>
<xs:all>
<xs:element minOccurs="0" name="properties" type="Properties">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
Contains the properties of this document.
</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="body" type="Body">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
Contains the releases of this project with the actions taken
for each of the releases.
</xs:documentation>
</xs:annotation>
</xs:element>
</xs:all>
</xs:complexType>
<xs:complexType name="Body">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element minOccurs="0" name="release" type="Release" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">The list of releases for this project.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Release">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">A single release of this project.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element minOccurs="0" name="action" type="Action" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">The list of actions taken for this release.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
<xs:attribute name="version" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
The version number associated with this release.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="date" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
&lt;p&gt;The date of this release.&lt;/p&gt;
&lt;p&gt;This field can be any String, such as &quot;in SVN&quot; when the version isn&apos;t yet released. &lt;/p&gt;
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="description" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
A short description of this release.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
<xs:complexType name="Action" mixed="true">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
A single action done on the project, during this release.
</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element minOccurs="0" name="fixes" type="FixedIssue" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">A list of fix issues.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="dueto" type="DueTo" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">A list of contibutors for this issue.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
<xs:attribute name="dev" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
&lt;p&gt;Name of developer who committed the change.&lt;/p&gt;
&lt;p&gt;This &lt;b&gt;MUST&lt;/b&gt; be the name of the developer as described in the developers section of the pom.xml file.&lt;/p&gt;
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="due-to" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
Name of the person to be credited for this change. This can be used when a patch is submitted by a non-committer.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="due-to-email" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
Email of the person to be credited for this change.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="issue" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
&lt;p&gt;Id of the issue related to this change. This is the id in your issue tracking system.&lt;/p&gt;
&lt;p&gt;The Changes plugin will generate a URL out of this id. The URL is constructed using the value of the issueLinkTemplate parameter.&lt;/p&gt;
&lt;p&gt;See the &lt;a href=&quot;changes-report.html&quot;&gt;changes-report mojo&lt;/a&gt; for more details.&lt;/p&gt;
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="type" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
Supported action types are the following:
&lt;ul&gt;
&lt;li&gt;add : added functionnality to the project.&lt;/li&gt;
&lt;li&gt;fix : bug fix for the project.&lt;/li&gt;
&lt;li&gt;update : updated some part of the project.&lt;/li&gt;
&lt;li&gt;remove : removed some functionnality from the project.&lt;/li&gt;
&lt;/ul&gt;
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="system" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
&lt;p&gt;Id of issue tracking system. If empty &apos;default&apos; value will be use.&lt;/p&gt;
&lt;p&gt;The Changes plugin will generate a URL out of this id. The URL is constructed using the value of the issueLinkTemplatePerSystem parameter.&lt;/p&gt;
&lt;p&gt;See the &lt;a href=&quot;changes-report.html&quot;&gt;changes-report mojo&lt;/a&gt; for more details.&lt;/p&gt;
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="date" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">fix date</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
<xs:complexType name="FixedIssue">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
A fixed issue.
</xs:documentation>
</xs:annotation>
<xs:attribute name="issue" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
&lt;p&gt;Id of the issue related to this change. This is the id in your issue tracking system.&lt;/p&gt;
&lt;p&gt;The Changes plugin will generate a URL out of this id. The URL is constructed using the value of the issueLinkTemplate parameter.&lt;/p&gt;
&lt;p&gt;See the &lt;a href=&quot;changes-report.html&quot;&gt;changes-report mojo&lt;/a&gt; for more details.&lt;/p&gt;
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
<xs:complexType name="DueTo">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
Name and Email of the person to be credited for this change. This can be used when a patch is submitted by a non-committer.
</xs:documentation>
</xs:annotation>
<xs:attribute name="name" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">Name of the person to be credited for this change.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="email" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">Email of the person to be credited for this change.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
<xs:complexType name="Properties">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
</xs:annotation>
<xs:all>
<xs:element minOccurs="0" name="title" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">Page Title.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="author" type="Author">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">Page Author</xs:documentation>
</xs:annotation>
</xs:element>
</xs:all>
</xs:complexType>
<xs:complexType name="Author" mixed="true">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
A description of the author page.
</xs:documentation>
</xs:annotation>
<xs:all/>
<xs:attribute name="email" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0</xs:documentation>
<xs:documentation source="description">
The page author email.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:schema>

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java
View File

@ -87,11 +87,11 @@ public class ReadMethodBinding extends BaseResourceReturningMethodBinding {
}
@Override
public List<IResource> invokeServer(Object theResourceProvider,Request theRequest) throws InvalidRequestException, InternalErrorException {
public List<IResource> invokeServer(Object theResourceProvider, Request theRequest) throws InvalidRequestException, InternalErrorException {
Object[] params = new Object[myParameterCount];
params[myIdIndex] = theRequest.getId();
if (myVersionIdIndex != null) {
params[myVersionIdIndex] = theRequest.getId();
params[myVersionIdIndex] = theRequest.getVersion();
}
Object response;

2
hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java
View File

@ -682,7 +682,7 @@ public class ResfulServerMethodTest {
responseContent = IOUtils.toString(status.getEntity().getContent());
ourLog.info("Response was:\n{}", responseContent);
assertEquals(404, status.getStatusLine().getStatusCode());
assertEquals(200, status.getStatusLine().getStatusCode());
}

6
hapi-fhir-structures-dstu/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>0.1</version>
<version>0.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -19,7 +19,7 @@
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId>
<version>0.1</version>
<version>0.3</version>
</dependency>
</dependencies>
@ -28,7 +28,7 @@
<plugin>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-tinder-plugin</artifactId>
<version>0.1</version>
<version>0.3</version>
<executions>
<execution>
<goals>

4
hapi-tinder-plugin/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>0.1</version>
<version>0.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -20,7 +20,7 @@
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId>
<version>0.1</version>
<version>0.3</version>
</dependency>
<dependency>

2
hapi-tinder-test/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>0.1</version>
<version>0.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

24
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<packaging>pom</packaging>
<version>0.1</version>
<version>0.3</version>
<name>HAPI</name>
<url>http://hl7api.sourceforge.net/</url>
<description>
@ -20,6 +20,22 @@
<dependencies>
</dependencies>
<developers>
<developer>
<name>James Agnew</name>
</developer>
<developer>
<name>Dmitri Sotnikov</name>
</developer>
<developer>
<name>Lisa Wong</name>
</developer>
<developer>
<name>Josh Mandel</name>
<url></url>
</developer>
</developers>
<licenses>
<license>
<name>Apache Software License 2.0</name>
@ -30,10 +46,8 @@
<modules>
<module>hapi-fhir-base</module>
<module>hapi-tinder-plugin</module>
<!--
<module>hapi-tinder-test</module>
<module>hapi-fhir-structures-dstu</module>
-->
</modules>
<properties>
@ -87,7 +101,7 @@
</pluginManagement>
<plugins>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
@ -102,7 +116,7 @@
</execution>
</executions>
</plugin>
-->
</plugins>
</build>