Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>jrimum-utilix</artifactId>
<packaging>jar</packaging>
<name>Projeto Utilix</name>
<version>0.2.3-DEV-SNAPSHOT</version>
<version>0.2.6</version>
<description>Projeto open source de componentes de software para o domínio de negócios do Brasil.</description>
<url>http://www.jrimum.org/utilix</url>

Expand Down Expand Up @@ -45,6 +45,10 @@
<name>Rômulo Augusto</name>
<email>romulomail@gmail.com</email>
</developer>
<developer>
<name>Bruno Augusto</name>
<email>brunoaugustosilva8@gmail.com</email>
</developer>
</developers>

<properties>
Expand All @@ -59,18 +63,18 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.6</version>
<version>1.23</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java15</artifactId>
<artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
Expand Down Expand Up @@ -147,9 +151,9 @@

<dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
<scope></scope>
</dependency>
<dependency>
Expand Down
36 changes: 18 additions & 18 deletions src/main/java/org/jrimum/utilix/Arrays.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ private Arrays() {
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand All @@ -83,13 +83,13 @@ public static boolean hasElement(char[] a){
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a
* - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand All @@ -104,12 +104,12 @@ public static boolean hasElement(boolean[] a){
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand All @@ -124,12 +124,12 @@ public static boolean hasElement(byte[] a){
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand All @@ -144,12 +144,12 @@ public static boolean hasElement(short[] a){
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand All @@ -164,12 +164,12 @@ public static boolean hasElement(int[] a){
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand All @@ -184,12 +184,12 @@ public static boolean hasElement(long[] a){
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand All @@ -204,12 +204,12 @@ public static boolean hasElement(float[] a){
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand All @@ -224,12 +224,12 @@ public static boolean hasElement(double[] a){
* </p>
* <p>
* Resposta direta para o seguinte código:
* <code>(a != null && a > 0)</code>.
* <code>(a != null &amp;&amp; a &gt; 0)</code>.
* </p>
*
* @param a - O array a ser testado.
*
* @return (a != null && a > 0)
* @return (a != null &amp;&amp; a &gt; 0)
*
* @since 0.2
*/
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/jrimum/utilix/Collections.java
Original file line number Diff line number Diff line change
Expand Up @@ -363,13 +363,13 @@ public static boolean hasElement(Map<?, ?> ... maps) {
* Indica se uma dada coleção tem elementos sem gerar NPE.
* <p>
* Resposta direta para o seguinte código:
* <code>(c != null && !c.isEmpty())</code>.
* <code>(c != null &amp;&amp; !c.isEmpty())</code>.
* </p>
*
* @param c
* - A coleção a ser testada.
*
* @return (c != null && !c.isEmpty())
* @return (c != null &amp;&amp; !c.isEmpty())
*
* @since 0.2
*/
Expand All @@ -382,13 +382,13 @@ public static boolean hasElement(Collection<?> c) {
* Indica se um dado mapa tem elementos sem gerar NPE.
* <p>
* Resposta direata para o seguinte código:
* <code>(m != null && !m.isEmpty())</code>.
* <code>(m != null &amp;&amp; !m.isEmpty())</code>.
* </p>
*
* @param m
* - O mapa a ser testado.
*
* @return (m != null && !m.isEmpty())
* @return (m != null &amp;&amp; !m.isEmpty())
*
* @since 0.2
*/
Expand Down Expand Up @@ -452,7 +452,7 @@ public static int size(Map<?, ?> m) {
* - Mensagem utiliada na exceção
* <code>IllegalArgumentException</code>.
*
* @throws IllegalArgumentException
* @throws IllegalArgumentException Se a coleção estiver nula ou vazia
*
* @since 0.2
*/
Expand Down Expand Up @@ -491,7 +491,7 @@ public static void checkNotEmpty(Collection<?> collection,
* - Mensagem utiliada na exceção
* <code>IllegalArgumentException</code>.
*
* @throws IllegalArgumentException
* @throws IllegalArgumentException Se o map estiver nulo ou vazio
*
* @since 0.2
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jrimum/utilix/Dates.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import java.util.Calendar;
import java.util.Date;

import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.time.DateUtils;

/**
* <p>
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/jrimum/utilix/Objects.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

package org.jrimum.utilix;

import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;


/**
Expand Down Expand Up @@ -349,11 +349,13 @@ public static <T> T whenNull(Object object, Object defaultValue,
/**
* Exibe os valores de instância para um objeto JRimum.
*
* @see org.apache.commons.lang.builder.ToStringBuilder#reflectionToString
* @see org.apache.commons.lang3.builder.ToStringBuilder#reflectionToString
*
* @since 0.2
*
* @see java.lang.Object#toString()
* @param obj Objeto a ser convertido para String
* @return String "JRimumObject" + Objeto.toString()
*/
public static String toString(Object obj) {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jrimum/utilix/text/DateFormat.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
* Formatadores de data thread-safe. Para uma mesma categoria, os formatadores
* atualmente são diferenciados pelos seus separadores ("formato_separador")
* exemplos:
* </p>
* <ul>
* <li>DDMMYY <code>default:ddMMyy</code></li>
* <li>DDMMYY_B <code>barr:dd/MM/yy</code></li>
Expand All @@ -48,7 +49,6 @@
* <li>HHMMSS_C <code>colon:"hh:mm:ss"</code></li>
* <li>etc.</li>
* </ul>
* </p>
*
* @author <a href=http://gilmatryx.googlepages.com/>Gilmar P.S.L.</a>
*
Expand Down
34 changes: 17 additions & 17 deletions src/main/java/org/jrimum/utilix/text/Strings.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@
package org.jrimum.utilix.text;

import static java.lang.String.format;
import static org.apache.commons.lang.StringUtils.EMPTY;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.commons.lang.StringUtils.isNumeric;
import static org.apache.commons.lang.StringUtils.leftPad;
import static org.apache.commons.lang.StringUtils.removeStart;
import static org.apache.commons.lang.StringUtils.replace;
import static org.apache.commons.lang.StringUtils.replaceChars;
import static org.apache.commons.lang.StringUtils.startsWith;
import static org.apache.commons.lang3.StringUtils.EMPTY;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.isNumeric;
import static org.apache.commons.lang3.StringUtils.leftPad;
import static org.apache.commons.lang3.StringUtils.removeStart;
import static org.apache.commons.lang3.StringUtils.replace;
import static org.apache.commons.lang3.StringUtils.replaceChars;
import static org.apache.commons.lang3.StringUtils.startsWith;
import static org.jrimum.utilix.Objects.isNotNull;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.jrimum.utilix.Exceptions;
import org.jrimum.utilix.Objects;

Expand Down Expand Up @@ -77,8 +77,8 @@ private Strings() {
/**
* Elimina simbolos como:
*
* <pre>>
* <,;.:!*&%+-_<>[]\/
* <pre>
* &lt;,;.:!*&amp;%+-_&lt;&gt;[]\/
* </pre>
*
* @param str
Expand Down Expand Up @@ -129,12 +129,12 @@ public static String eliminateSymbols(final String str) {
* Remove os zeros iniciais de uma <code>String</code>, seja ela numérica ou
* não.
* <p>
* <code>removeStartWithZeros("00000") => 0</code><br />
* <code>removeStartWithZeros("00023") => 23</code><br />
* <code>removeStartWithZeros("02003") => 2003</code>
* <code>removeStartWithZeros("00000") =&gt; 0</code><br>
* <code>removeStartWithZeros("00023") =&gt; 23</code><br>
* <code>removeStartWithZeros("02003") =&gt; 2003</code>
* <p>
*
* @param str
* @param str String com zeros preenchidos
* @return a string sem zeros inicias ou um único zero.
*
* @since 0.2
Expand Down Expand Up @@ -360,7 +360,7 @@ public static void checkNotBlank(String value) {

/**
* Retorna uma dado valor padrão quando a string informada for considerada
* como blank por {@linkplain StringUtils#isBlank(String)}.
* como blank por {@linkplain StringUtils#isBlank(CharSequence)}.
*
* <pre>
* whenBlank(null, null) = null
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jrimum/utilix/text/TestStrings.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

package org.jrimum.utilix.text;

import static org.apache.commons.lang.StringUtils.EMPTY;
import static org.apache.commons.lang3.StringUtils.EMPTY;
import static org.junit.Assert.assertEquals;

import org.junit.Test;
Expand Down