Removed set() methods from IpAddress related interfaces

Alena Prokharchyk · Alena Prokharchyk · commit 11162f5917ab · 2013-04-17T15:11:38.000-07:00
diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java
@@ -78,16 +78,7 @@ enum Purpose {
 
     boolean getSystem();
 
-    /**
-     * @return
-     */
     Long getVpcId();
 
-    /**
-     * @param vpcId
-     */
-    void setVpcId(Long vpcId);
     String getVmIp();
-    void setVmIp(String vmIp);
-
 }
diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/com/cloud/network/PublicIpAddress.java
@@ -30,7 +30,4 @@ public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan, Inte
     public String getNetmask();
 
     public String getGateway();
-
-    @Override
-    public String getVlanTag();
 }
diff --git a/server/src/com/cloud/network/addr/PublicIp.java b/server/src/com/cloud/network/addr/PublicIp.java
@@ -194,23 +194,12 @@ public Long getAllocatedInDomainId() {
     public boolean getSystem() {
         return _addr.getSystem();
     }
-
-    /* (non-Javadoc)
-     * @see com.cloud.network.IpAddress#getVpcId()
-     */
+	
     @Override
     public Long getVpcId() {
        return _addr.getVpcId();
     }
 
-    /* (non-Javadoc)
-     * @see com.cloud.network.IpAddress#setVpcId(java.lang.Long)
-     */
-    @Override
-    public void setVpcId(Long vpcId) {
-        _addr.setVpcId(vpcId);
-    }
-
     @Override
     public String getIp6Gateway() {
         return _vlan.getIp6Gateway();
@@ -230,9 +219,4 @@ public String getIp6Range() {
     public String getVmIp() {
         return _addr.getVmIp();
     }
-
-    @Override
-    public void setVmIp(String vmIp) {
-        _addr.setVmIp(vmIp);
-    }
 }
diff --git a/server/src/com/cloud/network/dao/IPAddressVO.java b/server/src/com/cloud/network/dao/IPAddressVO.java
@@ -292,7 +292,6 @@ public Long getVpcId() {
         return vpcId;
     }
 
-    @Override
     public void setVpcId(Long vpcId) {
         this.vpcId = vpcId;
     }
@@ -302,7 +301,6 @@ public String getVmIp() {
         return vmIp;
     }
 
-    @Override
     public void setVmIp(String vmIp) {
         this.vmIp = vmIp;
     }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,4 @@ public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan, Inte`
`30`	`30`	`public String getNetmask();`
`31`	`31`
`32`	`32`	`public String getGateway();`
`33`		`-`
`34`		`- @Override`
`35`		`- public String getVlanTag();`
`36`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,6 @@ public Long getVpcId() {`
`292`	`292`	`return vpcId;`
`293`	`293`	`}`
`294`	`294`
`295`		`- @Override`
`296`	`295`	`public void setVpcId(Long vpcId) {`
`297`	`296`	`this.vpcId = vpcId;`
`298`	`297`	`}`
`@@ -302,7 +301,6 @@ public String getVmIp() {`
`302`	`301`	`return vmIp;`
`303`	`302`	`}`
`304`	`303`
`305`		`- @Override`
`306`	`304`	`public void setVmIp(String vmIp) {`
`307`	`305`	`this.vmIp = vmIp;`
`308`	`306`	`}`