QA fixes: removed inner class

Author: Ann Witbrock

java/RPCClient.java

@@ -7,57 +7,53 @@
 
 public class RPCClient {
 
-  static class FibonacciRpcClient {
-    private Connection connection;
-    private Channel channel;
-    private String requestQueueName = "rpc_queue";
-    private String replyQueueName;
-    private QueueingConsumer consumer;
+  private Connection connection;
+  private Channel channel;
+  private String requestQueueName = "rpc_queue";
+  private String replyQueueName;
+  private QueueingConsumer consumer;
 
-    public FibonacciRpcClient() throws Exception {
-      ConnectionFactory factory = new ConnectionFactory();
-      factory.setHost("localhost");
-      connection = factory.newConnection();
-      channel = connection.createChannel();
+  public RPCClient() throws Exception {
+    ConnectionFactory factory = new ConnectionFactory();
+    factory.setHost("localhost");
+    connection = factory.newConnection();
+    channel = connection.createChannel();
 
-      replyQueueName = channel.queueDeclare().getQueue(); 
-      consumer = new QueueingConsumer(channel);
-      channel.basicConsume(replyQueueName, true, consumer);
-    }
+    replyQueueName = channel.queueDeclare().getQueue(); 
+    consumer = new QueueingConsumer(channel);
+    channel.basicConsume(replyQueueName, true, consumer);
+  }
 
-    public String call(String message) throws Exception {     
-      String response = null;
-      boolean replied = false;
-      String corrId = UUID.randomUUID().toString();
+  public String call(String message) throws Exception {     
+    String response = null;
+    String corrId = UUID.randomUUID().toString();
 
-      BasicProperties props = new BasicProperties();
-      props.setReplyTo(replyQueueName);
-      props.setCorrelationId(corrId);
+    BasicProperties props = new BasicProperties();
+    props.setReplyTo(replyQueueName);
+    props.setCorrelationId(corrId);
 
-      channel.basicPublish("", requestQueueName, props, message.getBytes());
+    channel.basicPublish("", requestQueueName, props, message.getBytes());
 
-      while (replied == false) {
-        QueueingConsumer.Delivery delivery = consumer.nextDelivery();
-        if (delivery.getProperties().getCorrelationId().compareTo(corrId) == 0) {
-          response = new String(delivery.getBody());
-          replied = true;
-        }
+    while (true) {
+      QueueingConsumer.Delivery delivery = consumer.nextDelivery();
+      if (delivery.getProperties().getCorrelationId().equals(corrId)) {
+        response = new String(delivery.getBody(),"UTF-8");
+        break;
       }
-
-      return response; 
     }
+
+    return response; 
+  }
 
-    public void close() throws Exception {
-      channel.close();
-      connection.close();
-    }
+  public void close() throws Exception {
+    connection.close();
   }
 
   public static void main(String[] argv) {
-    RPCClient.FibonacciRpcClient fibonacciRpc = null;
+    RPCClient fibonacciRpc = null;
     String response = null;
     try {
-      fibonacciRpc = new RPCClient.FibonacciRpcClient();
+      fibonacciRpc = new RPCClient();
 
       System.out.println(" [x] Requesting fib(30)");   
       response = fibonacciRpc.call("30");

java/RPCServer.java

@@ -8,19 +8,20 @@ public class RPCServer {
 
   private static final String RPC_QUEUE_NAME = "rpc_queue";
 
-  private static int fib(int n) throws Exception {
+  private static int fib(int n) {
     if (n > 1) return fib(n-1) + fib(n-2);
     else return n;
   }
 
   public static void main(String[] argv) {
     Connection connection = null;
+    Channel channel = null;
     try {
       ConnectionFactory factory = new ConnectionFactory();
       factory.setHost("localhost");
 
       connection = factory.newConnection();
-      Channel channel = connection.createChannel();
+      channel = connection.createChannel();
 
       channel.queueDeclare(RPC_QUEUE_NAME, false, false, false, null);
 
@@ -41,7 +42,7 @@ public static void main(String[] argv) {
         replyProps.setCorrelationId(props.getCorrelationId());        
 
         try {
-          String message = new String(delivery.getBody());
+          String message = new String(delivery.getBody(),"UTF-8");
           int n = Integer.parseInt(message);
 
           System.out.println(" [.] fib(" + message + ")");
@@ -52,7 +53,7 @@ public static void main(String[] argv) {
           response = "";
         }
         finally {  
-          channel.basicPublish( "", props.getReplyTo(), replyProps, response.getBytes());
+          channel.basicPublish( "", props.getReplyTo(), replyProps, response.getBytes("UTF-8"));
 
           channel.basicAck(delivery.getEnvelope().getDeliveryTag(), false);
         }