Correction of Java examples to preserve utf-8 string encoding

Author: andreho

java/EmitLog.java

@@ -17,19 +17,19 @@ public static void main(String[] argv) throws Exception {
 
     String message = getMessage(argv);
 
-    channel.basicPublish(EXCHANGE_NAME, "", null, message.getBytes());
+    channel.basicPublish(EXCHANGE_NAME, "", null, message.getBytes("UTF-8"));
     System.out.println(" [x] Sent '" + message + "'");
 
     channel.close();
     connection.close();
   }
-  
+
   private static String getMessage(String[] strings){
     if (strings.length < 1)
     	    return "info: Hello World!";
     return joinStrings(strings, " ");
   }
-  
+
   private static String joinStrings(String[] strings, String delimiter) {
     int length = strings.length;
     if (length == 0) return "";

java/EmitLogDirect.java

@@ -18,25 +18,25 @@ public static void main(String[] argv) throws Exception {
     String severity = getSeverity(argv);
     String message = getMessage(argv);
 
-    channel.basicPublish(EXCHANGE_NAME, severity, null, message.getBytes());
+    channel.basicPublish(EXCHANGE_NAME, severity, null, message.getBytes("UTF-8"));
     System.out.println(" [x] Sent '" + severity + "':'" + message + "'");
 
     channel.close();
     connection.close();
   }
-  
+
   private static String getSeverity(String[] strings){
     if (strings.length < 1)
     	    return "info";
     return strings[0];
   }
 
-  private static String getMessage(String[] strings){ 
+  private static String getMessage(String[] strings){
     if (strings.length < 2)
     	    return "Hello World!";
     return joinStrings(strings, " ", 1);
   }
-  
+
   private static String joinStrings(String[] strings, String delimiter, int startIndex) {
     int length = strings.length;
     if (length == 0 ) return "";

java/EmitLogHeader.java

@@ -15,7 +15,7 @@ public static void main(String[] argv) {
     Connection connection = null;
     Channel channel = null;
     try {
-    
+
       if (argv.length < 1){
         System.err.println("Usage: EmitLogHeader message queueName [headers]...");
         System.exit(1);
@@ -43,18 +43,18 @@ public static void main(String[] argv) {
 
       ConnectionFactory factory = new ConnectionFactory();
       factory.setHost("localhost");
-  
+
       connection = factory.newConnection();
       channel = connection.createChannel();
 
       channel.exchangeDeclare(EXCHANGE_NAME, "headers");
 
       AMQP.BasicProperties.Builder builder = new AMQP.BasicProperties.Builder();
 
-      // MessageProperties.PERSISTENT_TEXT_PLAIN is a static instance of AMQP.BasicProperties 
+      // MessageProperties.PERSISTENT_TEXT_PLAIN is a static instance of AMQP.BasicProperties
       // that contains a delivery mode and a priority. So we pass them to the builder.
-      builder.deliveryMode(MessageProperties.PERSISTENT_TEXT_PLAIN.getDeliveryMode());    
-      builder.priority(MessageProperties.PERSISTENT_TEXT_PLAIN.getPriority());    
+      builder.deliveryMode(MessageProperties.PERSISTENT_TEXT_PLAIN.getDeliveryMode());
+      builder.priority(MessageProperties.PERSISTENT_TEXT_PLAIN.getPriority());
 
       // Add the headers to the builder.
       builder.headers(headers);
@@ -63,7 +63,7 @@ public static void main(String[] argv) {
       AMQP.BasicProperties theProps = builder.build();
 
       // Now we add the headers.  This example only uses string headers, but they can also be integers
-      channel.basicPublish(EXCHANGE_NAME, routingKey, theProps, message.getBytes());
+      channel.basicPublish(EXCHANGE_NAME, routingKey, theProps, message.getBytes("UTF-8"));
       System.out.println(" [x] Sent message: '" + message + "'");
 
     }

java/EmitLogTopic.java

@@ -12,7 +12,7 @@ public static void main(String[] argv) {
     try {
       ConnectionFactory factory = new ConnectionFactory();
       factory.setHost("localhost");
-  
+
       connection = factory.newConnection();
       channel = connection.createChannel();
 
@@ -21,7 +21,7 @@ public static void main(String[] argv) {
       String routingKey = getRouting(argv);
       String message = getMessage(argv);
 
-      channel.basicPublish(EXCHANGE_NAME, routingKey, null, message.getBytes());
+      channel.basicPublish(EXCHANGE_NAME, routingKey, null, message.getBytes("UTF-8"));
       System.out.println(" [x] Sent '" + routingKey + "':'" + message + "'");
 
     }
@@ -37,19 +37,19 @@ public static void main(String[] argv) {
       }
     }
   }
-  
+
   private static String getRouting(String[] strings){
     if (strings.length < 1)
     	    return "anonymous.info";
     return strings[0];
   }
 
-  private static String getMessage(String[] strings){ 
+  private static String getMessage(String[] strings){
     if (strings.length < 2)
     	    return "Hello World!";
     return joinStrings(strings, " ", 1);
   }
-  
+
   private static String joinStrings(String[] strings, String delimiter, int startIndex) {
     int length = strings.length;
     if (length == 0 ) return "";

java/NewTask.java

@@ -4,7 +4,7 @@
 import com.rabbitmq.client.MessageProperties;
 
 public class NewTask {
-  
+
   private static final String TASK_QUEUE_NAME = "task_queue";
 
   public static void main(String[] argv) throws Exception {
@@ -13,26 +13,26 @@ public static void main(String[] argv) throws Exception {
     factory.setHost("localhost");
     Connection connection = factory.newConnection();
     Channel channel = connection.createChannel();
-    
+
     channel.queueDeclare(TASK_QUEUE_NAME, true, false, false, null);
-    
+
     String message = getMessage(argv);
-    
-    channel.basicPublish( "", TASK_QUEUE_NAME, 
+
+    channel.basicPublish( "", TASK_QUEUE_NAME,
                 MessageProperties.PERSISTENT_TEXT_PLAIN,
-                message.getBytes());
+                message.getBytes("UTF-8"));
     System.out.println(" [x] Sent '" + message + "'");
-    
+
     channel.close();
     connection.close();
   }
-    
+
   private static String getMessage(String[] strings){
     if (strings.length < 1)
       return "Hello World!";
     return joinStrings(strings, " ");
-  }  
-  
+  }
+
   private static String joinStrings(String[] strings, String delimiter) {
     int length = strings.length;
     if (length == 0) return "";

java/RPCClient.java

@@ -4,38 +4,38 @@
 import com.rabbitmq.client.QueueingConsumer;
 import com.rabbitmq.client.AMQP.BasicProperties;
 import java.util.UUID;
-    
+
 public class RPCClient {
-    
+
   private Connection connection;
   private Channel channel;
   private String requestQueueName = "rpc_queue";
   private String replyQueueName;
   private QueueingConsumer consumer;
-    
+
   public RPCClient() throws Exception {
     ConnectionFactory factory = new ConnectionFactory();
     factory.setHost("localhost");
     connection = factory.newConnection();
     channel = connection.createChannel();
 
-    replyQueueName = channel.queueDeclare().getQueue(); 
+    replyQueueName = channel.queueDeclare().getQueue();
     consumer = new QueueingConsumer(channel);
     channel.basicConsume(replyQueueName, true, consumer);
   }
-  
-  public String call(String message) throws Exception {     
+
+  public String call(String message) throws Exception {
     String response = null;
     String corrId = UUID.randomUUID().toString();
-    
+
     BasicProperties props = new BasicProperties
                                 .Builder()
                                 .correlationId(corrId)
                                 .replyTo(replyQueueName)
                                 .build();
-    
-    channel.basicPublish("", requestQueueName, props, message.getBytes());
-    
+
+    channel.basicPublish("", requestQueueName, props, message.getBytes("UTF-8"));
+
     while (true) {
       QueueingConsumer.Delivery delivery = consumer.nextDelivery();
       if (delivery.getProperties().getCorrelationId().equals(corrId)) {
@@ -44,20 +44,20 @@ public String call(String message) throws Exception {
       }
     }
 
-    return response; 
+    return response;
   }
-    
+
   public void close() throws Exception {
     connection.close();
   }
-  
+
   public static void main(String[] argv) {
     RPCClient fibonacciRpc = null;
     String response = null;
     try {
       fibonacciRpc = new RPCClient();
-  
-      System.out.println(" [x] Requesting fib(30)");   
+
+      System.out.println(" [x] Requesting fib(30)");
       response = fibonacciRpc.call("30");
       System.out.println(" [.] Got '" + response + "'");
     }

java/ReceiveLogHeader.java

@@ -17,10 +17,10 @@ public static void main(String[] argv) {
         System.err.println("Usage: ReceiveLogsHeader queueName [headers]...");
         System.exit(1);
       }
-    
+
       ConnectionFactory factory = new ConnectionFactory();
       factory.setHost("localhost");
-  
+
       connection = factory.newConnection();
       channel = connection.createChannel();
 
@@ -30,14 +30,14 @@ public static void main(String[] argv) {
       // value of the routing key is not used in the routing. You can receive information
       // from the sender here as the routing key is still available in the received message.
       String routingKeyFromUser = "ourTestRoutingKey";
- 
+
       // Argument processing: the first arg is the local queue name, the rest are
       // key value pairs for headers.
       String queueInputName = argv[0];
 
       // The map for the headers.
       Map<String, Object> headers = new HashMap<String, Object>();
- 
+
       // The rest of the arguments are key value header pairs.  For the purpose of this
       // example, we are assuming they are all strings, but that is not required by RabbitMQ
       // Note that when you run this code you should include the x-match header on the command
@@ -51,18 +51,18 @@ public static void main(String[] argv) {
 
       String queueName = channel.queueDeclare(queueInputName, true, false, false, null).getQueue();
       channel.queueBind(queueName, EXCHANGE_NAME, routingKeyFromUser, headers);
-    
+
       System.out.println(" [*] Waiting for messages. To exit press CTRL+C");
 
       QueueingConsumer consumer = new QueueingConsumer(channel);
       channel.basicConsume(queueName, true, consumer);
 
       while (true) {
         QueueingConsumer.Delivery delivery = consumer.nextDelivery();
-        String message = new String(delivery.getBody());
+        String message = new String(delivery.getBody(),"UTF-8");
         String routingKeyFromSender = delivery.getEnvelope().getRoutingKey();
 
-        System.out.println(" [x] Received '" + routingKeyFromSender + "':'" + message + "'");   
+        System.out.println(" [x] Received '" + routingKeyFromSender + "':'" + message + "'");
       }
     }
     catch  (Exception e) {

java/ReceiveLogs.java

@@ -17,17 +17,17 @@ public static void main(String[] argv) throws Exception {
     channel.exchangeDeclare(EXCHANGE_NAME, "fanout");
     String queueName = channel.queueDeclare().getQueue();
     channel.queueBind(queueName, EXCHANGE_NAME, "");
-    
+
     System.out.println(" [*] Waiting for messages. To exit press CTRL+C");
 
     QueueingConsumer consumer = new QueueingConsumer(channel);
     channel.basicConsume(queueName, true, consumer);
 
     while (true) {
       QueueingConsumer.Delivery delivery = consumer.nextDelivery();
-      String message = new String(delivery.getBody());
+      String message = new String(delivery.getBody(),"UTF-8");
 
-      System.out.println(" [x] Received '" + message + "'");   
+      System.out.println(" [x] Received '" + message + "'");
     }
   }
 }

java/ReceiveLogsDirect.java

@@ -16,27 +16,27 @@ public static void main(String[] argv) throws Exception {
 
     channel.exchangeDeclare(EXCHANGE_NAME, "direct");
     String queueName = channel.queueDeclare().getQueue();
-    
+
     if (argv.length < 1){
       System.err.println("Usage: ReceiveLogsDirect [info] [warning] [error]");
       System.exit(1);
     }
-    
-    for(String severity : argv){    
+
+    for(String severity : argv){
       channel.queueBind(queueName, EXCHANGE_NAME, severity);
     }
-    
+
     System.out.println(" [*] Waiting for messages. To exit press CTRL+C");
 
     QueueingConsumer consumer = new QueueingConsumer(channel);
     channel.basicConsume(queueName, true, consumer);
 
     while (true) {
       QueueingConsumer.Delivery delivery = consumer.nextDelivery();
-      String message = new String(delivery.getBody());
+      String message = new String(delivery.getBody(),"UTF-8");
       String routingKey = delivery.getEnvelope().getRoutingKey();
 
-      System.out.println(" [x] Received '" + routingKey + "':'" + message + "'");   
+      System.out.println(" [x] Received '" + routingKey + "':'" + message + "'");
     }
   }
 }