no message

This commit is contained in:
2025-02-04 20:51:23 +03:00
parent b05e7ffaec
commit d4c2875ed5
6 changed files with 24 additions and 63 deletions

7
.idea/workspace.xml generated
View File

@@ -7,9 +7,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -1,22 +1,23 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD; import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.io.File; import java.io.File;
import java.util.Vector; import java.util.Vector;
public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass_OLD<Vector<File>> { public class GetComponentsBackupsFromServer extends ComponentsServerPass<Vector<File>> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = new Vector<>(); target = new Vector<>();
return Global.components.getUI().CheckCurrent(Log); return Global.components.getUI().CheckCurrent(Log)&&
SendRequest(ServerCode.GetComponentsBackups,
Global.components.getUI().getCurrent().getComponentType().toString());
} }
@Override @Override
protected void ServerAction() throws Exception { protected void body() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsBackups, target = (Vector<File>) request.server_response.object;
Global.components.getUI().getCurrent().getComponentType().toString()));
target = (Vector<File>) server_response.object;
} }
@Override @Override
protected boolean validate() { protected boolean validate() {

View File

@@ -1,36 +1,16 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD; import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.net.ConnectException; import java.net.ConnectException;
public class PingComponentsServer extends ComponentsRepositoryPass_OLD { public class PingComponentsServer extends ComponentsServerPass {
boolean flag; //todo ПИНГ РЕАЛИЗОВАТЬ ЧЕРЕЗ SSH
boolean silent; boolean silent;
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
flag = false;
silent = args.length > 0 ? (boolean) args[0] : false; silent = args.length > 0 ? (boolean) args[0] : false;
return super.canStart(args); return super.canStart(args)&&SendRequest(ServerCode.Ping);
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.Ping));
flag = true;
}
@Override
protected boolean validate() {
return flag;
}
@Override
protected void CheckException(Exception ex) {
if (silent) {
Throwable cause = getCauseRec(ex);
if ((cause instanceof ConnectException) && cause.getMessage().contains("Connection refused: connect")) {
//так как это пинг, игнорируем.
return;
}
}
super.CheckException(ex);
} }
} }

View File

@@ -1,36 +1,16 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Passes.Server.TestingSystemPass_OLD; import _VisualDVM.Passes.Server.TestingSystemPass_OLD;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.net.ConnectException; import java.net.ConnectException;
public class PingTestingServer extends TestingSystemPass_OLD { public class PingTestingServer extends TestingServerPass {
boolean flag; //todo ПИНГ РЕАЛИЗОВАТЬ ЧЕРЕЗ SSH
boolean silent; boolean silent;
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
flag = false;
silent = args.length > 0 ? (boolean) args[0] : false; silent = args.length > 0 ? (boolean) args[0] : false;
return super.canStart(args); return super.canStart(args)&&(SendRequest(ServerCode.Ping));
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.Ping));
flag = true;
}
@Override
protected boolean validate() {
return flag;
}
@Override
protected void CheckException(Exception ex) {
if (silent) {
Throwable cause = getCauseRec(ex);
if ((cause instanceof ConnectException) && cause.getMessage().contains("Connection refused: connect")) {
//так как это пинг, игнорируем.
return;
}
}
super.CheckException(ex);
} }
} }

View File

@@ -1,16 +1,13 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD; import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class PublishRemoteWorkspace extends ComponentsRepositoryPass_OLD<SubscriberWorkspace> { public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (SubscriberWorkspace) args[0]; target = (SubscriberWorkspace) args[0];
return true; return SendRequest(ServerCode.PublishObject, "", target);
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
} }
} }

View File

@@ -118,6 +118,8 @@ public enum ServerCode {
return "Публикация объектов на сервере"; return "Публикация объектов на сервере";
case ReplaceTestCode: case ReplaceTestCode:
return "Замена кода теста на сервере"; return "Замена кода теста на сервере";
case GetComponentsBackups:
return "Получение резервных копий компонента с сервера";
default: default:
return this.toString(); return this.toString();
} }