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

publish msg on default exchange #29

Open
wants to merge 2 commits into
base: 2.0.x
Choose a base branch
from
Open

publish msg on default exchange #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
935e530
#28 : publish msg on default exchange
Mar 11, 2016
7747741
"Port" parameter in URI is not working
Mar 11, 2016
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
8 changes: 4 additions & 4 deletions src/main/java/com/instaclick/pentaho/plugin/amqp/AMQPPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private void initPluginStep() throws Exception
// use meta.getFields() to change it, so it reflects the output row structure
meta.getFields(rowMeta, getStepname(), null, null, this, repository, metaStore);

Integer port = null;
int port = 0;
String body = environmentSubstitute(meta.getBodyField());
String routing = environmentSubstitute(meta.getRouting());
String uri = environmentSubstitute(meta.getUri());
Expand All @@ -157,7 +157,7 @@ private void initPluginStep() throws Exception
throw new AMQPException("Unable to retrieve field : " + meta.getBodyField());
}

if ((username == null || password == null || host == null || port == null) && (uri == null)) {
if ((username == null || password == null || host == null || port == 0) && (uri == null)) {
throw new AMQPException("Unable to retrieve connection information");
}

Expand Down Expand Up @@ -216,8 +216,8 @@ private void initPluginStep() throws Exception
throw new AMQPException("Unable to retrieve body field : " + body);
}

if (data.target == null) {
throw new AMQPException("Unable to retrieve queue/exchange name");
if (data.isConsumer && data.target == null) {
throw new AMQPException("Unable to retrieve queue name");
}

logMinimal(getString("AmqpPlugin.Body.Label") + " : " + body);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/instaclick/pentaho/plugin/amqp/AMQPPluginDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,7 @@ private void ok()
return;
}

if (Const.isEmpty(input.getTarget())) {
if (input.isConsumer() && Const.isEmpty(input.getTarget())) {
textTarget.setFocus();
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/instaclick/pentaho/plugin/amqp/AMQPPluginMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ public String getTarget()
}

if (Const.isEmpty(target) && AMQPPluginData.MODE_PRODUCER.equals(mode)) {
target = "exchange_name";
target = "";
}

return target;
Expand Down