From 7c7b9d023cd466c1771068badc020dab36beb553 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 5 Apr 2012 14:49:11 -0500 Subject: Removed whitespaces from Java code. Whitespaces in Java code have been removed with the following command: find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \; Ticket #134 --- .../netscape/cmscore/request/ARequestQueue.java | 54 +++++++++++----------- .../netscape/cmscore/request/ARequestRecord.java | 2 +- .../cmscore/request/CertRequestConstants.java | 8 ++-- .../com/netscape/cmscore/request/RequestAttr.java | 2 +- .../com/netscape/cmscore/request/RequestQueue.java | 10 ++-- .../netscape/cmscore/request/RequestRecord.java | 28 +++++------ .../cmscore/request/RequestRepository.java | 6 +-- .../netscape/cmscore/request/RequestSubsystem.java | 8 ++-- 8 files changed, 59 insertions(+), 59 deletions(-) (limited to 'base/common/src/com/netscape/cmscore/request') diff --git a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java index 16db3985c..1d247ab0c 100644 --- a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java @@ -76,7 +76,7 @@ import com.netscape.certsrv.request.RequestStatus; *

* This class also implements the locking operations specified by the IRequestQueue interface. *

- * + * * @author thayes * @version $Revision$ $Date$ */ @@ -94,7 +94,7 @@ public abstract class ARequestQueue * This method must be implemented by the specialized class to generate a new id from data in the persistant store. * This id is used to create a new request object. *

- * + * * @return * a new RequestId object. * @exception EBaseException @@ -112,7 +112,7 @@ public abstract class ARequestQueue * The implementation of this object can use the createRequest member function to create a new instance of an * IRequest, and use the setRequestStatus, setCreationTime and setModificationTime functions to set those values. *

- * + * * @param id * the id of the request to read. * @return @@ -132,7 +132,7 @@ public abstract class ARequestQueue *

* This function is called when a new request immediately after creating a new request. *

- * + * * @param request * the request to add. * @exception EBaseException @@ -147,7 +147,7 @@ public abstract class ARequestQueue *

* Currently there are no hints for what has changed, so the entire request should be updated. *

- * + * * @param request * @exception EBaseException * TODO: this is not implemented yet @@ -164,7 +164,7 @@ public abstract class ARequestQueue *

* TODO: return IRequestList -or- just use listRequests as the basic engine. *

- * + * * @return * an Enumeration that generates RequestId objects. */ @@ -173,7 +173,7 @@ public abstract class ARequestQueue /** * protected access for setting the current state of a request. *

- * + * * @param request * The request to be modified. * @param status @@ -188,7 +188,7 @@ public abstract class ARequestQueue /** * protected access for setting the modification time of a request. *

- * + * * @param request * The request to be modified. * @param date @@ -203,7 +203,7 @@ public abstract class ARequestQueue /** * protected access for setting the creation time of a request. *

- * + * * @param request * The request to be modified. * @param date @@ -218,7 +218,7 @@ public abstract class ARequestQueue /** * protected access for creating a new Request object *

- * + * * @param id * The identifier for the new request * @return @@ -246,7 +246,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.newRequest *

- * + * * @see IRequestQueue#newRequest */ public IRequest newRequest(String requestType) @@ -282,18 +282,18 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.cloneRequest *

- * + * * @see IRequestQueue#cloneRequest */ public IRequest cloneRequest(IRequest r) throws EBaseException { - // 1. check for valid state. (Are any invalid ?) + // 1. check for valid state. (Are any invalid ?) RequestStatus rs = r.getRequestStatus(); if (rs == RequestStatus.BEGIN) throw new EBaseException("Invalid Status"); - // 2. create new request + // 2. create new request String reqType = r.getRequestType(); IRequest clone = newRequest(reqType); @@ -313,7 +313,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.findRequest *

- * + * * @see IRequestQueue#findRequest */ public IRequest findRequest(RequestId id) @@ -342,7 +342,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.processRequest *

- * + * * @see IRequestQueue#processRequest */ public final void processRequest(IRequest r) @@ -373,7 +373,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.markRequestPending *

- * + * * @see IRequestQueue#markRequestPending */ public final void markRequestPending(IRequest r) @@ -397,7 +397,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.cloneAndMarkPending *

- * + * * @see IRequestQueue#cloneAndMarkPending */ public IRequest cloneAndMarkPending(IRequest r) @@ -411,7 +411,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.approveRequest *

- * + * * @see IRequestQueue#approveRequest */ public final void approveRequest(IRequest r) @@ -455,7 +455,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.rejectRequest *

- * + * * @see IRequestQueue#rejectRequest */ public final void rejectRequest(IRequest r) @@ -477,7 +477,7 @@ public abstract class ARequestQueue /** * Implments IRequestQueue.cancelRequest *

- * + * * @see IRequestQueue#cancelRequest */ public final void cancelRequest(IRequest r) @@ -509,7 +509,7 @@ public abstract class ARequestQueue * Should be overridden by the specialized class if a more efficient method is available for implementing this * operation. *

- * + * * @see IRequestQueue#listRequests */ public IRequestList listRequests() { @@ -522,7 +522,7 @@ public abstract class ARequestQueue * Should be overridden by the specialized class if a more efficient method is available for implementing this * operation. *

- * + * * @see IRequestQueue#listRequestsByStatus */ public IRequestList listRequestsByStatus(RequestStatus s) { @@ -532,7 +532,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.releaseRequest *

- * + * * @see IRequestQueue#releaseRequest */ public final void releaseRequest(IRequest request) { @@ -733,7 +733,7 @@ public abstract class ARequestQueue } catch (InterruptedException e) { }; } - } + } public synchronized void unlock(RequestId id) { mHashtable.remove(id); @@ -742,7 +742,7 @@ public abstract class ARequestQueue } // instance variables - Hashtable mHashtable = new Hashtable(); + Hashtable mHashtable = new Hashtable(); } */ @@ -859,7 +859,7 @@ class Request * This function used to check that the keys obeyed LDAP attribute name * syntax rules. Keys are being encoded now, so it is changed to just * filter out null and empty string keys. - * + * * @param key The key to check * @return false if invalid */ diff --git a/base/common/src/com/netscape/cmscore/request/ARequestRecord.java b/base/common/src/com/netscape/cmscore/request/ARequestRecord.java index e23d4007c..5f2aa50b2 100644 --- a/base/common/src/com/netscape/cmscore/request/ARequestRecord.java +++ b/base/common/src/com/netscape/cmscore/request/ARequestRecord.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.request.RequestStatus; * The low level (attributes only) version of the database * record object. This exists so that RecordAttr methods can use * this type definition, - * + * * RequestRecord refers both to this class and to RecordAttr objects. */ class ARequestRecord { diff --git a/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java b/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java index eab41fcd5..9b9391d44 100644 --- a/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java +++ b/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java @@ -23,8 +23,8 @@ package com.netscape.cmscore.request; * as needed. */ public class CertRequestConstants { - // request types - these have string values. - // made to match policy constants. + // request types - these have string values. + // made to match policy constants. public final static String GETCRL_REQUEST = "getCRL"; public final static String GETCACHAIN_REQUEST = "getCAChain"; public final static String GETREVOCATIONINFO_REQUEST = "getRevocationInfo"; @@ -50,7 +50,7 @@ public class CertRequestConstants { // this has a CRLExtensions value. public final static String CRLEXTS = "CRLExts"; - // this has a String value - it is either null or set. + // this has a String value - it is either null or set. public final static String DOGETCACHAIN = "doGetCAChain"; // this has a CertificateChain value. @@ -63,7 +63,7 @@ public class CertRequestConstants { public final static String CERTIFICATE = "certificate"; // this is an array of EBaseException for service errors when - // there's an error processing an array of something such as + // there's an error processing an array of something such as // certs to renew, certs to revoke, etc. public final static String SVCERRORS = "serviceErrors"; diff --git a/base/common/src/com/netscape/cmscore/request/RequestAttr.java b/base/common/src/com/netscape/cmscore/request/RequestAttr.java index 25734c91e..a48fca1d2 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestAttr.java +++ b/base/common/src/com/netscape/cmscore/request/RequestAttr.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.ldap.IRequestMod; abstract class RequestAttr { /** - * + * */ abstract void set(ARequestRecord r, Object o); diff --git a/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/base/common/src/com/netscape/cmscore/request/RequestQueue.java index ef13d3c29..95335724a 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestQueue.java +++ b/base/common/src/com/netscape/cmscore/request/RequestQueue.java @@ -306,7 +306,7 @@ public class RequestQueue /** * Implements IRequestQueue.findRequestBySourceId *

- * + * * @see com.netscape.certsrv.request.IRequestQueue#findRequestBySourceId */ public RequestId findRequestBySourceId(String id) { @@ -321,7 +321,7 @@ public class RequestQueue /** * Implements IRequestQueue.findRequestsBySourceId *

- * + * * @see com.netscape.certsrv.request.IRequestQueue#findRequestsBySourceId */ public IRequestList findRequestsBySourceId(String id) { @@ -406,7 +406,7 @@ public class RequestQueue return new SearchEnumeration(this, results); } - /** + /** */ public IRequestList listRequestsByFilter(String f, int maxSize) { IDBSearchResults results = null; @@ -476,7 +476,7 @@ public class RequestQueue dbs = mDB.createSession(); results = dbs.search(mBaseDN, f1); } catch (EBaseException e) { - //System.err.println("Error: "+e); + //System.err.println("Error: "+e); //e.printStackTrace(); } finally { // Close session - ignoring errors (UTIL) @@ -595,7 +595,7 @@ public class RequestQueue } /* - * return request repository + * return request repository */ public IRepository getRequestRepository() { return (IRepository) mRepository; diff --git a/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/base/common/src/com/netscape/cmscore/request/RequestRecord.java index 1d066f0ad..3381727e4 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestRecord.java +++ b/base/common/src/com/netscape/cmscore/request/RequestRecord.java @@ -267,7 +267,7 @@ public class RequestRecord * This table contains attribute handlers for attributes * of the request. These attributes are ones that are stored * apart from the generic name/value pairs supported by the get/set - * interface plus the hashtable for the name/value pairs themselves. + * interface plus the hashtable for the name/value pairs themselves. * * NOTE: Eventually, all attributes should be done here. Currently * only the last ones added are implemented this way. @@ -430,10 +430,10 @@ class RequestIdMapper /** * A mapper between an request attr set and its LDAP attribute representation. - * + * * The attr attribute is no longer used. This class is kept for historical * and migration purposes. - * + * * @author thayes * @version $Revision$ $Date$ * @deprecated @@ -557,7 +557,7 @@ class RequestAttrsMapper /** * Implements IDBAttrMapper.mapLDAPAttributeSetToObject *

- * + * * @see IDBAttrMapper#mapLDAPAttributeSetToObject */ public void mapLDAPAttributeSetToObject(LDAPAttributeSet attrs, @@ -567,7 +567,7 @@ class RequestAttrsMapper // // Data is stored in a (single valued) binary attribute - // + // byte[] value; LDAPAttribute attr = null; @@ -609,14 +609,14 @@ class RequestAttrsMapper /** * Maps dynamic data for the extData- prefix to and from the extData Hashtable * in RequestRecord. - * + * * The data in RequestRecord is stored in a Hashtable. It comes in two forms: * 1. String key1 => String value1 * String key2 => String value2 * This is stored in LDAP as: * extData-key1 => value1 * extData-key2 => value2 - * + * * 2. String key => Hashtable value * where value stores: * String key2 => String value2 @@ -624,10 +624,10 @@ class RequestAttrsMapper * This is stored in LDAP as: * extData-key;key2 => value2 * extData-key;key3 => value3 - * + * * These can be mixed, but each top-level key can only be associated with * a String value or a Hashtable value. - * + * */ class ExtAttrDynMapper implements IDBDynAttrMapper { @@ -644,10 +644,10 @@ class ExtAttrDynMapper implements IDBDynAttrMapper { * Decodes extdata encoded keys. * -- followed by a 4 digit hexadecimal string is decoded to the character * representing the hex string. - * + * * The routine is written to be highly efficient. It only allocates * the StringBuffer if needed and copies the pieces in large chunks. - * + * * @param key The key to decode * @return The decoded key. */ @@ -693,7 +693,7 @@ class ExtAttrDynMapper implements IDBDynAttrMapper { /** * Encoded extdata keys for storage in LDAP. - * + * * The rules for encoding are trickier than decoding. We want to allow * '-' by itself to be stored in the database (for the common case of keys * like 'Foo-Bar'. Therefore we are using '--' as the encoding character. @@ -706,11 +706,11 @@ class ExtAttrDynMapper implements IDBDynAttrMapper { * 4) If [-] is preceded or followed by [^a-zA-Z0-9] then * the - as well as all following [^a-zA-Z0-9] characters are encoded * as --XXXX. - * + * * This routine tries to be as efficient as possible with StringBuffer and * large copies. However, the encoding unfortunately requires several * objects to be allocated. - * + * * @param key The key to encode * @return The encoded key */ diff --git a/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/base/common/src/com/netscape/cmscore/request/RequestRepository.java index 0a4a4ebf9..ed18c7048 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestRepository.java +++ b/base/common/src/com/netscape/cmscore/request/RequestRepository.java @@ -36,7 +36,7 @@ import com.netscape.cmscore.dbs.RepositoryRecord; * TODO: what does this class provide beyond the Repository * base class?? *

- * + * * @author thayes * @version $Revision$ $Date$ */ @@ -49,7 +49,7 @@ class RequestRepository /** * Create a request repository that uses the LDAP database *

- * + * * @param name * the name of the repository. This String is used to * construct the DN for the repository's LDAP entry. @@ -88,7 +88,7 @@ class RequestRepository * value can be used by the request queue to create the * name for the request records themselves. *

- * + * * @return * the LDAP base DN. */ diff --git a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java index 862ddaa68..69c0d0ce9 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java +++ b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java @@ -39,7 +39,7 @@ import com.netscape.cmscore.dbs.DBSubsystem; * TODO: review this It provides: + registration of LDAP/JAVA mapping classes with the DBSubsystem + creation of * RequestQueue storage in the database + retrieval of existing RequestQueue objects from the database *

- * + * * @author thayes * @version $Revision$, $Date$ */ @@ -91,7 +91,7 @@ public class RequestSubsystem RequestQueue rq = new RequestQueue(name, increment, p, s, n, pendingNotifier); // can't do this here because the service depends on getting rq - // (to get request) and since this method hasn't returned it's rq is null. + // (to get request) and since this method hasn't returned it's rq is null. //rq.recover(); return rq; @@ -105,7 +105,7 @@ public class RequestSubsystem /** * Implements ISubsystem.getId *

- * + * * @see ISubsystem#getId */ public String getId() { @@ -127,7 +127,7 @@ public class RequestSubsystem /** * Implements ISubsystem.startup *

- * + * * @see ISubsystem#startup */ public void startup() -- cgit