Skip to content

Commit 22ae3fd

Browse files
mythzmythz
committed
Add built-in NavItem,GetNavItems,GetNavItemsResponse DTOs
1 parent 67fabbf commit 22ae3fd

File tree

14 files changed

+226
-29
lines changed

14 files changed

+226
-29
lines changed

‎src/AndroidClient/.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎src/AndroidClient/android/android.iml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,31 +88,34 @@
8888
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/extractedTypedefs" />
9797
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9898
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
100101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
101102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
102103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
103105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
105107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
106109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
107111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
109112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/publish-proguard" />
110114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
111115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
112116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
113117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
114118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
116119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
117120
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
118121
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -135,5 +138,6 @@
135138
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
136139
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
137140
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
141+
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
138142
</component>
139143
</module>

‎src/AndroidClient/android/src/main/java/net/servicestack/GetNavItemsResponse.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package net.servicestack;
2+
3+
import net.servicestack.client.DataContract;
4+
import net.servicestack.client.DataMember;
5+
import net.servicestack.client.ResponseStatus;
6+
7+
import java.util.ArrayList;
8+
import java.util.HashMap;
9+
10+
@DataContract
11+
public class GetNavItemsResponse
12+
{
13+
@DataMember(Order=1)
14+
public ArrayList<NavItem> results = null;
15+
16+
@DataMember(Order=2)
17+
public HashMap<String,ArrayList<NavItem>> navItemsMap = null;
18+
19+
@DataMember(Order=3)
20+
public HashMap<String,String> meta = null;
21+
22+
@DataMember(Order=4)
23+
public ResponseStatus responseStatus = null;
24+
25+
public ArrayList<NavItem> getResults() { return results; }
26+
public GetNavItemsResponse setResults(ArrayList<NavItem> value) { this.results = value; return this; }
27+
public HashMap<String,ArrayList<NavItem>> getNavItemsMap() { return navItemsMap; }
28+
public GetNavItemsResponse setNavItemsMap(HashMap<String,ArrayList<NavItem>> value) { this.navItemsMap = value; return this; }
29+
public HashMap<String,String> getMeta() { return meta; }
30+
public GetNavItemsResponse setMeta(HashMap<String,String> value) { this.meta = value; return this; }
31+
public ResponseStatus getResponseStatus() { return responseStatus; }
32+
public GetNavItemsResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; }
33+
}

‎src/AndroidClient/android/src/main/java/net/servicestack/NavItem.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package net.servicestack;
2+
3+
import java.util.ArrayList;
4+
import java.util.HashMap;
5+
6+
public class NavItem
7+
{
8+
public String label = null;
9+
public String href = null;
10+
public Boolean exact = null;
11+
public String id = null;
12+
public String className = null;
13+
public String iconHtml = null;
14+
public String show = null;
15+
public String hide = null;
16+
public ArrayList<NavItem> children = null;
17+
public HashMap<String,String> meta = null;
18+
19+
public String getLabel() { return label; }
20+
public NavItem setLabel(String value) { this.label = value; return this; }
21+
public String getHref() { return href; }
22+
public NavItem setHref(String value) { this.href = value; return this; }
23+
public Boolean isExact() { return exact; }
24+
public NavItem setExact(Boolean value) { this.exact = value; return this; }
25+
public String getId() { return id; }
26+
public NavItem setId(String value) { this.id = value; return this; }
27+
public String getClassName() { return className; }
28+
public NavItem setClassName(String value) { this.className = value; return this; }
29+
public String getIconHtml() { return iconHtml; }
30+
public NavItem setIconHtml(String value) { this.iconHtml = value; return this; }
31+
public String getShow() { return show; }
32+
public NavItem setShow(String value) { this.show = value; return this; }
33+
public String getHide() { return hide; }
34+
public NavItem setHide(String value) { this.hide = value; return this; }
35+
public ArrayList<NavItem> getChildren() { return children; }
36+
public NavItem setChildren(ArrayList<NavItem> value) { this.children = value; return this; }
37+
public HashMap<String,String> getMeta() { return meta; }
38+
public NavItem setMeta(HashMap<String,String> value) { this.meta = value; return this; }
39+
}

‎src/AndroidClient/android/src/main/java/net/servicestack/client/GetNavItems.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package net.servicestack.client;
2+
3+
import net.servicestack.GetNavItemsResponse;
4+
5+
@Route("/metadata/nav")
6+
@DataContract
7+
public class GetNavItems implements IReturn<GetNavItemsResponse>
8+
{
9+
10+
private static Object responseType = GetNavItemsResponse.class;
11+
public Object getResponseType() { return responseType; }
12+
}

‎src/AndroidClient/androidchat/androidchat.iml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,40 +87,35 @@
8787
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
9091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
9797
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
10398
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
105100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
106101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
107103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
109105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
110106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
111107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
112108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
113-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
114109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
116110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
117111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
118112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
119-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
120113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
121115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
122116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
123117
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
118+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
124119
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
125120
</content>
126121
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
@@ -200,5 +195,6 @@
200195
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-28.0.0" level="project" />
201196
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-messenger-4.31.0" level="project" />
202197
<orderEntry type="module" module-name="android" />
198+
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
203199
</component>
204200
</module>

‎src/AndroidClient/app/app.iml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,21 @@
109109
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
110110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
111111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
112113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
113114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
114115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
115116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
117+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
116118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
117119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
118120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
121+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
119122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
120123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
124+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
121125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
126+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
122127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
123128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
124129
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
@@ -128,9 +133,11 @@
128133
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
129134
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
130135
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
136+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
131137
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
132138
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
133139
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
140+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
134141
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
135142
</content>
136143
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
@@ -170,5 +177,6 @@
170177
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-28.0.0" level="project" />
171178
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.1" level="project" />
172179
<orderEntry type="module" module-name="android" />
180+
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
173181
</component>
174182
</module>

‎src/AndroidClient/client/client.iml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,5 @@
3131
<orderEntry type="library" exported="" scope="TEST" name="Gradle: JUnitParams-1.1.1" level="project" />
3232
<orderEntry type="library" exported="" scope="TEST" name="Gradle: junit-4.12" level="project" />
3333
<orderEntry type="library" exported="" scope="TEST" name="Gradle: hamcrest-core-1.3" level="project" />
34-
<orderEntry type="library" exported="" name="client.client-1.0.35" level="project" />
35-
<orderEntry type="library" exported="" name="client.client-1.0.35-sources" level="project" />
36-
<orderEntry type="library" exported="" name="client.client-1.0.35-javadoc" level="project" />
37-
<orderEntry type="library" exported="" name="client.client-1.0.35" level="project" />
38-
<orderEntry type="library" exported="" name="client.client-1.0.35" level="project" />
39-
<orderEntry type="library" exported="" name="client.client-1.0.35" level="project" />
40-
<orderEntry type="library" exported="" name="client.client-1.0.35" level="project" />
41-
<orderEntry type="library" exported="" name="client.client-1.0.35" level="project" />
42-
<orderEntry type="library" exported="" name="client.client-1.0.35" level="project" />
43-
<orderEntry type="library" exported="" name="client.client-1.0.35" level="project" />
4434
</component>
4535
</module>

‎src/AndroidClient/client/src/main/java/net/servicestack/GetNavItemsResponse.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package net.servicestack;
2+
3+
import net.servicestack.client.DataContract;
4+
import net.servicestack.client.DataMember;
5+
import net.servicestack.client.ResponseStatus;
6+
7+
import java.util.ArrayList;
8+
import java.util.HashMap;
9+
10+
@DataContract
11+
public class GetNavItemsResponse
12+
{
13+
@DataMember(Order=1)
14+
public ArrayList<NavItem> results = null;
15+
16+
@DataMember(Order=2)
17+
public HashMap<String,ArrayList<NavItem>> navItemsMap = null;
18+
19+
@DataMember(Order=3)
20+
public HashMap<String,String> meta = null;
21+
22+
@DataMember(Order=4)
23+
public ResponseStatus responseStatus = null;
24+
25+
public ArrayList<NavItem> getResults() { return results; }
26+
public GetNavItemsResponse setResults(ArrayList<NavItem> value) { this.results = value; return this; }
27+
public HashMap<String,ArrayList<NavItem>> getNavItemsMap() { return navItemsMap; }
28+
public GetNavItemsResponse setNavItemsMap(HashMap<String,ArrayList<NavItem>> value) { this.navItemsMap = value; return this; }
29+
public HashMap<String,String> getMeta() { return meta; }
30+
public GetNavItemsResponse setMeta(HashMap<String,String> value) { this.meta = value; return this; }
31+
public ResponseStatus getResponseStatus() { return responseStatus; }
32+
public GetNavItemsResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; }
33+
}

‎src/AndroidClient/client/src/main/java/net/servicestack/NavItem.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package net.servicestack;
2+
3+
import java.util.ArrayList;
4+
import java.util.HashMap;
5+
6+
public class NavItem
7+
{
8+
public String label = null;
9+
public String href = null;
10+
public Boolean exact = null;
11+
public String id = null;
12+
public String className = null;
13+
public String iconHtml = null;
14+
public String show = null;
15+
public String hide = null;
16+
public ArrayList<NavItem> children = null;
17+
public HashMap<String,String> meta = null;
18+
19+
public String getLabel() { return label; }
20+
public NavItem setLabel(String value) { this.label = value; return this; }
21+
public String getHref() { return href; }
22+
public NavItem setHref(String value) { this.href = value; return this; }
23+
public Boolean isExact() { return exact; }
24+
public NavItem setExact(Boolean value) { this.exact = value; return this; }
25+
public String getId() { return id; }
26+
public NavItem setId(String value) { this.id = value; return this; }
27+
public String getClassName() { return className; }
28+
public NavItem setClassName(String value) { this.className = value; return this; }
29+
public String getIconHtml() { return iconHtml; }
30+
public NavItem setIconHtml(String value) { this.iconHtml = value; return this; }
31+
public String getShow() { return show; }
32+
public NavItem setShow(String value) { this.show = value; return this; }
33+
public String getHide() { return hide; }
34+
public NavItem setHide(String value) { this.hide = value; return this; }
35+
public ArrayList<NavItem> getChildren() { return children; }
36+
public NavItem setChildren(ArrayList<NavItem> value) { this.children = value; return this; }
37+
public HashMap<String,String> getMeta() { return meta; }
38+
public NavItem setMeta(HashMap<String,String> value) { this.meta = value; return this; }
39+
}

0 commit comments

Comments
 (0)