Skip to content

Commit 4dbf7d1

Browse files
committed
Merge branch 'develop'
2 parents 8beabae + 42a0145 commit 4dbf7d1

File tree

84 files changed

+2882
-953
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2882
-953
lines changed

AUTHORS.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
This project was originally created in 2019 by its authors:
2+
3+
* Tymko Oleg <[email protected]>
4+
* Maximov Valery <[email protected]>
5+
6+
with help of awesome contributors:
7+
8+
* Alexey Sosnoviy (@asosnoviy)
9+
* Nikita Gryzlov (@nixel2007)
10+
* Andrei Ovsiankin (@EvilBeaver)
11+
* Anton Stepanov (@Stepa86)

build.gradle.kts

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import java.net.URI
2+
import java.util.*
23

34
plugins {
45
java
56
maven
67
jacoco
8+
id("com.github.hierynomus.license") version "0.15.0"
79
id("com.github.gradle-git-version-calculator") version "1.1.0"
810
id("io.franzbecker.gradle-lombok") version "3.1.0"
911
id("org.sonarqube") version "2.7.1"
@@ -29,7 +31,7 @@ dependencies {
2931
// прочее
3032
implementation("commons-io", "commons-io", "2.6")
3133
implementation("org.apache.commons", "commons-lang3", "3.9")
32-
implementation("com.github.1c-syntax", "utils", "0.2.0")
34+
implementation("com.github.1c-syntax", "utils", "0.2.1")
3335
// генерики
3436
compileOnly("org.projectlombok", "lombok", lombok.version)
3537
// тестирование
@@ -87,3 +89,22 @@ lombok {
8789
version = "1.18.8"
8890
sha256 = "0396952823579b316a0fe85cbd871bbb3508143c2bcbd985dd7800e806cb24fc"
8991
}
92+
93+
license {
94+
header = rootProject.file("license/HEADER.txt")
95+
ext["year"] = "2019 - " + Calendar.getInstance().get(Calendar.YEAR)
96+
ext["name"] = "Tymko Oleg <[email protected]>, Maximov Valery <[email protected]>"
97+
ext["project"] = "MDClasses"
98+
strictCheck = true
99+
mapping("java", "SLASHSTAR_STYLE")
100+
excludes(listOf(
101+
"**/edt*/**",
102+
"**/origin*/**",
103+
"**/*.bin",
104+
"**/*.html",
105+
"**/*.properties",
106+
"**/*.xml",
107+
"**/*.json",
108+
"**/*.os",
109+
"**/*.bsl"))
110+
}

license/HEADER.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
This file is a part of ${project}.
2+
3+
Copyright © ${year}
4+
${name} and contributors
5+
6+
SPDX-License-Identifier: LGPL-3.0-or-later
7+
8+
${project} is free software; you can redistribute it and/or
9+
modify it under the terms of the GNU Lesser General Public
10+
License as published by the Free Software Foundation; either
11+
version 3.0 of the License, or (at your option) any later version.
12+
13+
${project} is distributed in the hope that it will be useful,
14+
but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
Lesser General Public License for more details.
17+
18+
You should have received a copy of the GNU Lesser General Public
19+
License along with ${project}.

src/main/java/com/github/_1c_syntax/mdclasses/Main.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright © 2019 - 2020
5+
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
122
package com.github._1c_syntax.mdclasses;
223

324
public class Main {

src/main/java/com/github/_1c_syntax/mdclasses/mdo/AccountingRegister.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright © 2019 - 2020
5+
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
122
package com.github._1c_syntax.mdclasses.mdo;
223

324
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
425
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
526
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
27+
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
628
import lombok.EqualsAndHashCode;
729
import lombok.Value;
830
import lombok.experimental.SuperBuilder;
@@ -13,8 +35,13 @@
1335
@SuperBuilder
1436
public class AccountingRegister extends MDObjectBase {
1537

38+
public MDOType getType() {
39+
return MDOType.ACCOUNTING_REGISTER;
40+
}
41+
1642
@JsonPOJOBuilder(withPrefix = "")
1743
@JsonIgnoreProperties(ignoreUnknown = true)
1844
static final class AccountingRegisterBuilderImpl extends AccountingRegister.AccountingRegisterBuilder<AccountingRegister, AccountingRegister.AccountingRegisterBuilderImpl> {
1945
}
46+
2047
}

src/main/java/com/github/_1c_syntax/mdclasses/mdo/AccumulationRegister.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright © 2019 - 2020
5+
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
122
package com.github._1c_syntax.mdclasses.mdo;
223

324
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
425
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
526
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
27+
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
628
import lombok.EqualsAndHashCode;
729
import lombok.Value;
830
import lombok.experimental.SuperBuilder;
@@ -13,6 +35,10 @@
1335
@SuperBuilder
1436
public class AccumulationRegister extends MDObjectBase {
1537

38+
public MDOType getType() {
39+
return MDOType.ACCUMULATION_REGISTER;
40+
}
41+
1642
@JsonPOJOBuilder(withPrefix = "")
1743
@JsonIgnoreProperties(ignoreUnknown = true)
1844
static final class AccumulationRegisterBuilderImpl extends AccumulationRegister.AccumulationRegisterBuilder<AccumulationRegister, AccumulationRegister.AccumulationRegisterBuilderImpl> {

src/main/java/com/github/_1c_syntax/mdclasses/mdo/BusinessProcess.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright © 2019 - 2020
5+
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
122
package com.github._1c_syntax.mdclasses.mdo;
223

324
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
425
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
526
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
27+
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
628
import lombok.EqualsAndHashCode;
729
import lombok.Value;
830
import lombok.experimental.SuperBuilder;
@@ -13,6 +35,10 @@
1335
@SuperBuilder
1436
public class BusinessProcess extends MDObjectBase {
1537

38+
public MDOType getType() {
39+
return MDOType.BUSINESS_PROCESS;
40+
}
41+
1642
@JsonPOJOBuilder(withPrefix = "")
1743
@JsonIgnoreProperties(ignoreUnknown = true)
1844
static final class BusinessProcessBuilderImpl extends BusinessProcess.BusinessProcessBuilder<BusinessProcess, BusinessProcess.BusinessProcessBuilderImpl> {

src/main/java/com/github/_1c_syntax/mdclasses/mdo/CalculationRegister.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright © 2019 - 2020
5+
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
122
package com.github._1c_syntax.mdclasses.mdo;
223

324
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
425
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
526
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
27+
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
628
import lombok.EqualsAndHashCode;
729
import lombok.Value;
830
import lombok.experimental.SuperBuilder;
@@ -13,6 +35,10 @@
1335
@SuperBuilder
1436
public class CalculationRegister extends MDObjectBase {
1537

38+
public MDOType getType() {
39+
return MDOType.CALCULATION_REGISTER;
40+
}
41+
1642
@JsonPOJOBuilder(withPrefix = "")
1743
@JsonIgnoreProperties(ignoreUnknown = true)
1844
static final class CalculationRegisterBuilderImpl extends CalculationRegister.CalculationRegisterBuilder<CalculationRegister, CalculationRegister.CalculationRegisterBuilderImpl> {

src/main/java/com/github/_1c_syntax/mdclasses/mdo/Catalog.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright © 2019 - 2020
5+
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
122
package com.github._1c_syntax.mdclasses.mdo;
223

324
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
425
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
526
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
27+
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
628
import lombok.EqualsAndHashCode;
729
import lombok.Value;
830
import lombok.experimental.SuperBuilder;
@@ -13,6 +35,10 @@
1335
@SuperBuilder
1436
public class Catalog extends MDObjectBase {
1537

38+
public MDOType getType() {
39+
return MDOType.CATALOG;
40+
}
41+
1642
@JsonPOJOBuilder(withPrefix = "")
1743
@JsonIgnoreProperties(ignoreUnknown = true)
1844
static final class CatalogBuilderImpl extends Catalog.CatalogBuilder<Catalog, Catalog.CatalogBuilderImpl> {

src/main/java/com/github/_1c_syntax/mdclasses/mdo/ChartOfAccounts.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright © 2019 - 2020
5+
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
122
package com.github._1c_syntax.mdclasses.mdo;
223

324
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
425
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
526
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
27+
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
628
import lombok.EqualsAndHashCode;
729
import lombok.Value;
830
import lombok.experimental.SuperBuilder;
@@ -13,6 +35,10 @@
1335
@SuperBuilder
1436
public class ChartOfAccounts extends MDObjectBase {
1537

38+
public MDOType getType() {
39+
return MDOType.CHART_OF_ACCOUNTS;
40+
}
41+
1642
@JsonPOJOBuilder(withPrefix = "")
1743
@JsonIgnoreProperties(ignoreUnknown = true)
1844
static final class ChartOfAccountsBuilderImpl extends ChartOfAccounts.ChartOfAccountsBuilder<ChartOfAccounts, ChartOfAccounts.ChartOfAccountsBuilderImpl> {

src/main/java/com/github/_1c_syntax/mdclasses/mdo/ChartOfCalculationTypes.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
/*
2+
* This file is a part of MDClasses.
3+
*
4+
* Copyright © 2019 - 2020
5+
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* MDClasses is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* MDClasses is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with MDClasses.
21+
*/
122
package com.github._1c_syntax.mdclasses.mdo;
223

324
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
425
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
526
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
27+
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
628
import lombok.EqualsAndHashCode;
729
import lombok.Value;
830
import lombok.experimental.SuperBuilder;
@@ -13,6 +35,10 @@
1335
@SuperBuilder
1436
public class ChartOfCalculationTypes extends MDObjectBase {
1537

38+
public MDOType getType() {
39+
return MDOType.CHART_OF_CALCULATION_TYPES;
40+
}
41+
1642
@JsonPOJOBuilder(withPrefix = "")
1743
@JsonIgnoreProperties(ignoreUnknown = true)
1844
static final class ChartOfCalculationTypesBuilderImpl extends ChartOfCalculationTypes.ChartOfCalculationTypesBuilder<ChartOfCalculationTypes, ChartOfCalculationTypes.ChartOfCalculationTypesBuilderImpl> {

0 commit comments

Comments
 (0)