Author: tchemit Date: 2013-07-25 10:24:51 +0200 (Thu, 25 Jul 2013) New Revision: 2599 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2599 Log: remove usage of guava when possible Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/util/PagerBean.java trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-24 10:20:14 UTC (rev 2598) +++ trunk/pom.xml 2013-07-25 08:24:51 UTC (rev 2599) @@ -154,12 +154,6 @@ </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> Modified: trunk/src/main/java/org/nuiton/util/PagerBean.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PagerBean.java 2013-07-24 10:20:14 UTC (rev 2598) +++ trunk/src/main/java/org/nuiton/util/PagerBean.java 2013-07-25 08:24:51 UTC (rev 2599) @@ -24,10 +24,10 @@ * #L% */ +import org.apache.commons.lang3.builder.ToStringBuilder; + import java.io.Serializable; -import com.google.common.base.Objects; - /** * A pager bean. * <p/> @@ -108,13 +108,13 @@ @Override public String toString() { - String result = Objects.toStringHelper(PagerBean.class) - .add("records", records) - .add("recordStartIndex", recordStartIndex) - .add("recordEndIndex", recordEndIndex) - .add("pageIndex", pageIndex) - .add("pageSize", pageSize) - .add("pagesNumber", pagesNumber) + String result = new ToStringBuilder(this) + .append("records", records) + .append("recordStartIndex", recordStartIndex) + .append("recordEndIndex", recordEndIndex) + .append("pageIndex", pageIndex) + .append("pageSize", pageSize) + .append("pagesNumber", pagesNumber) .toString(); return result; } Modified: trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java 2013-07-24 10:20:14 UTC (rev 2598) +++ trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java 2013-07-25 08:24:51 UTC (rev 2599) @@ -26,8 +26,6 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.beanutils.PropertyUtils; @@ -37,6 +35,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.TreeMap; /** * Usefull methods around the {@link PropertyChangeListener}. @@ -304,15 +303,15 @@ predicate = Predicates.alwaysTrue(); } - Set<Class<?>> exploredTypes = Sets.newHashSet(); - Map<String, PropertyDescriptor> result = Maps.newTreeMap(); + Set<Class<?>> exploredTypes = new HashSet<Class<?>>(); + Map<String, PropertyDescriptor> result = new TreeMap<String, PropertyDescriptor>(); getDescriptors(beanType, predicate, result, exploredTypes); // the special getClass will never be a JavaBean property... result.remove("class"); - return Sets.newHashSet(result.values()); + return new HashSet<PropertyDescriptor>(result.values()); } protected static void getDescriptors(Class<?> beanType,