Alon Bar-Lev has uploaded a new change for review. Change subject: utils: remove servlet interaction from PKIResources ......................................................................
utils: remove servlet interaction from PKIResources got some notes that better to move the code upward into the servlets, there was an option to add this to ServletUtils but it is way to specific to do so. so moving this into servlet and the upcoming registration servlet will use the same method. Change-Id: I7b8f18444afd9be981f195e153fd9328d9fc376c Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java 2 files changed, 4 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/21079/1 diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java index f5baea0..9d8b0c3 100644 --- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java +++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.services; import java.io.IOException; +import java.io.PrintWriter; import java.util.HashMap; import java.util.Map; @@ -60,7 +61,7 @@ String format = getMyParameter("format", request); String alias = getMyParameter("alias", request); - try { + try (PrintWriter out = response.getWriter()) { if (resource == null) { throw new IllegalArgumentException("Missing resource name"); } @@ -77,7 +78,8 @@ } } - pkiResources.setHttpResponse(response, r, outputType, alias); + response.setContentType(pkiResources.getContentType(r, outputType)); + out.print(pkiResources.getAsString(r, outputType, alias)); } catch(Exception e) { log.error( diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java index 6ed98d0..c3d49e6 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java @@ -2,16 +2,12 @@ import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; -import java.io.PrintWriter; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateFactory; import java.util.HashMap; import java.util.Map; - -import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; @@ -147,20 +143,5 @@ public String getContentType(Resource resource) { return getContentType(resource, null); - } - - public void setHttpResponse(HttpServletResponse response, Resource resource, OutputType outputType, String alias) throws IOException { - try (PrintWriter out = response.getWriter()) { - response.setContentType(getContentType(resource, outputType)); - out.print(getAsString(resource, outputType, alias)); - } - } - - public void setHttpResponse(HttpServletResponse response, Resource resource, OutputType outputType) throws IOException { - setHttpResponse(response, resource, outputType, null); - } - - public void setHttpResponse(HttpServletResponse response, Resource resource) throws IOException { - setHttpResponse(response, resource, null, null); } } -- To view, visit http://gerrit.ovirt.org/21079 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b8f18444afd9be981f195e153fd9328d9fc376c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
