Skip to content

Commit a24c06a

Browse files
version 0.1.3 + load properties via resource bundle
1 parent d0c6d8f commit a24c06a

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 0.1.3 / 2019-04-18 ###
2+
3+
* load sdk version via ResourceBundle
4+
15
### 0.1.2 / 2019-04-09 ###
26

37
* send client version via "Transloadit-Client" header

src/main/java/com/transloadit/sdk/Request.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.security.NoSuchAlgorithmException;
2727
import java.util.HashMap;
2828
import java.util.Map;
29-
import java.util.Properties;
29+
import java.util.ResourceBundle;
3030

3131
/**
3232
* Transloadit tailored Http Request class
@@ -38,16 +38,9 @@ public class Request {
3838

3939
Request(Transloadit transloadit) {
4040
this.transloadit = transloadit;
41-
42-
Properties prop = new Properties();
43-
InputStream in = getClass().getClassLoader().getResourceAsStream("version.properties");
44-
try {
45-
prop.load(in);
46-
version = "java-sdk:" + prop.getProperty("versionNumber").replace("'", "");
47-
in.close();
48-
} catch (IOException e) {
49-
throw new RuntimeException(e);
50-
}
41+
version = "java-sdk:" + ResourceBundle.getBundle("version")
42+
.getString("versionNumber")
43+
.replace("'", "");
5144
}
5245

5346
/**
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
versionNumber='0.1.2'
1+
versionNumber='0.1.3'

src/test/java/com/transloadit/sdk/RequestTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void get() throws Exception {
3333
mockServerClient.verify(HttpRequest.request()
3434
.withPath("/foo")
3535
.withMethod("GET")
36-
.withHeader("Transloadit-Client", "java-sdk:0.1.2"));
36+
.withHeader("Transloadit-Client", "java-sdk:0.1.3"));
3737

3838
}
3939

src/test/java/com/transloadit/sdk/async/AsyncAssemblyTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.transloadit.sdk.MockHttpService;
44
import com.transloadit.sdk.response.AssemblyResponse;
5+
import org.junit.After;
56
import org.junit.Before;
67
import org.junit.Rule;
78
import org.junit.Test;
@@ -54,6 +55,11 @@ public void setUp() throws Exception {
5455
.respond(HttpResponse.response().withBody(getJson("assembly.json")));
5556
}
5657

58+
@After
59+
public void tearDown() {
60+
mockServerClient.reset();
61+
}
62+
5763
@Test
5864
public void save() throws Exception {
5965
assembly.addFile(new File("LICENSE"), "file_name");

0 commit comments

Comments
 (0)