1 files changed, 44 insertions, 50 deletions
diff --git a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/queue/ServiceListQueue.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/queue/ServiceListQueue.java
index 8c802bd..04e23de 100644
--- a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/queue/ServiceListQueue.java
+++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/queue/ServiceListQueue.java
@@ -1,22 +1,18 @@
 /*******************************************************************************
  * Copyright 2016-2017 ZTE, Inc. and others.
  * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  ******************************************************************************/
 package org.onap.msb.apiroute.wrapper.queue;
 
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 
 import org.apache.http.HttpEntity;
@@ -25,50 +21,48 @@ import org.slf4j.LoggerFactory;
 
 public class ServiceListQueue extends BaseQueue<HttpEntity> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ServiceListQueue.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ServiceListQueue.class);
 
-  
-  private static final int SERVICE_LIST_DATA_QUEUE_NUM = 1;
-  private static final int SERVICE_LIST_QUEUE_INDEX = 0;
 
-  public ServiceListQueue(final int queueCapacity) {
-    super(SERVICE_LIST_DATA_QUEUE_NUM,queueCapacity);
-  }
+    private static final int SERVICE_LIST_DATA_QUEUE_NUM = 1;
+    private static final int SERVICE_LIST_QUEUE_INDEX = 0;
 
-  @Override
-  public void put(ServiceData<HttpEntity> data) throws InterruptedException {
-    BlockingQueue<ServiceData<HttpEntity>> queue=getQueue(SERVICE_LIST_QUEUE_INDEX);
-    
-    int size=queue.size();
-//    LOGGER.info("before put ServiceListQueue[size:"+size+"] success :[service num]"+data.getData().size());
-    //先清空队列
-    if(size>0){
-      queue.clear();
+    public ServiceListQueue(final int queueCapacity) {
+        super(SERVICE_LIST_DATA_QUEUE_NUM, queueCapacity);
     }
-    //插入记录
-    queue.put(data);
-    
-  }
 
-  @Override
-  public ServiceData<HttpEntity> take(int queueIndex) throws InterruptedException {
-    BlockingQueue<ServiceData<HttpEntity>> queue = getQueue(queueIndex);
-    ServiceData<HttpEntity> serviceData = queue.take();
-    return serviceData;
-    
-    /*//取队列最新一条数据
-    if (queue.isEmpty()) {
-      LOGGER.info("take a single serviceData from ServiceListQueue ");
-      return serviceData;
-    } else {
-      List<ServiceData<Map<String, List<String>>>> serviceDataList =
-          new ArrayList<ServiceData<Map<String, List<String>>>>();
-      //一次性从BlockingQueue获取所有数据
-      queue.drainTo(serviceDataList);
-      LOGGER.info("take multiple serviceDatas from ServiceListQueue :[num]"+serviceDataList.size());
-      return serviceDataList.get(serviceDataList.size() - 1);
-    }*/
-  }
+    @Override
+    public void put(ServiceData<HttpEntity> data) throws InterruptedException {
+        BlockingQueue<ServiceData<HttpEntity>> queue = getQueue(SERVICE_LIST_QUEUE_INDEX);
+
+        int size = queue.size();
+        // LOGGER.info("before put ServiceListQueue[size:"+size+"] success :[service
+        // num]"+data.getData().size());
+        // 先清空队列
+        if (size > 0) {
+            queue.clear();
+        }
+        // 插入记录
+        queue.put(data);
+
+    }
+
+    @Override
+    public ServiceData<HttpEntity> take(int queueIndex) throws InterruptedException {
+        BlockingQueue<ServiceData<HttpEntity>> queue = getQueue(queueIndex);
+        ServiceData<HttpEntity> serviceData = queue.take();
+        return serviceData;
+
+        /*
+         * //取队列最新一条数据 if (queue.isEmpty()) {
+         * LOGGER.info("take a single serviceData from ServiceListQueue "); return serviceData; }
+         * else { List<ServiceData<Map<String, List<String>>>> serviceDataList = new
+         * ArrayList<ServiceData<Map<String, List<String>>>>(); //一次性从BlockingQueue获取所有数据
+         * queue.drainTo(serviceDataList);
+         * LOGGER.info("take multiple serviceDatas from ServiceListQueue :[num]"+serviceDataList.
+         * size()); return serviceDataList.get(serviceDataList.size() - 1); }
+         */
+    }
 
 
 }