Skip to content

Commit d09628c

Browse files
hsato03Copilotwinterhazel
authored
Apply suggestions from code review
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Fabricio Duarte <fabricio.duarte.jr@gmail.com>
1 parent 6df5728 commit d09628c

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ protected void loadPresetVariableValueForVpc(UsageVO usageRecord, Value value) {
814814
value.setVpcOffering(getPresetVariableValueVpcOffering(vpc.getVpcOfferingId()));
815815
}
816816

817-
protected GenericPresetVariable getPresetVariableValueVpcOffering(long vpcOfferingId) {
817+
protected GenericPresetVariable getPresetVariableValueVpcOffering(Long vpcOfferingId) {
818818
VpcOfferingVO vpcOfferingVo = vpcOfferingDao.findByIdIncludingRemoved(vpcOfferingId);
819819
validateIfObjectIsNull(vpcOfferingVo, vpcOfferingId, "vpc offering");
820820

framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ public GenericPresetVariable getNetworkOffering() {
268268

269269
public void setNetworkOffering(GenericPresetVariable networkOffering) {
270270
this.networkOffering = networkOffering;
271-
fieldNamesToIncludeInToString.add("networkOffering");
272271
}
273272

274273
public GenericPresetVariable getVpcOffering() {
@@ -277,6 +276,5 @@ public GenericPresetVariable getVpcOffering() {
277276

278277
public void setVpcOffering(GenericPresetVariable vpcOffering) {
279278
this.vpcOffering = vpcOffering;
280-
fieldNamesToIncludeInToString.add("vpcOffering");
281279
}
282280
}

framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,6 @@ public void getPresetVariableValueNetworkOfferingTestSetValuesAndReturnObject()
13081308
GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableValueNetworkOffering(1L);
13091309

13101310
assertPresetVariableIdAndName(expected, result);
1311-
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"), result);
13121311
}
13131312

13141313
@Test
@@ -1324,6 +1323,5 @@ public void getPresetVariableValueVpcOfferingTestSetValuesAndReturnObject() {
13241323
GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableValueVpcOffering(1L);
13251324

13261325
assertPresetVariableIdAndName(expected, result);
1327-
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"), result);
13281326
}
13291327
}

0 commit comments

Comments
 (0)