All subclasses of PKIService have been modified to remove the Context attribute since they have been declared in the base class.
Pushed to master under trivial rule. -- Endi S. Dewata
>From 7fc7d3e8844d4992db60a637370b8599bff5a282 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <edew...@redhat.com> Date: Fri, 31 Mar 2017 19:23:43 +0200 Subject: [PATCH] Removed redundant Context attributes. All subclasses of PKIService have been modified to remove the Context attribute since they have been declared in the base class. Change-Id: Icdbe97efa2b910a579264099f817930c2cc2ed1a --- .../org/dogtagpki/server/ca/rest/AuthorityService.java | 17 ----------------- .../dogtagpki/server/ca/rest/CertRequestService.java | 17 ----------------- .../src/org/dogtagpki/server/ca/rest/CertService.java | 17 ----------------- .../dogtagpki/server/ca/rest/KRAConnectorService.java | 17 ----------------- .../org/dogtagpki/server/ca/rest/ProfileService.java | 16 ---------------- .../dogtagpki/server/kra/rest/KeyRequestService.java | 17 ----------------- .../src/org/dogtagpki/server/kra/rest/KeyService.java | 17 ----------------- .../cms/src/org/dogtagpki/server/rest/AuditService.java | 17 ----------------- .../cms/src/org/dogtagpki/server/rest/GroupService.java | 17 ----------------- .../dogtagpki/server/rest/SecurityDomainService.java | 17 ----------------- .../src/org/dogtagpki/server/rest/SelfTestService.java | 17 ----------------- .../org/dogtagpki/server/rest/SystemConfigService.java | 17 ----------------- .../cms/src/org/dogtagpki/server/rest/UserService.java | 17 ----------------- .../dogtagpki/server/tks/rest/TPSConnectorService.java | 9 --------- .../org/dogtagpki/server/tps/config/ConfigService.java | 17 ----------------- .../org/dogtagpki/server/tps/rest/ActivityService.java | 17 ----------------- .../dogtagpki/server/tps/rest/AuthenticatorService.java | 17 ----------------- .../org/dogtagpki/server/tps/rest/ConnectorService.java | 17 ----------------- .../server/tps/rest/ProfileMappingService.java | 17 ----------------- .../org/dogtagpki/server/tps/rest/ProfileService.java | 17 ----------------- .../org/dogtagpki/server/tps/rest/TPSCertService.java | 17 ----------------- .../src/org/dogtagpki/server/tps/rest/TokenService.java | 17 ----------------- 22 files changed, 365 deletions(-) diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java b/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java index c734fbf4645aabf2b068b56ead3a0d0a04e8d639..215d0fa150759e8709c24b08fed0b7abac167311 100644 --- a/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java @@ -27,13 +27,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; @@ -75,18 +70,6 @@ public class AuthorityService extends SubsystemService implements AuthorityResou hostCA = (ICertificateAuthority) CMS.getSubsystem("ca"); } - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - private final static String LOGGING_SIGNED_AUDIT_AUTHORITY_CONFIG = "LOGGING_SIGNED_AUDIT_AUTHORITY_CONFIG_3"; diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/CertRequestService.java b/base/ca/src/org/dogtagpki/server/ca/rest/CertRequestService.java index a0d36b95f8331efce24839a1d76b4418cdde4d71..a0f3d46fbea3b7106dade5e176599ccf3be6883f 100644 --- a/base/ca/src/org/dogtagpki/server/ca/rest/CertRequestService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/CertRequestService.java @@ -24,13 +24,8 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; -import javax.servlet.http.HttpServletRequest; import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -81,18 +76,6 @@ import netscape.security.x509.X500Name; */ public class CertRequestService extends PKIService implements CertRequestResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public static final int DEFAULT_START = 0; public static final int DEFAULT_PAGESIZE = 20; public static final int DEFAULT_MAXRESULTS = 100; diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java index ebbab25728b0df2b9f64e7042a1e8002aebcdce2..d5fe02ff07e7ad89cad6e66d8f724ba67b3d173c 100644 --- a/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java @@ -34,12 +34,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.catalina.realm.GenericPrincipal; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -94,18 +89,6 @@ import netscape.security.x509.X509Key; */ public class CertService extends PKIService implements CertResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - ICertificateAuthority authority; ICertificateRepository repo; Random random; diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/KRAConnectorService.java b/base/ca/src/org/dogtagpki/server/ca/rest/KRAConnectorService.java index 4ef1b7ea38c3184357a71509e39c8ab57e023172..24c33fa015754f88559c13ebff51519b3d707570 100644 --- a/base/ca/src/org/dogtagpki/server/ca/rest/KRAConnectorService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/KRAConnectorService.java @@ -17,12 +17,7 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.ca.rest; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.BadRequestException; @@ -38,18 +33,6 @@ import com.netscape.cms.servlet.base.PKIService; */ public class KRAConnectorService extends PKIService implements KRAConnectorResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - @Override public Response addConnector(KRAConnectorInfo info) { diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java index ba648a463b8f3af0de9221daa461b9376d99d5b2..694fb92bb072bedb13ae349e926e6e39fc70204d 100644 --- a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java @@ -32,11 +32,7 @@ import java.util.Map; import java.util.Properties; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; @@ -90,18 +86,6 @@ import com.netscape.cmscore.base.SimpleProperties; */ public class ProfileService extends SubsystemService implements ProfileResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - private IProfileSubsystem ps = (IProfileSubsystem) CMS.getSubsystem(IProfileSubsystem.ID); private IPluginRegistry registry = (IPluginRegistry) CMS.getSubsystem(CMS.SUBSYSTEM_REGISTRY); diff --git a/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java b/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java index 4138b38963e4abb53b218a3ec6744543de630699..e0c4ca95dcb814372d24432d1d265d0b77ac16c6 100644 --- a/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java +++ b/base/kra/src/org/dogtagpki/server/kra/rest/KeyRequestService.java @@ -25,13 +25,8 @@ import java.security.Principal; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.mozilla.jss.crypto.SymmetricKey; @@ -67,18 +62,6 @@ import com.netscape.cmsutil.ldap.LDAPUtil; */ public class KeyRequestService extends SubsystemService implements KeyRequestResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - private static final String LOGGING_SIGNED_AUDIT_SECURITY_DATA_ARCHIVAL_REQUEST = "LOGGING_SIGNED_AUDIT_SECURITY_DATA_ARCHIVAL_REQUEST_4"; diff --git a/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java b/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java index e8cb6e9b7ad10231ee08bfdb2aed6e926528e639..e15b2635e23e20beaa672fb083891425e10c2731 100644 --- a/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java +++ b/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java @@ -29,15 +29,10 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; -import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -82,18 +77,6 @@ import com.netscape.cmsutil.util.Utils; */ public class KeyService extends SubsystemService implements KeyResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - private final static String LOGGING_SIGNED_AUDIT_SECURITY_DATA_RETRIEVE_KEY = "LOGGING_SIGNED_AUDIT_SECURITY_DATA_RETRIEVE_KEY_5"; private final static String LOGGING_SIGNED_AUDIT_KEY_STATUS_CHANGE = diff --git a/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java b/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java index 76a5396c2650dc3a3fca445b02e09155471e8752..9af95d9920696dd0ed900ef06c931f95fcd50a3a 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java @@ -26,12 +26,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.TreeSet; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -51,18 +46,6 @@ import com.netscape.cms.servlet.base.SubsystemService; */ public class AuditService extends SubsystemService implements AuditResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public AuditService() { CMS.debug("AuditService.<init>()"); } diff --git a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java index 9d127c8db2287cc2b412e6b5b00b25b402628e43..4ee28102afe37899c6a3da7e128c7a28a1241a57 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java @@ -23,12 +23,7 @@ import java.net.URLEncoder; import java.util.Enumeration; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -58,18 +53,6 @@ import com.netscape.cms.servlet.base.SubsystemService; */ public class GroupService extends SubsystemService implements GroupResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public IUGSubsystem userGroupManager = (IUGSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_UG); public GroupData createGroupData(IGroup group) throws Exception { diff --git a/base/server/cms/src/org/dogtagpki/server/rest/SecurityDomainService.java b/base/server/cms/src/org/dogtagpki/server/rest/SecurityDomainService.java index 3d708ebb6de32235e9fbaaf8a6e8e87635c131ce..3dccea16e7612add61b0c1c3c36d5155d02a00f8 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/SecurityDomainService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SecurityDomainService.java @@ -17,12 +17,7 @@ // --- END COPYRIGHT BLOCK --- package org.dogtagpki.server.rest; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.PKIException; @@ -37,18 +32,6 @@ import com.netscape.cms.servlet.csadmin.SecurityDomainProcessor; */ public class SecurityDomainService extends PKIService implements SecurityDomainResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - @Override public Response getInstallToken(String hostname, String subsystem) { CMS.debug("SecurityDomainService.getInstallToken(" + hostname + ", " + subsystem + ")"); diff --git a/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java b/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java index 9108a45fe301b0f86509c169bd4d4440389b3166..7cfe85f69e815d66fc8ca2bebea4923aba0f41db 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java @@ -27,12 +27,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -53,18 +48,6 @@ import com.netscape.cms.servlet.base.PKIService; */ public class SelfTestService extends PKIService implements SelfTestResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public SelfTestService() { CMS.debug("SelfTestService.<init>()"); } diff --git a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java index 18263f74f010fb83a9ddbc415b1434897cd42e1c..27a68173865e8773d9e35a7c2df71b134b2363de 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java @@ -28,12 +28,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Random; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.UriInfo; - import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.mutable.MutableBoolean; import org.mozilla.jss.CryptoManager; @@ -73,17 +67,6 @@ import netscape.security.x509.X509CertImpl; * */ public class SystemConfigService extends PKIService implements SystemConfigResource { - @Context - public UriInfo uriInfo; - - @Context - public HttpHeaders headers; - - @Context - public Request request; - - @Context - public HttpServletRequest servletRequest; public IConfigStore cs; public String csType; diff --git a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java index 529c472194f14fb2d7ddc33eab1eb57315901844..eeadba5ae2d4500295e4dfa256b22ebb2c18112c 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java @@ -32,12 +32,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -84,18 +79,6 @@ import netscape.security.x509.X509CertImpl; */ public class UserService extends SubsystemService implements UserResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public final static String BACK_SLASH = "\\"; public final static String SYSTEM_USER = "$System$"; diff --git a/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java b/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java index 9119d777945b5bdbfaf51890c967d69fc8b40608..77aba1a455f0d1d035adef33611011c8036b1ae2 100644 --- a/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java +++ b/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java @@ -12,10 +12,7 @@ import java.util.Iterator; import java.util.List; import java.util.TreeSet; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; @@ -52,12 +49,6 @@ public class TPSConnectorService extends PKIService implements TPSConnectorResou IConfigStore cs = CMS.getConfigStore(); - @Context - private UriInfo uriInfo; - - @Context - private HttpServletRequest servletRequest; - public IUGSubsystem userGroupManager = (IUGSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_UG); @Override diff --git a/base/tps/src/org/dogtagpki/server/tps/config/ConfigService.java b/base/tps/src/org/dogtagpki/server/tps/config/ConfigService.java index 8309a2f322186e70b5fabeca72c7937e3d5668db..e9590e6ef53f59292225df4cbee54959d5d1eb62 100644 --- a/base/tps/src/org/dogtagpki/server/tps/config/ConfigService.java +++ b/base/tps/src/org/dogtagpki/server/tps/config/ConfigService.java @@ -23,12 +23,7 @@ import java.net.URI; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -45,18 +40,6 @@ import com.netscape.cms.servlet.base.SubsystemService; */ public class ConfigService extends SubsystemService implements ConfigResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public ConfigService() { CMS.debug("ConfigService.<init>()"); } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/ActivityService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ActivityService.java index 90029ea61593e859d8343a9081f0a7c3effa9d46..37a3083a8b94ecefdd3a24feb13832a744df77f0 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ActivityService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ActivityService.java @@ -23,12 +23,7 @@ import java.net.URI; import java.net.URLEncoder; import java.util.Iterator; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; import org.dogtagpki.server.tps.dbs.ActivityDatabase; @@ -49,18 +44,6 @@ import com.netscape.cms.servlet.base.PKIService; */ public class ActivityService extends PKIService implements ActivityResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public ActivityService() { CMS.debug("ActivityService.<init>()"); } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java b/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java index 424cd1490f04e96ef61c811a5e925c6a36612f20..50453ee3b1bdc7f2dbf01250480c228a90e19e26 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java @@ -26,12 +26,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.dogtagpki.server.tps.TPSSubsystem; @@ -55,18 +50,6 @@ import com.netscape.cms.servlet.base.SubsystemService; */ public class AuthenticatorService extends SubsystemService implements AuthenticatorResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public AuthenticatorService() { CMS.debug("AuthenticatorService.<init>()"); } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java index c789f14721afe3ac2dd99b314bb6ecc03309f743..01bc1323c644283c655157a24ca23308d35c2e8a 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java @@ -26,12 +26,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.dogtagpki.server.tps.TPSSubsystem; @@ -55,18 +50,6 @@ import com.netscape.cms.servlet.base.SubsystemService; */ public class ConnectorService extends SubsystemService implements ConnectorResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public ConnectorService() { CMS.debug("ConnectorService.<init>()"); } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java index eca180358e38dbfdad706cdcfe4fe2fb683b67b2..2c070c086904ef27237e93570fd3f6481baf7103 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java @@ -26,12 +26,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.dogtagpki.server.tps.TPSSubsystem; @@ -55,18 +50,6 @@ import com.netscape.cms.servlet.base.SubsystemService; */ public class ProfileMappingService extends SubsystemService implements ProfileMappingResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public ProfileMappingService() { CMS.debug("ProfileMappingService.<init>()"); } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java index b7691343e8c0767adf7a1d3af6ee7c5cd9178078..8058caf6a92b256198b05151996744ebd5cc14ae 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java @@ -26,12 +26,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.dogtagpki.server.tps.TPSSubsystem; @@ -55,18 +50,6 @@ import com.netscape.cms.servlet.base.SubsystemService; */ public class ProfileService extends SubsystemService implements ProfileResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public ProfileService() { CMS.debug("ProfileService.<init>()"); } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/TPSCertService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TPSCertService.java index 074d3d034e137a63ff0fc054cdf01c401cdd8ad7..9b627520e83c7fa65ccdde7a23fe896d2711c232 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/TPSCertService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/TPSCertService.java @@ -25,12 +25,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.dogtagpki.server.tps.TPSSubsystem; import org.dogtagpki.server.tps.dbs.TPSCertDatabase; @@ -50,18 +45,6 @@ import com.netscape.cms.servlet.base.PKIService; */ public class TPSCertService extends PKIService implements TPSCertResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public TPSCertService() { CMS.debug("TPSCertService.<init>()"); } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java index a624e2aeb9611a782ba830073c41f1dc4a20d161..f3d0d80ef03daff73812533e21fd80aeadfc1a0a 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java @@ -29,12 +29,7 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.dogtagpki.server.tps.TPSSubsystem; @@ -64,18 +59,6 @@ import netscape.ldap.LDAPException; */ public class TokenService extends SubsystemService implements TokenResource { - @Context - private UriInfo uriInfo; - - @Context - private HttpHeaders headers; - - @Context - private Request request; - - @Context - private HttpServletRequest servletRequest; - public TokenService() throws Exception { CMS.debug("TokenService.<init>()"); } -- 2.9.3
_______________________________________________ Pki-devel mailing list Pki-devel@redhat.com https://www.redhat.com/mailman/listinfo/pki-devel