Vojtech Szocs has posted comments on this change. Change subject: engine,userportal,webadmin: Various code fixes ......................................................................
Patch Set 1: (4 comments) http://gerrit.ovirt.org/#/c/34905/1/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java File frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java: Line 284: MessageDigest digest = createMd5Digest(); Line 285: for (MD5Attributes attribute: MD5Attributes.values()) { Line 286: if (request.getAttribute(attribute.getKey()) != null) { Line 287: digest.update(request.getAttribute(attribute.getKey()). Line 288: toString().getBytes(UTF8)); Instead of getBytes(String charsetName) we could use getBytes(Charset charset) while using Java 7's StandardCharsets, for example: getBytes(StandardCharsets.UTF_8) This change could be retroactively applied to any Java code that references "UTF-8" charset as string, too. Line 289: } Line 290: } Line 291: return digest; Line 292: } http://gerrit.ovirt.org/#/c/34905/1/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java File frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java: Line 68: UnsupportedEncodingException { Line 69: MessageDigest digest = super.getMd5Digest(request); Line 70: Line 71: // Update based on applicationMode object Line 72: digest.update(request.getAttribute(ATTR_APPLICATION_MODE).toString().getBytes(UTF8)); Please see my comment in GwtDynamicHostPageServlet regarding the use of StandardCharsets.UTF_8 constant. Line 73: Line 74: // Update based on pluginDefinitions array Line 75: digest.update(request.getAttribute(ATTR_PLUGIN_DEFS).toString().getBytes(UTF8)); Line 76: http://gerrit.ovirt.org/#/c/34905/1/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServletTest.java File frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServletTest.java: Line 106: UnsupportedEncodingException { Line 107: MessageDigest result = testServlet.getMd5Digest(mockRequest); Line 108: assertEquals(result, mockDigest); Line 109: verify(mockDigest, atLeast(3)).update(byteArrayCaptor.capture()); Line 110: assertArrayEquals(SELECTOR_SCRIPT.getBytes(GwtDynamicHostPageServlet.UTF8), byteArrayCaptor.getAllValues().get(0)); Please see my comment in GwtDynamicHostPageServlet regarding the use of StandardCharsets.UTF_8 constant. Line 111: assertArrayEquals(APPLICATION_MODE.getBytes(GwtDynamicHostPageServlet.UTF8), byteArrayCaptor.getAllValues().get(1)); Line 112: assertArrayEquals(mockPluginDefinitionsArray.toString().getBytes(GwtDynamicHostPageServlet.UTF8), byteArrayCaptor.getAllValues().get(2)); Line 113: } Line 114: http://gerrit.ovirt.org/#/c/34905/1/frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/GwtMessagesValidator.java File frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/GwtMessagesValidator.java: Line 145: Reader fr = null; Line 146: FileInputStream fis = null; Line 147: try { Line 148: fis = new FileInputStream(localeFile); Line 149: fr = new InputStreamReader(fis, "UTF-8"); Instead of InputStreamReader(InputStream in, String charsetName) we could use InputStreamReader(InputStream in, Charset cs) while using Java 7's StandardCharsets, for example: new InputStreamReader(fis, StandardCharsets.UTF_8) This change could be retroactively applied to any Java code that references "UTF-8" charset as string, too. Line 150: properties.load(fr); Line 151: } finally { Line 152: if (fis != null) { Line 153: fis.close(); -- To view, visit http://gerrit.ovirt.org/34905 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I759bfd3176b25731a5150ae690a9838e0ab63ce8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> Gerrit-Reviewer: Alexander Wels <aw...@redhat.com> Gerrit-Reviewer: Einav Cohen <eco...@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gsher...@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vsz...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
