Merge branch 'release/v0.4.0'

Author: theshadowco

build.gradle.kts

@@ -20,8 +20,8 @@ repositories {
 val junitVersion = "5.5.2"
 dependencies {
 
-    implementation("com.fasterxml.jackson.dataformat", "jackson-dataformat-xml", "2.9.4")
-    implementation("com.fasterxml.jackson.module", "jackson-module-parameter-names", "2.9.4")
+    implementation("com.fasterxml.jackson.dataformat", "jackson-dataformat-xml", "2.10.3")
+    implementation("com.fasterxml.jackson.module", "jackson-module-parameter-names", "2.10.3")
 
     // логирование
     implementation("org.slf4j", "slf4j-api", "1.8.0-beta4")

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

@@ -1,15 +1,12 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Map;
-
 @Value
 @EqualsAndHashCode(callSuper = true)
 @JsonDeserialize(builder = AccountingRegister.AccountingRegisterBuilderImpl.class)
@@ -19,12 +16,5 @@ public class AccountingRegister extends MDObjectBase {
   @JsonPOJOBuilder(withPrefix = "")
   @JsonIgnoreProperties(ignoreUnknown = true)
   static final class AccountingRegisterBuilderImpl extends AccountingRegister.AccountingRegisterBuilder<AccountingRegister, AccountingRegister.AccountingRegisterBuilderImpl> {
-
-    @JsonProperty("Properties")
-    @Override
-    public AccountingRegister.AccountingRegisterBuilderImpl properties(Map<String, Object> properties) {
-      super.properties(properties);
-      return this.self();
-    }
   }
 }

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

@@ -1,15 +1,12 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Map;
-
 @Value
 @EqualsAndHashCode(callSuper = true)
 @JsonDeserialize(builder = AccumulationRegister.AccumulationRegisterBuilderImpl.class)
@@ -19,12 +16,5 @@ public class AccumulationRegister extends MDObjectBase {
   @JsonPOJOBuilder(withPrefix = "")
   @JsonIgnoreProperties(ignoreUnknown = true)
   static final class AccumulationRegisterBuilderImpl extends AccumulationRegister.AccumulationRegisterBuilder<AccumulationRegister, AccumulationRegister.AccumulationRegisterBuilderImpl> {
-
-    @JsonProperty("Properties")
-    @Override
-    public AccumulationRegister.AccumulationRegisterBuilderImpl properties(Map<String, Object> properties) {
-      super.properties(properties);
-      return this.self();
-    }
   }
 }

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

@@ -1,15 +1,12 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Map;
-
 @Value
 @EqualsAndHashCode(callSuper = true)
 @JsonDeserialize(builder = BusinessProcess.BusinessProcessBuilderImpl.class)
@@ -19,12 +16,5 @@ public class BusinessProcess extends MDObjectBase {
   @JsonPOJOBuilder(withPrefix = "")
   @JsonIgnoreProperties(ignoreUnknown = true)
   static final class BusinessProcessBuilderImpl extends BusinessProcess.BusinessProcessBuilder<BusinessProcess, BusinessProcess.BusinessProcessBuilderImpl> {
-
-    @JsonProperty("Properties")
-    @Override
-    public BusinessProcess.BusinessProcessBuilderImpl properties(Map<String, Object> properties) {
-      super.properties(properties);
-      return this.self();
-    }
   }
 }

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

@@ -1,15 +1,12 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Map;
-
 @Value
 @EqualsAndHashCode(callSuper = true)
 @JsonDeserialize(builder = CalculationRegister.CalculationRegisterBuilderImpl.class)
@@ -19,12 +16,5 @@ public class CalculationRegister extends MDObjectBase {
   @JsonPOJOBuilder(withPrefix = "")
   @JsonIgnoreProperties(ignoreUnknown = true)
   static final class CalculationRegisterBuilderImpl extends CalculationRegister.CalculationRegisterBuilder<CalculationRegister, CalculationRegister.CalculationRegisterBuilderImpl> {
-
-    @JsonProperty("Properties")
-    @Override
-    public CalculationRegister.CalculationRegisterBuilderImpl properties(Map<String, Object> properties) {
-      super.properties(properties);
-      return this.self();
-    }
   }
 }

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

@@ -1,15 +1,12 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Map;
-
 @Value
 @EqualsAndHashCode(callSuper = true)
 @JsonDeserialize(builder = Catalog.CatalogBuilderImpl.class)
@@ -19,12 +16,5 @@ public class Catalog extends MDObjectBase {
   @JsonPOJOBuilder(withPrefix = "")
   @JsonIgnoreProperties(ignoreUnknown = true)
   static final class CatalogBuilderImpl extends Catalog.CatalogBuilder<Catalog, Catalog.CatalogBuilderImpl> {
-
-    @JsonProperty("Properties")
-    @Override
-    public Catalog.CatalogBuilderImpl properties(Map<String, Object> properties) {
-      super.properties(properties);
-      return this.self();
-    }
   }
 }

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

@@ -1,15 +1,12 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Map;
-
 @Value
 @EqualsAndHashCode(callSuper = true)
 @JsonDeserialize(builder = ChartOfAccounts.ChartOfAccountsBuilderImpl.class)
@@ -19,12 +16,5 @@ public class ChartOfAccounts extends MDObjectBase {
   @JsonPOJOBuilder(withPrefix = "")
   @JsonIgnoreProperties(ignoreUnknown = true)
   static final class ChartOfAccountsBuilderImpl extends ChartOfAccounts.ChartOfAccountsBuilder<ChartOfAccounts, ChartOfAccounts.ChartOfAccountsBuilderImpl> {
-
-    @JsonProperty("Properties")
-    @Override
-    public ChartOfAccounts.ChartOfAccountsBuilderImpl properties(Map<String, Object> properties) {
-      super.properties(properties);
-      return this.self();
-    }
   }
 }

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

@@ -1,15 +1,12 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Map;
-
 @Value
 @EqualsAndHashCode(callSuper = true)
 @JsonDeserialize(builder = ChartOfCalculationTypes.ChartOfCalculationTypesBuilderImpl.class)
@@ -19,12 +16,5 @@ public class ChartOfCalculationTypes extends MDObjectBase {
   @JsonPOJOBuilder(withPrefix = "")
   @JsonIgnoreProperties(ignoreUnknown = true)
   static final class ChartOfCalculationTypesBuilderImpl extends ChartOfCalculationTypes.ChartOfCalculationTypesBuilder<ChartOfCalculationTypes, ChartOfCalculationTypes.ChartOfCalculationTypesBuilderImpl> {
-
-    @JsonProperty("Properties")
-    @Override
-    public ChartOfCalculationTypes.ChartOfCalculationTypesBuilderImpl properties(Map<String, Object> properties) {
-      super.properties(properties);
-      return this.self();
-    }
   }
 }

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

@@ -1,15 +1,12 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Map;
-
 @Value
 @EqualsAndHashCode(callSuper = true)
 @JsonDeserialize(builder = ChartOfCharacteristicTypes.ChartOfCharacteristicTypesBuilderImpl.class)
@@ -19,12 +16,5 @@ public class ChartOfCharacteristicTypes extends MDObjectBase {
   @JsonPOJOBuilder(withPrefix = "")
   @JsonIgnoreProperties(ignoreUnknown = true)
   static final class ChartOfCharacteristicTypesBuilderImpl extends ChartOfCharacteristicTypes.ChartOfCharacteristicTypesBuilder<ChartOfCharacteristicTypes, ChartOfCharacteristicTypes.ChartOfCharacteristicTypesBuilderImpl> {
-
-    @JsonProperty("Properties")
-    @Override
-    public ChartOfCharacteristicTypes.ChartOfCharacteristicTypesBuilderImpl properties(Map<String, Object> properties) {
-      super.properties(properties);
-      return this.self();
-    }
   }
 }

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

@@ -0,0 +1,20 @@
+package com.github._1c_syntax.mdclasses.mdo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import lombok.experimental.SuperBuilder;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+@JsonDeserialize(builder = Command.CommandBuilderImpl.class)
+@SuperBuilder
+public class Command extends MDObjectBase {
+
+  @JsonPOJOBuilder(withPrefix = "")
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  static final class CommandBuilderImpl extends Command.CommandBuilder<Command, Command.CommandBuilderImpl> {
+  }
+}