Skip to content

Commit edd6e81

Browse files
committed
remove overview.json from main/assets/resources + change lookup to use filepath from proj folder
1 parent 8ce26ba commit edd6e81

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

src/AndroidClient/android/android.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.23" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.24" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>

src/AndroidClient/android/src/main/assets/overview.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/AndroidClient/client/client.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.23" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.24" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>

src/AndroidClient/client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>net.servicestack</groupId>
66
<artifactId>client</artifactId>
7-
<version>1.0.23</version>
7+
<version>1.0.24</version>
88
<name>ServiceStack.Client</name>
99
<description>A client library to call your ServiceStack webservices.</description>
1010
<url>https://github.com/ServiceStack/ServiceStack.Java</url>

src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TechStacksServiceTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import net.servicestack.client.JsonServiceClient;
55
import net.servicestack.client.Utils;
66

7+
import java.io.File;
78
import java.io.FileInputStream;
89
import java.io.IOException;
910
import java.io.InputStream;
@@ -119,7 +120,9 @@ public void test_Can_deserialize_Overview() throws IOException {
119120
// InputStream stream = this.getClass().getClassLoader().getResourceAsStream("overview.json");
120121
// String json = Utils.readToEnd(stream, "UTF-8");
121122
// Works from gradle -> test or check as they run 'processTestResources' that copy resources into build directory
122-
String json = Utils.readToEnd(getClass().getResourceAsStream("/overview.json"), "UTF-8");
123+
String projFolder = getClass().getClassLoader().getResource("").getPath().replace("build/classes/test/","");
124+
String overviewPath = projFolder + "src/test/resources/overview.json";
125+
String json = Utils.readToEnd(new FileInputStream(overviewPath), "UTF-8");
123126

124127
OverviewResponse dto = (OverviewResponse)client.fromJson(json, OverviewResponse.class);
125128

0 commit comments

Comments
 (0)