Skip to content

Commit fa841d4

Browse files
mythzmythz
committed
Update techstackskotlin to use updated dtos with initialized collections
1 parent bd6e20d commit fa841d4

File tree

4 files changed

+49
-48
lines changed

4 files changed

+49
-48
lines changed

‎src/AndroidClient/techstackskotlin/src/main/java/servicestack/net/techstackskotlin/MainActivity.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class MainActivity : ActionBarActivity(), ActionBar.TabListener {
187187
App.DataType.AppOverview -> {
188188
val spinner = categorySpinner
189189
if (spinner != null) {
190-
val categories = data.appOverviewResponse?.AllTiers?.map { it.Title } ?: listOf<Option>()
190+
val categories = data.appOverviewResponse!!.AllTiers.map { it.Title }
191191
spinner.adapter = ArrayAdapter(activity, android.R.layout.simple_spinner_item, categories)
192192
}
193193

@@ -205,7 +205,7 @@ class MainActivity : ActionBarActivity(), ActionBar.TabListener {
205205
}
206206

207207
private fun getTopTechnologies(data: App.AppData): ArrayList<TechnologyInfo> {
208-
var topTechnologies = data.appOverviewResponse!!.TopTechnologies!!
208+
var topTechnologies = data.appOverviewResponse!!.TopTechnologies
209209
if (selectedCategory != null && selectedCategory!!.Value != null) {
210210
topTechnologies = topTechnologies.filter { it.Tier == selectedCategory?.Value }.toArrayList()
211211
}
@@ -246,7 +246,7 @@ class MainActivity : ActionBarActivity(), ActionBar.TabListener {
246246

247247
val list = rootView.findViewById(R.id.listTechStacks) as ListView
248248
list.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id ->
249-
val result = App.data.searchTechStacksResponse?.Results!![position]
249+
val result = App.data.searchTechStacksResponse!!.Results[position]
250250
App.openTechStack(activity, result.Slug)
251251
}
252252

@@ -265,7 +265,7 @@ class MainActivity : ActionBarActivity(), ActionBar.TabListener {
265265
App.DataType.SearchTechStacks -> {
266266
val list = listViewResults
267267
if (list != null) {
268-
val results = data.searchTechStacksResponse?.Results?.map { it.Name } ?: listOf<TechnologyStack>()
268+
val results = data.searchTechStacksResponse!!.Results.map { it.Name }
269269
list.adapter = ArrayAdapter(activity, android.R.layout.simple_list_item_1, results)
270270
}
271271
}
@@ -305,7 +305,7 @@ class MainActivity : ActionBarActivity(), ActionBar.TabListener {
305305

306306
val list = rootView.findViewById(R.id.listTechnologies) as ListView
307307
list.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id ->
308-
val result = App.data.searchTechnologiesResponse?.Results!![position]
308+
val result = App.data.searchTechnologiesResponse!!.Results[position]
309309
App.openTechnology(activity, result.Slug)
310310
}
311311
return rootView
@@ -323,7 +323,7 @@ class MainActivity : ActionBarActivity(), ActionBar.TabListener {
323323
App.DataType.SearchTechnologies -> {
324324
val list = listViewResults
325325
if (list != null) {
326-
val results = data.searchTechnologiesResponse?.Results?.map { it.Name } ?: listOf<Technology>()
326+
val results = data.searchTechnologiesResponse!!.Results.map { it.Name }
327327
list.adapter = ArrayAdapter(activity, android.R.layout.simple_list_item_1, results)
328328
}
329329
}

‎src/AndroidClient/techstackskotlin/src/main/java/servicestack/net/techstackskotlin/TechStackActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ class TechStackActivity : Activity(), App.AppDataListener {
7474

7575
val layout = findViewById(R.id.layoutTechStackCategories) as LinearLayout
7676
layout.removeAllViews()
77-
for (o in App.data.appOverviewResponse?.AllTiers ?: ArrayList<Option>()) {
78-
val results = result.TechnologyChoices?.filter { it.Tier === o.Value } ?: listOf<TechnologyInStack>()
77+
for (o in App.data.appOverviewResponse!!.AllTiers) {
78+
val results = result.TechnologyChoices.filter { it.Tier === o.Value }
7979

8080
if (results.size == 0)
8181
continue

‎src/AndroidClient/techstackskotlin/src/main/java/servicestack/net/techstackskotlin/TechnologyActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ class TechnologyActivity : Activity(), App.AppDataListener {
6666
}
6767

6868
val list = findViewById(R.id.listTechnologyTechStacks) as ListView
69-
val stackNames = result.TechnologyStacks?.map { it.Name } ?: listOf<TechnologyStack>()
69+
val stackNames = result.TechnologyStacks.map { it.Name }
7070

7171
val activity = this
7272
list.adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, stackNames)
7373
list.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id ->
74-
App.openTechStack(activity, result.TechnologyStacks!![position].Slug)
74+
App.openTechStack(activity, result.TechnologyStacks[position].Slug)
7575
}
7676
}
7777
}

‎src/AndroidClient/techstackskotlin/src/main/java/servicestack/net/techstackskotlin/dtos.kt‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Options:
2-
Date: 2015-12-09 01:45:37
2+
Date: 2015-12-09 04:03:26
33
Version: 4.050
44
Tip: To override a DTO option, remove "//" prefix before updating
55
BaseUrl: http://techstacks.io
@@ -10,6 +10,7 @@ Package: servicestack.net.techstackskotlin
1010
//AddImplicitVersion:
1111
//IncludeTypes:
1212
//ExcludeTypes:
13+
//InitializeCollections: True
1314
//TreatTypesAsStrings:
1415
//DefaultImports: java.math.*,java.util.*,net.servicestack.client.*,com.google.gson.annotations.*,com.google.gson.reflect.*
1516
*/
@@ -180,7 +181,7 @@ open class CreateTechnologyStack : IReturn<CreateTechnologyStackResponse>
180181
var Description:String? = null
181182
var Details:String? = null
182183
var IsLocked:Boolean? = null
183-
var TechnologyIds:ArrayList<Long>? = null
184+
var TechnologyIds:ArrayList<Long> = ArrayList<Long>()
184185
companion object { private val responseType = CreateTechnologyStackResponse::class.java }
185186
override fun getResponseType(): Any? = responseType
186187
}
@@ -196,7 +197,7 @@ open class UpdateTechnologyStack : IReturn<UpdateTechnologyStackResponse>
196197
var Description:String? = null
197198
var Details:String? = null
198199
var IsLocked:Boolean? = null
199-
var TechnologyIds:ArrayList<Long>? = null
200+
var TechnologyIds:ArrayList<Long> = ArrayList<Long>()
200201
companion object { private val responseType = UpdateTechnologyStackResponse::class.java }
201202
override fun getResponseType(): Any? = responseType
202203
}
@@ -388,7 +389,7 @@ open class Authenticate : IReturn<AuthenticateResponse>
388389
var cnonce:String? = null
389390

390391
@DataMember(Order=15)
391-
var Meta:HashMap<String,String>? = null
392+
var Meta:HashMap<String,String> = HashMap<String,String>()
392393
companion object { private val responseType = AuthenticateResponse::class.java }
393394
override fun getResponseType(): Any? = responseType
394395
}
@@ -401,10 +402,10 @@ open class AssignRoles : IReturn<AssignRolesResponse>
401402
var UserName:String? = null
402403

403404
@DataMember(Order=2)
404-
var Permissions:ArrayList<String>? = null
405+
var Permissions:ArrayList<String> = ArrayList<String>()
405406

406407
@DataMember(Order=3)
407-
var Roles:ArrayList<String>? = null
408+
var Roles:ArrayList<String> = ArrayList<String>()
408409
companion object { private val responseType = AssignRolesResponse::class.java }
409410
override fun getResponseType(): Any? = responseType
410411
}
@@ -417,10 +418,10 @@ open class UnAssignRoles : IReturn<UnAssignRolesResponse>
417418
var UserName:String? = null
418419

419420
@DataMember(Order=2)
420-
var Permissions:ArrayList<String>? = null
421+
var Permissions:ArrayList<String> = ArrayList<String>()
421422

422423
@DataMember(Order=3)
423-
var Roles:ArrayList<String>? = null
424+
var Roles:ArrayList<String> = ArrayList<String>()
424425
companion object { private val responseType = UnAssignRolesResponse::class.java }
425426
override fun getResponseType(): Any? = responseType
426427
}
@@ -456,24 +457,24 @@ open class GetTechnologyResponse
456457
{
457458
var Created:Date? = null
458459
var Technology:Technology? = null
459-
var TechnologyStacks:ArrayList<TechnologyStack>? = null
460+
var TechnologyStacks:ArrayList<TechnologyStack> = ArrayList<TechnologyStack>()
460461
var ResponseStatus:ResponseStatus? = null
461462
}
462463

463464
open class GetTechnologyPreviousVersionsResponse
464465
{
465-
var Results:ArrayList<TechnologyHistory>? = null
466+
var Results:ArrayList<TechnologyHistory> = ArrayList<TechnologyHistory>()
466467
}
467468

468469
open class GetTechnologyFavoriteDetailsResponse
469470
{
470-
var Users:ArrayList<String>? = null
471+
var Users:ArrayList<String> = ArrayList<String>()
471472
var FavoriteCount:Int? = null
472473
}
473474

474475
open class GetAllTechnologiesResponse
475476
{
476-
var Results:ArrayList<Technology>? = null
477+
var Results:ArrayList<Technology> = ArrayList<Technology>()
477478
}
478479

479480
@DataContract
@@ -486,10 +487,10 @@ open class QueryResponse<T>
486487
var Total:Int? = null
487488

488489
@DataMember(Order=3)
489-
var Results:ArrayList<T>? = null
490+
var Results:ArrayList<T> = ArrayList<T>()
490491

491492
@DataMember(Order=4)
492-
var Meta:HashMap<String,String>? = null
493+
var Meta:HashMap<String,String> = HashMap<String,String>()
493494

494495
@DataMember(Order=5)
495496
var ResponseStatus:ResponseStatus? = null
@@ -515,7 +516,7 @@ open class DeleteTechnologyStackResponse
515516

516517
open class GetAllTechnologyStacksResponse
517518
{
518-
var Results:ArrayList<TechnologyStack>? = null
519+
var Results:ArrayList<TechnologyStack> = ArrayList<TechnologyStack>()
519520
}
520521

521522
open class GetTechnologyStackResponse
@@ -527,41 +528,41 @@ open class GetTechnologyStackResponse
527528

528529
open class GetTechnologyStackPreviousVersionsResponse
529530
{
530-
var Results:ArrayList<TechnologyStackHistory>? = null
531+
var Results:ArrayList<TechnologyStackHistory> = ArrayList<TechnologyStackHistory>()
531532
}
532533

533534
open class GetTechnologyStackFavoriteDetailsResponse
534535
{
535-
var Users:ArrayList<String>? = null
536+
var Users:ArrayList<String> = ArrayList<String>()
536537
var FavoriteCount:Int? = null
537538
}
538539

539540
open class GetConfigResponse
540541
{
541-
var AllTiers:ArrayList<Option>? = null
542+
var AllTiers:ArrayList<Option> = ArrayList<Option>()
542543
}
543544

544545
open class OverviewResponse
545546
{
546547
var Created:Date? = null
547-
var TopUsers:ArrayList<UserInfo>? = null
548-
var TopTechnologies:ArrayList<TechnologyInfo>? = null
549-
var LatestTechStacks:ArrayList<TechStackDetails>? = null
550-
var TopTechnologiesByTier:HashMap<TechnologyTier,ArrayList<TechnologyInfo>>? = null
548+
var TopUsers:ArrayList<UserInfo> = ArrayList<UserInfo>()
549+
var TopTechnologies:ArrayList<TechnologyInfo> = ArrayList<TechnologyInfo>()
550+
var LatestTechStacks:ArrayList<TechStackDetails> = ArrayList<TechStackDetails>()
551+
var TopTechnologiesByTier:HashMap<TechnologyTier,ArrayList<TechnologyInfo>> = HashMap<TechnologyTier,ArrayList<TechnologyInfo>>()
551552
var ResponseStatus:ResponseStatus? = null
552553
}
553554

554555
open class AppOverviewResponse
555556
{
556557
var Created:Date? = null
557-
var AllTiers:ArrayList<Option>? = null
558-
var TopTechnologies:ArrayList<TechnologyInfo>? = null
558+
var AllTiers:ArrayList<Option> = ArrayList<Option>()
559+
var TopTechnologies:ArrayList<TechnologyInfo> = ArrayList<TechnologyInfo>()
559560
var ResponseStatus:ResponseStatus? = null
560561
}
561562

562563
open class GetFavoriteTechStackResponse
563564
{
564-
var Results:ArrayList<TechnologyStack>? = null
565+
var Results:ArrayList<TechnologyStack> = ArrayList<TechnologyStack>()
565566
}
566567

567568
open class FavoriteTechStackResponse
@@ -571,7 +572,7 @@ open class FavoriteTechStackResponse
571572

572573
open class GetFavoriteTechnologiesResponse
573574
{
574-
var Results:ArrayList<Technology>? = null
575+
var Results:ArrayList<Technology> = ArrayList<Technology>()
575576
}
576577

577578
open class FavoriteTechnologyResponse
@@ -581,17 +582,17 @@ open class FavoriteTechnologyResponse
581582

582583
open class GetUserFeedResponse
583584
{
584-
var Results:ArrayList<TechStackDetails>? = null
585+
var Results:ArrayList<TechStackDetails> = ArrayList<TechStackDetails>()
585586
}
586587

587588
open class GetUserInfoResponse
588589
{
589590
var UserName:String? = null
590591
var Created:Date? = null
591592
var AvatarUrl:String? = null
592-
var TechStacks:ArrayList<TechnologyStack>? = null
593-
var FavoriteTechStacks:ArrayList<TechnologyStack>? = null
594-
var FavoriteTechnologies:ArrayList<Technology>? = null
593+
var TechStacks:ArrayList<TechnologyStack> = ArrayList<TechnologyStack>()
594+
var FavoriteTechStacks:ArrayList<TechnologyStack> = ArrayList<TechnologyStack>()
595+
var FavoriteTechnologies:ArrayList<Technology> = ArrayList<Technology>()
595596
}
596597

597598
@DataContract
@@ -616,17 +617,17 @@ open class AuthenticateResponse
616617
var ResponseStatus:ResponseStatus? = null
617618

618619
@DataMember(Order=7)
619-
var Meta:HashMap<String,String>? = null
620+
var Meta:HashMap<String,String> = HashMap<String,String>()
620621
}
621622

622623
@DataContract
623624
open class AssignRolesResponse
624625
{
625626
@DataMember(Order=1)
626-
var AllRoles:ArrayList<String>? = null
627+
var AllRoles:ArrayList<String> = ArrayList<String>()
627628

628629
@DataMember(Order=2)
629-
var AllPermissions:ArrayList<String>? = null
630+
var AllPermissions:ArrayList<String> = ArrayList<String>()
630631

631632
@DataMember(Order=3)
632633
var ResponseStatus:ResponseStatus? = null
@@ -636,10 +637,10 @@ open class AssignRolesResponse
636637
open class UnAssignRolesResponse
637638
{
638639
@DataMember(Order=1)
639-
var AllRoles:ArrayList<String>? = null
640+
var AllRoles:ArrayList<String> = ArrayList<String>()
640641

641642
@DataMember(Order=2)
642-
var AllPermissions:ArrayList<String>? = null
643+
var AllPermissions:ArrayList<String> = ArrayList<String>()
643644

644645
@DataMember(Order=3)
645646
var ResponseStatus:ResponseStatus? = null
@@ -679,14 +680,14 @@ open class QueryBase_1<T> : QueryBase()
679680
open class TechStackDetails : TechnologyStackBase()
680681
{
681682
var DetailsHtml:String? = null
682-
var TechnologyChoices:ArrayList<TechnologyInStack>? = null
683+
var TechnologyChoices:ArrayList<TechnologyInStack> = ArrayList<TechnologyInStack>()
683684
}
684685

685686
open class TechnologyStackHistory : TechnologyStackBase()
686687
{
687688
var TechnologyStackId:Long? = null
688689
var Operation:String? = null
689-
var TechnologyIds:ArrayList<Long>? = null
690+
var TechnologyIds:ArrayList<Long> = ArrayList<Long>()
690691
}
691692

692693
@DataContract
@@ -779,7 +780,7 @@ open class QueryBase
779780
var Include:String? = null
780781

781782
@DataMember(Order=6)
782-
var Meta:HashMap<String,String>? = null
783+
var Meta:HashMap<String,String> = HashMap<String,String>()
783784
}
784785

785786
open class TechnologyInStack : TechnologyBase()

0 commit comments

Comments
 (0)