Allon Mureinik has uploaded a new change for review. Change subject: core: Remove final members from common package ......................................................................
core: Remove final members from common package Since GWT RPC does not handle final members properly, there is a need to implement a mechanism to enforce that no member in this package will be made final by mistake (unless it's a static final constant), as was done, e.g., in patch I53d6e5bbd66c4d67ec37326b545b65f086600169. This patch is a preparation for such a mechanism (which will be presented in the next patch) which removes all the final keywords from member variables in the common package. Change-Id: I2caa2e4e79e6237401982cd832164e49dee2d297 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterClusterParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ListUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeBricksVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeOptionVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeProfileInfoVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/RemoveGlusterServerVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigurationValuesTest.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/gluster/GlusterCoreUtilTest.java 12 files changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/16251/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java index 426b0e6..6385e7b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java @@ -17,9 +17,9 @@ private Object _returnValue; private String _description = ""; private ArrayList<Guid> _taskIdList = new ArrayList<Guid>(); - private final ArrayList<Guid> _internalIdList = new ArrayList<Guid>(); + private ArrayList<Guid> _internalIdList = new ArrayList<Guid>(); private boolean _endActionTryAgain = true; - private final ArrayList<String> _executeFailedMessages = new ArrayList<String>(); + private ArrayList<String> _executeFailedMessages = new ArrayList<String>(); private VdcFault _fault; private String correlationId; private Guid jobId; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterClusterParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterClusterParameters.java index 33ae721..306d8295 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterClusterParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterClusterParameters.java @@ -10,7 +10,7 @@ private static final long serialVersionUID = 2260339638936514331L; @NotNull(message = "VALIDATION.GLUSTER.VOLUME.CLUSTER_ID.NOT_NULL") - private final Guid clusterId; + private Guid clusterId; public GlusterClusterParameters(Guid clusterId) { super(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ListUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ListUtils.java index 2854e0f..6453d34 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ListUtils.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ListUtils.java @@ -42,7 +42,7 @@ this.predicate = predicate; } - final Predicate<T> predicate; + Predicate<T> predicate; @Override public List<T> filter(final List<T> data) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java index 92ab956..2b3cd06 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java @@ -7,9 +7,9 @@ public class VmNicDeviceVDSParameters extends VdsIdVDSCommandParametersBase { - private final VM vm; - private final VmNetworkInterface nic; - private final VmDevice vmDevice; + private VM vm; + private VmNetworkInterface nic; + private VmDevice vmDevice; public VmNicDeviceVDSParameters(Guid vdsId, VM vm, VmNetworkInterface nic, VmDevice vmDevice) { super(vdsId); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeBricksVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeBricksVDSParameters.java index 8de42ba..7931561 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeBricksVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeBricksVDSParameters.java @@ -6,7 +6,7 @@ import org.ovirt.engine.core.compat.Guid; public class GlusterVolumeBricksVDSParameters extends GlusterVolumeVDSParameters { - private final List<GlusterBrickEntity> bricks; + private List<GlusterBrickEntity> bricks; public GlusterVolumeBricksVDSParameters(Guid serverId, String volumeName, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeOptionVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeOptionVDSParameters.java index 6dd9531..61ba8a5 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeOptionVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeOptionVDSParameters.java @@ -8,7 +8,7 @@ * {@link GlusterVolumeVDSParameters}. Used by the "set gluster volume option" command. */ public class GlusterVolumeOptionVDSParameters extends GlusterVolumeVDSParameters { - private final GlusterVolumeOptionEntity volumeOption; + private GlusterVolumeOptionEntity volumeOption; public GlusterVolumeOptionVDSParameters(Guid serverId, String volumeName, GlusterVolumeOptionEntity volumeOption) { super(serverId, volumeName); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeProfileInfoVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeProfileInfoVDSParameters.java index 789e74c..afeb798 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeProfileInfoVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeProfileInfoVDSParameters.java @@ -7,7 +7,7 @@ * This will be used directly by Gluster Volume Profile Info Query. */ public class GlusterVolumeProfileInfoVDSParameters extends GlusterVolumeVDSParameters { - private final Guid clusterId; + private Guid clusterId; public GlusterVolumeProfileInfoVDSParameters(Guid clusterId, Guid serverId, String volumeName) { super(serverId, volumeName); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java index da1ed2b..71af248 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java @@ -9,7 +9,7 @@ * and inherited by others (e.g. set volume option). */ public class GlusterVolumeVDSParameters extends VdsIdVDSCommandParametersBase { - private final String volumeName; + private String volumeName; public GlusterVolumeVDSParameters(Guid serverId, String volumeName) { super(serverId); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/RemoveGlusterServerVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/RemoveGlusterServerVDSParameters.java index d6bfd37..43d282f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/RemoveGlusterServerVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/RemoveGlusterServerVDSParameters.java @@ -8,7 +8,7 @@ * This will be used directly by Remove Gluster Server command. */ public class RemoveGlusterServerVDSParameters extends VdsIdVDSCommandParametersBase { - private final String hostnameOrIp; + private String hostnameOrIp; private boolean forceAction; public RemoveGlusterServerVDSParameters(Guid serverId, String hostnameOrIp, boolean forceAction) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java index a2d2c44..b1a63e2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java @@ -10,8 +10,8 @@ */ public class ResetGlusterVolumeOptionsVDSParameters extends GlusterVolumeVDSParameters { - private final GlusterVolumeOptionEntity volumeOption; - private final boolean forceAction; + private GlusterVolumeOptionEntity volumeOption; + private boolean forceAction; public ResetGlusterVolumeOptionsVDSParameters(Guid serverId, String volumeName, GlusterVolumeOptionEntity volumeOption, boolean forceAction) { super(serverId, volumeName); diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigurationValuesTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigurationValuesTest.java index 0418ad0..634c3fc 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigurationValuesTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/ConfigurationValuesTest.java @@ -15,7 +15,7 @@ public class ConfigurationValuesTest { /** The tested value */ - private final ConfigurationValues value; + private ConfigurationValues value; public ConfigurationValuesTest(ConfigurationValues value) { this.value = value; diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/gluster/GlusterCoreUtilTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/gluster/GlusterCoreUtilTest.java index 30a2450..3698a65 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/gluster/GlusterCoreUtilTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/gluster/GlusterCoreUtilTest.java @@ -14,18 +14,18 @@ import org.ovirt.engine.core.compat.Guid; public class GlusterCoreUtilTest { - private final String SERVER_1 = "server1"; - private final String SERVER_2 = "server2"; - private final String SERVER_3 = "server3"; - private final String DIR_1 = "dir1"; - private final String DIR_2 = "dir2"; - private final String DIR_3 = "dir3"; - private final Guid UUID_1 = Guid.newGuid(); - private final Guid UUID_2 = Guid.newGuid(); - private final Guid UUID_3 = Guid.newGuid(); - private final GlusterBrickEntity brick1 = createBrick(UUID_1, SERVER_1, DIR_1); - private final GlusterBrickEntity brick2 = createBrick(UUID_2, SERVER_2, DIR_2); - private final GlusterBrickEntity brick3 = createBrick(UUID_3, SERVER_3, DIR_3); + private static final String SERVER_1 = "server1"; + private static final String SERVER_2 = "server2"; + private static final String SERVER_3 = "server3"; + private static final String DIR_1 = "dir1"; + private static final String DIR_2 = "dir2"; + private static final String DIR_3 = "dir3"; + private static final Guid UUID_1 = Guid.newGuid(); + private static final Guid UUID_2 = Guid.newGuid(); + private static final Guid UUID_3 = Guid.newGuid(); + private static final GlusterBrickEntity brick1 = createBrick(UUID_1, SERVER_1, DIR_1); + private static final GlusterBrickEntity brick2 = createBrick(UUID_2, SERVER_2, DIR_2); + private static final GlusterBrickEntity brick3 = createBrick(UUID_3, SERVER_3, DIR_3); @Test public void testGetQualifiedBrickList() { @@ -75,7 +75,7 @@ assertNull(GlusterCoreUtil.findBrick(bricks, brick3)); } - private GlusterBrickEntity createBrick(Guid serverId, String serverName, String brickDir) { + private static GlusterBrickEntity createBrick(Guid serverId, String serverName, String brickDir) { GlusterBrickEntity brick = new GlusterBrickEntity(); brick.setId(Guid.newGuid()); brick.setServerId(serverId); -- To view, visit http://gerrit.ovirt.org/16251 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2caa2e4e79e6237401982cd832164e49dee2d297 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
