Update declarations to refer to vality.dev namespace (#4)

* Switch CODEOWNERS * Drop few dead links * Update gitignore rules to ignore generated files
2024-11-06 01:35:19 +00:00 · 2022-01-06 13:30:52 +03:00 · 2022-01-06 13:30:52 +03:00 · 827f692653
commit 827f692653
parent 270043770c
41 changed files with 65 additions and 76 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,11 +8,8 @@
 /_build/
 *.sublime-workspace

-# wercker
-/_builds/
-/_cache/
-/_projects/
-/_steps/
-/_temp/
+# erlang
+/src/*.erl
+/include/*.hrl

 *.iml
--- a/12
+++ b/12
@ -1,6 +1,6 @@
-/proto/ @rbkmoney/erlang @rbkmoney/java @rbkmoney/frontend
-/rebar.* @rbkmoney/erlang
-/src/ @rbkmoney/erlang
-/pom.xml @rbkmoney/java
-/package-lock.json @rbkmoney/frontend
-/package.json @rbkmoney/frontend
+/proto/ @valitydev/erlang @valitydev/java @valitydev/frontend
+/rebar.* @valitydev/erlang
+/src/ @valitydev/erlang
+/pom.xml @valitydev/java
+/package-lock.json @valitydev/frontend
+/package.json @valitydev/frontend
--- a/README.md
+++ b/README.md
@ -1,23 +1,20 @@
 # Damsel

-
-[![Build Status](http://ci.rbkmoney.com/buildStatus/icon?job=rbkmoney_private/damsel/master)](http://ci.rbkmoney.com/job/rbkmoney_private/job/damsel/job/master/)
-
 Systemwide protocol collection.


-# Требования к оформлению Thrift IDL файлов
+## Требования к оформлению Thrift IDL файлов

 - __Namespace:__ 

 	В каждом файле нужно __обязательно__ указывать `namespace` для __JAVA__:
 		
-		namespace java com.rbkmoney.damsel.<name>
+		namespace java dev.vality.damsel.<name>
 			
 	Где `<name>` - имя, уникальное для Thrift IDL файлa в Damsel.
 	
 	
-# Java development
+## Java development

 Собрать дамзель и инсталировать новый jar в локальный мавен репозиторий:

@ -28,7 +25,7 @@ Systemwide protocol collection.

 ```
 <dependency>
-    <groupId>com.rbkmoney</groupId>
+    <groupId>dev.vality</groupId>
    <artifactId>damsel</artifactId>
    <version>1.136-07b0898</version>
    <classifier>v136</classifier>
--- a/build/erlang/src/damsel.app.src
+++ b/build/erlang/src/damsel.app.src
@ -1,11 +1,10 @@
 {application, damsel, [
-    {description, "Damsel modules compiled to use as a dependency"},
+    {description, "Damsel protocol definitions precompiled as a rebar3 dependency"},
    {vsn, "1"},
    {applications, [
        kernel,
        stdlib
    ]},
    {maintainers, [
-        "Mayorov Andrey <a.mayorov@rbkmoney.com>"
    ]}
 ]}.
--- a/package.json
+++ b/package.json
@ -4,9 +4,9 @@
  "description": "",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/rbkmoney/damsel.git"
+    "url": "git+https://github.com/valitydev/damsel.git"
  },
  "author": "rbkmoney",
-  "license": "",
+  "license": "Apache-2.0",
  "private": true
 }
--- a/pom.xml
+++ b/pom.xml
@ -5,9 +5,9 @@
    <modelVersion>4.0.0</modelVersion>

    <parent>
-        <groupId>com.rbkmoney</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.5</version>
+        <groupId>dev.vality</groupId>
+        <artifactId>library-parent-pom</artifactId>
+        <version>1.0.0</version>
    </parent>

    <artifactId>damsel</artifactId>
@ -16,19 +16,19 @@

    <name>Damsel</name>
    <description>Generates jar artifact containing compiled thrift classes based on generated thrift IDL files</description>
-    <url>https://github.com/rbkmoney/damsel.git</url>
+    <url>https://github.com/valitydev/damsel.git</url>

    <developers>
        <developer>
-            <organization>RBK.money</organization>
-            <organizationUrl>https://rbk.money</organizationUrl>
+            <organization>Vality</organization>
+            <organizationUrl>https://github.com/valitydev</organizationUrl>
        </developer>
    </developers>

    <scm>
-        <connection>scm:git:git://github.com/rbkmoney/damsel.git</connection>
-        <developerConnection>scm:git:ssh://github.com/rbkmoney/damsel.git</developerConnection>
-        <url>https://github.com/rbkmoney/damsel/tree/master</url>
+        <connection>scm:git:git://github.com/valitydev/damsel.git</connection>
+        <developerConnection>scm:git:ssh://github.com/valitydev/damsel.git</developerConnection>
+        <url>https://github.com/valitydev/damsel/tree/master</url>
    </scm>

    <properties>
@ -37,7 +37,7 @@

    <dependencies>
        <dependency>
-            <groupId>com.rbkmoney.woody</groupId>
+            <groupId>dev.vality.woody</groupId>
            <artifactId>woody-thrift</artifactId>
            <version>[1.1.21,)</version>
            <scope>provided</scope>
@ -89,8 +89,8 @@
                        <configuration>
                            <relocations>
                                <relocation>
-                                    <pattern>com.rbkmoney.damsel</pattern>
-                                    <shadedPattern>com.rbkmoney.damsel.v${commit.number}</shadedPattern>
+                                    <pattern>dev.vality.damsel</pattern>
+                                    <shadedPattern>dev.vality.damsel.v${commit.number}</shadedPattern>
                                </relocation>
                            </relocations>
                            <shadedArtifactAttached>true</shadedArtifactAttached>
--- a/proto/accounter.thrift
+++ b/proto/accounter.thrift
@ -1,7 +1,7 @@
 include 'base.thrift'
 include 'domain.thrift'

-namespace java com.rbkmoney.damsel.accounter
+namespace java dev.vality.damsel.accounter
 namespace erlang accounter
 typedef base.ID PlanID
 typedef i64 BatchID
--- a/proto/base.thrift
+++ b/proto/base.thrift
@ -2,7 +2,7 @@
 * Базовые, наиболее общие определения
 */

-namespace java com.rbkmoney.damsel.base
+namespace java dev.vality.damsel.base

 /** Идентификатор */
 typedef string ID
--- a/proto/claim_management.thrift
+++ b/proto/claim_management.thrift
@ -1,4 +1,4 @@
-namespace java com.rbkmoney.damsel.claim_management
+namespace java dev.vality.damsel.claim_management
 namespace erlang claim_management

 include "base.thrift"
--- a/proto/context.thrift
+++ b/proto/context.thrift
@ -4,7 +4,7 @@

 include "msgpack.thrift"

-namespace java com.rbkmoney.damsel.context
+namespace java dev.vality.damsel.context
 namespace erlang ctx

 // Types
@ -12,7 +12,7 @@ namespace erlang ctx
 /**
 * Пространство имён, отделяющее конексты одного сервиса.
 *
- * Например, `com.rbkmoney.capi`.
+ * Например, `dev.vality.capi`.
 */
 typedef string                  Namespace

--- a/proto/domain.thrift
+++ b/proto/domain.thrift
@ -6,7 +6,7 @@ include "base.thrift"
 include "msgpack.thrift"
 include "json.thrift"

-namespace java com.rbkmoney.damsel.domain
+namespace java dev.vality.damsel.domain
 namespace erlang domain

 typedef i64        DataRevision
@ -323,7 +323,6 @@ struct InvoicePaymentChargedBack {}

 /**
 * Шаблон инвойса.
- * Согласно https://github.com/rbkmoney/coredocs/blob/0a5ae1a79f977be3134c3b22028631da5225d407/docs/domain/entities/invoice.md#шаблон-инвойса
 */

 typedef base.ID InvoiceTemplateID
@ -3198,7 +3197,7 @@ struct IdentityProvider {
 * - all field types must be unique,
 * - all corresponding field names in both unions must match.
 *
- * Otherwise [dmt_core](https://github.com/rbkmoney/dmt_core)'s
+ * Otherwise [dmt_core](https://github.com/valitydev/dmt_core)'s
 * integrity verification mechanism would break.
 */

--- a/proto/domain_config.thrift
+++ b/proto/domain_config.thrift
@ -5,7 +5,7 @@

 include "domain.thrift"

-namespace java com.rbkmoney.damsel.domain_config
+namespace java dev.vality.damsel.domain_config
 namespace erl domain

 /**
--- a/proto/geo_ip.thrift
+++ b/proto/geo_ip.thrift
@ -1,7 +1,7 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.geo_ip
+namespace java dev.vality.damsel.geo_ip
 namespace erlang geo_ip

 /**
--- a/proto/identity_document_storage.thrift
+++ b/proto/identity_document_storage.thrift
@ -1,6 +1,6 @@
 include "base.thrift"

-namespace java com.rbkmoney.damsel.identity_document_storage
+namespace java dev.vality.damsel.identity_document_storage
 namespace erlang ident_doc_store

 /**
--- a/proto/json.thrift
+++ b/proto/json.thrift
@ -1,5 +1,5 @@
 namespace erlang json
-namespace java com.rbkmoney.damsel.json
+namespace java dev.vality.damsel.json

 /**
 * Значение в JSON, согласно [RFC7159](https://tools.ietf.org/html/rfc7159).
--- a/proto/merch_stat.thrift
+++ b/proto/merch_stat.thrift
@ -6,7 +6,7 @@ include "base.thrift"
 include "domain.thrift"
 include "geo_ip.thrift"

-namespace java com.rbkmoney.damsel.merch_stat
+namespace java dev.vality.damsel.merch_stat
 namespace erlang merchstat

 /**
--- a/proto/message_sender.thrift
+++ b/proto/message_sender.thrift
@ -1,7 +1,7 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.message_sender
+namespace java dev.vality.damsel.message_sender
 namespace erlang message_sender

 struct MessageAttachment{
--- a/proto/msgpack.thrift
+++ b/proto/msgpack.thrift
@ -1,5 +1,5 @@
 namespace erlang msgpack
-namespace java com.rbkmoney.damsel.msgpack
+namespace java dev.vality.damsel.msgpack

 /**
 * Значение в msgpack, согласно [спецификации](https://github.com/msgpack/msgpack/blob/master/spec.md).
--- a/proto/papidmt.thrift
+++ b/proto/papidmt.thrift
@ -1,6 +1,6 @@
 include "domain_config.thrift"

-namespace java com.rbkmoney.damsel.papidmt
+namespace java dev.vality.damsel.papidmt
 namespace erlang papidmt

 struct HistoryWrapper {
--- a/proto/payment_processing.thrift
+++ b/proto/payment_processing.thrift
@ -9,7 +9,7 @@ include "timeout_behaviour.thrift"
 include "repairing.thrift"
 include "msgpack.thrift"

-namespace java com.rbkmoney.damsel.payment_processing
+namespace java dev.vality.damsel.payment_processing
 namespace erlang payproc

 /* Interface clients */
--- a/proto/payment_processing_errors.thrift
+++ b/proto/payment_processing_errors.thrift
@ -1,4 +1,4 @@
-namespace java com.rbkmoney.damsel.payment_processing.errors
+namespace java dev.vality.damsel.payment_processing.errors
 namespace erlang payprocerr

 /**
--- a/proto/payment_tool_provider.thrift
+++ b/proto/payment_tool_provider.thrift
@ -1,7 +1,7 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.payment_tool_provider
+namespace java dev.vality.damsel.payment_tool_provider
 namespace erlang paytoolprv

 /**
--- a/proto/payment_tool_token.thrift
+++ b/proto/payment_tool_token.thrift
@ -1,7 +1,7 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.payment_tool_token
+namespace java dev.vality.damsel.payment_tool_token
 namespace erlang ptt

 /**
--- a/proto/payout_processing.thrift
+++ b/proto/payout_processing.thrift
@ -2,7 +2,7 @@ include "base.thrift"
 include "domain.thrift"
 include "msgpack.thrift"

-namespace java com.rbkmoney.damsel.payout_processing
+namespace java dev.vality.damsel.payout_processing
 namespace erlang payout_processing

 typedef base.ID PayoutID
--- a/proto/preauth.thrift
+++ b/proto/preauth.thrift
@ -1,6 +1,6 @@
 include "base.thrift"

-namespace java com.rbkmoney.damsel.preauth
+namespace java dev.vality.damsel.preauth
 namespace erlang preauth

 union Status {
--- a/proto/proto_limiter.thrift
+++ b/proto/proto_limiter.thrift
@ -1,12 +1,10 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.proto_limiter
+namespace java dev.vality.damsel.proto_limiter
 namespace erlang proto_limiter

 /**
-* Протокол разрабатывался в рамках https://rbkmoney.atlassian.net/browse/MSPF-626
-* как временное решение для закрытия задачи https://rbkmoney.atlassian.net/browse/MSPF-623
 * Описание сущностей лимитов является частью микросервиса proto-limiter
 */

--- a/proto/proxy_inspector.thrift
+++ b/proto/proxy_inspector.thrift
@ -1,7 +1,7 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.proxy_inspector
+namespace java dev.vality.damsel.proxy_inspector
 namespace erlang proxy_inspector

 /**
--- a/proto/proxy_provider.thrift
+++ b/proto/proxy_provider.thrift
@ -3,7 +3,7 @@ include "domain.thrift"
 include "user_interaction.thrift"
 include "timeout_behaviour.thrift"

-namespace java com.rbkmoney.damsel.proxy_provider
+namespace java dev.vality.damsel.proxy_provider
 namespace erlang prxprv

 /**
--- a/proto/repairing.thrift
+++ b/proto/repairing.thrift
@ -2,7 +2,7 @@
 * Определения для задач "починки" различных машин.
 */

-namespace java com.rbkmoney.damsel.repairing
+namespace java dev.vality.damsel.repairing
 namespace erlang repair

 include "base.thrift"
--- a/proto/reporting.thrift
+++ b/proto/reporting.thrift
@ -1,7 +1,7 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.reports
+namespace java dev.vality.damsel.reports
 namespace erlang reports

 typedef base.Timestamp Timestamp
--- a/proto/test.thrift
+++ b/proto/test.thrift
@ -4,7 +4,7 @@

 include "base.thrift"

-namespace java com.rbkmoney.damsel.test
+namespace java dev.vality.damsel.test

 struct Shout {
    1: required string contents
--- a/proto/timeout_behaviour.thrift
+++ b/proto/timeout_behaviour.thrift
@ -1,5 +1,5 @@
 namespace erlang tmbhv
-namespace java com.rbkmoney.damsel.timeout_behaviour
+namespace java dev.vality.damsel.timeout_behaviour
 include "base.thrift"
 include "domain.thrift"

--- a/proto/user_interaction.thrift
+++ b/proto/user_interaction.thrift
@ -1,4 +1,4 @@
-namespace java com.rbkmoney.damsel.user_interaction
+namespace java dev.vality.damsel.user_interaction
 include "base.thrift"

 /**
--- a/proto/walker.thrift
+++ b/proto/walker.thrift
@ -2,7 +2,7 @@
    include "base.thrift"
    include "payment_processing.thrift"

-    namespace java com.rbkmoney.damsel.walker
+    namespace java dev.vality.damsel.walker
    namespace erlang walker

    typedef i64 ClaimID
--- a/proto/webhooker.thrift
+++ b/proto/webhooker.thrift
@ -1,7 +1,7 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.webhooker
+namespace java dev.vality.damsel.webhooker
 namespace erlang webhooker

 typedef string Url
--- a/proto/withdrawals_domain.thrift
+++ b/proto/withdrawals_domain.thrift
@ -1,7 +1,7 @@
 include "base.thrift"
 include "domain.thrift"

-namespace java com.rbkmoney.damsel.withdrawals.domain
+namespace java dev.vality.damsel.withdrawals.domain
 namespace erlang wthdm

 /// Domain
--- a/proto/withdrawals_errors.thrift
+++ b/proto/withdrawals_errors.thrift
@ -1,4 +1,4 @@
-namespace java com.rbkmoney.damsel.withdrawals.errors
+namespace java dev.vality.damsel.withdrawals.errors
 namespace erlang wtherr

 union WithdrawalFailure {
--- a/proto/withdrawals_processing.thrift
+++ b/proto/withdrawals_processing.thrift
@ -3,7 +3,7 @@ include "msgpack.thrift"
 include "domain.thrift"
 include "withdrawals_domain.thrift"

-namespace java com.rbkmoney.damsel.withdrawals.processing
+namespace java dev.vality.damsel.withdrawals.processing
 namespace erlang wthproc

 /// Processing
--- a/proto/withdrawals_provider_adapter.thrift
+++ b/proto/withdrawals_provider_adapter.thrift
@ -3,7 +3,7 @@ include "msgpack.thrift"
 include "domain.thrift"
 include "withdrawals_domain.thrift"

-namespace java com.rbkmoney.damsel.withdrawals.provider_adapter
+namespace java dev.vality.damsel.withdrawals.provider_adapter
 namespace erlang wthadpt

 typedef domain.Failure Failure
--- a/rebar.config
+++ b/rebar.config
@ -49,7 +49,7 @@

 {plugins, [
    {rebar3_thrift_compiler,
-        {git, "https://github.com/rbkmoney/rebar3_thrift_compiler.git", {branch, "master"}}}
+        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {tag, "0.3.1"}}}
 ]}.

 {provider_hooks, [
--- a/src/damsel.app.src
+++ b/src/damsel.app.src
@ -1,11 +1,10 @@
 {application, damsel, [
-    {description, "Damsel modules compiled to use as a dependency"},
+    {description, "Damsel protocol definitions"},
    {vsn, "1"},
    {applications, [
        kernel,
        stdlib
    ]},
    {maintainers, [
-        "Mayorov Andrey <a.mayorov@rbkmoney.com>"
    ]}
 ]}.