[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openig-dev
Subject: [Openig-dev] [988] trunk/openig-core/src/main/java/org/forgerock/openig/el/Functions. java:
From: noreply () forgerock ! org
Date: 2015-04-27 15:07:05
Message-ID: 20150427150705.093C83F86E () sources ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[988] trunk/openig-core/src/main/java/org/forgerock/openig/el/Functions.java: \
Autorefactor'ed Functions.java.</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/openig/?cs=988">988</a></dd> \
<dt>Author</dt> <dd>violette</dd> <dt>Date</dt> <dd>2015-04-27 16:07:04 +0100 (Mon, \
27 Apr 2015)</dd> </dl>
<h3>Log Message</h3>
<pre>Autorefactor'ed Functions.java.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkopenigcoresrcmainjavaorgforgerockopenigelFunctionsjava">trunk/openig-core/src/main/java/org/forgerock/openig/el/Functions.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkopenigcoresrcmainjavaorgforgerockopenigelFunctionsjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openig-core/src/main/java/org/forgerock/openig/el/Functions.java (987 => \
988)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openig-core/src/main/java/org/forgerock/openig/el/Functions.java 2015-04-27 \
15:07:00 UTC (rev 987)
+++ trunk/openig-core/src/main/java/org/forgerock/openig/el/Functions.java 2015-04-27 \
15:07:04 UTC (rev 988) </span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> if (object == null || value == null) {
</span><span class="cx"> return false;
</span><span class="cx"> } else if (object instanceof CharSequence && \
value instanceof CharSequence) { </span><del>- return \
(object.toString().contains(value.toString())); </del><ins>+ return \
object.toString().contains(value.toString()); </ins><span class="cx"> } else \
if (object instanceof Collection) { </span><span class="cx"> return \
((Collection<?>) object).contains(value); </span><span class="cx"> } \
else if (object instanceof Object[]) { </span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> * not found.
</span><span class="cx"> */
</span><span class="cx"> public static int indexOf(String value, String \
substring) { </span><del>- return (value != null && substring != null \
? value.indexOf(substring) : null); </del><ins>+ return value != null \
&& substring != null ? value.indexOf(substring) : null; </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> * @return the string containing the joined strings.
</span><span class="cx"> */
</span><span class="cx"> public static String join(String[] values, String \
separator) { </span><del>- return (values != null ? StringUtil.join(separator, \
(Object[]) values) : null); </del><ins>+ return values != null ? \
StringUtil.join(separator, (Object[]) values) : null; </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -164,10 +164,8 @@
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><span class="cx"> for (Object key : ((Map<?, ?>) \
map).keySet()) { </span><del>- if (key instanceof String) {
- if (p.matcher((String) key).matches()) {
- return (String) key;
- }
</del><ins>+ if (key instanceof String && p.matcher((String) \
key).matches()) { + return (String) key;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -265,7 +263,7 @@
</span><span class="cx"> * @return the resulting array of split substrings.
</span><span class="cx"> */
</span><span class="cx"> public static String[] split(String value, String regex) \
{ </span><del>- return (value != null ? value.split(regex) : null);
</del><ins>+ return value != null ? value.split(regex) : null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -275,7 +273,7 @@
</span><span class="cx"> * @return the string with characters converted to lower \
case. </span><span class="cx"> */
</span><span class="cx"> public static String toLowerCase(String value) {
</span><del>- return (value != null ? value.toLowerCase() : null);
</del><ins>+ return value != null ? value.toLowerCase() : null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -286,7 +284,7 @@
</span><span class="cx"> * @return the string value of the object.
</span><span class="cx"> */
</span><span class="cx"> public static String toString(Object value) {
</span><del>- return (value != null ? value.toString() : null);
</del><ins>+ return value != null ? value.toString() : null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -296,7 +294,7 @@
</span><span class="cx"> * @return the string with characters converted to upper \
case. </span><span class="cx"> */
</span><span class="cx"> public static String toUpperCase(String value) {
</span><del>- return (value != null ? value.toUpperCase() : null);
</del><ins>+ return value != null ? value.toUpperCase() : null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -306,7 +304,7 @@
</span><span class="cx"> * @return the string with leading and trailing white \
space omitted. </span><span class="cx"> */
</span><span class="cx"> public static String trim(String value) {
</span><del>- return (value != null ? value.trim() : null);
</del><ins>+ return value != null ? value.trim() : null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -342,10 +340,10 @@
</span><span class="cx"> * {@code string} was {@code null}.
</span><span class="cx"> */
</span><span class="cx"> public static String encodeBase64(final String value) {
</span><del>- if (value == null) {
- return null;
</del><ins>+ if (value != null) {
+ return Base64.encode(value.getBytes());
</ins><span class="cx"> }
</span><del>- return Base64.encode(value.getBytes());
</del><ins>+ return null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -357,10 +355,10 @@
</span><span class="cx"> * {@code string} was {@code null} or if the \
input was not a Base64 valid input. </span><span class="cx"> */
</span><span class="cx"> public static String decodeBase64(final String value) {
</span><del>- if (value == null) {
- return null;
</del><ins>+ if (value != null) {
+ return new String(Base64.decode(value));
</ins><span class="cx"> }
</span><del>- return new String(Base64.decode(value));
</del><ins>+ return null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
Openig-dev mailing list
Openig-dev@forgerock.org
https://lists.forgerock.org/mailman/listinfo/openig-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic