Finish v0.17.4

Author: theshadowco

build.gradle.kts

@@ -7,9 +7,9 @@ plugins {
     jacoco
     id("cloud.rio.license") version "0.18.0"
     id("me.qoomon.git-versioning") version "6.4.4"
-    id("io.freefair.lombok") version "9.1.0"
-    id("io.freefair.javadoc-links") version "9.1.0"
-    id("io.freefair.javadoc-utf-8") version "9.1.0"
+    id("io.freefair.lombok") version "9.2.0"
+    id("io.freefair.javadoc-links") version "9.2.0"
+    id("io.freefair.javadoc-utf-8") version "9.2.0"
 //    id("io.freefair.maven-central.validate-poms") version "9.1.0" не работает на 9 градле
     id("com.github.ben-manes.versions") version "0.53.0"
     id("ru.vyarus.pom") version "3.0.0"

src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/RoleDataConverter.java

@@ -27,12 +27,12 @@
 import com.github._1c_syntax.bsl.reader.common.xstream.ReadConverter;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-
-import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Используется для преобразования содержимого пакета XDTO
  */
+@Slf4j
 @CommonConverter
 public class RoleDataConverter implements ReadConverter {
 
@@ -54,15 +54,15 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
       if (OBJECT_NODE_NAME.equals(name)) {
         var objectRight = readObjectRight(reader, context);
         builder.objectRight(objectRight);
-      } else if (RESTRICTION_TEMPLATE_NODE_NAME.equals(name)) {
-        // пропускаем
-        reader.moveUp();
-        continue;
-      } else {
+      } else if (!RESTRICTION_TEMPLATE_NODE_NAME.equals(name)) { // рестрикций пока нет
         var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
-        Objects.requireNonNull(fieldClass, "Field type not found for: " + name);
-        var value = ExtendXStream.readValue(context, fieldClass);
-        TransformationUtils.setValue(builder, name, value);
+        if (fieldClass != null) {
+          var value = ExtendXStream.readValue(context, fieldClass);
+          TransformationUtils.setValue(builder, name, value);
+        } else {
+          // пропустим без падения и будем надеяться, что о ворнинге кто-то скажет
+          LOGGER.warn("Field type not found for {}", name);
+        }
       }
 
       reader.moveUp();
@@ -81,11 +81,10 @@ private static RoleData.ObjectRight readObjectRight(HierarchicalStreamReader rea
         builder.right(right);
       } else {
         var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
-        if (fieldClass == null) {
-          continue;
+        if (fieldClass != null) {
+          var value = ExtendXStream.readValue(context, fieldClass);
+          TransformationUtils.setValue(builder, name, value);
         }
-        var value = ExtendXStream.readValue(context, fieldClass);
-        TransformationUtils.setValue(builder, name, value);
       }
 
       reader.moveUp();
@@ -100,11 +99,10 @@ private static RoleData.Right readRight(HierarchicalStreamReader reader, Unmarsh
       reader.moveDown();
       var name = reader.getNodeName();
       var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
-      if (fieldClass == null) {
-        continue;
+      if (fieldClass != null) {
+        var value = ExtendXStream.readValue(context, fieldClass);
+        TransformationUtils.setValue(builder, name, value);
       }
-      var value = ExtendXStream.readValue(context, fieldClass);
-      TransformationUtils.setValue(builder, name, value);
       reader.moveUp();
     }
 

src/test/java/com/github/_1c_syntax/bsl/mdclasses/helpers/RightsTest.java

@@ -57,7 +57,7 @@ void rightAccessCf() {
     mdv = cf.findChild("Task.ЗадачаИсполнителя.Command.Перенаправить");
     assertThat(mdv).isPresent();
     md = mdv.get();
-    assertThat(Rights.rightAccess(cf, RoleRight.VIEW, md)).isFalse();
+    assertThat(Rights.rightAccess(cf, RoleRight.VIEW, md)).isTrue();
     assertThat(Rights.rightAccess(cf, RoleRight.USE, md)).isFalse();
     assertThat(cf.rightAccess(RoleRight.START, md)).isFalse();
 
@@ -105,21 +105,21 @@ void rolesAccessCf() {
       .anyMatch(role -> role.getName().equals("ЗапускТолстогоКлиента"));
 
     assertThat(Rights.rolesAccess(cf, RoleRight.ALL_FUNCTIONS_MODE)).isEmpty();
-    assertThat(cf.rolesAccess(RoleRight.ANALYTICS_SYSTEM_CLIENT)).hasSize(78);
+    assertThat(cf.rolesAccess(RoleRight.ANALYTICS_SYSTEM_CLIENT)).hasSize(103);
 
     var mdv = cf.findChild("Document.Анкета");
     assertThat(mdv).isPresent();
     var md = mdv.get();
     assertThat(Rights.rolesAccess(cf, RoleRight.DELETE, md)).hasSize(1);
     assertThat(Rights.rolesAccess(cf, RoleRight.INTERACTIVE_DELETE, md)).isEmpty();
-    assertThat(Rights.rolesAccess(cf, RoleRight.VIEW, md)).hasSize(1);
+    assertThat(Rights.rolesAccess(cf, RoleRight.VIEW, md)).hasSize(2);
     assertThat(Rights.rolesAccess(cf, RoleRight.USE, md)).isEmpty();
     assertThat(cf.rolesAccess(RoleRight.INTERACTIVE_DELETE_MARKED, md)).isEmpty();
 
     mdv = cf.findChild("Task.ЗадачаИсполнителя.Command.Перенаправить");
     assertThat(mdv).isPresent();
     md = mdv.get();
-    assertThat(Rights.rolesAccess(cf, RoleRight.VIEW, md)).isEmpty();
+    assertThat(Rights.rolesAccess(cf, RoleRight.VIEW, md)).hasSize(4);
     assertThat(Rights.rolesAccess(cf, RoleRight.USE, md)).isEmpty();
     assertThat(cf.rolesAccess(RoleRight.DELETE, md)).isEmpty();