Skip to content

Commit 8a968f0

Browse files
committed
renaming, fromstring added
1 parent f200f98 commit 8a968f0

5 files changed

Lines changed: 362 additions & 324 deletions

File tree

zenoh-flat-jni/build.rs

Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -82,60 +82,61 @@ fn main() {
8282
.class_fun(pq!(z_encoding_id))
8383
.class_fun(pq!(z_encoding_schema))
8484
.data_class(pq!(Encoding))
85-
.class_fun(pq!(z_encoding_to_string))
86-
.class_object_fun(pq!(z_encoding_zenoh_bytes))
87-
.class_object_fun(pq!(z_encoding_zenoh_string))
88-
.class_object_fun(pq!(z_encoding_zenoh_serialized))
89-
.class_object_fun(pq!(z_encoding_application_octet_stream))
90-
.class_object_fun(pq!(z_encoding_text_plain))
91-
.class_object_fun(pq!(z_encoding_application_json))
92-
.class_object_fun(pq!(z_encoding_text_json))
93-
.class_object_fun(pq!(z_encoding_application_cdr))
94-
.class_object_fun(pq!(z_encoding_application_cbor))
95-
.class_object_fun(pq!(z_encoding_application_yaml))
96-
.class_object_fun(pq!(z_encoding_text_yaml))
97-
.class_object_fun(pq!(z_encoding_text_json5))
98-
.class_object_fun(pq!(z_encoding_application_python_serialized_object))
99-
.class_object_fun(pq!(z_encoding_application_protobuf))
100-
.class_object_fun(pq!(z_encoding_application_java_serialized_object))
101-
.class_object_fun(pq!(z_encoding_application_openmetrics_text))
102-
.class_object_fun(pq!(z_encoding_image_png))
103-
.class_object_fun(pq!(z_encoding_image_jpeg))
104-
.class_object_fun(pq!(z_encoding_image_gif))
105-
.class_object_fun(pq!(z_encoding_image_bmp))
106-
.class_object_fun(pq!(z_encoding_image_webp))
107-
.class_object_fun(pq!(z_encoding_application_xml))
108-
.class_object_fun(pq!(z_encoding_application_x_www_form_urlencoded))
109-
.class_object_fun(pq!(z_encoding_text_html))
110-
.class_object_fun(pq!(z_encoding_text_xml))
111-
.class_object_fun(pq!(z_encoding_text_css))
112-
.class_object_fun(pq!(z_encoding_text_javascript))
113-
.class_object_fun(pq!(z_encoding_text_markdown))
114-
.class_object_fun(pq!(z_encoding_text_csv))
115-
.class_object_fun(pq!(z_encoding_application_sql))
116-
.class_object_fun(pq!(z_encoding_application_coap_payload))
117-
.class_object_fun(pq!(z_encoding_application_json_patch_json))
118-
.class_object_fun(pq!(z_encoding_application_json_seq))
119-
.class_object_fun(pq!(z_encoding_application_jsonpath))
120-
.class_object_fun(pq!(z_encoding_application_jwt))
121-
.class_object_fun(pq!(z_encoding_application_mp4))
122-
.class_object_fun(pq!(z_encoding_application_soap_xml))
123-
.class_object_fun(pq!(z_encoding_application_yang))
124-
.class_object_fun(pq!(z_encoding_audio_aac))
125-
.class_object_fun(pq!(z_encoding_audio_flac))
126-
.class_object_fun(pq!(z_encoding_audio_mp4))
127-
.class_object_fun(pq!(z_encoding_audio_ogg))
128-
.class_object_fun(pq!(z_encoding_audio_vorbis))
129-
.class_object_fun(pq!(z_encoding_video_h261))
130-
.class_object_fun(pq!(z_encoding_video_h263))
131-
.class_object_fun(pq!(z_encoding_video_h264))
132-
.class_object_fun(pq!(z_encoding_video_h265))
133-
.class_object_fun(pq!(z_encoding_video_h266))
134-
.class_object_fun(pq!(z_encoding_video_mp4))
135-
.class_object_fun(pq!(z_encoding_video_ogg))
136-
.class_object_fun(pq!(z_encoding_video_raw))
137-
.class_object_fun(pq!(z_encoding_video_vp8))
138-
.class_object_fun(pq!(z_encoding_video_vp9))
85+
.class_fun(pq!(encoding_to_string))
86+
.class_object_fun(pq!(encoding_from_string))
87+
.class_object_fun(pq!(encoding_zenoh_bytes))
88+
.class_object_fun(pq!(encoding_zenoh_string))
89+
.class_object_fun(pq!(encoding_zenoh_serialized))
90+
.class_object_fun(pq!(encoding_application_octet_stream))
91+
.class_object_fun(pq!(encoding_text_plain))
92+
.class_object_fun(pq!(encoding_application_json))
93+
.class_object_fun(pq!(encoding_text_json))
94+
.class_object_fun(pq!(encoding_application_cdr))
95+
.class_object_fun(pq!(encoding_application_cbor))
96+
.class_object_fun(pq!(encoding_application_yaml))
97+
.class_object_fun(pq!(encoding_text_yaml))
98+
.class_object_fun(pq!(encoding_text_json5))
99+
.class_object_fun(pq!(encoding_application_python_serialized_object))
100+
.class_object_fun(pq!(encoding_application_protobuf))
101+
.class_object_fun(pq!(encoding_application_java_serialized_object))
102+
.class_object_fun(pq!(encoding_application_openmetrics_text))
103+
.class_object_fun(pq!(encoding_image_png))
104+
.class_object_fun(pq!(encoding_image_jpeg))
105+
.class_object_fun(pq!(encoding_image_gif))
106+
.class_object_fun(pq!(encoding_image_bmp))
107+
.class_object_fun(pq!(encoding_image_webp))
108+
.class_object_fun(pq!(encoding_application_xml))
109+
.class_object_fun(pq!(encoding_application_x_www_form_urlencoded))
110+
.class_object_fun(pq!(encoding_text_html))
111+
.class_object_fun(pq!(encoding_text_xml))
112+
.class_object_fun(pq!(encoding_text_css))
113+
.class_object_fun(pq!(encoding_text_javascript))
114+
.class_object_fun(pq!(encoding_text_markdown))
115+
.class_object_fun(pq!(encoding_text_csv))
116+
.class_object_fun(pq!(encoding_application_sql))
117+
.class_object_fun(pq!(encoding_application_coap_payload))
118+
.class_object_fun(pq!(encoding_application_json_patch_json))
119+
.class_object_fun(pq!(encoding_application_json_seq))
120+
.class_object_fun(pq!(encoding_application_jsonpath))
121+
.class_object_fun(pq!(encoding_application_jwt))
122+
.class_object_fun(pq!(encoding_application_mp4))
123+
.class_object_fun(pq!(encoding_application_soap_xml))
124+
.class_object_fun(pq!(encoding_application_yang))
125+
.class_object_fun(pq!(encoding_audio_aac))
126+
.class_object_fun(pq!(encoding_audio_flac))
127+
.class_object_fun(pq!(encoding_audio_mp4))
128+
.class_object_fun(pq!(encoding_audio_ogg))
129+
.class_object_fun(pq!(encoding_audio_vorbis))
130+
.class_object_fun(pq!(encoding_video_h261))
131+
.class_object_fun(pq!(encoding_video_h263))
132+
.class_object_fun(pq!(encoding_video_h264))
133+
.class_object_fun(pq!(encoding_video_h265))
134+
.class_object_fun(pq!(encoding_video_h266))
135+
.class_object_fun(pq!(encoding_video_mp4))
136+
.class_object_fun(pq!(encoding_video_ogg))
137+
.class_object_fun(pq!(encoding_video_raw))
138+
.class_object_fun(pq!(encoding_video_vp8))
139+
.class_object_fun(pq!(encoding_video_vp9))
139140
.package("pubsub")
140141
.ptr_class(pq!(ZPublisher))
141142
.class_fun(pq!(z_publisher_put))
@@ -153,6 +154,7 @@ fn main() {
153154
[
154155
IntoSource::borrow(pq!(Encoding)),
155156
IntoSource::borrow(pq!(ZEncoding)),
157+
IntoSource::borrow(pq!(String)),
156158
],
157159
)
158160
;

zenoh-flat-jni/generated-kotlin/io/zenoh/jni/JNINative.kt

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,61 @@ import io.zenoh.jni.keyexpr.ZKeyExpr
1515
import io.zenoh.jni.scouting.ZScout
1616

1717
internal object JNINative {
18+
external fun encodingApplicationCbor(): Encoding
19+
external fun encodingApplicationCdr(): Encoding
20+
external fun encodingApplicationCoapPayload(): Encoding
21+
external fun encodingApplicationJavaSerializedObject(): Encoding
22+
external fun encodingApplicationJson(): Encoding
23+
external fun encodingApplicationJsonPatchJson(): Encoding
24+
external fun encodingApplicationJsonSeq(): Encoding
25+
external fun encodingApplicationJsonpath(): Encoding
26+
external fun encodingApplicationJwt(): Encoding
27+
external fun encodingApplicationMp4(): Encoding
28+
external fun encodingApplicationOctetStream(): Encoding
29+
external fun encodingApplicationOpenmetricsText(): Encoding
30+
external fun encodingApplicationProtobuf(): Encoding
31+
external fun encodingApplicationPythonSerializedObject(): Encoding
32+
external fun encodingApplicationSoapXml(): Encoding
33+
external fun encodingApplicationSql(): Encoding
34+
external fun encodingApplicationXWwwFormUrlencoded(): Encoding
35+
external fun encodingApplicationXml(): Encoding
36+
external fun encodingApplicationYaml(): Encoding
37+
external fun encodingApplicationYang(): Encoding
38+
external fun encodingAudioAac(): Encoding
39+
external fun encodingAudioFlac(): Encoding
40+
external fun encodingAudioMp4(): Encoding
41+
external fun encodingAudioOgg(): Encoding
42+
external fun encodingAudioVorbis(): Encoding
43+
external fun encodingFromString(s: String): Encoding
44+
external fun encodingImageBmp(): Encoding
45+
external fun encodingImageGif(): Encoding
46+
external fun encodingImageJpeg(): Encoding
47+
external fun encodingImagePng(): Encoding
48+
external fun encodingImageWebp(): Encoding
49+
external fun encodingTextCss(): Encoding
50+
external fun encodingTextCsv(): Encoding
51+
external fun encodingTextHtml(): Encoding
52+
external fun encodingTextJavascript(): Encoding
53+
external fun encodingTextJson(): Encoding
54+
external fun encodingTextJson5(): Encoding
55+
external fun encodingTextMarkdown(): Encoding
56+
external fun encodingTextPlain(): Encoding
57+
external fun encodingTextXml(): Encoding
58+
external fun encodingTextYaml(): Encoding
59+
external fun encodingToString(e: Encoding): String
60+
external fun encodingVideoH261(): Encoding
61+
external fun encodingVideoH263(): Encoding
62+
external fun encodingVideoH264(): Encoding
63+
external fun encodingVideoH265(): Encoding
64+
external fun encodingVideoH266(): Encoding
65+
external fun encodingVideoMp4(): Encoding
66+
external fun encodingVideoOgg(): Encoding
67+
external fun encodingVideoRaw(): Encoding
68+
external fun encodingVideoVp8(): Encoding
69+
external fun encodingVideoVp9(): Encoding
70+
external fun encodingZenohBytes(): Encoding
71+
external fun encodingZenohSerialized(): Encoding
72+
external fun encodingZenohString(): Encoding
1873
external fun initAndroidLogs(filter: String)
1974
external fun initZenohLogsFromEnvOr(fallbackFilter: String)
2075
external fun keyexprAutocanonize(s: String): KeyExpr
@@ -33,62 +88,8 @@ internal object JNINative {
3388
external fun zConfigFromYaml(s: String): Long
3489
external fun zConfigGetJson(c: Long, key: String): String
3590
external fun zConfigInsertJson5(c: Long, key: String, value: String)
36-
external fun zEncodingApplicationCbor(): Encoding
37-
external fun zEncodingApplicationCdr(): Encoding
38-
external fun zEncodingApplicationCoapPayload(): Encoding
39-
external fun zEncodingApplicationJavaSerializedObject(): Encoding
40-
external fun zEncodingApplicationJson(): Encoding
41-
external fun zEncodingApplicationJsonPatchJson(): Encoding
42-
external fun zEncodingApplicationJsonSeq(): Encoding
43-
external fun zEncodingApplicationJsonpath(): Encoding
44-
external fun zEncodingApplicationJwt(): Encoding
45-
external fun zEncodingApplicationMp4(): Encoding
46-
external fun zEncodingApplicationOctetStream(): Encoding
47-
external fun zEncodingApplicationOpenmetricsText(): Encoding
48-
external fun zEncodingApplicationProtobuf(): Encoding
49-
external fun zEncodingApplicationPythonSerializedObject(): Encoding
50-
external fun zEncodingApplicationSoapXml(): Encoding
51-
external fun zEncodingApplicationSql(): Encoding
52-
external fun zEncodingApplicationXWwwFormUrlencoded(): Encoding
53-
external fun zEncodingApplicationXml(): Encoding
54-
external fun zEncodingApplicationYaml(): Encoding
55-
external fun zEncodingApplicationYang(): Encoding
56-
external fun zEncodingAudioAac(): Encoding
57-
external fun zEncodingAudioFlac(): Encoding
58-
external fun zEncodingAudioMp4(): Encoding
59-
external fun zEncodingAudioOgg(): Encoding
60-
external fun zEncodingAudioVorbis(): Encoding
6191
external fun zEncodingId(e: Long): Int
62-
external fun zEncodingImageBmp(): Encoding
63-
external fun zEncodingImageGif(): Encoding
64-
external fun zEncodingImageJpeg(): Encoding
65-
external fun zEncodingImagePng(): Encoding
66-
external fun zEncodingImageWebp(): Encoding
6792
external fun zEncodingSchema(e: Long): String
68-
external fun zEncodingTextCss(): Encoding
69-
external fun zEncodingTextCsv(): Encoding
70-
external fun zEncodingTextHtml(): Encoding
71-
external fun zEncodingTextJavascript(): Encoding
72-
external fun zEncodingTextJson(): Encoding
73-
external fun zEncodingTextJson5(): Encoding
74-
external fun zEncodingTextMarkdown(): Encoding
75-
external fun zEncodingTextPlain(): Encoding
76-
external fun zEncodingTextXml(): Encoding
77-
external fun zEncodingTextYaml(): Encoding
78-
external fun zEncodingToString(e: Encoding): String
79-
external fun zEncodingVideoH261(): Encoding
80-
external fun zEncodingVideoH263(): Encoding
81-
external fun zEncodingVideoH264(): Encoding
82-
external fun zEncodingVideoH265(): Encoding
83-
external fun zEncodingVideoH266(): Encoding
84-
external fun zEncodingVideoMp4(): Encoding
85-
external fun zEncodingVideoOgg(): Encoding
86-
external fun zEncodingVideoRaw(): Encoding
87-
external fun zEncodingVideoVp8(): Encoding
88-
external fun zEncodingVideoVp9(): Encoding
89-
external fun zEncodingZenohBytes(): Encoding
90-
external fun zEncodingZenohSerialized(): Encoding
91-
external fun zEncodingZenohString(): Encoding
9293
external fun zHelloLocators(h: Long): List<String>
9394
external fun zHelloWhatami(h: Long): Int
9495
external fun zHelloZid(h: Long): Long

0 commit comments

Comments
 (0)