Added policy deprecations

Many of the policy deprecation warnings come from classes that probably ought to
be deprecated as part of the deprecated policy framework as well.  Making these
as deprecated removes the deprecation warnings - and we can really see where
we make sure of deprecated policy code elsewhere.

Also removed some URLEncoder, Decoder deprecations

3 files changed, 42 insertions, 27 deletions

diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/Request.java b/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
index 0f0827d67..3dffc929c 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
@@ -18,6 +18,7 @@ package com.netscape.pkisilent.common;
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
 
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Calendar;
 import java.util.Date;
@@ -153,9 +154,10 @@ public class Request extends TestClient {
      * 
      * @param fromrequest number
      * @param endrequestnumber.
+     * @throws UnsupportedEncodingException
      */
 
-    public Vector<String> ListPendingRequests(String fromRequestNumber, String toRequestNumber) {
+    public Vector<String> ListPendingRequests(String fromRequestNumber, String toRequestNumber) throws UnsupportedEncodingException {
         reqState = "showWaiting";
         reqType = "enrollment";
         approveseqnumFrom = fromRequestNumber;
@@ -169,9 +171,10 @@ public class Request extends TestClient {
      * 
      * @param fromrequest number
      * @param endrequestnumber.
+     * @throws UnsupportedEncodingException
      */
 
-    public Vector<String> ListAllRequests(String fromRequestNumber, String toRequestNumber) {
+    public Vector<String> ListAllRequests(String fromRequestNumber, String toRequestNumber) throws UnsupportedEncodingException {
         reqState = "showAll";
         reqType = "enrollment";
         approveseqnumFrom = fromRequestNumber;
@@ -184,9 +187,10 @@ public class Request extends TestClient {
      * Approve pending enrollment request. Takes parameters RequestNumber
      * 
      * @param request number
+     * @throws UnsupportedEncodingException
      */
 
-    public int ApproveRequests(String requestNumber) {
+    public int ApproveRequests(String requestNumber) throws UnsupportedEncodingException {
         reqState = "showWaiting";
         reqType = "enrollment";
         approveseqnum = requestNumber;
@@ -205,9 +209,10 @@ public class Request extends TestClient {
      * Approve profile based pending enrollment request. Takes parameters RequestNumber
      * 
      * @param request number
+     * @throws UnsupportedEncodingException
      */
 
-    public int ApproveProfileRequests(String RequestNumber) {
+    public int ApproveProfileRequests(String RequestNumber) throws UnsupportedEncodingException {
 
         approveseqnum = RequestNumber;
         approveseqnumFrom = RequestNumber;
@@ -223,7 +228,7 @@ public class Request extends TestClient {
 
     }
 
-    public boolean Approve_cadualcert_Profile_Request(String RequestNumber, String name) {
+    public boolean Approve_cadualcert_Profile_Request(String RequestNumber, String name) throws UnsupportedEncodingException {
 
         approveseqnum = RequestNumber;
         approveseqnumFrom = RequestNumber;
@@ -252,9 +257,10 @@ public class Request extends TestClient {
      * Reject profile based pending enrollment request. Takes parameters RequestNumber
      * 
      * @param request number
+     * @throws UnsupportedEncodingException
      */
 
-    public int RejectProfileRequests(String RequestNumber) {
+    public int RejectProfileRequests(String RequestNumber) throws UnsupportedEncodingException {
 
         approveseqnum = RequestNumber;
         approveseqnumFrom = RequestNumber;
@@ -274,9 +280,10 @@ public class Request extends TestClient {
      * Cancel profile based pending enrollment request. Takes parameters RequestNumber
      * 
      * @param request number
+     * @throws UnsupportedEncodingException
      */
 
-    public int CancelProfileRequests(String RequestNumber) {
+    public int CancelProfileRequests(String RequestNumber) throws UnsupportedEncodingException {
 
         approveseqnum = RequestNumber;
         approveseqnumFrom = RequestNumber;
@@ -678,7 +685,7 @@ public class Request extends TestClient {
         return st;
     }
 
-    private void buildquery() {
+    private void buildquery() throws UnsupportedEncodingException {
 
         if (reqtype == 1) { // req type = list
             ACTION_STRING = "/" + agenttype + ACTION_LISTREQUEST;
@@ -711,9 +718,9 @@ public class Request extends TestClient {
             query = "seqNum=" + approveseqnum;
             query += "&toDo=accept";
             if (subjectdn != null) {
-                query += "&subject=" + URLEncoder.encode(subjectdn);
+                query += "&subject=" + URLEncoder.encode(subjectdn, "UTF-8");
             } else if (subject != null) {
-                query += "&subject=" + URLEncoder.encode(subject);
+                query += "&subject=" + URLEncoder.encode(subject, "UTF-8");
             }
 
             if (csrRequestorName != null) {
@@ -776,7 +783,7 @@ public class Request extends TestClient {
             query = "requestId=" + approveseqnum;
             query += "&name="
                     + URLEncoder.encode(
-                            "UID=test,E=test,CN=test,OU=netscape,O=aol");
+                            "UID=test,E=test,CN=test,OU=netscape,O=aol", "UTF-8");
             query += "&keyUsageCritical=true";
             query += "&keyUsageDigitalSignature=true";
             query += "&keyUsageNonRepudiation=true";
@@ -800,7 +807,7 @@ public class Request extends TestClient {
 
             query += "&subAltNameExtCritical=false";
             query += "&subjAltNames=RFC822Name:"
-                    + URLEncoder.encode(" thomasknscp@aol.com");
+                    + URLEncoder.encode(" thomasknscp@aol.com", "UTF-8");
             query += "&signingAlg=MD5withRSA";
 
             query += "&submit=submit";
@@ -864,7 +871,7 @@ public class Request extends TestClient {
                     + ":" + end.get(Calendar.SECOND);
 
             query = "requestId=" + approveseqnum + "&name="
-                    + URLEncoder.encode(cadualcert_name) + "&notBefore=" + nb
+                    + URLEncoder.encode(cadualcert_name, "UTF-8") + "&notBefore=" + nb
                     + "&notAfter=" + nat + "&authInfoAccessCritical=false"
                     + "&authInfoAccessGeneralNames=" + "&keyUsageCritical=true"
                     + "&keyUsageDigitalSignature=false"
@@ -958,7 +965,7 @@ public class Request extends TestClient {
 
     }
 
-    private boolean listRequest(String from, String To) {
+    private boolean listRequest(String from, String To) throws UnsupportedEncodingException {
 
         Integer x = new Integer(from);
 
@@ -980,7 +987,7 @@ public class Request extends TestClient {
         return (Send());
     }
 
-    private boolean approveRequest() {
+    private boolean approveRequest() throws UnsupportedEncodingException {
 
         boolean st = true;
 
@@ -1059,9 +1066,10 @@ public class Request extends TestClient {
 
     /**
      * Use this method when you need to use properties file.
+     * @throws UnsupportedEncodingException
      */
 
-    public int processRequest() {
+    public int processRequest() throws UnsupportedEncodingException {
         if (propfileName != null) {
             readProperties();
         }
@@ -1112,7 +1120,12 @@ public class Request extends TestClient {
 
         Request t = new Request(args[0]);
 
-        st = t.processRequest();
+        try {
+            st = t.processRequest();
+        } catch (UnsupportedEncodingException e) {
+            System.out.println(e);
+            e.printStackTrace();
+        }
         if (st == -1) {
             System.exit(0);
         } else {
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java b/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
index 5761c6f77..c55088bc6 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
@@ -23,6 +23,7 @@ import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -153,7 +154,7 @@ public class UserEnroll extends TestClient {
         certType = ct;
     }
 
-    public boolean enroll_load() {
+    public boolean enroll_load() throws UnsupportedEncodingException {
         buildquery();
         setStatusString("");
         return (Send());
@@ -297,7 +298,7 @@ public class UserEnroll extends TestClient {
 
     }
 
-    private void buildquery() {
+    private void buildquery() throws UnsupportedEncodingException {
 
         StringBuffer queryStrBuf = new StringBuffer();
 
@@ -324,10 +325,10 @@ public class UserEnroll extends TestClient {
             if (requestorName.length() > 0) {
                 queryStrBuf.append("&csrRequestorName=");
             }
-            queryStrBuf.append(URLEncoder.encode(requestorName));
+            queryStrBuf.append(URLEncoder.encode(requestorName, "UTF-8"));
             if (requestorEmail.length() > 0) {
                 queryStrBuf.append("&csrRequestorEmail=");
-                queryStrBuf.append(URLEncoder.encode(requestorEmail));
+                queryStrBuf.append(URLEncoder.encode(requestorEmail, "UTF-8"));
                 queryStrBuf.append("&email=true");
 
             } else {
@@ -336,11 +337,11 @@ public class UserEnroll extends TestClient {
 
             if (requestorPhone.length() > 0) {
                 queryStrBuf.append("&csrRequestorPhone=");
-                queryStrBuf.append(URLEncoder.encode(requestorPhone));
+                queryStrBuf.append(URLEncoder.encode(requestorPhone, "UTF-8"));
             }
             if (requestorComments.length() > 0) {
                 queryStrBuf.append("&csrRequestorComments=");
-                queryStrBuf.append(URLEncoder.encode(requestorComments));
+                queryStrBuf.append(URLEncoder.encode(requestorComments, "UTF-8"));
             }
             System.out.println("buidlquery client E ");
             if (E.length() > 0) {
@@ -364,7 +365,7 @@ public class UserEnroll extends TestClient {
             // if(C.length() >0) {	queryStrBuf.append("&C=");queryStrBuf.append(C);}
             System.out.println("buidlquery client dn ");
             queryStrBuf.append("&subject=");
-            queryStrBuf.append(URLEncoder.encode(DN));
+            queryStrBuf.append(URLEncoder.encode(DN, "UTF-8"));
         }
 
         if (certType.equals("ra")) {
@@ -405,7 +406,7 @@ public class UserEnroll extends TestClient {
         }
 
         queryStrBuf.append("&pkcs10Request=");
-        queryStrBuf.append(URLEncoder.encode(pkcs10request));
+        queryStrBuf.append(URLEncoder.encode(pkcs10request, "UTF-8"));
         System.out.println("before converting bug to string ");
         query = queryStrBuf.toString();
 
diff --git a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
index 3c715226d..f3980c0ed 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.URLDecoder;
@@ -1078,7 +1079,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback {
         return true;
     }
 
-    public static void main(String args[]) {
+    public static void main(String args[]) throws UnsupportedEncodingException {
         HTTPClient hc = new HTTPClient();
         HTTPResponse hr = null;
 
@@ -1217,7 +1218,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback {
 
         String responseValue = null;
         if (decode.equalsIgnoreCase("true"))
-            responseValue = URLDecoder.decode(hr.getHTML());
+            responseValue = URLDecoder.decode(hr.getHTML(), "UTF-8");
         else
             responseValue = hr.getHTML();