JIRA : NETVIRT-1690
Signed-off-by: Chetan Arakere Gowdru <chetan.arakere@altencalsoftlabs.com>
Change-Id: I83f816520fa87f39ff8b122361cf1b02bc2eb034
Signed-off-by: Chetan Arakere Gowdru <chetan.arakere@altencalsoftlabs.com>
import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import java.util.ArrayList;
import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
.setPortName(fixedNeutronPortName);
}
if (fixedIpAddress != null) {
.setPortName(fixedNeutronPortName);
}
if (fixedIpAddress != null) {
- List<InternalToExternalPortMap> intExtPortMapList
- = new ArrayList<InternalToExternalPortMap>(fixedNeutronPortBuilder
- .getInternalToExternalPortMap() != null ? fixedNeutronPortBuilder
- .getInternalToExternalPortMap().values() : null);
- if (intExtPortMapList == null) {
- intExtPortMapList = new ArrayList<>();
- }
+ Collection<InternalToExternalPortMap> intExtPortMapCollection = fixedNeutronPortBuilder
+ .getInternalToExternalPortMap() != null ? fixedNeutronPortBuilder
+ .getInternalToExternalPortMap().values() : null;
+ List<InternalToExternalPortMap> intExtPortMapList =
+ new ArrayList<InternalToExternalPortMap>(intExtPortMapCollection != null
+ ? intExtPortMapCollection : Collections.emptyList());
InternalToExternalPortMap intExtPortMap = new InternalToExternalPortMapBuilder().withKey(new
InternalToExternalPortMapKey(fixedIpAddress)).setInternalIp(fixedIpAddress)
.setExternalIp(floatingIpAddress).setExternalId(floatingIpId).build();
InternalToExternalPortMap intExtPortMap = new InternalToExternalPortMapBuilder().withKey(new
InternalToExternalPortMapKey(fixedIpAddress)).setInternalIp(fixedIpAddress)
.setExternalIp(floatingIpAddress).setExternalId(floatingIpId).build();