Shahar Havivi has uploaded a new change for review. Change subject: findbugs: dont use static filed as public ......................................................................
findbugs: dont use static filed as public A mutable static field could be changed by malicious code or by accident. The field could be made package protected to avoid this vulnerability. findbugs reason: MS: Field should be package protected (MS_PKGPROTECT) Change-Id: If0d3d345fdd56faf1a7b9ae826924527f6fceff2 Signed-off-by: Shahar Havivi <shav...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADGroupContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADRootDSEContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADUserContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultRootDSEContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAGroupContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPARootDSEContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAUserContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSGroupContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSRootDSEContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSUserContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapGroupContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapUserContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSGroupContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSRootDSEContextMapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUserContextMapper.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java 20 files changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/15287/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java index a25bf21..e472f2b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java @@ -16,8 +16,8 @@ import org.ovirt.engine.core.utils.transaction.TransactionSupport; public class VmTemplateHandler { - public static Guid BlankVmTemplateId = new Guid(); - public static String BlankVmTemplateName = "Blank"; + protected static Guid BlankVmTemplateId = new Guid(); + protected static String BlankVmTemplateName = "Blank"; private static ObjectIdentityChecker mUpdateVmTemplate; /** diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADGroupContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADGroupContextMapper.java index 3debcce..e8b13af 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADGroupContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADGroupContextMapper.java @@ -21,7 +21,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), objectGuid.name() }; + protected final static String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), objectGuid.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADRootDSEContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADRootDSEContextMapper.java index 5860588..02cb3f4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADRootDSEContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADRootDSEContextMapper.java @@ -11,7 +11,7 @@ public class ADRootDSEContextMapper implements ContextMapper { - public final static String[] ROOTDSE_ATTRIBUTE_FILTER = { defaultNamingContext.name(), domainControllerFunctionality.name(), domainFunctionality.name() }; + protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = { defaultNamingContext.name(), domainControllerFunctionality.name(), domainFunctionality.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADUserContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADUserContextMapper.java index 3d96806..3224568 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADUserContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADUserContextMapper.java @@ -29,7 +29,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] USERS_ATTRIBUTE_FILTER = { objectguid.name(), userprincipalname.name(), + protected final static String[] USERS_ATTRIBUTE_FILTER = { objectguid.name(), userprincipalname.name(), givenname.name(), department.name(), title.name(), mail.name(), memberof.name(), sn.name() }; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultRootDSEContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultRootDSEContextMapper.java index cb5f60f..3bc1a94 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultRootDSEContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultRootDSEContextMapper.java @@ -15,7 +15,7 @@ private static Log log = LogFactory.getLog(DefaultRootDSEContextMapper.class); - public final static String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; + protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAGroupContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAGroupContextMapper.java index 924c398..406b796 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAGroupContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAGroupContextMapper.java @@ -21,7 +21,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), ipaUniqueId.name() }; + protected final static String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), ipaUniqueId.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPARootDSEContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPARootDSEContextMapper.java index cbe5637..b1438be 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPARootDSEContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPARootDSEContextMapper.java @@ -11,7 +11,7 @@ public class IPARootDSEContextMapper implements ContextMapper { - public final static String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; + protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAUserContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAUserContextMapper.java index 42ff031..42bb70a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAUserContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPAUserContextMapper.java @@ -29,7 +29,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] USERS_ATTRIBUTE_FILTER = { ipaUniqueId.name(), krbPrincipalname.name(), + protected final static String[] USERS_ATTRIBUTE_FILTER = { ipaUniqueId.name(), krbPrincipalname.name(), givenname.name(), department.name(), title.name(), mail.name(), memberof.name(), sn.name() }; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSGroupContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSGroupContextMapper.java index 33a76c0..60d31a1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSGroupContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSGroupContextMapper.java @@ -20,7 +20,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] GROUP_ATTRIBUTE_FILTER = { uniqueMember.name(), uniqueIdentifier.name() }; + protected final static String[] GROUP_ATTRIBUTE_FILTER = { uniqueMember.name(), uniqueIdentifier.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSRootDSEContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSRootDSEContextMapper.java index 3b2dbff..7277afa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSRootDSEContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSRootDSEContextMapper.java @@ -15,7 +15,7 @@ private static Log log = LogFactory.getLog(ITDSRootDSEContextMapper.class); - public final static String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; + protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSUserContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSUserContextMapper.java index 3cd0742..38a7957 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSUserContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSUserContextMapper.java @@ -23,7 +23,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] USERS_ATTRIBUTE_FILTER = { uniqueIdentifier.name(), uid.name(), + protected final static String[] USERS_ATTRIBUTE_FILTER = { uniqueIdentifier.name(), uid.name(), givenname.name(), department.name(), title.name(), mail.name(), sn.name() }; @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapGroupContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapGroupContextMapper.java index 2089162..7f5e7bc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapGroupContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapGroupContextMapper.java @@ -20,7 +20,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), entryuuid.name() }; + protected final static String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), entryuuid.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapUserContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapUserContextMapper.java index 34af868..e5aabab 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapUserContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/OpenLdapUserContextMapper.java @@ -28,7 +28,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] USERS_ATTRIBUTE_FILTER = { entryuuid.name(), + protected final static String[] USERS_ATTRIBUTE_FILTER = { entryuuid.name(), givenname.name(), uid.name(), title.name(), mail.name(), memberof.name(), sn.name() }; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSGroupContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSGroupContextMapper.java index 770ebde..605a347 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSGroupContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSGroupContextMapper.java @@ -20,7 +20,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), nsUniqueId.name() }; + protected final static String[] GROUP_ATTRIBUTE_FILTER = { memberof.name(), nsUniqueId.name() }; @Override public Object mapFromContext(Object ctx) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSRootDSEContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSRootDSEContextMapper.java index 7da1676..bbc3857 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSRootDSEContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSRootDSEContextMapper.java @@ -14,8 +14,8 @@ public class RHDSRootDSEContextMapper implements ContextMapper { private static Log log = LogFactory.getLog(RHDSRootDSEContextMapper.class); - public final static String RHDS_NAMING_CONTEXT = "o=netscaperoot"; - public final static String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; + protected final static String RHDS_NAMING_CONTEXT = "o=netscaperoot"; + protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; public static String getDefaultNamingContextFromNameingContexts(Attribute namingContexts) { for (int index = 0; index < namingContexts.size(); ++index) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUserContextMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUserContextMapper.java index 0865d1b..54f6fbb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUserContextMapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSUserContextMapper.java @@ -28,7 +28,7 @@ private static Log log = LogFactory.getLog(LdapBrokerImpl.class); - public final static String[] USERS_ATTRIBUTE_FILTER = { nsUniqueId.name(), uid.name(), + protected final static String[] USERS_ATTRIBUTE_FILTER = { nsUniqueId.name(), uid.name(), givenname.name(), departmentnumber.name(), title.name(), mail.name(), memberof.name(), sn.name() }; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java index a706ea1..4b0fdc0 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java @@ -35,7 +35,7 @@ extends AbstractBackendDevicesResource<Disk, Disks, org.ovirt.engine.core.common.businessentities.Disk> implements VmDisksResource { - public static final String[] SUB_COLLECTIONS = {"permissions", "statistics"}; + protected static final String[] SUB_COLLECTIONS = {"permissions", "statistics"}; public BackendVmDisksResource(Guid parentId, VdcQueryType queryType, diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java index 50cd98e..b4bfbde 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java @@ -33,7 +33,7 @@ extends AbstractBackendCollectionResource<GlusterVolume, GlusterVolumeEntity> implements GlusterVolumesResource { - public static final String[] SUB_COLLECTIONS = { "bricks" }; + protected static final String[] SUB_COLLECTIONS = { "bricks" }; private ClusterResource parent; private String clusterId; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java index 2d5995b..52985c0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java @@ -14,9 +14,9 @@ @SuppressWarnings("unused") public class ClusterPolicyModel extends EntityModel { - public static Integer lowLimitPowerSaving = null; - public static Integer highLimitPowerSaving = null; - public static Integer highLimitEvenlyDistributed = null; + protected static Integer lowLimitPowerSaving = null; + protected static Integer highLimitPowerSaving = null; + protected static Integer highLimitEvenlyDistributed = null; private EntityModel privateOverCommitTime; private boolean editClusterPolicyFirst; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java index 9f81873..cf4031e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java @@ -37,7 +37,7 @@ @SuppressWarnings("unused") public abstract class VmInterfaceModel extends Model { - public static String ENGINE_NETWORK_NAME; + protected static String ENGINE_NETWORK_NAME; private EntityModel privateName; private ListModel privateNetwork; -- To view, visit http://gerrit.ovirt.org/15287 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0d3d345fdd56faf1a7b9ae826924527f6fceff2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches