Merge pull request #5 from sharmalab/dev

Make the yaml to the execution directory
sharmalab · Oct 26, 2018 · abcf9b2 · abcf9b2
2 parents bd3b9ab + 5ad0ae3
commit abcf9b2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/tcia-rest-client-java/README.md b/tcia-rest-client-java/README.md
@@ -13,8 +13,8 @@ This project requires JDK 1.8 for compiling and running. It does not work with l
 
 ## Configuring Authentication
 
-Create src/main/resources/config.yaml with the correct access credentials (TCIA user name and password) to access the
-TCIA REST API with authentication. 
+Create config.yaml in your execution directory with the correct access credentials (TCIA user name and password) 
+to access the TCIA REST API with authentication. 
 
 A sample configuration file can be found at src/main/resources/config.test.yaml.
 

diff --git a/tcia-rest-client-java/pom.xml b/tcia-rest-client-java/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>edu.emory.bmi</groupId>
 	<artifactId>tcia-sdk</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<packaging>jar</packaging>
 
 	<name>TCIA-SDK</name>

diff --git a/tcia-rest-client-java/src/main/java/edu/emory/bmi/tcia/client/conf/TCIAConstants.java b/tcia-rest-client-java/src/main/java/edu/emory/bmi/tcia/client/conf/TCIAConstants.java
@@ -9,7 +9,7 @@ public class TCIAConstants {
 	public static final String AUTH_SEPARATOR = ":";
 
 	// The location of the configuration file for further configurations.
-	public static final String TCIA_CONF_FILE = "src/main/resources/config.yaml";
+	public static final String TCIA_CONF_FILE = "config.yaml";
 
 	// The character that separates the auth mechanism against the value, as in "ldap base64EncodedUNandPW"
 	public static final String AUTH_VAL_SEPARATOR = " ";

diff --git a/tcia-rest-client-java/src/main/java/edu/emory/bmi/tcia/client/util/ImageResult.java b/tcia-rest-client-java/src/main/java/edu/emory/bmi/tcia/client/util/ImageResult.java
@@ -11,13 +11,13 @@ public class ImageResult {
 	public InputStream getRawData() {
 		return rawData;
 	}
-	void setRawData(InputStream rawData) {
+	public void setRawData(InputStream rawData) {
 		this.rawData = rawData;
 	}
 	public Integer getImageCount() {
 		return imageCount;
 	}
-	void setImageCount(Integer imageCount) {
+	public void setImageCount(Integer imageCount) {
 		this.imageCount = imageCount;
 	}
 }