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

Merge branch 'master' of github.com:petromykhailysyn/hapi-fhir into petromykhailysyn-master

This commit is contained in:
James Agnew 2014-10-30 13:59:12 -04:00
parent e9ab9c8259 c474839f01
commit c7d4441d3b
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/CustomThymeleafNarrativeGenerator.java
View File

@ -20,7 +20,6 @@ package ca.uhn.fhir.narrative;
* #L% * #L%
*/ */
import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -39,10 +38,8 @@ public class CustomThymeleafNarrativeGenerator extends BaseThymeleafNarrativeGen
* <li>file:/path/to/file/file.properties</li> * <li>file:/path/to/file/file.properties</li>
* <li>classpath:/com/package/file.properties</li> * <li>classpath:/com/package/file.properties</li>
* </ul> * </ul>
* @throws IOException
* If the file can not be found/read
*/ */
public CustomThymeleafNarrativeGenerator(String... thePropertyFile) throws IOException { public CustomThymeleafNarrativeGenerator(String... thePropertyFile) {
setPropertyFile(thePropertyFile); setPropertyFile(thePropertyFile);
} }
@ -55,8 +52,6 @@ public class CustomThymeleafNarrativeGenerator extends BaseThymeleafNarrativeGen
* <li>file:/path/to/file/file.properties</li> * <li>file:/path/to/file/file.properties</li>
* <li>classpath:/com/package/file.properties</li> * <li>classpath:/com/package/file.properties</li>
* </ul> * </ul>
* @throws IOException
* If the file can not be found/read
*/ */
public void setPropertyFile(String... thePropertyFile) { public void setPropertyFile(String... thePropertyFile) {
Validate.notNull(thePropertyFile, "Property file can not be null"); Validate.notNull(thePropertyFile, "Property file can not be null");

4
hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/narrative/CustomThymeleafNarrativeGeneratorTest.java
View File

@ -3,8 +3,6 @@ package ca.uhn.fhir.narrative;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import ca.uhn.fhir.model.dstu.composite.NarrativeDt; import ca.uhn.fhir.model.dstu.composite.NarrativeDt;
@ -15,7 +13,7 @@ public class CustomThymeleafNarrativeGeneratorTest {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(CustomThymeleafNarrativeGeneratorTest.class); private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(CustomThymeleafNarrativeGeneratorTest.class);
@Test @Test
public void testGenerator() throws IOException { public void testGenerator() {
CustomThymeleafNarrativeGenerator gen = new CustomThymeleafNarrativeGenerator("file:src/test/resources/narrative/customnarrative.properties"); CustomThymeleafNarrativeGenerator gen = new CustomThymeleafNarrativeGenerator("file:src/test/resources/narrative/customnarrative.properties");