Merge pull request #156 from 1c-syntax/develop

Релиз v0.7.0

Author: otymko

build.gradle.kts

@@ -28,7 +28,8 @@ dependencies {
     implementation("org.apache.commons", "commons-collections4", "4.4")
 
     // https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream
-    implementation("com.thoughtworks.xstream", "xstream", "1.4.12")
+    // https://github.com/x-stream/xstream/pull/228
+    implementation("com.github.nixel2007.xstream", "xstream", "7c5b15dedea167761ebeae31097f8d91ad3acc81")
 
     // логирование
     implementation("org.slf4j", "slf4j-api", "1.7.30")

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

@@ -21,18 +21,27 @@
  */
 package com.github._1c_syntax.mdclasses.mdo;
 
+import com.github._1c_syntax.mdclasses.mdo.form.FormData;
 import com.github._1c_syntax.mdclasses.mdo.wrapper.DesignerMDO;
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import lombok.Value;
 
-@Value
+@Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true, onlyExplicitlyIncluded = true)
 @NoArgsConstructor
-public class CommonForm extends MDObjectBSL {
+public class CommonForm extends MDObjectBSL implements MDOForm {
+  /**
+   * Данные формы. Читается из отдельного файла
+   * и предоставляет информацию о:
+   * + список элементов формы
+   * + список обработчиков формы
+   * + список реквизитов формы
+   */
+  private FormData data;
 
   public CommonForm(DesignerMDO designerMDO) {
     super(designerMDO);

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

@@ -22,19 +22,35 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.github._1c_syntax.mdclasses.mdo.wrapper.DesignerMDO;
+import com.github._1c_syntax.mdclasses.mdo.wrapper.DesignerXRItems;
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import lombok.Value;
 
-@Value
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+@Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true, onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 public class Document extends MDObjectComplex {
+  /**
+   * Список связанных регистров (где документ является регистратором)
+   */
+  @XStreamImplicit
+  private List<String> registerRecords = Collections.emptyList();
+
   public Document(DesignerMDO designerMDO) {
     super(designerMDO);
+    // registerRecords
+    Optional.ofNullable(designerMDO.getProperties().getRegisterRecords())
+      .map(DesignerXRItems::getItems)
+      .ifPresent(this::setRegisterRecords);
   }
 
   @Override

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

@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.mdclasses.mdo;
 
+import com.github._1c_syntax.mdclasses.mdo.form.FormData;
 import com.github._1c_syntax.mdclasses.mdo.wrapper.DesignerMDO;
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
 import lombok.Data;
@@ -32,7 +33,15 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true, onlyExplicitlyIncluded = true)
 @NoArgsConstructor
-public class Form extends MDObjectBSL {
+public class Form extends MDObjectBSL implements MDOForm {
+  /**
+   * Данные формы. Читается из отдельного файла
+   * и предоставляет информацию о:
+   * + список элементов формы
+   * + список обработчиков формы
+   * + список реквизитов формы
+   */
+  private FormData data;
 
   public Form(DesignerMDO designerMDO) {
     super(designerMDO);
@@ -42,5 +51,4 @@ public Form(DesignerMDO designerMDO) {
   public MDOType getType() {
     return MDOType.FORM;
   }
-
 }

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

@@ -0,0 +1,60 @@
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright © 2019 - 2020
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.mdclasses.mdo;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.regex.Pattern;
+
+/**
+ * POJO представление свойств типа «Обработчики событий» для таких типов метаданных как
+ * «Регламентные задания» или «Подписки на события»
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class Handler {
+
+    private static final String METHOD_HANDLER_SPLIT_REGEX = "\\.";
+    private static final Pattern METHOD_HANDLER_SPLIT_PATTERN = Pattern.compile(METHOD_HANDLER_SPLIT_REGEX);
+
+    private String methodPath = "";
+    private String moduleName = "";
+    private String methodName = "";
+
+    public Handler(String methodPath) {
+        methodPath = methodPath == null ? "" : methodPath;
+
+        this.methodPath = methodPath;
+        String[] data = METHOD_HANDLER_SPLIT_PATTERN.split(methodPath);
+        if (data.length > 1) {
+            this.methodName = data[2];
+            this.moduleName = data[1];
+        }
+    }
+
+    public boolean isEmpty() {
+        return methodPath.isBlank();
+    }
+}

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

@@ -73,6 +73,16 @@ public class MDOConfiguration extends MDObjectBSL {
    */
   private UseMode synchronousPlatformExtensionAndAddInCallUseMode = UseMode.USE;
 
+  /**
+   * Использовать управляемые формы в обычном приложении
+   */
+  private boolean useManagedFormInOrdinaryApplication;
+
+  /**
+   * Использовать обычные формы в управляемом приложении
+   */
+  private boolean useOrdinaryFormInManagedApplication;
+
   /**
    * Режим запуска клиента по умолчанию
    */
@@ -126,6 +136,9 @@ public MDOConfiguration(DesignerMDO designerMDO) {
     configurationExtensionPurpose = designerProperties.getConfigurationExtensionPurpose();
     namePrefix = designerProperties.getNamePrefix();
 
+    useManagedFormInOrdinaryApplication = designerProperties.isUseManagedFormInOrdinaryApplication();
+    useOrdinaryFormInManagedApplication = designerProperties.isUseOrdinaryFormInManagedApplication();
+
     children = designerMDO.getChildObjects().getChildren();
   }
 

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

@@ -0,0 +1,29 @@
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright © 2019 - 2020
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.mdclasses.mdo;
+
+import com.github._1c_syntax.mdclasses.mdo.form.FormData;
+
+public interface MDOForm {
+  FormData getData();
+  void setData(FormData formData);
+}

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

@@ -0,0 +1,35 @@
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright © 2019 - 2020
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.mdclasses.mdo;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class MDOSynonym {
+    @XStreamAlias("key")
+    private String language;
+    @XStreamAlias("value")
+    private String content;
+}

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

@@ -22,15 +22,18 @@
 package com.github._1c_syntax.mdclasses.mdo;
 
 import com.github._1c_syntax.mdclasses.mdo.wrapper.DesignerMDO;
+import com.github._1c_syntax.mdclasses.mdo.wrapper.DesignerSynonym;
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOReference;
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ObjectBelonging;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -55,6 +58,17 @@ public class MDObjectBase implements MDOExtensions {
    */
   protected String name = "";
 
+  /**
+   * Путь к файлу объекта
+   */
+  protected Path path;
+
+  /**
+   * Синонимы объекта
+   */
+  @XStreamImplicit(itemFieldName = "synonym")
+  protected List<MDOSynonym> synonyms = Collections.emptyList();
+
   /**
    * Строка с комментарием объекта
    */
@@ -83,6 +97,7 @@ public class MDObjectBase implements MDOExtensions {
   public MDObjectBase(DesignerMDO designerMDO) {
     uuid = designerMDO.getUuid();
     name = designerMDO.getProperties().getName();
+    synonyms = getSynonymsFromDesignerMDO(designerMDO.getProperties().getSynonyms());
     comment = designerMDO.getProperties().getComment();
     objectBelonging = designerMDO.getProperties().getObjectBelonging();
   }
@@ -103,4 +118,21 @@ public void addIncludedSubsystem(Subsystem subsystem) {
     }
     includedSubsystems.add(subsystem);
   }
+
+  private List<MDOSynonym> getSynonymsFromDesignerMDO(List<DesignerSynonym> synonyms) {
+
+    if (synonyms.isEmpty()) {
+      return Collections.emptyList();
+    }
+    List<MDOSynonym> result = new ArrayList<>();
+    for (DesignerSynonym synonym : synonyms) {
+      MDOSynonym mdoSynonym = new MDOSynonym();
+      mdoSynonym.setLanguage(synonym.getLanguage());
+      mdoSynonym.setContent(synonym.getContent());
+
+      result.add(mdoSynonym);
+    }
+
+    return result;
+  }
 }

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

@@ -0,0 +1,45 @@
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright © 2019 - 2020
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.mdclasses.mdo;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * POJO представление прав доступа объекта метаданных, содержащихся в конкретной роли
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class ObjectRight {
+    private String name = "";
+
+    @XStreamAlias("right")
+    @XStreamImplicit
+    List<Right> rights = Collections.emptyList();
+}