diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2017-11-10 09:40:55 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2017-11-10 09:40:55 +0100 |
commit | 8a6bb95ec100f05134ff872ec3ffd2188f2ac502 (patch) | |
tree | a9f4dfa5405af4a8c46ea100aed6e684488a4811 | |
parent | c6a91ed5430892fbab4147a0adcbc0dcb5fbff38 (diff) |
Renamed files
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerServlet.java | 12 | ||||
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/CertificateSerializedPayload.java (renamed from athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/SignedCertificate.java) | 8 | ||||
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/CsrSerializedPayload.java (renamed from athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/SigningRequest.java) | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerServlet.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerServlet.java index ad69ffa652a..fa1fa69cada 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerServlet.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerServlet.java @@ -2,8 +2,8 @@ package com.yahoo.vespa.hosted.athenz.instanceproviderservice.ca; import com.yahoo.log.LogLevel; -import com.yahoo.vespa.hosted.athenz.instanceproviderservice.ca.model.SignedCertificate; -import com.yahoo.vespa.hosted.athenz.instanceproviderservice.ca.model.SigningRequest; +import com.yahoo.vespa.hosted.athenz.instanceproviderservice.ca.model.CertificateSerializedPayload; +import com.yahoo.vespa.hosted.athenz.instanceproviderservice.ca.model.CsrSerializedPayload; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl.Utils; import org.bouncycastle.openssl.PEMParser; import org.bouncycastle.openssl.jcajce.JcaPEMWriter; @@ -38,17 +38,17 @@ public class CertificateSignerServlet extends HttpServlet { protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { try { String remoteHostname = getRemoteHostname(req); - SigningRequest signingRequest = Utils.getMapper().readValue(req.getReader(), SigningRequest.class); + CsrSerializedPayload csrSerializedPayload = Utils.getMapper().readValue(req.getReader(), CsrSerializedPayload.class); - PKCS10CertificationRequest csr = getPKCS10CertRequest(new StringReader(signingRequest.csr)); + PKCS10CertificationRequest csr = getPKCS10CertRequest(new StringReader(csrSerializedPayload.csr)); log.log(LogLevel.DEBUG, "Certification request from " + remoteHostname + ": " + csr); X509Certificate certificate = certificateSigner.generateX509Certificate(csr, remoteHostname); - SignedCertificate signedCertificate = new SignedCertificate(x509CertificateToString(certificate)); + CertificateSerializedPayload certificateSerializedPayload = new CertificateSerializedPayload(x509CertificateToString(certificate)); resp.setStatus(HttpServletResponse.SC_OK); resp.setContentType("application/json"); - resp.getWriter().write(Utils.getMapper().writeValueAsString(signedCertificate)); + resp.getWriter().write(Utils.getMapper().writeValueAsString(certificateSerializedPayload)); } catch (RuntimeException e) { log.log(LogLevel.ERROR, e.getMessage(), e); resp.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage()); diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/SignedCertificate.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/CertificateSerializedPayload.java index 1229cebe0c1..5208643a7e9 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/SignedCertificate.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/CertificateSerializedPayload.java @@ -9,12 +9,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; * * @author freva */ -public class SignedCertificate { +public class CertificateSerializedPayload { @JsonProperty("certificate") public final String certificate; @JsonCreator - public SignedCertificate(@JsonProperty("certificate") String certificate) { + public CertificateSerializedPayload(@JsonProperty("certificate") String certificate) { this.certificate = certificate; } @@ -23,7 +23,7 @@ public class SignedCertificate { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - SignedCertificate that = (SignedCertificate) o; + CertificateSerializedPayload that = (CertificateSerializedPayload) o; return certificate.equals(that.certificate); } @@ -35,7 +35,7 @@ public class SignedCertificate { @Override public String toString() { - return "SignedCertificate{" + + return "CertificateSerializedPayload{" + "certificate='" + certificate + '\'' + '}'; } diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/SigningRequest.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/CsrSerializedPayload.java index a4d9f276b28..a1535a35c1b 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/SigningRequest.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/model/CsrSerializedPayload.java @@ -9,12 +9,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; * * @author freva */ -public class SigningRequest { +public class CsrSerializedPayload { @JsonProperty("csr") public final String csr; @JsonCreator - public SigningRequest(@JsonProperty("csr") String csr) { + public CsrSerializedPayload(@JsonProperty("csr") String csr) { this.csr = csr; } @@ -23,7 +23,7 @@ public class SigningRequest { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - SigningRequest that = (SigningRequest) o; + CsrSerializedPayload that = (CsrSerializedPayload) o; return csr.equals(that.csr); } @@ -35,7 +35,7 @@ public class SigningRequest { @Override public String toString() { - return "SigningRequest{" + + return "CsrSerializedPayload{" + "csr='" + csr + '\'' + '}'; } |