Skip to content

Commit 7c60dcd

Browse files
LayoricLayoric
committed
Merge branch 'master' of github.com:ServiceStack/ServiceStack.Java
2 parents 95cc8b9 + 1f007db commit 7c60dcd

File tree

4 files changed

+30
-44
lines changed

4 files changed

+30
-44
lines changed

‎src/AndroidClient/android/android.iml‎

Lines changed: 2 additions & 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.21" 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.22" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -74,6 +74,7 @@
7474
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7575
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7676
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7879
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7980
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

‎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.21" 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.22" 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.21</version>
7+
<version>1.0.22</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/techstackskotlin/src/main/java/servicestack/net/techstackskotlin/App.kt‎

Lines changed: 26 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import android.graphics.Bitmap
66
import android.net.Uri
77
import net.servicestack.android.AndroidServiceClient
88
import net.servicestack.android.AndroidUtils
9-
import net.servicestack.client.AsyncResult
9+
import net.servicestack.client.AsyncSuccess
1010
import net.servicestack.client.Utils
1111
import java.util.*
1212

@@ -41,11 +41,9 @@ class App {
4141
if (appOverviewResponse != null) {
4242
onUpdate(DataType.AppOverview)
4343
}
44-
client.getAsync(AppOverview(), object : AsyncResult<AppOverviewResponse>() {
45-
override fun success(response: AppOverviewResponse) {
46-
appOverviewResponse = response
47-
onUpdate(DataType.AppOverview)
48-
}
44+
client.getAsync(AppOverview(), AsyncSuccess<AppOverviewResponse> {
45+
appOverviewResponse = it
46+
onUpdate(DataType.AppOverview)
4947
})
5048
return this
5149
}
@@ -62,13 +60,11 @@ class App {
6260

6361
lastTechStacksQuery = query
6462
client.getAsync(FindTechStacks(),
65-
Utils.createMap("NameContains", query, "DescriptionContains", query),
66-
object : AsyncResult<QueryResponse<TechnologyStack>>() {
67-
override fun success(response: QueryResponse<TechnologyStack>) {
68-
if (Utils.equals(query, lastTechStacksQuery)) {
69-
searchTechStacksResponse = response
70-
onUpdate(DataType.SearchTechStacks)
71-
}
63+
hashMapOf(Pair("NameContains", query), Pair("DescriptionContains", query)),
64+
AsyncSuccess<QueryResponse<TechnologyStack>> {
65+
if (Utils.equals(query, lastTechStacksQuery)) {
66+
searchTechStacksResponse = it
67+
onUpdate(DataType.SearchTechStacks)
7268
}
7369
})
7470

@@ -87,13 +83,11 @@ class App {
8783

8884
lastTechnologiesQuery = query
8985
client.getAsync(FindTechnologies(),
90-
Utils.createMap("NameContains", query, "DescriptionContains", query),
91-
object : AsyncResult<QueryResponse<Technology>>() {
92-
override fun success(response: QueryResponse<Technology>) {
93-
if (Utils.equals(query, lastTechnologiesQuery)) {
94-
searchTechnologiesResponse = response
95-
onUpdate(DataType.SearchTechnologies)
96-
}
86+
hashMapOf(Pair("NameContains", query), Pair("DescriptionContains", query)),
87+
AsyncSuccess<QueryResponse<Technology>> {
88+
if (Utils.equals(query, lastTechnologiesQuery)) {
89+
searchTechnologiesResponse = it
90+
onUpdate(DataType.SearchTechnologies)
9791
}
9892
})
9993

@@ -113,13 +107,10 @@ class App {
113107

114108
val request = GetTechnology()
115109
request.Slug = slug
116-
client.getAsync(request,
117-
object : AsyncResult<GetTechnologyResponse>() {
118-
override fun success(response: GetTechnologyResponse) {
119-
technology = response
120-
onUpdate(DataType.Technology)
121-
}
122-
})
110+
client.getAsync(request, AsyncSuccess<GetTechnologyResponse> {
111+
technology = it
112+
onUpdate(DataType.Technology)
113+
})
123114
}
124115

125116
var techStack: GetTechnologyStackResponse? = null
@@ -132,13 +123,10 @@ class App {
132123

133124
val request = GetTechnologyStack()
134125
request.Slug = slug
135-
client.getAsync(request,
136-
object : AsyncResult<GetTechnologyStackResponse>() {
137-
override fun success(response: GetTechnologyStackResponse) {
138-
techStack = response
139-
onUpdate(DataType.TechStack)
140-
}
141-
})
126+
client.getAsync(request, AsyncSuccess<GetTechnologyStackResponse> {
127+
techStack = it
128+
onUpdate(DataType.TechStack)
129+
})
142130
}
143131

144132
internal var imgCache = HashMap<String, Bitmap>()
@@ -149,12 +137,10 @@ class App {
149137
return
150138
}
151139

152-
client.getAsync(imgUrl, object : AsyncResult<ByteArray>() {
153-
override fun success(imgBytes: ByteArray) {
154-
val img = AndroidUtils.readBitmap(imgBytes)
155-
imgCache.put(imgUrl, img)
156-
callback.success(img)
157-
}
140+
client.getAsync(imgUrl, AsyncSuccess<ByteArray> {
141+
val img = AndroidUtils.readBitmap(it)
142+
imgCache.put(imgUrl, img)
143+
callback.success(img)
158144
})
159145
}
160146
}
@@ -205,5 +191,4 @@ class App {
205191
activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
206192
}
207193
}
208-
209194
}

0 commit comments

Comments
 (0)