diff --git a/alarm-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/alarm/datastore/inmemory/AlarmDatastoreInMemory.java b/alarm-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/alarm/datastore/inmemory/AlarmDatastoreInMemory.java index 3ce79804..d6e6eece 100644 --- a/alarm-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/alarm/datastore/inmemory/AlarmDatastoreInMemory.java +++ b/alarm-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/alarm/datastore/inmemory/AlarmDatastoreInMemory.java @@ -205,6 +205,10 @@ public class AlarmDatastoreInMemory extends BaseInMemoryDatastore implements Ala public PaginationResponse getForCustomer(int customerId, Set equipmentIdSet, Set alarmCodeSet, long createdAfterTimestamp, List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/alarm-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/alarm/datastore/rdbms/AlarmDatastoreRdbms.java b/alarm-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/alarm/datastore/rdbms/AlarmDatastoreRdbms.java index bafa0d84..f9323535 100644 --- a/alarm-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/alarm/datastore/rdbms/AlarmDatastoreRdbms.java +++ b/alarm-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/alarm/datastore/rdbms/AlarmDatastoreRdbms.java @@ -58,6 +58,11 @@ public class AlarmDatastoreRdbms implements AlarmDatastore { public PaginationResponse getForCustomer(int customerId, Set equipmentIdSet, Set alarmCodeSet, long createdAfterTimestamp, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return alarmDAO.getForCustomer(customerId, equipmentIdSet, alarmCodeSet, createdAfterTimestamp, sortBy, context); diff --git a/alarm-service/src/main/java/com/telecominfraproject/wlan/alarm/controller/AlarmController.java b/alarm-service/src/main/java/com/telecominfraproject/wlan/alarm/controller/AlarmController.java index 58813e0f..9007d080 100644 --- a/alarm-service/src/main/java/com/telecominfraproject/wlan/alarm/controller/AlarmController.java +++ b/alarm-service/src/main/java/com/telecominfraproject/wlan/alarm/controller/AlarmController.java @@ -125,7 +125,11 @@ public class AlarmController { @RequestParam Set alarmCodeSet, @RequestParam long createdAfterTimestamp, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Alarms for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/client-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/client/datastore/inmemory/ClientDatastoreInMemory.java b/client-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/client/datastore/inmemory/ClientDatastoreInMemory.java index 33fb2566..91e378e0 100644 --- a/client-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/client/datastore/inmemory/ClientDatastoreInMemory.java +++ b/client-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/client/datastore/inmemory/ClientDatastoreInMemory.java @@ -137,6 +137,10 @@ public class ClientDatastoreInMemory extends BaseInMemoryDatastore implements Cl public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); @@ -328,6 +332,10 @@ public class ClientDatastoreInMemory extends BaseInMemoryDatastore implements Cl Set equipmentIds, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/client-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/client/datastore/rdbms/ClientDatastoreRdbms.java b/client-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/client/datastore/rdbms/ClientDatastoreRdbms.java index 85558526..4515f12d 100644 --- a/client-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/client/datastore/rdbms/ClientDatastoreRdbms.java +++ b/client-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/client/datastore/rdbms/ClientDatastoreRdbms.java @@ -53,6 +53,11 @@ public class ClientDatastoreRdbms implements ClientDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return clientDAO.getForCustomer( customerId, sortBy, context); } @@ -84,6 +89,11 @@ public class ClientDatastoreRdbms implements ClientDatastore { @Override public PaginationResponse getSessionsForCustomer(int customerId, Set equipmentIds, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return clientSessionDAO.getSessionsForCustomer(customerId, equipmentIds, sortBy, context); } diff --git a/client-service/src/main/java/com/telecominfraproject/wlan/client/controller/ClientController.java b/client-service/src/main/java/com/telecominfraproject/wlan/client/controller/ClientController.java index 032527c0..b71334a3 100644 --- a/client-service/src/main/java/com/telecominfraproject/wlan/client/controller/ClientController.java +++ b/client-service/src/main/java/com/telecominfraproject/wlan/client/controller/ClientController.java @@ -124,7 +124,11 @@ public class ClientController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Clients for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); @@ -242,7 +246,11 @@ public class ClientController { public PaginationResponse getSessionsForCustomer(@RequestParam int customerId, @RequestParam Set equipmentIds, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Client sessions for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/equipment-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/equipment/datastore/inmemory/EquipmentDatastoreInMemory.java b/equipment-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/equipment/datastore/inmemory/EquipmentDatastoreInMemory.java index 51b40914..03ad1127 100644 --- a/equipment-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/equipment/datastore/inmemory/EquipmentDatastoreInMemory.java +++ b/equipment-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/equipment/datastore/inmemory/EquipmentDatastoreInMemory.java @@ -166,6 +166,10 @@ public class EquipmentDatastoreInMemory extends BaseInMemoryDatastore implements public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); @@ -261,6 +265,10 @@ public class EquipmentDatastoreInMemory extends BaseInMemoryDatastore implements public PaginationResponse getForCustomer(int customerId, EquipmentType equipmentType, Set locationIds, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/equipment-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/equipment/datastore/rdbms/EquipmentDatastoreRdbms.java b/equipment-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/equipment/datastore/rdbms/EquipmentDatastoreRdbms.java index 7b35f0da..21c4dc1d 100644 --- a/equipment-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/equipment/datastore/rdbms/EquipmentDatastoreRdbms.java +++ b/equipment-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/equipment/datastore/rdbms/EquipmentDatastoreRdbms.java @@ -56,12 +56,22 @@ public class EquipmentDatastoreRdbms implements EquipmentDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return equipmentDAO.getForCustomer( customerId, sortBy, context); } @Override public PaginationResponse getForCustomer(int customerId, EquipmentType equipmentType, Set locationIds, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return equipmentDAO.getForCustomer( customerId, equipmentType, locationIds, sortBy, context); } diff --git a/equipment-service/src/main/java/com/telecominfraproject/wlan/equipment/controller/EquipmentController.java b/equipment-service/src/main/java/com/telecominfraproject/wlan/equipment/controller/EquipmentController.java index d7df69a9..99c29937 100644 --- a/equipment-service/src/main/java/com/telecominfraproject/wlan/equipment/controller/EquipmentController.java +++ b/equipment-service/src/main/java/com/telecominfraproject/wlan/equipment/controller/EquipmentController.java @@ -154,7 +154,11 @@ public class EquipmentController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Equipments for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); @@ -185,7 +189,11 @@ public class EquipmentController { public PaginationResponse getForCustomerWithFilter(@RequestParam int customerId, @RequestParam EquipmentType equipmentType, @RequestParam Set locationIds, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up equipment {} for customer {} locations {} last returned page number {}", equipmentType, customerId, locationIds, paginationContext.getLastReturnedPageNumber()); diff --git a/firmware-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/firmware/datastore/inmemory/FirmwareDatastoreInMemory.java b/firmware-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/firmware/datastore/inmemory/FirmwareDatastoreInMemory.java index 1c7d7fbd..73021e80 100644 --- a/firmware-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/firmware/datastore/inmemory/FirmwareDatastoreInMemory.java +++ b/firmware-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/firmware/datastore/inmemory/FirmwareDatastoreInMemory.java @@ -148,6 +148,10 @@ public class FirmwareDatastoreInMemory extends BaseInMemoryDatastore implements public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/firmware-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/firmware/datastore/rdbms/FirmwareDatastoreRdbms.java b/firmware-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/firmware/datastore/rdbms/FirmwareDatastoreRdbms.java index dd0ab6dc..cb0ea029 100644 --- a/firmware-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/firmware/datastore/rdbms/FirmwareDatastoreRdbms.java +++ b/firmware-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/firmware/datastore/rdbms/FirmwareDatastoreRdbms.java @@ -55,6 +55,11 @@ public class FirmwareDatastoreRdbms implements FirmwareDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return firmwareDAO.getForCustomer( customerId, sortBy, context); } } diff --git a/firmware-service/src/main/java/com/telecominfraproject/wlan/firmware/controller/FirmwareController.java b/firmware-service/src/main/java/com/telecominfraproject/wlan/firmware/controller/FirmwareController.java index 07118439..733061ed 100644 --- a/firmware-service/src/main/java/com/telecominfraproject/wlan/firmware/controller/FirmwareController.java +++ b/firmware-service/src/main/java/com/telecominfraproject/wlan/firmware/controller/FirmwareController.java @@ -134,7 +134,11 @@ public class FirmwareController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Firmwares for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/location-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/location/datastore/inmemory/LocationDatastoreInMemory.java b/location-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/location/datastore/inmemory/LocationDatastoreInMemory.java index af09f66d..8f338ec5 100644 --- a/location-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/location/datastore/inmemory/LocationDatastoreInMemory.java +++ b/location-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/location/datastore/inmemory/LocationDatastoreInMemory.java @@ -182,6 +182,10 @@ public class LocationDatastoreInMemory extends BaseInMemoryDatastore implements public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/location-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/location/datastore/rdbms/LocationDatastoreRdbms.java b/location-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/location/datastore/rdbms/LocationDatastoreRdbms.java index 5dbdc1fc..08471273 100644 --- a/location-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/location/datastore/rdbms/LocationDatastoreRdbms.java +++ b/location-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/location/datastore/rdbms/LocationDatastoreRdbms.java @@ -66,6 +66,11 @@ public class LocationDatastoreRdbms implements LocationDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return locationDAO.getForCustomer( customerId, sortBy, context); } diff --git a/location-service/src/main/java/com/telecominfraproject/wlan/location/service/LocationServiceController.java b/location-service/src/main/java/com/telecominfraproject/wlan/location/service/LocationServiceController.java index 6247c306..e7a6f7d7 100644 --- a/location-service/src/main/java/com/telecominfraproject/wlan/location/service/LocationServiceController.java +++ b/location-service/src/main/java/com/telecominfraproject/wlan/location/service/LocationServiceController.java @@ -200,7 +200,11 @@ public class LocationServiceController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Locations for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/manufacturer-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/manufacturer/datastore/inmemory/ManufacturerDatastoreInMemory.java b/manufacturer-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/manufacturer/datastore/inmemory/ManufacturerDatastoreInMemory.java index a97fccca..5ec39ddc 100644 --- a/manufacturer-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/manufacturer/datastore/inmemory/ManufacturerDatastoreInMemory.java +++ b/manufacturer-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/manufacturer/datastore/inmemory/ManufacturerDatastoreInMemory.java @@ -148,6 +148,10 @@ public class ManufacturerDatastoreInMemory extends BaseInMemoryDatastore impleme public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/manufacturer-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/manufacturer/datastore/rdbms/ManufacturerDatastoreRdbms.java b/manufacturer-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/manufacturer/datastore/rdbms/ManufacturerDatastoreRdbms.java index 2272a4e4..bfd88a62 100644 --- a/manufacturer-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/manufacturer/datastore/rdbms/ManufacturerDatastoreRdbms.java +++ b/manufacturer-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/manufacturer/datastore/rdbms/ManufacturerDatastoreRdbms.java @@ -55,6 +55,11 @@ public class ManufacturerDatastoreRdbms implements ManufacturerDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return manufacturerDAO.getForCustomer( customerId, sortBy, context); } } diff --git a/manufacturer-service/src/main/java/com/telecominfraproject/wlan/manufacturer/controller/ManufacturerController.java b/manufacturer-service/src/main/java/com/telecominfraproject/wlan/manufacturer/controller/ManufacturerController.java index 2644f92e..77d68a35 100644 --- a/manufacturer-service/src/main/java/com/telecominfraproject/wlan/manufacturer/controller/ManufacturerController.java +++ b/manufacturer-service/src/main/java/com/telecominfraproject/wlan/manufacturer/controller/ManufacturerController.java @@ -134,7 +134,11 @@ public class ManufacturerController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Manufacturers for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/alarm/AlarmPortalController.java b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/alarm/AlarmPortalController.java index 71f5fa7c..62191543 100644 --- a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/alarm/AlarmPortalController.java +++ b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/alarm/AlarmPortalController.java @@ -62,7 +62,11 @@ public class AlarmPortalController { @RequestParam(required = false) Set alarmCodes, @RequestParam(required = false, defaultValue = "-1") long createdAfterTimestamp, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Alarms for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/client/ClientPortalController.java b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/client/ClientPortalController.java index da062aaa..b6cfbca8 100644 --- a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/client/ClientPortalController.java +++ b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/client/ClientPortalController.java @@ -115,7 +115,11 @@ public class ClientPortalController { public PaginationResponse getClientSessionsForCustomer(@RequestParam int customerId, @RequestParam(required = false) Set equipmentIds, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Client Sessions for customer {} equipment {} with last returned page number {}", customerId, equipmentIds, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/equipment/EquipmentPortalController.java b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/equipment/EquipmentPortalController.java index 284712c0..2b4ef1a5 100644 --- a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/equipment/EquipmentPortalController.java +++ b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/equipment/EquipmentPortalController.java @@ -99,7 +99,11 @@ public class EquipmentPortalController { @RequestMapping(value = "/equipment/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Equipments for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); @@ -131,7 +135,11 @@ public class EquipmentPortalController { @RequestParam(required = false) EquipmentType equipmentType, @RequestParam(required = false) Set locationIds, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up equipment {} for customer {} locations {} last returned page number {}", equipmentType, customerId, locationIds, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/location/LocationPortalController.java b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/location/LocationPortalController.java index a650c408..ffca24d5 100644 --- a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/location/LocationPortalController.java +++ b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/location/LocationPortalController.java @@ -121,7 +121,11 @@ public class LocationPortalController { @RequestMapping(value = "/location/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Locations for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/portaluser/PortalUserPortalController.java b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/portaluser/PortalUserPortalController.java index 2dfa5069..d8c3a6bc 100644 --- a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/portaluser/PortalUserPortalController.java +++ b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/portaluser/PortalUserPortalController.java @@ -123,7 +123,11 @@ public class PortalUserPortalController { @RequestMapping(value = "/portalUser/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up PortalUsers for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/profile/ProfilePortalController.java b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/profile/ProfilePortalController.java index 4bdd2272..3f54b3a0 100644 --- a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/profile/ProfilePortalController.java +++ b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/profile/ProfilePortalController.java @@ -95,7 +95,11 @@ public class ProfilePortalController { @RequestMapping(value = "/profile/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Profiles for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/servicemetric/ServiceMetricPortalController.java b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/servicemetric/ServiceMetricPortalController.java index 0b34c9cd..a0f0bcce 100644 --- a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/servicemetric/ServiceMetricPortalController.java +++ b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/servicemetric/ServiceMetricPortalController.java @@ -52,6 +52,10 @@ public class ServiceMetricPortalController { @RequestParam(required = false) List sortBy, @RequestParam(required = false) PaginationContext paginationContext) { + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } + LOG.debug("Looking up ServiceMetrics for customer {} equipment {} from {} to {} with last returned page number {}", customerId, equipmentIds, fromTime, toTime, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/status/StatusPortalController.java b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/status/StatusPortalController.java index 08e3d5a4..f98d4e32 100644 --- a/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/status/StatusPortalController.java +++ b/portal-services/src/main/java/com/telecominfraproject/wlan/portal/controller/status/StatusPortalController.java @@ -55,7 +55,11 @@ public class StatusPortalController { @RequestMapping(value = "/status/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Statuses for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); @@ -87,7 +91,11 @@ public class StatusPortalController { @RequestParam(required = false) Set equipmentIds, @RequestParam(required = false) Set statusDataTypes, @RequestParam(required = false) List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up status for customer {} equipment {} type {} last returned page number {}", customerId, equipmentIds, statusDataTypes, paginationContext.getLastReturnedPageNumber()); diff --git a/portal-user-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/inmemory/PortalUserDatastoreInMemory.java b/portal-user-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/inmemory/PortalUserDatastoreInMemory.java index 9d399600..98759162 100644 --- a/portal-user-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/inmemory/PortalUserDatastoreInMemory.java +++ b/portal-user-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/inmemory/PortalUserDatastoreInMemory.java @@ -160,6 +160,10 @@ public class PortalUserDatastoreInMemory extends BaseInMemoryDatastore implement public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/portal-user-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/rdbms/PortalUserDatastoreRdbms.java b/portal-user-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/rdbms/PortalUserDatastoreRdbms.java index a62f0dc3..333d4d76 100644 --- a/portal-user-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/rdbms/PortalUserDatastoreRdbms.java +++ b/portal-user-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/rdbms/PortalUserDatastoreRdbms.java @@ -60,6 +60,11 @@ public class PortalUserDatastoreRdbms implements PortalUserDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return portalUserDAO.getForCustomer( customerId, sortBy, context); } } diff --git a/portal-user-service/src/main/java/com/telecominfraproject/wlan/portaluser/controller/PortalUserController.java b/portal-user-service/src/main/java/com/telecominfraproject/wlan/portaluser/controller/PortalUserController.java index dec2da71..ff65e617 100644 --- a/portal-user-service/src/main/java/com/telecominfraproject/wlan/portaluser/controller/PortalUserController.java +++ b/portal-user-service/src/main/java/com/telecominfraproject/wlan/portaluser/controller/PortalUserController.java @@ -152,7 +152,11 @@ public class PortalUserController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up PortalUsers for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/profile-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/profile/datastore/inmemory/ProfileDatastoreInMemory.java b/profile-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/profile/datastore/inmemory/ProfileDatastoreInMemory.java index a6f7768a..16b58c2d 100644 --- a/profile-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/profile/datastore/inmemory/ProfileDatastoreInMemory.java +++ b/profile-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/profile/datastore/inmemory/ProfileDatastoreInMemory.java @@ -152,6 +152,10 @@ public class ProfileDatastoreInMemory extends BaseInMemoryDatastore implements P public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/profile-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/profile/datastore/rdbms/ProfileDatastoreRdbms.java b/profile-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/profile/datastore/rdbms/ProfileDatastoreRdbms.java index f45815cd..b60942e9 100644 --- a/profile-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/profile/datastore/rdbms/ProfileDatastoreRdbms.java +++ b/profile-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/profile/datastore/rdbms/ProfileDatastoreRdbms.java @@ -55,6 +55,11 @@ public class ProfileDatastoreRdbms implements ProfileDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return profileDAO.getForCustomer( customerId, sortBy, context); } diff --git a/profile-service/src/main/java/com/telecominfraproject/wlan/profile/controller/ProfileController.java b/profile-service/src/main/java/com/telecominfraproject/wlan/profile/controller/ProfileController.java index 9c50bca3..f482b844 100644 --- a/profile-service/src/main/java/com/telecominfraproject/wlan/profile/controller/ProfileController.java +++ b/profile-service/src/main/java/com/telecominfraproject/wlan/profile/controller/ProfileController.java @@ -134,7 +134,11 @@ public class ProfileController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Profiles for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java b/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java index 41ed9b1a..fc513736 100644 --- a/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java +++ b/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java @@ -153,6 +153,10 @@ public class RoutingDatastoreInMemory extends BaseInMemoryDatastore implements R public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/routing-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/routing/datastore/rdbms/RoutingDatastoreRdbms.java b/routing-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/routing/datastore/rdbms/RoutingDatastoreRdbms.java index 0e9da0fb..e40889b3 100644 --- a/routing-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/routing/datastore/rdbms/RoutingDatastoreRdbms.java +++ b/routing-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/routing/datastore/rdbms/RoutingDatastoreRdbms.java @@ -57,6 +57,11 @@ public class RoutingDatastoreRdbms implements RoutingDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return routingDAO.getForCustomer( customerId, sortBy, context); } diff --git a/routing-service/src/main/java/com/telecominfraproject/wlan/routing/controller/RoutingController.java b/routing-service/src/main/java/com/telecominfraproject/wlan/routing/controller/RoutingController.java index 557e5eca..8eb5a5ca 100644 --- a/routing-service/src/main/java/com/telecominfraproject/wlan/routing/controller/RoutingController.java +++ b/routing-service/src/main/java/com/telecominfraproject/wlan/routing/controller/RoutingController.java @@ -143,7 +143,11 @@ public class RoutingController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Routings for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); diff --git a/status-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/status/datastore/inmemory/StatusDatastoreInMemory.java b/status-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/status/datastore/inmemory/StatusDatastoreInMemory.java index 64b989d5..11c3a25d 100644 --- a/status-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/status/datastore/inmemory/StatusDatastoreInMemory.java +++ b/status-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/status/datastore/inmemory/StatusDatastoreInMemory.java @@ -233,6 +233,10 @@ public class StatusDatastoreInMemory extends BaseInMemoryDatastore implements St private PaginationResponse getNextPage(PaginationFilter filter, List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/status-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/status/datastore/rdbms/StatusDatastoreRdbms.java b/status-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/status/datastore/rdbms/StatusDatastoreRdbms.java index ab334560..af9a996c 100644 --- a/status-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/status/datastore/rdbms/StatusDatastoreRdbms.java +++ b/status-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/status/datastore/rdbms/StatusDatastoreRdbms.java @@ -51,12 +51,22 @@ public class StatusDatastoreRdbms implements StatusDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return statusDAO.getForCustomer( customerId, sortBy, context); } @Override public PaginationResponse getForCustomer(int customerId, Set equipmentIds, Set statusDataTypes, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return statusDAO.getForCustomer( customerId, equipmentIds, statusDataTypes, sortBy, context); } } diff --git a/status-service/src/main/java/com/telecominfraproject/wlan/status/controller/StatusController.java b/status-service/src/main/java/com/telecominfraproject/wlan/status/controller/StatusController.java index c24c6c9f..906ffc0e 100644 --- a/status-service/src/main/java/com/telecominfraproject/wlan/status/controller/StatusController.java +++ b/status-service/src/main/java/com/telecominfraproject/wlan/status/controller/StatusController.java @@ -81,7 +81,11 @@ public class StatusController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Statuses for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber()); @@ -113,7 +117,11 @@ public class StatusController { @RequestParam Set equipmentIds, @RequestParam Set statusDataTypes, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up Statuses for customer {} equipment {} types {} with last returned page number {}", customerId, equipmentIds, statusDataTypes, paginationContext.getLastReturnedPageNumber()); diff --git a/system-event-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/systemevent/datastore/inmemory/SystemEventDatastoreInMemory.java b/system-event-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/systemevent/datastore/inmemory/SystemEventDatastoreInMemory.java index 6793fb0c..1a776894 100644 --- a/system-event-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/systemevent/datastore/inmemory/SystemEventDatastoreInMemory.java +++ b/system-event-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/systemevent/datastore/inmemory/SystemEventDatastoreInMemory.java @@ -148,6 +148,10 @@ public class SystemEventDatastoreInMemory extends BaseInMemoryDatastore implemen public PaginationResponse getForCustomer(int customerId, final List sortBy, PaginationContext context) { + if(context == null) { + context = new PaginationContext<>(); + } + PaginationResponse ret = new PaginationResponse<>(); ret.setContext(context.clone()); diff --git a/system-event-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/systemevent/datastore/rdbms/SystemEventDatastoreRdbms.java b/system-event-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/systemevent/datastore/rdbms/SystemEventDatastoreRdbms.java index 9189eafd..ce2e37bb 100644 --- a/system-event-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/systemevent/datastore/rdbms/SystemEventDatastoreRdbms.java +++ b/system-event-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/systemevent/datastore/rdbms/SystemEventDatastoreRdbms.java @@ -55,6 +55,11 @@ public class SystemEventDatastoreRdbms implements SystemEventDatastore { @Override public PaginationResponse getForCustomer(int customerId, List sortBy, PaginationContext context) { + + if(context == null) { + context = new PaginationContext<>(); + } + return systemEventDAO.getForCustomer( customerId, sortBy, context); } } diff --git a/system-event-service/src/main/java/com/telecominfraproject/wlan/systemevent/controller/SystemEventController.java b/system-event-service/src/main/java/com/telecominfraproject/wlan/systemevent/controller/SystemEventController.java index 3203942c..8fd92b12 100644 --- a/system-event-service/src/main/java/com/telecominfraproject/wlan/systemevent/controller/SystemEventController.java +++ b/system-event-service/src/main/java/com/telecominfraproject/wlan/systemevent/controller/SystemEventController.java @@ -125,7 +125,11 @@ public class SystemEventController { @RequestMapping(value = "/forCustomer", method = RequestMethod.GET) public PaginationResponse getForCustomer(@RequestParam int customerId, @RequestParam List sortBy, - @RequestParam PaginationContext paginationContext) { + @RequestParam(required = false) PaginationContext paginationContext) { + + if(paginationContext == null) { + paginationContext = new PaginationContext<>(); + } LOG.debug("Looking up SystemEventRecords for customer {} with last returned page number {}", customerId, paginationContext.getLastReturnedPageNumber());