Merge pull request #461 from 1c-syntax/feature/458

Обработка отсутствия элементов перечислений

Author: theshadowco

src/main/java/com/github/_1c_syntax/bsl/mdo/support/ApplicationRunMode.java

@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.bsl.mdo.support;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.bsl.mdo.support;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -34,7 +34,13 @@
 public enum ApplicationRunMode implements EnumWithValue {
   AUTO("Auto"),
   MANAGED_APPLICATION("ManagedApplication"),
-  ORDINARY_APPLICATION("OrdinaryApplication");
+  ORDINARY_APPLICATION("OrdinaryApplication"),
+  UNKNOWN("unknown") {
+    @Override
+    public boolean isUnknown() {
+      return true;
+    }
+  };
 
   @Accessors(fluent = true)
   private final String value;

src/main/java/com/github/_1c_syntax/bsl/mdo/support/AutoRecordType.java

@@ -20,20 +20,26 @@
  * License along with MDClasses.
  */
 package com.github._1c_syntax.bsl.mdo.support;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.experimental.Accessors;
-
-/**
- * Типы авторегистрации в плане обмена
- */
-@AllArgsConstructor
-@Getter
-public enum AutoRecordType implements EnumWithValue {
-  ALLOW("Allow"),
-  DENY("Deny");
-
-  @Accessors(fluent = true)
-  private final String value;
-}
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+/**
+ * Типы авторегистрации в плане обмена
+ */
+@AllArgsConstructor
+@Getter
+public enum AutoRecordType implements EnumWithValue {
+  ALLOW("Allow"),
+  DENY("Deny"),
+  UNKNOWN("unknown") {
+    @Override
+    public boolean isUnknown() {
+      return true;
+    }
+  };
+
+  @Accessors(fluent = true)
+  private final String value;
+}

src/main/java/com/github/_1c_syntax/bsl/mdo/support/ConfigurationExtensionPurpose.java

@@ -20,22 +20,28 @@
  * License along with MDClasses.
  */
 package com.github._1c_syntax.bsl.mdo.support;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.experimental.Accessors;
-
-/**
- * Возможные виды расширений
- */
-@AllArgsConstructor
-@Getter
-public enum ConfigurationExtensionPurpose implements EnumWithValue {
-  CUSTOMIZATION("Customization"),
-  ADD_ON("AddOn"),
-  PATCH("Patch"),
-  UNDEFINED("Undefined");
-
-  @Accessors(fluent = true)
-  private final String value;
-}
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+/**
+ * Возможные виды расширений
+ */
+@AllArgsConstructor
+@Getter
+public enum ConfigurationExtensionPurpose implements EnumWithValue {
+  CUSTOMIZATION("Customization"),
+  ADD_ON("AddOn"),
+  PATCH("Patch"),
+  UNDEFINED("Undefined"),
+  UNKNOWN("unknown") {
+    @Override
+    public boolean isUnknown() {
+      return true;
+    }
+  };
+
+  @Accessors(fluent = true)
+  private final String value;
+}

src/main/java/com/github/_1c_syntax/bsl/mdo/support/DataLockControlMode.java

@@ -20,21 +20,27 @@
  * License along with MDClasses.
  */
 package com.github._1c_syntax.bsl.mdo.support;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.experimental.Accessors;
-
-/**
- * Возможные варианты режима блокировки
- */
-@AllArgsConstructor
-@Getter
-public enum DataLockControlMode implements EnumWithValue {
-  AUTOMATIC("Automatic"),
-  MANAGED("Managed"),
-  AUTOMATIC_AND_MANAGED("AutomaticAndManaged");
-
-  @Accessors(fluent = true)
-  private final String value;
-}
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+/**
+ * Возможные варианты режима блокировки
+ */
+@AllArgsConstructor
+@Getter
+public enum DataLockControlMode implements EnumWithValue {
+  AUTOMATIC("Automatic"),
+  MANAGED("Managed"),
+  AUTOMATIC_AND_MANAGED("AutomaticAndManaged"),
+  UNKNOWN("unknown") {
+    @Override
+    public boolean isUnknown() {
+      return true;
+    }
+  };
+
+  @Accessors(fluent = true)
+  private final String value;
+}

src/main/java/com/github/_1c_syntax/bsl/mdo/support/DataSeparation.java

@@ -20,20 +20,26 @@
  * License along with MDClasses.
  */
 package com.github._1c_syntax.bsl.mdo.support;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.experimental.Accessors;
-
-/**
- * Возможные варианты свойства `Разделение данных`
- */
-@AllArgsConstructor
-@Getter
-public enum DataSeparation implements EnumWithValue {
-  DONT_USE("DontUse"),
-  SEPARATE("Separate");
-
-  @Accessors(fluent = true)
-  private final String value;
-}
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+/**
+ * Возможные варианты свойства `Разделение данных`
+ */
+@AllArgsConstructor
+@Getter
+public enum DataSeparation implements EnumWithValue {
+  DONT_USE("DontUse"),
+  SEPARATE("Separate"),
+  UNKNOWN("unknown") {
+    @Override
+    public boolean isUnknown() {
+      return true;
+    }
+  };
+
+  @Accessors(fluent = true)
+  private final String value;
+}

src/main/java/com/github/_1c_syntax/bsl/mdo/support/DataSetType.java

@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.bsl.mdo.support;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.bsl.mdo.support;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -30,7 +30,13 @@
 public enum DataSetType implements EnumWithValue {
   DATA_SET_QUERY("DataSetQuery"),
   DATA_SET_UNION("DataSetUnion"),
-  DATA_SET_OBJECT("DataSetObject");
+  DATA_SET_OBJECT("DataSetObject"),
+  UNKNOWN("unknown") {
+    @Override
+    public boolean isUnknown() {
+      return true;
+    }
+  };
 
   @Accessors(fluent = true)
   private final String value;

src/main/java/com/github/_1c_syntax/bsl/mdo/support/EnumWithValue.java

@@ -20,16 +20,22 @@
  * License along with MDClasses.
  */
 package com.github._1c_syntax.bsl.mdo.support;
-
-/**
- * Расширение для перечислений, необходимое для использования в анмаршалинге
- * автор идеи: alkoleft (https://github.com/alkoleft)
- */
-public interface EnumWithValue {
-  /**
-   * Возвращает значение перечисления
-   *
-   * @return Строковое значение перечисления
-   */
-  String value();
-}
+
+/**
+ * Расширение для перечислений, необходимое для использования в анмаршалинге
+ */
+public interface EnumWithValue {
+  /**
+   * Возвращает значение перечисления
+   *
+   * @return Строковое значение перечисления
+   */
+  String value();
+
+  /**
+   * Признак того, что значение используется как значение для неизвестных
+   */
+  default boolean isUnknown() {
+    return false;
+  }
+}

src/main/java/com/github/_1c_syntax/bsl/mdo/support/FormType.java

@@ -20,20 +20,26 @@
  * License along with MDClasses.
  */
 package com.github._1c_syntax.bsl.mdo.support;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.experimental.Accessors;
-
-/**
- * Тип формы (обычная или управляемая)
- */
-@AllArgsConstructor
-@Getter
-public enum FormType implements EnumWithValue {
-  ORDINARY("Ordinary"),
-  MANAGED("Managed");
-
-  @Accessors(fluent = true)
-  private final String value;
-}
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+/**
+ * Тип формы (обычная или управляемая)
+ */
+@AllArgsConstructor
+@Getter
+public enum FormType implements EnumWithValue {
+  ORDINARY("Ordinary"),
+  MANAGED("Managed"),
+  UNKNOWN("unknown") {
+    @Override
+    public boolean isUnknown() {
+      return true;
+    }
+  };
+
+  @Accessors(fluent = true)
+  private final String value;
+}