commit a1da42ebbf253825760337f3ad269e1f5aa07d99
author Thomas Vachuska <tom@onlab.us> Wed Sep 09 00:45:22 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Wed Sep 09 01:01:18 2015 -0700
tree f52d52b7895caa9af92abc3a53f3a3528e2e4fd3
parent 54dc352569638aa4c34dff9d03cddf8d92db3cab

Renaming DHCP* to Dhcp* to follow ONOS conventions.

Change-Id: I36cfbe5b57e342af2e436e31374f1a1f49633e78

apps/dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java

diff --git a/apps/dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java
index b18acd5..38df577 100644
--- a/apps/dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java
+++ b/apps/dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java
@@ -20,8 +20,8 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.MacAddress;
-import org.onosproject.dhcp.DHCPService;
-import org.onosproject.dhcp.IPAssignment;
+import org.onosproject.dhcp.DhcpService;
+import org.onosproject.dhcp.IpAssignment;
 import org.onosproject.rest.AbstractWebResource;
 
 import javax.ws.rs.Consumes;
@@ -42,7 +42,7 @@
 @Path("dhcp")
 public class DHCPWebResource extends AbstractWebResource {
 
-    final DHCPService service = get(DHCPService.class);
+    final DhcpService service = get(DhcpService.class);
 
     /**
      * Get DHCP server configuration data.
@@ -53,7 +53,7 @@
     @GET
     @Path("config")
     public Response getConfigs() {
-        DHCPService service = get(DHCPService.class);
+        DhcpService service = get(DhcpService.class);
         ObjectNode node = mapper().createObjectNode()
                 .put("leaseTime", service.getLeaseTime())
                 .put("renewalTime", service.getRenewalTime())
@@ -72,7 +72,7 @@
     public Response listMappings() {
         ObjectNode root = mapper().createObjectNode();
 
-        final Map<MacAddress, IPAssignment> intents = service.listMapping();
+        final Map<MacAddress, IpAssignment> intents = service.listMapping();
         ArrayNode arrayNode = root.putArray("mappings");
         intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode()
                 .put("mac", i.getKey().toString())
@@ -124,7 +124,7 @@
                 }
             }
 
-            final Map<MacAddress, IPAssignment> intents = service.listMapping();
+            final Map<MacAddress, IpAssignment> intents = service.listMapping();
             ArrayNode arrayNode = root.putArray("mappings");
             intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode()
                     .put("mac", i.getKey().toString())
@@ -150,7 +150,7 @@
         if (!service.removeStaticMapping(MacAddress.valueOf(macID))) {
             throw new IllegalArgumentException("Static Mapping Removal Failed.");
         }
-        final Map<MacAddress, IPAssignment> intents = service.listMapping();
+        final Map<MacAddress, IpAssignment> intents = service.listMapping();
         ArrayNode arrayNode = root.putArray("mappings");
         intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode()
                 .put("mac", i.getKey().toString())