Хотфикс v0.9.1

Внесены правки для корректной работы в составе плагина SonarQube

Author: theshadowco

build.gradle.kts

@@ -41,8 +41,7 @@ dependencies {
     implementation("com.github.1c-syntax", "utils", "0.2.1")
 
     // быстрый поиск классов
-    implementation("org.atteo.classindex", "classindex", "3.10")
-    annotationProcessor("org.atteo.classindex", "classindex", "3.10")
+    implementation("io.github.classgraph:classgraph:4.8.106")
 
     // тестирование
     testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion)

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

@@ -24,6 +24,7 @@
 import com.github._1c_syntax.mdclasses.mdo.attributes.AbstractMDOAttribute;
 import com.github._1c_syntax.mdclasses.mdo.attributes.CommonAttribute;
 import com.github._1c_syntax.mdclasses.mdo.metadata.Metadata;
+import com.github._1c_syntax.mdclasses.mdo.support.DataSeparation;
 import com.github._1c_syntax.mdclasses.mdo.support.MDOType;
 import com.github._1c_syntax.mdclasses.mdo.support.UseMode;
 import com.github._1c_syntax.mdclasses.unmarshal.wrapper.DesignerMDO;
@@ -62,7 +63,7 @@ public class MDCommonAttribute extends AbstractMDObjectBase {
   /**
    * Признак использования общего реквизита как разделителя данных
    */
-  private UseMode dataSeparation = UseMode.DONT_USE;
+  private DataSeparation dataSeparation = DataSeparation.SEPARATE;
 
   /**
    * Список объектов, использующих общий реквизит

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

@@ -24,8 +24,12 @@
 import com.github._1c_syntax.mdclasses.mdo.children.template.TemplateData;
 import com.github._1c_syntax.mdclasses.mdo.children.template.TemplateType;
 
+import java.nio.file.Path;
+
 public interface MDOTemplate {
   TemplateType getTemplateType();
 
   TemplateData<?> getTemplateData();
+
+  Path getTemplateDataPath();
 }

src/main/java/com/github/_1c_syntax/mdclasses/mdo/metadata/AttributeMetadata.java

@@ -21,14 +21,12 @@
  */
 package com.github._1c_syntax.mdclasses.mdo.metadata;
 
-import org.atteo.classindex.IndexAnnotated;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@IndexAnnotated
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface AttributeMetadata {

src/main/java/com/github/_1c_syntax/mdclasses/mdo/metadata/Metadata.java

@@ -22,7 +22,6 @@
 package com.github._1c_syntax.mdclasses.mdo.metadata;
 
 import com.github._1c_syntax.mdclasses.mdo.support.MDOType;
-import org.atteo.classindex.IndexAnnotated;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -32,7 +31,6 @@
 /**
  * Содержит набор метаинформации о типе метаданных
  */
-@IndexAnnotated
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface Metadata {

src/main/java/com/github/_1c_syntax/mdclasses/mdo/metadata/MetadataStorage.java

@@ -21,16 +21,21 @@
  */
 package com.github._1c_syntax.mdclasses.mdo.metadata;
 
-import org.atteo.classindex.ClassIndex;
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfo;
+import lombok.extern.slf4j.Slf4j;
 
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
 
 /**
  * Используется для хранения кэша метаинформации по MD классам
  */
+@Slf4j
 public final class MetadataStorage {
 
   private static final Map<Class<?>, Metadata> STORAGE = computeStorage(Metadata.class);
@@ -70,9 +75,31 @@ public static AttributeMetadata getAttribute(Class<?> clazz) {
   }
 
   private static <T extends Annotation> Map<Class<?>, T> computeStorage(Class<T> annotation) {
-    Map<Class<?>, T> localStorage = new HashMap<>();
-    ClassIndex.getAnnotated(annotation).forEach(
-      clazz -> localStorage.put(clazz, clazz.getAnnotation(annotation)));
-    return Collections.unmodifiableMap(localStorage);
+    try (var scanResult = new ClassGraph()
+            .enableClassInfo()
+            .enableAnnotationInfo()
+            .acceptPackages("com.github._1c_syntax.mdclasses")
+            .scan()) {
+
+      Map<Class<?>, T> localStorage = new HashMap<>();
+      var classes = scanResult.getClassesWithAnnotation(annotation.getName());
+      classes.stream()
+              .map(getClassFromInfoClass())
+              .filter(Objects::nonNull)
+              .forEach(aClass -> localStorage.put(aClass, aClass.getAnnotation(annotation)));
+
+      return Collections.unmodifiableMap(localStorage);
+    }
+  }
+
+  private static Function<ClassInfo, ? extends Class<?>> getClassFromInfoClass() {
+    return classInfo -> {
+      try {
+        return Class.forName(classInfo.getName());
+      } catch (ClassNotFoundException e) {
+        LOGGER.error("Cannot resolve class: " + classInfo.getName());
+        return null;
+      }
+    };
   }
 }

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

@@ -0,0 +1,39 @@
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright © 2019 - 2021
+ * 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.support;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+/**
+ * Возможные варианты свойства `Разделение данных`
+ */
+@AllArgsConstructor
+public enum DataSeparation implements EnumWithValue {
+  DONT_USE("DontUse"),
+  SEPARATE("Separate");
+
+  @Getter
+  @Accessors(fluent = true)
+  private final String value;
+}

src/main/java/com/github/_1c_syntax/mdclasses/unmarshal/ExtendStaxDriver.java

@@ -41,6 +41,8 @@ public class ExtendStaxDriver extends StaxDriver {
 
   public ExtendStaxDriver(QNameMap qNameMap) {
     super(qNameMap);
+    // Do not delete. Implementation via XMLInputFactoryImpl
+    System.setProperty("javax.xml.stream.XMLInputFactory", "com.sun.xml.internal.stream.XMLInputFactoryImpl");
   }
 
   @Override

src/main/java/com/github/_1c_syntax/mdclasses/unmarshal/XStreamFactory.java

@@ -39,6 +39,7 @@
 import com.github._1c_syntax.mdclasses.mdo.support.ConfigurationExtensionPurpose;
 import com.github._1c_syntax.mdclasses.mdo.support.DataLockControlMode;
 import com.github._1c_syntax.mdclasses.mdo.support.DataPath;
+import com.github._1c_syntax.mdclasses.mdo.support.DataSeparation;
 import com.github._1c_syntax.mdclasses.mdo.support.FormType;
 import com.github._1c_syntax.mdclasses.mdo.support.MDOModule;
 import com.github._1c_syntax.mdclasses.mdo.support.MDOType;
@@ -357,6 +358,7 @@ private void registerConverters(XStream xStream) {
     xStream.registerConverter(new EnumConverter<>(ObjectBelonging.class));
     xStream.registerConverter(new EnumConverter<>(TemplateType.class));
     xStream.registerConverter(new EnumConverter<>(DataLockControlMode.class));
+    xStream.registerConverter(new EnumConverter<>(DataSeparation.class));
     xStream.registerConverter(new EnumConverter<>(FormType.class));
     xStream.registerConverter(new AttributeConverter());
     xStream.registerConverter(new CompatibilityModeConverter());

src/main/java/com/github/_1c_syntax/mdclasses/unmarshal/wrapper/DesignerProperties.java

@@ -25,6 +25,7 @@
 import com.github._1c_syntax.mdclasses.mdo.children.template.TemplateType;
 import com.github._1c_syntax.mdclasses.mdo.support.ConfigurationExtensionPurpose;
 import com.github._1c_syntax.mdclasses.mdo.support.DataLockControlMode;
+import com.github._1c_syntax.mdclasses.mdo.support.DataSeparation;
 import com.github._1c_syntax.mdclasses.mdo.support.FormType;
 import com.github._1c_syntax.mdclasses.mdo.support.MessageDirection;
 import com.github._1c_syntax.mdclasses.mdo.support.ObjectBelonging;
@@ -151,5 +152,5 @@ public class DesignerProperties {
   @XStreamAlias("AutoUse")
   private UseMode autoUse = UseMode.DONT_USE;
   @XStreamAlias("DataSeparation")
-  private UseMode dataSeparation = UseMode.DONT_USE;
+  private DataSeparation dataSeparation = DataSeparation.DONT_USE;
 }

src/test/java/com/github/_1c_syntax/mdclasses/mdo/MDCommonAttributeTest.java

@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.mdclasses.mdo;
 
+import com.github._1c_syntax.mdclasses.mdo.support.DataSeparation;
 import com.github._1c_syntax.mdclasses.mdo.support.MDOType;
 import com.github._1c_syntax.mdclasses.mdo.support.UseMode;
 import org.junit.jupiter.api.Test;
@@ -42,7 +43,7 @@ void testEDT() {
     checkNoModules(mdo);
     var commonAttribute = (MDCommonAttribute) mdo;
     assertThat(commonAttribute.getAutoUse()).isEqualTo(UseMode.USE);
-    assertThat(commonAttribute.getDataSeparation()).isEqualTo(UseMode.DONT_USE);
+    assertThat(commonAttribute.getDataSeparation()).isEqualTo(DataSeparation.DONT_USE);
   }
 
   @Override
@@ -55,7 +56,7 @@ void testDesigner() {
     checkNoModules(mdo);
     var commonAttribute = (MDCommonAttribute) mdo;
     assertThat(commonAttribute.getAutoUse()).isEqualTo(UseMode.USE);
-    assertThat(commonAttribute.getDataSeparation()).isEqualTo(UseMode.DONT_USE);
+    assertThat(commonAttribute.getDataSeparation()).isEqualTo(DataSeparation.DONT_USE);
   }
 
 }