TD-222: Update to valitydev/thrift compiler 0.14.2.3 (#22)

Use msgpack-proto instead of damsel dependency.

package.json

@@ -22,6 +22,6 @@
   "types": "./lib/file_storage.d.ts",
   "devDependencies": {
     "@vality/thrift-codegen": "0.1.1-c81b4b7.0",
-    "damsel": "github:valitydev/damsel#d384c125d16c0204e23b0d96a6ef791244a72315"
+    "msgpack-proto": "github:valitydev/msgpack-proto#ce882a7f1c23248cab840fd672f247567679c9a4"
   }
 }

pom.xml

@@ -59,8 +59,8 @@
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
-            <artifactId>damsel</artifactId>
-            <version>1.563-d384c12</version>
+            <artifactId>msgpack-proto</artifactId>
+            <version>1.14-7e44749</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

proto/base.thrift

@@ -0,0 +1,13 @@
+namespace java dev.vality.file.storage.base
+namespace erlang filestore.base
+
+/**
+ * Отметка во времени согласно RFC 3339.
+ *
+ * Строка должна содержать дату и время в UTC в следующем формате:
+ * `2016-03-22T06:12:27Z`.
+ */
+typedef string Timestamp
+
+/** Идентификатор объекта */
+typedef string ID

proto/file_storage.thrift

@@ -1,8 +1,8 @@
-include "proto/base.thrift"
+include "base.thrift"
 include "proto/msgpack.thrift"
 
 namespace java dev.vality.file.storage
-namespace erlang file_storage
+namespace erlang filestore.storage
 
 // время
 typedef base.Timestamp Timestamp

rebar.config

@@ -1,6 +1,5 @@
 %% Common project erlang options.
 {erl_opts, [
-
     % mandatory
     debug_info,
     warnings_as_errors,
@@ -26,10 +25,7 @@
 ]}.
 
 {deps, [
-    {damsel,
-        {git, "https://github.com/valitydev/damsel.git",
-        {branch, "master"}}
-    }
+    {msgpack_proto, {git, "https://github.com/valitydev/msgpack-proto.git", {branch, "master"}}}
 ]}.
 
 %% XRef checks
@@ -57,18 +53,17 @@
 
 {plugins, [
     {rebar3_thrift_compiler,
-        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {branch, "master"}}}
+        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {branch, "0.4"}}}
 ]}.
 
 {provider_hooks, [
     {pre, [
         {compile, {thrift, compile}},
-        {clean  , {thrift, clean  }}
+        {clean, {thrift, clean}}
     ]}
 ]}.
 
 {thrift_compiler_opts, [
     {in_dir, "proto"},
-    {in_files, all},
-    {gen, "erlang:scoped_typenames"}
+    {gen, "erlang:app_namespaces"}
 ]}.

rebar.lock

@@ -1,4 +1,4 @@
-[{<<"damsel">>,
-  {git,"https://github.com/valitydev/damsel",
-       {ref,"d384c125d16c0204e23b0d96a6ef791244a72315"}},
+[{<<"msgpack_proto">>,
+  {git,"https://github.com/valitydev/msgpack-proto.git",
+       {ref,"7e447496aa5df4a5f1ace7ef2e3c31248b2a3ed0"}},
   0}].

src/file_storage_proto.app.src

@@ -3,6 +3,7 @@
     {vsn, "0.1.0"},
     {applications, [
         kernel,
-        stdlib
+        stdlib,
+        msgpack_proto
     ]}
 ]}.