Fixed SVACE deteted Code

Change-Id: Ic324f1ab173e6101bd92c399e790fa343f15a197
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7561
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

diff --git a/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java b/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java
index d6c62ed..f2c4f7f 100644 (file)
--- a/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java
+++ b/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java
@@ -30,6 +30,8 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import javax.swing.text.html.parser.Entity;
+
 import org.iotivity.cloud.base.Resource;
 import org.iotivity.cloud.base.SessionManager;
 import org.iotivity.cloud.base.protocols.coap.CoapRequest;
@@ -40,6 +42,7 @@ import org.iotivity.cloud.util.Cbor;
 import org.iotivity.cloud.util.Logger;
 
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.collection.IntObjectMap.Entry;
 
 /**
  *
@@ -184,14 +187,16 @@ public class KeepAliveResource extends Resource {
                 // check interval
                 while (iterator.hasNext()) {
                     ChannelHandlerContext key = iterator.next();
-                    if (map.containsKey(key) && map.get(key) != null) {
-                        Long lifeTime = (Long) map.get(key);
-                        if (lifeTime != 0) {
-                            Logger.d("KeepAliveTask Operating : "
-                                    + key.channel().toString() + ", Time : "
-                                    + (lifeTime - currentTime));
-                            if (lifeTime < currentTime) {
-                                deleteList.add(key);
+                    if (map.containsKey(key)) {
+                        if (map.get(key) != null) {
+                            Long lifeTime = (Long) map.get(key);
+                            if (lifeTime != null) {
+                                Logger.d("KeepAliveTask Operating : "
+                                        + key.channel().toString() + ", Time : "
+                                        + (lifeTime - currentTime));
+                                if (lifeTime < currentTime) {
+                                    deleteList.add(key);
+                                }
                             }
                         }
                     }

diff --git a/cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/MongoDB.java b/cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/MongoDB.java
index 5e1c1bc..890e116 100644 (file)
--- a/cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/MongoDB.java
+++ b/cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/MongoDB.java
@@ -124,29 +124,101 @@ public class MongoDB {
         LinksPayloadFormat linksPayloadFormat = new LinksPayloadFormat();
         ArrayList<LinksPayloadFormat> list = new ArrayList<LinksPayloadFormat>();
 
-        publishPayloadFormat
-                .setDeviceName(doc.getString(Constants.RS_DEVICE_NAME));
-        publishPayloadFormat.setDi(doc.getString(Constants.RS_DEVICE_ID));
-        publishPayloadFormat.setBaseUri(doc.getString(Constants.RS_BASE_URI));
-        publishPayloadFormat.setBitmap(doc.getInteger(Constants.RS_BITMAP));
-        publishPayloadFormat.setPort(doc.getInteger(Constants.RS_HOSTING_PORT));
-        publishPayloadFormat.setIns(doc.getInteger(Constants.RS_INS));
-        publishPayloadFormat.setRts(doc.getString(Constants.RS_RTS));
-        publishPayloadFormat.setDrel(doc.getString(Constants.RS_DREL));
-        publishPayloadFormat.setTtl(doc.getInteger(Constants.RS_TTL));
-
-        linksPayloadFormat.setHref(doc.getString(Constants.RS_HREF));
-        linksPayloadFormat
-                .setRt((ArrayList<String>) doc.get(Constants.RS_RESOURCE_TYPE));
-        linksPayloadFormat
-                .setItf((ArrayList<String>) doc.get(Constants.RS_INTERFACE));
-        linksPayloadFormat.setRel(doc.getString(Constants.RS_REL));
-        linksPayloadFormat.setObs(doc.getBoolean(Constants.RS_OBS));
-        linksPayloadFormat.setTitle(doc.getString(Constants.RS_TITLE));
-        linksPayloadFormat.setUri(doc.getString(Constants.RS_URI));
-        linksPayloadFormat.setIns(doc.getInteger(Constants.RS_INS));
-        linksPayloadFormat
-                .setMt((ArrayList<String>) doc.get(Constants.RS_MEDIA_TYPE));
+        Object tmp = null;
+        
+        tmp = doc.get(Constants.RS_DEVICE_NAME);
+        if(tmp != null) {
+            publishPayloadFormat
+            .setDeviceName(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_DEVICE_ID);
+        if(tmp != null) {
+            publishPayloadFormat.setDi(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_BASE_URI);
+        if(tmp != null) {
+            publishPayloadFormat.setBaseUri(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_BITMAP);
+        if(tmp != null) {
+            publishPayloadFormat.setBitmap((int)tmp);
+        }
+        
+        tmp = doc.get(Constants.RS_HOSTING_PORT);
+        if(tmp != null) {
+            publishPayloadFormat.setPort((int)tmp);
+        }
+       
+        tmp = doc.get(Constants.RS_INS);
+        if(tmp != null) {
+            publishPayloadFormat.setIns((int)tmp);
+        }
+        
+        tmp = doc.get(Constants.RS_RTS);
+        if(tmp != null) {
+            publishPayloadFormat.setRts(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_DREL);
+        if(tmp != null) {
+            publishPayloadFormat.setDrel(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_TTL);
+        if(tmp != null) {
+            publishPayloadFormat.setTtl((int)tmp);
+        }
+        
+        tmp = doc.get(Constants.RS_HREF);
+        if(tmp != null) {
+            linksPayloadFormat.setHref(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_RESOURCE_TYPE);
+        if(tmp != null) {
+            linksPayloadFormat
+            .setRt((ArrayList<String>) tmp);
+        }
+
+        tmp = doc.get(Constants.RS_INTERFACE);
+        if(tmp != null) {
+            linksPayloadFormat
+            .setItf((ArrayList<String>) tmp);
+        }
+        
+        tmp = doc.get(Constants.RS_REL);
+        if(tmp != null) {
+            linksPayloadFormat.setRel(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_OBS);
+        if(tmp != null) {
+            linksPayloadFormat.setObs((boolean)tmp);
+        }
+        
+        tmp = doc.get(Constants.RS_TITLE);
+        if(tmp != null) {
+            linksPayloadFormat.setTitle(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_URI);
+        if(tmp != null) {
+            linksPayloadFormat.setUri(tmp.toString());
+        }
+        
+        tmp = doc.get(Constants.RS_INS);
+        if(tmp != null) {
+            linksPayloadFormat.setIns((int)tmp);
+        }
+        
+        tmp = doc.get(Constants.RS_MEDIA_TYPE);
+        if(tmp != null) {
+            linksPayloadFormat
+            .setMt((ArrayList<String>) tmp);
+        }
 
         list.add(linksPayloadFormat);
         publishPayloadFormat.setLinks(list);

diff --git a/cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/ResourceDirectoryResource.java b/cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/ResourceDirectoryResource.java
index b3f63e9..09d3471 100644 (file)
--- a/cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/ResourceDirectoryResource.java
+++ b/cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/ResourceDirectoryResource.java
@@ -263,7 +263,8 @@ public class ResourceDirectoryResource extends Resource {
                         "st is not null, so this is the get msg about private devices");
                 // parse payload
                 byte[] payload = request.getPayload();
-                ArrayList<String> deviceList = JSONUtil.parseJSON(payload, Constants.RS_DEVICE_LIST_KEY);
+                ArrayList<String> deviceList = JSONUtil.parseJSON(payload,
+                        Constants.RS_DEVICE_LIST_KEY);
                 if (deviceList == null) {
                     throw new IllegalArgumentException("deviceList is null");
                 }
@@ -325,7 +326,11 @@ public class ResourceDirectoryResource extends Resource {
             ArrayList<Object> payloadData = cbor.parsePayloadFromCbor(
                     request.getPayload(), ArrayList.class);
 
-            Logger.i("payloadData: " + payloadData.toString());
+            if (payloadData == null) {
+                throw new IllegalArgumentException("parsed payload is null");
+            } else {
+                Logger.i("payloadData: " + payloadData.toString());
+            }
 
             HashMap<Object, Object> tags = (HashMap<Object, Object>) payloadData
                     .get(0);
@@ -334,54 +339,61 @@ public class ResourceDirectoryResource extends Resource {
                 throw new IllegalArgumentException("tags is null!");
             }
 
-            if (tags.get(Constants.RS_DEVICE_ID) != null) {
-                pubPayload.setDi(tags.get(Constants.RS_DEVICE_ID).toString());
+            Object di = tags.get(Constants.RS_DEVICE_ID);
+            if (di != null) {
+                pubPayload.setDi(di.toString());
                 Logger.i("di : " + pubPayload.getDi());
             } else {
                 throw new IllegalArgumentException("device id is null!");
             }
 
-            if (tags.get(Constants.RS_DEVICE_NAME) != null) {
-                pubPayload.setDeviceName(
-                        tags.get(Constants.RS_DEVICE_NAME).toString());
+            Object deviceName = tags.get(Constants.RS_DEVICE_NAME);
+            if (deviceName != null) {
+                pubPayload.setDeviceName(deviceName.toString());
                 Logger.i("device name : " + pubPayload.getDeviceName());
             }
 
-            if (tags.get(Constants.RS_BASE_URI) != null) {
-                pubPayload
-                        .setBaseUri(tags.get(Constants.RS_BASE_URI).toString());
+            Object baseUri = tags.get(Constants.RS_BASE_URI);
+            if (baseUri != null) {
+                pubPayload.setBaseUri(baseUri.toString());
                 Logger.i("baseURI : " + pubPayload.getBaseUri());
             }
 
-            if (tags.get(Constants.RS_BITMAP) != null) {
-                pubPayload.setBitmap((int) tags.get(Constants.RS_BITMAP));
+            Object bitMap = tags.get(Constants.RS_BITMAP);
+            if (bitMap != null) {
+                pubPayload.setBitmap((int) bitMap);
                 Logger.i("bm : " + pubPayload.getBitmap());
             }
 
-            if (tags.get(Constants.RS_HOSTING_PORT) != null) {
-                pubPayload.setPort((int) tags.get(Constants.RS_HOSTING_PORT));
+            Object hostingPort = tags.get(Constants.RS_HOSTING_PORT);
+            if (hostingPort != null) {
+                pubPayload.setPort((int) hostingPort);
                 Logger.i("port : " + pubPayload.getPort());
             }
 
-            if (tags.get(Constants.RS_INS) != null) {
-                pubPayload.setIns((int) tags.get(Constants.RS_INS));
+            Object ins = tags.get(Constants.RS_INS);
+            if (ins != null) {
+                pubPayload.setIns((int) ins);
                 Logger.i("ins : " + pubPayload.getIns());
             }
 
-            if (tags.get(Constants.RS_RTS) != null) {
-                pubPayload.setRts(tags.get(Constants.RS_RTS).toString());
+            Object rts = tags.get(Constants.RS_RTS);
+            if (rts != null) {
+                pubPayload.setRts(rts.toString());
                 Logger.i("rts : " + pubPayload.getRts());
             }
 
-            if (tags.get(Constants.RS_DREL) != null) {
-                pubPayload.setDrel(tags.get(Constants.RS_DREL).toString());
+            Object drel = tags.get(Constants.RS_DREL);
+            if (drel != null) {
+                pubPayload.setDrel(drel.toString());
                 Logger.i("drel : " + pubPayload.getDrel());
             }
 
-            if (tags.get(Constants.RS_TTL) != null) {
-                pubPayload.setTtl((int) tags.get(Constants.RS_TTL));
-                Logger.i("ttl : " + pubPayload.getTtl());
-            }
+            // Object ttl = tags.get(Constants.RS_TTL);
+            // if (ttl != null) {
+            // pubPayload.setTtl((int) ttl);
+            // Logger.i("ttl : " + pubPayload.getTtl());
+            // }
 
             ArrayList<LinkedHashMap<Object, Object>> publishLinks = (ArrayList<LinkedHashMap<Object, Object>>) payloadData
                     .get(1);
@@ -394,54 +406,80 @@ public class ResourceDirectoryResource extends Resource {
 
                 LinksPayloadFormat storeLinks = new LinksPayloadFormat();
 
-                if (o.get(Constants.RS_HREF) != null) {
+                Object href = o.get(Constants.RS_HREF);
+                if (href != null) {
                     String prefix = "/" + pubPayload.getDi();
-                    storeLinks.setHref(
-                            prefix + o.get(Constants.RS_HREF).toString());
+                    storeLinks.setHref(prefix + href.toString());
                     Logger.i("href : " + storeLinks.getHref());
                 }
 
                 if (o.get(Constants.RS_RESOURCE_TYPE) != null) {
-                    storeLinks.setRt((ArrayList<String>) o
-                            .get(Constants.RS_RESOURCE_TYPE));
-                    Logger.i("rt : " + storeLinks.getRt().toString());
+                    Object obj = o.get(Constants.RS_RESOURCE_TYPE);
+                    if (obj != null) {
+                        storeLinks.setRt((ArrayList<String>) obj);
+                    }
+                    Object rt = storeLinks.getRt();
+                    if (rt != null) {
+                        Logger.i("rt : " + storeLinks.getRt().toString());
+                    }
                 }
 
                 if (o.get(Constants.RS_INTERFACE) != null) {
                     storeLinks.setItf(
                             (ArrayList<String>) o.get(Constants.RS_INTERFACE));
-                    Logger.i("if : " + storeLinks.getItf().toString());
+                    Object itf = storeLinks.getItf();
+                    if (itf != null) {
+                        Logger.i("if : " + storeLinks.getItf().toString());
+                    }
                 }
 
-                if (o.get(Constants.RS_REL) != null) {
-                    storeLinks.setRel(o.get(Constants.RS_REL).toString());
+                Object rel = o.get(Constants.RS_REL);
+                if (rel != null) {
+                    storeLinks.setRel(rel.toString());
                     Logger.i("rel : " + storeLinks.getRel());
                 }
 
                 if (o.get(Constants.RS_OBS) != null) {
-                    storeLinks.setObs((boolean) o.get(Constants.RS_OBS));
+                    Object obj = o.get(Constants.RS_OBS);
+                    if (obj != null) {
+                        storeLinks.setObs((boolean) obj);
+                    }
                     Logger.i("obs : " + storeLinks.isObs());
                 }
 
                 if (o.get(Constants.RS_TITLE) != null) {
-                    storeLinks.setTitle(o.get(Constants.RS_TITLE).toString());
+                    Object obj = o.get(Constants.RS_TITLE);
+                    if (obj != null) {
+                        storeLinks.setTitle(obj.toString());
+                    }
                     Logger.i("title : " + storeLinks.getTitle());
                 }
 
                 if (o.get(Constants.RS_URI) != null) {
-                    storeLinks.setUri(o.get(Constants.RS_URI).toString());
+                    Object obj = o.get(Constants.RS_URI);
+                    if (obj != null) {
+                        storeLinks.setUri(obj.toString());
+                    }
                     Logger.i("uri : " + storeLinks.getUri());
                 }
 
                 if (o.get(Constants.RS_INS) != null) {
-                    storeLinks.setIns((int) (o.get(Constants.RS_INS)));
+                    Object obj = o.get(Constants.RS_INS);
+                    if (obj != null) {
+                        storeLinks.setIns((int) obj);
+                    }
                     Logger.i("ins : " + storeLinks.getIns());
                 }
 
                 if (o.get(Constants.RS_MEDIA_TYPE) != null) {
-                    storeLinks.setMt(
-                            (ArrayList<String>) o.get(Constants.RS_MEDIA_TYPE));
-                    Logger.i("mt : " + storeLinks.getMt().toString());
+                    Object obj = o.get(Constants.RS_MEDIA_TYPE);
+                    if (obj != null) {
+                        storeLinks.setMt((ArrayList<String>) obj);
+                    }
+                    Object mt = storeLinks.getMt();
+                    if (mt != null) {
+                        Logger.i("mt : " + mt.toString());
+                    }
                 }
 
                 pubPayload.links.add(storeLinks);

diff --git a/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/RDServerTest.java b/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/RDServerTest.java
index 2770326..bf8ada3 100644 (file)
--- a/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/RDServerTest.java
+++ b/cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/RDServerTest.java
@@ -78,6 +78,9 @@ public class RDServerTest {
         CoapClientHandler coapHandler = new CoapClientHandler();
         coapClient.addHandler(coapHandler);
         coapClient.startClient(new InetSocketAddress("127.0.0.1", 5683));
+        if (coapHandler.connectCtx == null) {
+                throw new IllegalArgumentException("connectCtx is null");
+        }
         return coapHandler.connectCtx;
     }
 
@@ -186,7 +189,12 @@ public class RDServerTest {
         didList.add("98f7483c-5a31-4161-ba7e-9c13e0d");
         data.put("devices", didList);
         String payload = JSONUtil.writeJSON(data);
-        request.setPayload(payload.getBytes(StandardCharsets.UTF_8));
+        if (payload != null) {
+            request.setPayload(payload.getBytes(StandardCharsets.UTF_8));
+        }
+        else {
+                throw new IllegalArgumentException("payload writeJson error");
+        }
 
         startServer();
         ChannelHandlerContext ctx = startClient();