You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/10/28 09:29:20 UTC
[jspwiki] branch master updated: JSPWIKI-1156 - Remove 'protected'
member in 'final' class.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 551de88 JSPWIKI-1156 - Remove 'protected' member in 'final' class.
551de88 is described below
commit 551de885142b6c05007122201d027e1bed6d4c4c
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Fri Oct 1 18:36:31 2021 +0200
JSPWIKI-1156 - Remove 'protected' member in 'final' class.
---
.../org/apache/wiki/event/WikiEventManager.java | 4 +--
.../org/apache/wiki/event/WikiSecurityEvent.java | 22 ++++++------
.../wiki/search/kendra/KendraSearchProvider.java | 4 +--
.../src/main/java/org/apache/wiki/WikiSession.java | 6 ++--
.../org/apache/wiki/auth/SecurityVerifier.java | 14 ++++----
.../java/org/apache/wiki/auth/WikiPrincipal.java | 2 +-
.../java/org/apache/wiki/auth/authorize/Role.java | 2 +-
.../wiki/auth/permissions/AllPermission.java | 2 +-
.../wiki/auth/permissions/GroupPermission.java | 14 ++++----
.../wiki/auth/permissions/PagePermission.java | 22 ++++++------
.../wiki/auth/permissions/WikiPermission.java | 14 ++++----
.../apache/wiki/filters/DefaultFilterManager.java | 2 +-
.../apache/wiki/plugin/DefaultPluginManager.java | 6 ++--
.../org/apache/wiki/plugin/PageViewPlugin.java | 4 +--
.../apache/wiki/search/LuceneSearchProvider.java | 4 +--
.../org/apache/wiki/ui/DefaultCommandResolver.java | 4 +--
.../org/apache/wiki/ui/DefaultEditorManager.java | 2 +-
.../java/org/apache/wiki/ui/InputValidator.java | 6 ++--
.../main/java/org/apache/wiki/util/CryptoUtil.java | 6 ++--
.../main/java/org/apache/wiki/util/MailUtil.java | 40 +++++++++++-----------
.../main/java/org/apache/wiki/util/Serializer.java | 2 +-
.../main/java/org/apache/wiki/util/TextUtil.java | 4 +--
22 files changed, 93 insertions(+), 93 deletions(-)
diff --git a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiEventManager.java b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiEventManager.java
index 768ae1b..0a61410 100644
--- a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiEventManager.java
+++ b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiEventManager.java
@@ -365,7 +365,7 @@ public final class WikiEventManager {
* Constructor for an WikiEventDelegateImpl, provided with the client Object it will service, or the Class
* of client, the latter when used to preload a future incoming delegate.
*/
- protected WikiEventDelegate( final Object client ) {
+ WikiEventDelegate( final Object client ) {
if( client instanceof Class ) {
m_class = ( Class< ? > )client;
}
@@ -374,7 +374,7 @@ public final class WikiEventManager {
/**
* Returns the class of the client-less delegate, null if this delegate is attached to a client Object.
*/
- protected Class< ? > getClientClass() {
+ Class< ? > getClientClass() {
return m_class;
}
diff --git a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
index 9a097cb..e3000a7 100644
--- a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
+++ b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
@@ -27,7 +27,7 @@ import java.security.Principal;
/**
* <p>Event class for security events: login/logout, wiki group adds/changes, and authorization decisions. When a WikiSecurityEvent
- * is constructed, the security logger {@link #log} is notified.</p>
+ * is constructed, the security logger {@link #LOG} is notified.</p>
* <p>These events are logged with priority <code>ERROR</code>:</p>
* <ul>
* <li>login failed - bad credential or password</li>
@@ -112,7 +112,7 @@ public final class WikiSecurityEvent extends WikiEvent {
public static final int PROFILE_NAME_CHANGED = 54;
/** The security logging service. */
- protected static final Logger log = LogManager.getLogger( "SecurityLog" );
+ private static final Logger LOG = LogManager.getLogger( "SecurityLog" );
private final Principal m_principal;
@@ -126,7 +126,7 @@ public final class WikiSecurityEvent extends WikiEvent {
/**
* Constructs a new instance of this event type, which signals a security event has occurred. The <code>source</code> parameter is
- * required, and may not be <code>null</code>. When the WikiSecurityEvent is constructed, the security logger {@link #log} is notified.
+ * required, and may not be <code>null</code>. When the WikiSecurityEvent is constructed, the security logger {@link #LOG} is notified.
*
* @param src the source of the event, which can be any object: a wiki page, group or authentication/authentication/group manager.
* @param type the type of event
@@ -140,19 +140,19 @@ public final class WikiSecurityEvent extends WikiEvent {
}
this.m_principal = principal;
this.m_target = target;
- if( log.isEnabled( Level.ERROR ) && ArrayUtils.contains( ERROR_EVENTS, type ) ) {
- log.error( this );
- } else if( log.isEnabled( Level.WARN ) && ArrayUtils.contains( WARN_EVENTS, type ) ) {
- log.warn( this );
- } else if( log.isEnabled( Level.INFO ) && ArrayUtils.contains( INFO_EVENTS, type ) ) {
- log.info( this );
+ if( LOG.isEnabled( Level.ERROR ) && ArrayUtils.contains( ERROR_EVENTS, type ) ) {
+ LOG.error( this );
+ } else if( LOG.isEnabled( Level.WARN ) && ArrayUtils.contains( WARN_EVENTS, type ) ) {
+ LOG.warn( this );
+ } else if( LOG.isEnabled( Level.INFO ) && ArrayUtils.contains( INFO_EVENTS, type ) ) {
+ LOG.info( this );
}
- log.debug( this );
+ LOG.debug( this );
}
/**
* Constructs a new instance of this event type, which signals a security event has occurred. The <code>source</code> parameter
- * is required, and may not be <code>null</code>. When the WikiSecurityEvent is constructed, the security logger {@link #log}
+ * is required, and may not be <code>null</code>. When the WikiSecurityEvent is constructed, the security logger {@link #LOG}
* is notified.
*
* @param src the source of the event, which can be any object: a wiki page, group or authentication/authentication/group manager.
diff --git a/jspwiki-kendra-searchprovider/src/main/java/org/apache/wiki/search/kendra/KendraSearchProvider.java b/jspwiki-kendra-searchprovider/src/main/java/org/apache/wiki/search/kendra/KendraSearchProvider.java
index f64644d..d54f409 100644
--- a/jspwiki-kendra-searchprovider/src/main/java/org/apache/wiki/search/kendra/KendraSearchProvider.java
+++ b/jspwiki-kendra-searchprovider/src/main/java/org/apache/wiki/search/kendra/KendraSearchProvider.java
@@ -454,8 +454,8 @@ public class KendraSearchProvider implements SearchProvider {
* Updater thread that updates Kendra indexes.
*/
private static final class KendraUpdater extends WikiBackgroundThread {
- protected static final int INDEX_DELAY = 5;
- protected static final int INITIAL_DELAY = 10;
+ static final int INDEX_DELAY = 5;
+ static final int INITIAL_DELAY = 10;
private final KendraSearchProvider provider;
private final int initialDelay;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
index b89232b..b59445e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
@@ -58,7 +58,7 @@ import java.util.concurrent.ConcurrentHashMap;
* methods for managing WikiSessions for an entire wiki. These methods allow callers to find, query and remove WikiSession objects, and
* to obtain a list of the current wiki session users.</p>
*/
-public final class WikiSession implements Session {
+public class WikiSession implements Session {
private static final Logger log = LogManager.getLogger( WikiSession.class );
@@ -388,7 +388,7 @@ public final class WikiSession implements Session {
* This method should generally be called after a user's {@link org.apache.wiki.auth.user.UserProfile} is saved. If the wiki session
* is null, or there is no matching user profile, the method returns silently.
*/
- protected void injectGroupPrincipals() {
+ void injectGroupPrincipals() {
// Flush the existing GroupPrincipals
m_subject.getPrincipals().removeAll( m_subject.getPrincipals(GroupPrincipal.class) );
@@ -406,7 +406,7 @@ public final class WikiSession implements Session {
* and login name. These Principals will be WikiPrincipals, and they will replace all other WikiPrincipals in the Subject. <em>Note:
* this method is never called during anonymous or asserted sessions.</em>
*/
- protected void injectUserProfilePrincipals() {
+ void injectUserProfilePrincipals() {
// Search for the user profile
final String searchId = m_loginPrincipal.getName();
if ( searchId == null ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
index 9b6d23c..319cba8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
@@ -439,7 +439,7 @@ public final class SecurityVerifier {
* container <code>web.xml</code> file.
* @throws WikiException if the web authorizer cannot verify the roles
*/
- protected void verifyPolicyAndContainerRoles() throws WikiException
+ void verifyPolicyAndContainerRoles() throws WikiException
{
final Authorizer authorizer = m_engine.getManager( AuthorizationManager.class ).getAuthorizer();
final Principal[] containerRoles = authorizer.getRoles();
@@ -467,7 +467,7 @@ public final class SecurityVerifier {
* Verifies that the group datbase was initialized properly, and that
* user add and delete operations work as they should.
*/
- protected void verifyGroupDatabase()
+ void verifyGroupDatabase()
{
final GroupManager mgr = m_engine.getManager( GroupManager.class );
GroupDatabase db = null;
@@ -547,7 +547,7 @@ public final class SecurityVerifier {
* {@value org.apache.wiki.auth.AuthenticationManager#PROP_LOGIN_MODULE}
* resolves to a valid class on the classpath.
*/
- protected void verifyJaas() {
+ void verifyJaas() {
// Verify that the specified JAAS moduie corresponds to a class we can load successfully.
final String jaasClass = m_engine.getWikiProperties().getProperty( AuthenticationManager.PROP_LOGIN_MODULE );
if( jaasClass == null || jaasClass.isEmpty() ) {
@@ -583,7 +583,7 @@ public final class SecurityVerifier {
* @param property the system property to look up
* @return the file object, or <code>null</code> if not found
*/
- protected File getFileFromProperty( final String property )
+ File getFileFromProperty( final String property )
{
String propertyValue = null;
try
@@ -645,7 +645,7 @@ public final class SecurityVerifier {
* represents a valid policy.
*/
@SuppressWarnings("unchecked")
- protected void verifyPolicy() {
+ void verifyPolicy() {
// Look up the policy file and set the status text.
final URL policyURL = m_engine.findConfigFile( AuthorizationManager.DEFAULT_POLICY );
String path = policyURL.getPath();
@@ -708,7 +708,7 @@ public final class SecurityVerifier {
* @return the result, based on consultation with the active Java security
* policy
*/
- protected boolean verifyStaticPermission( final Principal principal, final Permission permission )
+ boolean verifyStaticPermission( final Principal principal, final Permission permission )
{
final Subject subject = new Subject();
subject.getPrincipals().add( principal );
@@ -736,7 +736,7 @@ public final class SecurityVerifier {
* Verifies that the user datbase was initialized properly, and that
* user add and delete operations work as they should.
*/
- protected void verifyUserDatabase()
+ void verifyUserDatabase()
{
final UserDatabase db = m_engine.getManager( UserManager.class ).getUserDatabase();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/WikiPrincipal.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/WikiPrincipal.java
index 787fa84..6ad9bf9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/WikiPrincipal.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/WikiPrincipal.java
@@ -70,7 +70,7 @@ public final class WikiPrincipal implements Principal, Comparable< Principal >,
private final String m_type;
/** For serialization purposes */
- protected WikiPrincipal()
+ WikiPrincipal()
{
this(null);
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
index ac20ffc..1aacfb6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
@@ -49,7 +49,7 @@ public final class Role implements Principal, Serializable
/**
* Create an empty Role.
*/
- protected Role()
+ Role()
{
this(null);
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
index 2096f6a..fe502da 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
@@ -37,7 +37,7 @@ public final class AllPermission extends Permission implements Serializable {
private final String m_wiki;
/** For serialization purposes. */
- protected AllPermission() {
+ AllPermission() {
this( null );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
index 5bb0d73..7731e6c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
@@ -94,11 +94,11 @@ public final class GroupPermission extends Permission implements Serializable
/** Action for viewing a group or collection of groups. */
public static final String VIEW_ACTION = "view";
- protected static final int DELETE_MASK = 0x4;
+ static final int DELETE_MASK = 0x4;
- protected static final int EDIT_MASK = 0x2;
+ static final int EDIT_MASK = 0x2;
- protected static final int VIEW_MASK = 0x1;
+ static final int VIEW_MASK = 0x1;
/** Convenience constant that denotes <code>GroupPermission( "*:*, "delete" )</code>. */
public static final GroupPermission DELETE = new GroupPermission( DELETE_ACTION );
@@ -124,7 +124,7 @@ public final class GroupPermission extends Permission implements Serializable
private final String m_wiki;
/** For serialization purposes */
- protected GroupPermission()
+ GroupPermission()
{
this("");
}
@@ -327,7 +327,7 @@ public final class GroupPermission extends Permission implements Serializable
* @param mask binary mask for actions
* @return binary mask for implied actions
*/
- protected static int impliedMask( int mask )
+ static int impliedMask( int mask )
{
if ( ( mask & DELETE_MASK ) > 0 )
{
@@ -346,7 +346,7 @@ public final class GroupPermission extends Permission implements Serializable
* @param actions the actions for this permission, separated by commas
* @return the binary actions mask
*/
- protected static int createMask( final String actions )
+ static int createMask( final String actions )
{
if ( actions == null || actions.isEmpty() )
{
@@ -464,7 +464,7 @@ public final class GroupPermission extends Permission implements Serializable
* GroupPrincipal matching the implied GroupPermission’s group;
* <code>false</code> otherwise
*/
- protected boolean impliesMember(final Permission permission )
+ boolean impliesMember(final Permission permission )
{
if ( !( permission instanceof GroupPermission ) )
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
index b3b50c1..8e6b578 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
@@ -87,19 +87,19 @@ public final class PagePermission extends Permission implements Serializable
/** Action name for the view permission. */
public static final String VIEW_ACTION = "view";
- protected static final int COMMENT_MASK = 0x4;
+ static final int COMMENT_MASK = 0x4;
- protected static final int DELETE_MASK = 0x10;
+ static final int DELETE_MASK = 0x10;
- protected static final int EDIT_MASK = 0x2;
+ static final int EDIT_MASK = 0x2;
- protected static final int MODIFY_MASK = 0x40;
+ static final int MODIFY_MASK = 0x40;
- protected static final int RENAME_MASK = 0x20;
+ static final int RENAME_MASK = 0x20;
- protected static final int UPLOAD_MASK = 0x8;
+ static final int UPLOAD_MASK = 0x8;
- protected static final int VIEW_MASK = 0x1;
+ static final int VIEW_MASK = 0x1;
/** A static instance of the comment permission. */
public static final PagePermission COMMENT = new PagePermission( COMMENT_ACTION );
@@ -139,7 +139,7 @@ public final class PagePermission extends Permission implements Serializable
private final String m_wiki;
/** For serialization purposes. */
- protected PagePermission()
+ PagePermission()
{
this("");
}
@@ -351,7 +351,7 @@ public final class PagePermission extends Permission implements Serializable
* @param mask binary mask for actions
* @return binary mask for implied actions
*/
- protected static int impliedMask( int mask )
+ static int impliedMask( int mask )
{
if ( ( mask & DELETE_MASK ) > 0 )
{
@@ -387,7 +387,7 @@ public final class PagePermission extends Permission implements Serializable
* @return the results of the test, where <code>true</code> indicates that
* <code>subSet</code> is a subset of <code>superSet</code>
*/
- protected static boolean isSubset( final String superSet, final String subSet )
+ static boolean isSubset( final String superSet, final String subSet )
{
// If either is null, return false
if ( superSet == null || subSet == null )
@@ -430,7 +430,7 @@ public final class PagePermission extends Permission implements Serializable
* @param actions the actions for this permission, separated by commas
* @return the binary actions mask
*/
- protected static int createMask( final String actions )
+ static int createMask( final String actions )
{
if ( actions == null || actions.isEmpty() )
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
index f801930..c979106 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
@@ -57,15 +57,15 @@ public final class WikiPermission extends Permission implements Serializable
/** Value for a generic wildcard. */
public static final String WILDCARD = "*";
- protected static final int CREATE_GROUPS_MASK = 0x1;
+ static final int CREATE_GROUPS_MASK = 0x1;
- protected static final int CREATE_PAGES_MASK = 0x2;
+ static final int CREATE_PAGES_MASK = 0x2;
- protected static final int EDIT_PREFERENCES_MASK = 0x4;
+ static final int EDIT_PREFERENCES_MASK = 0x4;
- protected static final int EDIT_PROFILE_MASK = 0x8;
+ static final int EDIT_PROFILE_MASK = 0x8;
- protected static final int LOGIN_MASK = 0x10;
+ static final int LOGIN_MASK = 0x10;
/** A static instance of the createGroups permission. */
public static final WikiPermission CREATE_GROUPS = new WikiPermission( WILDCARD, CREATE_GROUPS_ACTION );
@@ -215,7 +215,7 @@ public final class WikiPermission extends Permission implements Serializable
* @param mask the initial mask
* @return the implied mask
*/
- protected static int impliedMask( int mask )
+ static int impliedMask( int mask )
{
if ( ( mask & CREATE_GROUPS_MASK ) > 0 )
{
@@ -230,7 +230,7 @@ public final class WikiPermission extends Permission implements Serializable
* @param actions the permission actions, separated by commas
* @return binary mask representing the permissions
*/
- protected static int createMask(final String actions )
+ static int createMask(final String actions )
{
if ( actions == null || actions.isEmpty() )
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
index 618c47b..7d01dba 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
@@ -402,7 +402,7 @@ public class DefaultFilterManager extends BaseModuleManager implements FilterMan
super( name );
}
- protected static PageFilterInfo newInstance( final String className, final Element pluginEl ) {
+ static PageFilterInfo newInstance( final String className, final Element pluginEl ) {
if( className == null || className.isEmpty() ) {
return null;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
index 5af9f92..c36d631 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
@@ -476,7 +476,7 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
* @param externalJars the list of external jars to search
* @return A WikiPluginInfo object.
*/
- protected static WikiPluginInfo newInstance( final String className, final Element el, final List<String> searchPath, final List<String> externalJars ) {
+ static WikiPluginInfo newInstance( final String className, final Element el, final List<String> searchPath, final List<String> externalJars ) {
if( className == null || className.isEmpty() ) {
return null;
}
@@ -494,7 +494,7 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
* @param searchPath A List of Strings, containing different package names.
* @param externalJars the list of external jars to search
*/
- protected void initializePlugin( final WikiPluginInfo info, final Engine engine , final List<String> searchPath, final List<String> externalJars) {
+ void initializePlugin( final WikiPluginInfo info, final Engine engine , final List<String> searchPath, final List<String> externalJars) {
if( !m_initialized ) {
// This makes sure we only try once per class, even if init fails.
m_initialized = true;
@@ -533,7 +533,7 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
* @param clazz The class to check
* @return A WikiPluginInfo instance
*/
- protected static WikiPluginInfo newInstance( final Class< ? > clazz ) {
+ static WikiPluginInfo newInstance( final Class< ? > clazz ) {
return new WikiPluginInfo( clazz.getName() );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
index 376747b..057767b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
@@ -498,7 +498,7 @@ public class PageViewPlugin extends AbstractReferralPlugin implements Plugin, In
* @return int The page count for the given key.
* @param key the key for the Counter
*/
- protected int getCount( final Object key )
+ int getCount( final Object key )
{
return m_counters.get( key ).getValue();
}
@@ -529,7 +529,7 @@ public class PageViewPlugin extends AbstractReferralPlugin implements Plugin, In
/**
* Save the page view counters to file.
*/
- protected void storeCounters() {
+ void storeCounters() {
if( m_counters != null && m_storage != null && m_dirty ) {
log.info( "Storing " + m_counters.size() + " counter values." );
synchronized( this ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index 01b21db..40b6378 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -542,8 +542,8 @@ public class LuceneSearchProvider implements SearchProvider {
* Updater thread that updates Lucene indexes.
*/
private static final class LuceneUpdater extends WikiBackgroundThread {
- protected static final int INDEX_DELAY = 5;
- protected static final int INITIAL_DELAY = 60;
+ static final int INDEX_DELAY = 5;
+ static final int INITIAL_DELAY = 60;
private final LuceneSearchProvider m_provider;
private final int m_initialDelay;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
index 5b69658..57a5ad9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
@@ -45,7 +45,7 @@ import java.util.Properties;
*
* @since 2.4.22
*/
-public final class DefaultCommandResolver implements CommandResolver {
+public class DefaultCommandResolver implements CommandResolver {
/** Private map with request contexts as keys, Commands as values */
private static final Map< String, Command > CONTEXTS;
@@ -325,7 +325,7 @@ public final class DefaultCommandResolver implements CommandResolver {
* @throws ProviderException if the underlyng page provider that locates pages
* throws an exception
*/
- protected boolean simplePageExists( final String page ) throws ProviderException {
+ boolean simplePageExists( final String page ) throws ProviderException {
if ( m_specialPages.containsKey( page ) ) {
return true;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
index 6198fbd..8bc6f0d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
@@ -156,7 +156,7 @@ public class DefaultEditorManager extends BaseModuleManager implements EditorMan
private static final class WikiEditorInfo extends WikiModuleInfo {
private String m_path;
- protected static WikiEditorInfo newInstance( final String name, final Element el ) {
+ static WikiEditorInfo newInstance( final String name, final Element el ) {
if( name == null || name.isEmpty() ) {
return null;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java
index 8d0f5a4..f2a33d3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java
@@ -48,9 +48,9 @@ public final class InputValidator {
* Used when checking against IDs such as a full name when saving groups.
* @since 2.4.82
*/
- protected static final Pattern ID_PATTERN = Pattern.compile( "[\\x00\\r\\n\\x0f\"'<>;&\\xff{}]" );
- protected static final Pattern EMAIL_PATTERN = Pattern.compile( "^[0-9a-zA-Z-_\\.\\+]+@([0-9a-zA-Z-_]+\\.)+[a-zA-Z]+$" );
- protected static final Pattern UNSAFE_PATTERN = Pattern.compile( "[\\x00\\r\\n\\x0f\"':<>\\[\\];#&@\\xff{}\\$%\\\\]" );
+ static final Pattern ID_PATTERN = Pattern.compile( "[\\x00\\r\\n\\x0f\"'<>;&\\xff{}]" );
+ static final Pattern EMAIL_PATTERN = Pattern.compile( "^[0-9a-zA-Z-_\\.\\+]+@([0-9a-zA-Z-_]+\\.)+[a-zA-Z]+$" );
+ static final Pattern UNSAFE_PATTERN = Pattern.compile( "[\\x00\\r\\n\\x0f\"':<>\\[\\];#&@\\xff{}\\$%\\\\]" );
private final String m_form;
private final Session m_session;
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/CryptoUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/CryptoUtil.java
index d11961e..52a19e1 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/CryptoUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/CryptoUtil.java
@@ -172,7 +172,7 @@ public final class CryptoUtil
* @return the Base64-encoded password hash, prepended by <code>{SSHA}</code> or <code>{SHA256}</code>.
* @throws NoSuchAlgorithmException If your JVM does not supply the necessary algorithm. Should not happen.
*/
- protected static String getSaltedPassword(final byte[] password, final byte[] salt, final String algorithm ) throws NoSuchAlgorithmException
+ static String getSaltedPassword(final byte[] password, final byte[] salt, final String algorithm ) throws NoSuchAlgorithmException
{
//The term SSHA is used as a password prefix for backwards compatibility, but we use SHA-1 when fetching an instance
//of MessageDigest, as it is the guaranteed option. We also need to remove curly braces surrounding the string for
@@ -237,7 +237,7 @@ public final class CryptoUtil
* @throws IllegalArgumentException if the length of the supplied digest is
* less than or equal to 20 bytes
*/
- protected static byte[] extractPasswordHash(final byte[] digest, final int hashLength ) throws IllegalArgumentException
+ static byte[] extractPasswordHash(final byte[] digest, final int hashLength ) throws IllegalArgumentException
{
if( digest.length < hashLength )
{
@@ -261,7 +261,7 @@ public final class CryptoUtil
* @throws IllegalArgumentException if the length of the supplied digest is
* less than given length.
*/
- protected static byte[] extractSalt(final byte[] digest, final int hashLength ) throws IllegalArgumentException
+ static byte[] extractSalt(final byte[] digest, final int hashLength ) throws IllegalArgumentException
{
if( digest.length <= hashLength )
{
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
index ae9f029..647ea74 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
@@ -197,39 +197,39 @@ public final class MailUtil {
private static final String PROP_MAIL_AUTH = "mail.smtp.auth";
- protected static final Logger log = LogManager.getLogger(MailUtil.class);
+ static final Logger log = LogManager.getLogger(MailUtil.class);
- protected static final String DEFAULT_MAIL_JNDI_NAME = "mail/Session";
+ static final String DEFAULT_MAIL_JNDI_NAME = "mail/Session";
- protected static final String DEFAULT_MAIL_HOST = "localhost";
+ static final String DEFAULT_MAIL_HOST = "localhost";
- protected static final String DEFAULT_MAIL_PORT = "25";
+ static final String DEFAULT_MAIL_PORT = "25";
- protected static final String DEFAULT_MAIL_TIMEOUT = "5000";
+ static final String DEFAULT_MAIL_TIMEOUT = "5000";
- protected static final String DEFAULT_MAIL_CONN_TIMEOUT = "5000";
+ static final String DEFAULT_MAIL_CONN_TIMEOUT = "5000";
- protected static final String DEFAULT_SENDER = "jspwiki@localhost";
+ static final String DEFAULT_SENDER = "jspwiki@localhost";
- protected static final String PROP_MAIL_JNDI_NAME = "jspwiki.mail.jndiname";
+ static final String PROP_MAIL_JNDI_NAME = "jspwiki.mail.jndiname";
- protected static final String PROP_MAIL_HOST = "mail.smtp.host";
+ static final String PROP_MAIL_HOST = "mail.smtp.host";
- protected static final String PROP_MAIL_PORT = "mail.smtp.port";
+ static final String PROP_MAIL_PORT = "mail.smtp.port";
- protected static final String PROP_MAIL_ACCOUNT = "mail.smtp.account";
+ static final String PROP_MAIL_ACCOUNT = "mail.smtp.account";
- protected static final String PROP_MAIL_PASSWORD = "mail.smtp.password";
+ static final String PROP_MAIL_PASSWORD = "mail.smtp.password";
- protected static final String PROP_MAIL_TIMEOUT = "mail.smtp.timeout";
+ static final String PROP_MAIL_TIMEOUT = "mail.smtp.timeout";
- protected static final String PROP_MAIL_CONNECTION_TIMEOUT = "mail.smtp.connectiontimeout";
+ static final String PROP_MAIL_CONNECTION_TIMEOUT = "mail.smtp.connectiontimeout";
- protected static final String PROP_MAIL_TRANSPORT = "smtp";
+ static final String PROP_MAIL_TRANSPORT = "smtp";
- protected static final String PROP_MAIL_SENDER = "mail.from";
+ static final String PROP_MAIL_SENDER = "mail.from";
- protected static final String PROP_MAIL_STARTTLS = "mail.smtp.starttls.enable";
+ static final String PROP_MAIL_STARTTLS = "mail.smtp.starttls.enable";
private static String c_fromAddress;
@@ -303,7 +303,7 @@ public final class MailUtil {
* @param pProperties <code>Properties</code>
* @return <code>String</code>
*/
- protected static String getSenderEmailAddress(final Session pSession, final Properties pProperties)
+ static String getSenderEmailAddress(final Session pSession, final Properties pProperties)
{
if( c_fromAddress == null )
{
@@ -380,7 +380,7 @@ public final class MailUtil {
* @param props the properties that contain mail session properties
* @return the initialized JavaMail Session
*/
- protected static Session getStandaloneMailSession(final Properties props ) {
+ static Session getStandaloneMailSession(final Properties props ) {
// Read the JSPWiki settings from the properties
final String host = props.getProperty( PROP_MAIL_HOST, DEFAULT_MAIL_HOST );
final String port = props.getProperty( PROP_MAIL_PORT, DEFAULT_MAIL_PORT );
@@ -433,7 +433,7 @@ public final class MailUtil {
* @return the initialized JavaMail Session
* @throws NamingException if the Session cannot be obtained; for example, if the factory is not configured
*/
- protected static Session getJNDIMailSession(final String jndiName ) throws NamingException
+ static Session getJNDIMailSession(final String jndiName ) throws NamingException
{
Session session = null;
try
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/Serializer.java b/jspwiki-util/src/main/java/org/apache/wiki/util/Serializer.java
index 90796b3..78ca48a 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/Serializer.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/Serializer.java
@@ -41,7 +41,7 @@ public final class Serializer
/**
* Prefix used to indicated that a serialized item was encoded with Base64.
*/
- protected static final String BASE64_PREFIX = "base64 ";
+ static final String BASE64_PREFIX = "base64 ";
/**
* Prevent instantiation.
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
index efabc9b..68a2498 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
@@ -59,7 +59,7 @@ public final class TextUtil {
* @param rs the string to encode
* @return the URL-encoded string
*/
- protected static String urlEncode( final byte[] rs ) {
+ static String urlEncode( final byte[] rs ) {
final StringBuilder result = new StringBuilder( rs.length * 2 );
// Does the URLEncoding. We could use the java.net one, but it does not eat byte[]s.
@@ -102,7 +102,7 @@ public final class TextUtil {
*
* @throws IllegalArgumentException If the byte array is not a valid string.
*/
- protected static String urlDecode( final byte[] bytes, final String encoding ) throws IllegalArgumentException {
+ static String urlDecode( final byte[] bytes, final String encoding ) throws IllegalArgumentException {
if( bytes == null ) {
return null;
}