удаление неиспользуемых джсонов групп тестов и настроек.

.idea/workspace.xml

@@ -8,9 +8,15 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupsJson.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsArrayJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFilesJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />

src/_VisualDVM/TestingSystem/Common/Group/Json/GroupJson.java

@@ -1,18 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Group.Json;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import com.google.gson.annotations.Expose;
-public class GroupJson {
-    @Expose
-    public int id;
-    @Expose
-    public String description;
-    @Expose
-    public String language;
-    public GroupJson(Group group) {
-        id = group.id;
-        language = group.language.toString();
-        description = group.description;
-    }
-    public GroupJson() {
-    }
-}

src/_VisualDVM/TestingSystem/Common/Group/Json/GroupsJson.java

@@ -1,19 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Group.Json;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import com.google.gson.annotations.Expose;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Vector;
-public class GroupsJson implements Serializable {
-    @Expose
-    public List<GroupJson> array = new Vector<>();
-    public GroupsJson() {
-    }
-    //при создании пакета.
-    public GroupsJson(Vector<Group> groups) {
-        array = new Vector<>();
-        for (Group group : groups)
-            array.add(new GroupJson(group));
-    }
-}

src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsArrayJson.java

@@ -1,19 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Settings.Json;
-import _VisualDVM.TestingSystem.Common.Settings.Settings;
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Vector;
-public class SettingsArrayJson {
-    @Expose
-    public List<SettingsJson> array = new Vector<>();
-    public SettingsArrayJson() {
-    }
-    //при создании пакета.
-    public SettingsArrayJson(Vector<? extends Settings> settings_in) {
-        array = new Vector<>();
-        for (Settings settings : settings_in)
-            array.add(new SettingsJson(settings));
-    }
-}
-

src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsJson.java

@@ -1,15 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Settings.Json;
-import _VisualDVM.TestingSystem.Common.Settings.Settings;
-import com.google.gson.annotations.Expose;
-public class SettingsJson {
-    @Expose
-    public int id;
-    @Expose
-    public String description;
-    public SettingsJson(Settings settings) {
-        id = settings.id;
-        description = settings.description;
-    }
-    public SettingsJson() {
-    }
-}

src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java

@@ -1,24 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test.Json;
-import _VisualDVM.ProjectData.Files.FileType;
-import _VisualDVM.ProjectData.Files.LanguageStyle;
-import _VisualDVM.ProjectData.Files.ProjectFile;
-import _VisualDVM.ProjectData.LanguageName;
-import com.google.gson.annotations.Expose;
-public class TestFileJson {
-    @Expose
-    public String name = "";
-    @Expose
-    public FileType type = FileType.none;
-    @Expose
-    public LanguageName language = LanguageName.n;
-    @Expose
-    public LanguageStyle style = LanguageStyle.none;
-    public TestFileJson() {
-    }
-    public TestFileJson(ProjectFile src) {
-        name = src.file.getName();
-        type = src.fileType;
-        language = src.languageName;
-        style = src.style;
-    }
-}

src/_VisualDVM/TestingSystem/Common/Test/Json/TestFilesJson.java

@@ -1,9 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test.Json;
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Vector;
-public class TestFilesJson {
-    @Expose
-    public List<TestFileJson> values = new Vector<>();
-}

src/_VisualDVM/TestingSystem/Common/Test/Json/TestJson.java

@@ -1,14 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test.Json;
-import _VisualDVM.TestingSystem.Common.Test.Test;
-import com.google.gson.annotations.Expose;
-
-import java.io.Serializable;
-public class TestJson implements Serializable {
-    @Expose
-    public int id;
-    public TestJson(Test test) {
-        id = test.id;
-    }
-    public TestJson() {
-    }
-}

src/_VisualDVM/TestingSystem/Common/Test/Json/TestsJson.java

@@ -1,19 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test.Json;
-import _VisualDVM.TestingSystem.Common.Test.Test;
-import com.google.gson.annotations.Expose;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Vector;
-public class TestsJson implements Serializable {
-    @Expose
-    public List<TestJson> array = new Vector<>();
-    public TestsJson() {
-    }
-    //при создании пакета.
-    public TestsJson(Vector<Test> tests) {
-        array = new Vector<>();
-        for (Test test : tests)
-            array.add(new TestJson(test));
-    }
-}

src/_VisualDVM/TestingSystem/Common/TestingServer.java

@@ -15,7 +15,6 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.All.DownloadDvmTestsRepository;
 import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.RepositoryServer;
@@ -24,8 +23,6 @@ import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.MachineProcess.MachineProcess;
 import _VisualDVM.TestingSystem.Common.MachineProcess.MachineProcessSet;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestFileJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestFilesJson;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestType;
 import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
@@ -636,11 +633,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             File src = versions.get(name);
             File[] files = src.listFiles(pathname -> !pathname.isDirectory());
             if (files != null && files.length > 0) {
-                //--
-                TestFilesJson filesJson = new TestFilesJson();
-                for (File file : files) {
-                    filesJson.values.add(new TestFileJson(new ProjectFile(file)));
-                }
                 //--
                 Test test = new Test();
                 test.group_id = group.id;

src/_VisualDVM/TestingSystem/Common/TestsDatabase.java

@@ -10,12 +10,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
-import _VisualDVM.TestingSystem.Common.Group.Json.GroupJson;
-import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestsJson;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
 import _VisualDVM.TestingSystem.Common.TestFile.TestFile;