diff --git a/AF-Demo/src/af/interfaces/AFState.java b/AF-Demo/src/af/interfaces/AFState.java index 63f5cca..3b9ae61 100644 --- a/AF-Demo/src/af/interfaces/AFState.java +++ b/AF-Demo/src/af/interfaces/AFState.java @@ -4,4 +4,5 @@ public interface AFState { public String IDLE = "IDLE"; public String W_E01Res = "W_DBRes"; public String W_ARes = "W_ARes"; + public String END = "END"; } diff --git a/AF-Demo/src/af/message/EC02Builder.java b/AF-Demo/src/af/message/EC02Builder.java index 14b373a..7767a01 100644 --- a/AF-Demo/src/af/message/EC02Builder.java +++ b/AF-Demo/src/af/message/EC02Builder.java @@ -39,10 +39,10 @@ public class EC02Builder { return eqxRawDataList; } - public EquinoxRawData getHTTPResponse(EQXRawInstance eqxRaw){ + public EquinoxRawData getHTTPResponse(EQXRawInstance eqxRaw,String invoke){ eqxRaw.setType(EQXMsg.RESPONSE); this.msgBuilder = new EC02MSGBuilder(eqxRaw); - this.msgBuilder.setInvoke(this.ec02Ins.getAFInstance().getInvoke()); + this.msgBuilder.setInvoke(invoke); return this.msgBuilder.getHttpMessage(); } diff --git a/AF-Demo/src/af/state/StateIdle.java b/AF-Demo/src/af/state/StateIdle.java index cc0ac4e..bb03774 100644 --- a/AF-Demo/src/af/state/StateIdle.java +++ b/AF-Demo/src/af/state/StateIdle.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import af.instatnce.E01Instance; import af.instatnce.EC02Instance; +import af.instatnce.EQXRawInstance; import af.interfaces.AFEvent; import af.interfaces.AFState; import af.interfaces.EQXMsg; @@ -30,27 +31,30 @@ public class StateIdle implements IAFState { ec02Ins.getAFInstance().setInvoke(eqxRawData.getInvoke()); ec02Ins.getAFInstance().setOrig(eqxRawData.getRawDataAttribute(EQXMsg.ORIG)); - if(eqxRawData.getRawEventType().equals(AFEvent.Incoming_HTTP_Request)){ - E01Instance e01Ins = new E01Instance(); - ArrayList keys = new ArrayList(); - keys.add(eqxRawData.getRawDataMessage()); - keys.add("def"); - keys.add("def"); - keys.add("def"); - keys.add("def"); - e01Ins.setCmd("search"); - e01Ins.setObjType("TESTDATA"); - e01Ins.setKey(keys); -// e01Ins.setId("01"); - ec02Ins.setE01Ins(e01Ins); - this.ec02Builder.getE01Request(); - String [] parameter = {""}; - abstractAF.getUtils().writeLog("mylog1", "hello word!!!"); - abstractAF.getUtils().incrementStats("my_stat"); - abstractAF.getUtils().incrementStats("raise_by_stat"); - abstractAF.getUtils().raiseAlarm("my_alarm", parameter, AlarmSeverity.WARNING, AlarmCategory.APPLICATION, AlarmType.Normal); - this.eqxState = AFState.W_E01Res; - } + /* + * if(eqxRawData.getRawEventType().equals(AFEvent. + * Incoming_HTTP_Request)){ E01Instance e01Ins = new E01Instance(); + * ArrayList keys = new ArrayList(); + * keys.add(eqxRawData.getRawDataMessage()); keys.add("def"); + * keys.add("def"); keys.add("def"); keys.add("def"); + * e01Ins.setCmd("search"); e01Ins.setObjType("TESTDATA"); + * e01Ins.setKey(keys); // e01Ins.setId("01"); + * ec02Ins.setE01Ins(e01Ins); this.ec02Builder.getE01Request(); + * String [] parameter = {""}; + * abstractAF.getUtils().writeLog("mylog1", "hello word!!!"); + * abstractAF.getUtils().incrementStats("my_stat"); + * abstractAF.getUtils().incrementStats("raise_by_stat"); + * abstractAF.getUtils().raiseAlarm("my_alarm", parameter, + * AlarmSeverity.WARNING, AlarmCategory.APPLICATION, + * AlarmType.Normal); this.eqxState = AFState.W_E01Res; } + */ + + EQXRawInstance eqxRaw = new EQXRawInstance(); + eqxRaw.setMessage("A Res."); + eqxRaw.setTo(ec02Ins.getAFInstance().getOrig()); + eqxRaw.setCtype(EQXMsg.TEXTPLAIN); + this.eqxRawDataList.add(this.ec02Builder.getHTTPResponse(eqxRaw,eqxRawData.getInvoke())); + this.eqxState = AFState.W_ARes; } ec02Ins.setEqxRawDataList(this.eqxRawDataList); return this.eqxState; diff --git a/AF-Demo/src/af/state/StateWaitA.java b/AF-Demo/src/af/state/StateWaitA.java index 2a069e8..41c67e3 100644 --- a/AF-Demo/src/af/state/StateWaitA.java +++ b/AF-Demo/src/af/state/StateWaitA.java @@ -25,22 +25,29 @@ public class StateWaitA implements IAFState { for(EquinoxRawData eqxRawData : eqxRawDataList) { this.ec02Builder.setEquinoxRawData(eqxRawData, abstractAF, ec02Ins); - if(eqxRawData.getRawEventType().equals(AFEvent.Incoming_A_Response)){ - StringExtract str = new StringExtract(); - HashMap map = str.getAll(str.setMessage(eqxRawData.getRawDataMessage().trim())); - String message = map.get("MSG[0].value"); - if (message.trim().equals("SUCCESS")) { - EQXRawInstance eqxRaw = new EQXRawInstance(); - eqxRaw.setMessage(message.trim()); - eqxRaw.setTo(ec02Ins.getAFInstance().getOrig()); - eqxRaw.setCtype(EQXMsg.TEXTPLAIN); - this.eqxRawDataList.add(this.ec02Builder.getHTTPResponse(eqxRaw)); - this.eqxState = AFState.IDLE; - } - else { - - } - } + /* + * if(eqxRawData.getRawEventType().equals(AFEvent. + * Incoming_A_Response)){ StringExtract str = new StringExtract(); + * HashMap map = + * str.getAll(str.setMessage(eqxRawData.getRawDataMessage().trim())) + * ; String message = map.get("MSG[0].value"); if + * (message.trim().equals("SUCCESS")) { EQXRawInstance eqxRaw = new + * EQXRawInstance(); eqxRaw.setMessage(message.trim()); + * eqxRaw.setTo(ec02Ins.getAFInstance().getOrig()); + * eqxRaw.setCtype(EQXMsg.TEXTPLAIN); + * this.eqxRawDataList.add(this.ec02Builder.getHTTPResponse(eqxRaw)) + * ; this.eqxState = AFState.IDLE; } else { + * + * } } + */ + + EQXRawInstance eqxRaw = new EQXRawInstance(); + eqxRaw.setMessage("B Res."); + eqxRaw.setTo(eqxRawData.getOrig()); + eqxRaw.setCtype(EQXMsg.TEXTPLAIN); + this.eqxRawDataList.add(this.ec02Builder.getHTTPResponse(eqxRaw,eqxRawData.getInvoke())); + this.eqxState = AFState.END; + } ec02Ins.setEqxRawDataList(this.eqxRawDataList); return this.eqxState; -- libgit2 0.21.2