Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support headers with different header length #13

Merged
merged 3 commits into from
Feb 27, 2018
Merged

Support headers with different header length #13

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27e6fde
Support headers with different header length
Jan 11, 2018
003c5d6
add a new line
Jan 30, 2018
16e5921
Fix from required change
Feb 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.connector</groupId>
<artifactId>org.wso2.carbon.connector.iso8583</artifactId>
<packaging>jar</packaging>
<version>1.0.3-SNAPSHOT</version>
<version>1.0.2</version>
<name>WSO2 Carbon - Mediation Library Connector For ISO8583</name>
<url>http://wso2.org</url>
<properties>
Expand Down
34 changes: 19 additions & 15 deletions src/main/java/org/wso2/carbon/connector/iso8583/ISO8583MessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.jpos.iso.ISOPackager;

import java.io.BufferedReader;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
Expand All @@ -44,7 +45,7 @@
public class ISO8583MessageHandler {
private static final Log log = LogFactory.getLog(ISO8583MessageHandler.class);

public ISO8583MessageHandler(MessageContext messageContext, String details, String host, int port) {
public ISO8583MessageHandler(MessageContext messageContext, byte[] details, String host, int port) {
try {
Socket socket = new Socket(host, port);
clientHandler(messageContext, socket, details);
Expand All @@ -56,28 +57,31 @@ public ISO8583MessageHandler(MessageContext messageContext, String details, Stri
/**
* handle the iso8583 message request and responses
*
* @param isoMessage packed ISOMessage
* @param connection Socket connection with backend Test server
* @param messageContext the message context
* @param connection Socket connection with backend Test server
* @param isoMessage packed ISOMessage
*/
public void clientHandler(MessageContext messageContext, Socket connection, String isoMessage) {
public void clientHandler(MessageContext messageContext, Socket connection, byte[] isoMessage) {
DataOutputStream outStream = null;
BufferedReader inFromServer = null;
String message;
DataInputStream inFromServer = null;
try {
outStream = new DataOutputStream(connection.getOutputStream());
inFromServer = new BufferedReader(new InputStreamReader(connection.getInputStream()));
inFromServer = new DataInputStream(connection.getInputStream());
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Furthermore it is wrong to close connection in this finally block. It should be closed by the method who creates it in it's finally block.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolved

if (connection.isConnected()) {
outStream.writeUTF(isoMessage);
outStream.write(isoMessage);
outStream.flush();

/* Sender will receive the Acknowledgement here */
if ((message = inFromServer.readLine()) != null) {
unpackResponse(messageContext, message);
}
Thread.sleep(200);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you put 200 sleep here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will take time to get the response from the back end in the input stream buffer. That's why I put.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check without it ...

int messageLength = inFromServer.available();
byte[] message = new byte[messageLength];
inFromServer.readFully(message, 0, messageLength);
unpackResponse(messageContext, message);
}
} catch (IOException e) {
handleException("An exception occurred in sending the iso8583 message", e);
} catch (InterruptedException e) {
handleException("An exception occurred in reading the iso8583 message", e);
} finally {
try {
if (outStream != null) {
Expand All @@ -94,18 +98,18 @@ public void clientHandler(MessageContext messageContext, Socket connection, Stri
}

/**
* unpack the response string of isoMessage
* unpack the response byte of isoMessage
*
* @param message response String of isoMessage
* @param messageContext the message context
* @param message response byte of isoMessage
*/
public void unpackResponse(MessageContext messageContext, String message) {
public void unpackResponse(MessageContext messageContext, byte[] message) {
try {
int headerLength = getHeaderLength(messageContext);
ISOPackager packager = ISO8583PackagerFactory.getPackager(headerLength);
ISOMsg isoMsg = new ISOMsg();
isoMsg.setPackager(packager);
isoMsg.unpack(message.getBytes());
isoMsg.unpack(message);
messageBuilder(messageContext, isoMsg);
} catch (ISOException e) {
handleException("Couldn't unpack the message since message is not in ISO Standard :" + message, e);
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/wso2/carbon/connector/iso8583/ISO8583MessageProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.apache.synapse.MessageContext;
import org.jpos.iso.ISOException;
import org.jpos.iso.ISOMsg;
import org.jpos.iso.ISOPackager;
import org.wso2.carbon.connector.core.AbstractConnector;
import org.wso2.carbon.connector.core.ConnectException;

Expand Down Expand Up @@ -76,8 +75,7 @@ public void packedISO8583Message(MessageContext msgContext, String host, int por
}
}
byte[] data = isoMsg.pack();
String packedMessage = new String(data).toUpperCase();
new ISO8583MessageHandler(msgContext, packedMessage, host, port);
new ISO8583MessageHandler(msgContext, data, host, port);
} catch (ISOException e) {
handleException("Couldn't packed iso8583 Messages", e, msgContext);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/iso8583_produceMessage/sendMessage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
<template xmlns="http://ws.apache.org/ns/synapse" name="sendMessage">
<sequence>
<class name="org.wso2.carbon.connector.iso8583.ISO8583MessageProducer"/>
<script language="js"><![CDATA[mc.getEnvelope().getBody().getFirstElement().detach();]]></script>
</sequence>
</template>
</template>