Repository: jclouds-labs-openstack Updated Branches: refs/heads/master ad94f665d -> 0dacbce26
Fixes missing nullable annotations Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/0dacbce2 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/0dacbce2 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/0dacbce2 Branch: refs/heads/master Commit: 0dacbce262e60c7ae1a4aa339089c9e18ce19bf7 Parents: ad94f66 Author: Zack Shoylev <[email protected]> Authored: Tue Aug 12 14:13:22 2014 -0500 Committer: Zack Shoylev <[email protected]> Committed: Tue Aug 12 15:00:39 2014 -0500 ---------------------------------------------------------------------- .../openstack/neutron/v2/domain/AddressPair.java | 3 +++ .../openstack/neutron/v2/domain/AllocationPool.java | 3 +++ .../neutron/v2/domain/ExternalGatewayInfo.java | 3 +++ .../openstack/neutron/v2/domain/ExtraDhcpOption.java | 4 ++++ .../jclouds/openstack/neutron/v2/domain/HostRoute.java | 3 +++ .../org/jclouds/openstack/neutron/v2/domain/IP.java | 3 +++ .../openstack/neutron/v2/domain/NetworkSegment.java | 12 ++++++++---- .../openstack/neutron/v2/domain/RouterInterface.java | 3 +++ 8 files changed, 30 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/0dacbce2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java index 585577d..4e317ce 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java @@ -18,6 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import java.beans.ConstructorProperties; @@ -58,6 +59,7 @@ public class AddressPair { /** * @return the macAddress of the AddressPair */ + @Nullable public String getMacAddress() { return macAddress; } @@ -65,6 +67,7 @@ public class AddressPair { /** * @return the ipAddress of the AddressPair */ + @Nullable public String getIpAddress() { return ipAddress; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/0dacbce2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java index 267e3cd..ef681e7 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java @@ -18,6 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import org.jclouds.javax.annotation.Nullable; import java.beans.ConstructorProperties; @@ -43,6 +44,7 @@ public class AllocationPool { /** * @return the start of the AllocationPool */ + @Nullable public String getStart() { return start; } @@ -50,6 +52,7 @@ public class AllocationPool { /** * @return the end of the AllocationPool */ + @Nullable public String getEnd() { return end; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/0dacbce2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java index d26e4e7..a7cc0df 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java @@ -18,6 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import java.beans.ConstructorProperties; @@ -41,6 +42,7 @@ public class ExternalGatewayInfo { /** * @return the networkId of the ExternalGatewayInfo */ + @Nullable public String getNetworkId() { return networkId; } @@ -48,6 +50,7 @@ public class ExternalGatewayInfo { /** * @return the enableSnat status of the ExternalGatewayInfo */ + @Nullable public Boolean getEnableSnat() { return enableSnat; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/0dacbce2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java index e5596d4..91ff9d9 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java @@ -18,6 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import java.beans.ConstructorProperties; @@ -50,6 +51,7 @@ public class ExtraDhcpOption { /** * @return the id of the ExtraDhcpOption */ + @Nullable public String getId() { return id; } @@ -57,6 +59,7 @@ public class ExtraDhcpOption { /** * @return the optionName of the ExtraDhcpOption */ + @Nullable public String getOptionName() { return optionName; } @@ -64,6 +67,7 @@ public class ExtraDhcpOption { /** * @return the optionValue of the ExtraDhcpOption */ + @Nullable public String getOptionValue() { return optionValue; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/0dacbce2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java index a7f4343..476a927 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java @@ -19,6 +19,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import java.beans.ConstructorProperties; @@ -44,6 +45,7 @@ public class HostRoute { /** * @return the destination CIDR for this route. */ + @Nullable public String getDestinationCidr() { return destinationCidr; } @@ -51,6 +53,7 @@ public class HostRoute { /** * @return the IP of the next hop to forward traffic to. */ + @Nullable public String getNextHop() { return nextHop; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/0dacbce2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java index 00029d5..c8ff037 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java @@ -18,6 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import java.beans.ConstructorProperties; @@ -41,6 +42,7 @@ public class IP { /** * @return the ipAddress of the IP */ + @Nullable public String getIpAddress() { return ipAddress; } @@ -48,6 +50,7 @@ public class IP { /** * @return the subnetId of the IP */ + @Nullable public String getSubnetId() { return subnetId; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/0dacbce2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java index 1fb4c3e..28f998b 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java @@ -18,6 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import java.beans.ConstructorProperties; @@ -37,10 +38,10 @@ public class NetworkSegment { @Named("provider:physical_network") protected final String physicalNetwork; @Named("provider:segmentation_id") - protected final int segmentationId; + protected final Integer segmentationId; @ConstructorProperties({"provider:network_type", "provider:physical_network", "provider:segmentation_id"}) - protected NetworkSegment(NetworkType networkType, String physicalNetwork, int segmentationId) { + protected NetworkSegment(NetworkType networkType, String physicalNetwork, Integer segmentationId) { this.networkType = networkType; this.physicalNetwork = physicalNetwork; this.segmentationId = segmentationId; @@ -49,6 +50,7 @@ public class NetworkSegment { /** * @return the networkType of the NetworkSegment */ + @Nullable public NetworkType getNetworkType() { return networkType; } @@ -56,6 +58,7 @@ public class NetworkSegment { /** * @return the physicalNetwork of the NetworkSegment */ + @Nullable public String getPhysicalNetwork() { return physicalNetwork; } @@ -63,7 +66,8 @@ public class NetworkSegment { /** * @return the segmentationId of the NetworkSegment */ - public int getSegmentationId() { + @Nullable + public Integer getSegmentationId() { return segmentationId; } @@ -111,7 +115,7 @@ public class NetworkSegment { public static class Builder { protected NetworkType networkType; protected String physicalNetwork; - protected int segmentationId; + protected Integer segmentationId; /** * Provide the networkType to the NetworkSegment's Builder. http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/0dacbce2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java index 1e1a52c..9d5b93f 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java @@ -18,6 +18,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import java.beans.ConstructorProperties; @@ -45,6 +46,7 @@ public class RouterInterface { /** * @return the subnetId of the RouterInterface */ + @Nullable public String getSubnetId() { return subnetId; } @@ -52,6 +54,7 @@ public class RouterInterface { /** * @return the portId of the RouterInterface */ + @Nullable public String getPortId() { return portId; }
