commit 6cfc02d9539e382e3eb1ffd3cfb96d4b2352eeff
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri Sep 11 11:19:11 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 11 18:53:17 2015 +0000
tree 808929e8f93cb96eb243508e99778f294af70041
parent f578b4301b193759aa70b06786aad11620b96d63

Use dianmond operator

Change-Id: I551dd9443b10ef17832f74a554486b7605e9866a

apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java

diff --git a/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java b/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
index 0a427bb..1cb1444 100644
--- a/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
+++ b/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
@@ -131,7 +131,7 @@
     @Path("{portUUID}")

     @DELETE

     public Response deletePorts(@PathParam("portUUID") String id) {

-        Set<VirtualPortId> vPortIds = new HashSet<VirtualPortId>();

+        Set<VirtualPortId> vPortIds = new HashSet<>();

         try {

             if (id != null) {

                 vPortIds.add(VirtualPortId.portId(id));

@@ -201,8 +201,8 @@
      */

     public Iterable<VirtualPort> changeJsonToPorts(JsonNode vPortNodes) {

         checkNotNull(vPortNodes, JSON_NOT_NULL);

-        Map<VirtualPortId, VirtualPort> portMap = new HashMap<VirtualPortId, VirtualPort>();

-        Map<String, String> strMap = new HashMap<String, String>();

+        Map<VirtualPortId, VirtualPort> portMap = new HashMap<>();

+        Map<String, String> strMap = new HashMap<>();

         for (JsonNode vPortnode : vPortNodes) {

             VirtualPortId id = VirtualPortId.portId(vPortnode.get("id")

                     .asText());

@@ -220,7 +220,7 @@
                     .asText());

             String deviceOwner = vPortnode.get("device_owner").asText();

             JsonNode fixedIpNodes = vPortNodes.get("fixed_ips");

-            Set<FixedIp> fixedIps = new HashSet<FixedIp>();

+            Set<FixedIp> fixedIps = new HashSet<>();

             for (JsonNode fixedIpNode : fixedIpNodes) {

                 FixedIp fixedIp = jsonNodeToFixedIps(fixedIpNode);

                 fixedIps.add(fixedIp);

@@ -265,8 +265,8 @@
      */

     public Iterable<VirtualPort> changeJsonToPort(JsonNode vPortNodes) {

         checkNotNull(vPortNodes, JSON_NOT_NULL);

-        Map<VirtualPortId, VirtualPort> vportMap = new HashMap<VirtualPortId, VirtualPort>();

-        Map<String, String> strMap = new HashMap<String, String>();

+        Map<VirtualPortId, VirtualPort> vportMap = new HashMap<>();

+        Map<String, String> strMap = new HashMap<>();

         VirtualPortId id = VirtualPortId.portId(vPortNodes.get("id").asText());

         String name = vPortNodes.get("name").asText();

         TenantId tenantId = TenantId.tenantId(vPortNodes.get("tenant_id")

@@ -281,7 +281,7 @@
                 .asText());

         String deviceOwner = vPortNodes.get("device_owner").asText();

         JsonNode fixedIpNodes = vPortNodes.get("fixed_ips");

-        Set<FixedIp> fixedIps = new HashSet<FixedIp>();

+        Set<FixedIp> fixedIps = new HashSet<>();

         for (JsonNode fixedIpNode : fixedIpNodes) {

             FixedIp fixedIp = jsonNodeToFixedIps(fixedIpNode);

             fixedIps.add(fixedIp);