Allon Mureinik has uploaded a new change for review.
Change subject: core: Reduce array visibility of ContextMappers
......................................................................
core: Reduce array visibility of ContextMappers
Reduced the visibility of array "constants" to solve MS_PKGPROTECT
FindBugs warnings in these classes.
Change-Id: Iabdebea8667b9e7e6137cdf8d024f837d4a6b0d2
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
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
15 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/22145/1
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 6861294..6602ded 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);
- protected final static String[] GROUP_ATTRIBUTE_FILTER = {
memberof.name(), objectGuid.name() };
+ static final 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 02cb3f4..3c235f0 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 {
- protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = {
defaultNamingContext.name(), domainControllerFunctionality.name(),
domainFunctionality.name() };
+ static final 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 97e166e..485e4ea 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);
- protected final static String[] USERS_ATTRIBUTE_FILTER = {
objectguid.name(), userprincipalname.name(),
+ static final 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 3bc1a94..cc39bb9 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);
- protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = {
namingContexts.name() };
+ static final 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 f4e4c3f..0b7c380 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);
- protected final static String[] GROUP_ATTRIBUTE_FILTER = {
memberof.name(), ipaUniqueId.name() };
+ static final 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 b1438be..e9ede6c 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 {
- protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = {
namingContexts.name() };
+ static final 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 7daca28..04a5385 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);
- protected final static String[] USERS_ATTRIBUTE_FILTER = {
ipaUniqueId.name(), krbPrincipalname.name(),
+ static final 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 d799775..e602841 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);
- protected final static String[] GROUP_ATTRIBUTE_FILTER = {
uniqueMember.name(), uniqueIdentifier.name() };
+ static final 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 7277afa..62f6e5c 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);
- protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = {
namingContexts.name() };
+ static final 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 2d59610..0ea8cfd 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);
- protected final static String[] USERS_ATTRIBUTE_FILTER = {
uniqueIdentifier.name(), uid.name(),
+ static final 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 1a0c016..3a36b1e 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);
- protected final static String[] GROUP_ATTRIBUTE_FILTER = {
memberof.name(), entryuuid.name() };
+ static final 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 b473144..e1b193b 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);
- protected final static String[] USERS_ATTRIBUTE_FILTER = {
entryuuid.name(),
+ static final 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 5f31725..8fc7a1d 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);
- protected final static String[] GROUP_ATTRIBUTE_FILTER = {
memberof.name(), nsUniqueId.name() };
+ static final 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 bbc3857..efb7b9c 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);
- protected final static String RHDS_NAMING_CONTEXT = "o=netscaperoot";
- protected final static String[] ROOTDSE_ATTRIBUTE_FILTER = {
namingContexts.name() };
+ protected static final String RHDS_NAMING_CONTEXT = "o=netscaperoot";
+ static final 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 3d8258e..82586e3 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);
- protected final static String[] USERS_ATTRIBUTE_FILTER = {
nsUniqueId.name(), uid.name(),
+ static final String[] USERS_ATTRIBUTE_FILTER = { nsUniqueId.name(),
uid.name(),
givenname.name(), departmentnumber.name(), title.name(),
mail.name(), memberof.name(),
sn.name() };
--
To view, visit http://gerrit.ovirt.org/22145
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabdebea8667b9e7e6137cdf8d024f837d4a6b0d2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
