Author: matthieu Date: Mon Nov 2 13:45:00 2015 New Revision: 1711979 URL: http://svn.apache.org/viewvc?rev=1711979&view=rev Log: JAMES-1595 remove addAll method from Mappings, use builder instead
Modified: james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mappings.java james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableMock.java Modified: james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mappings.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mappings.java?rev=1711979&r1=1711978&r2=1711979&view=diff ============================================================================== --- james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mappings.java (original) +++ james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mappings.java Mon Nov 2 13:45:00 2015 @@ -26,8 +26,6 @@ public interface Mappings extends Iterab Collection<String> getMappings(); - Mappings addAll(Mappings toAdd); - boolean contains(String mapping); int size(); Modified: james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java?rev=1711979&r1=1711978&r2=1711979&view=diff ============================================================================== --- james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java (original) +++ james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java Mon Nov 2 13:45:00 2015 @@ -37,7 +37,6 @@ import org.apache.james.rrt.hbase.def.HR import org.apache.james.rrt.lib.AbstractRecipientRewriteTable; import org.apache.james.rrt.lib.Mappings; import org.apache.james.rrt.lib.MappingsImpl; -import org.apache.james.rrt.lib.MappingsImpl.Builder; import org.apache.james.rrt.lib.RecipientRewriteTableUtil; import org.apache.james.system.hbase.TablePool; import org.slf4j.Logger; @@ -83,7 +82,7 @@ public class HBaseRecipientRewriteTable try { table = TablePool.getInstance().getRecipientRewriteTable(); // Optimize this to only make one call. - feedUserDomainMappingsList(table, user, domain, list); + return feedUserDomainMappingsList(table, user, domain, list); } catch (IOException e) { log.error("Error while getting user domain mapping in HBase", e); throw new RecipientRewriteTableException("Error while getting user domain mapping in HBase", e); @@ -96,7 +95,6 @@ public class HBaseRecipientRewriteTable } } } - return list; } private Mappings feedUserDomainMappingsList(HTableInterface table, String user, String domain, Mappings list) throws @@ -106,7 +104,8 @@ public class HBaseRecipientRewriteTable List<KeyValue> keyValues = result.getColumn(HRecipientRewriteTable.COLUMN_FAMILY_NAME, HRecipientRewriteTable.COLUMN.MAPPING); if (keyValues.size() > 0) { - return list.addAll(MappingsImpl.fromRawString(Bytes.toString(keyValues.get(0).getValue()))); + return MappingsImpl.from(list) + .addAll(MappingsImpl.fromRawString(Bytes.toString(keyValues.get(0).getValue()))).build(); } return list; } Modified: james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java?rev=1711979&r1=1711978&r2=1711979&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java (original) +++ james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java Mon Nov 2 13:45:00 2015 @@ -103,10 +103,6 @@ public class MappingsImpl implements Map return mappings; } - @Override - public Mappings addAll(Mappings toAdd) { - return MappingsImpl.fromCollection(Lists.newArrayList(Iterables.concat(this, toAdd.getMappings()))); - } @Override public boolean contains(String mapping) { Modified: james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableMock.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableMock.java?rev=1711979&r1=1711978&r2=1711979&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableMock.java (original) +++ james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableMock.java Mon Nov 2 13:45:00 2015 @@ -21,6 +21,7 @@ package org.apache.james.transport.maile import org.apache.james.rrt.api.RecipientRewriteTableException; import org.apache.james.rrt.lib.Mappings; import org.apache.james.rrt.lib.MappingsImpl; +import org.apache.james.rrt.lib.MappingsImpl.Builder; import java.util.*; @@ -77,10 +78,11 @@ public class RecipientRewriteTableMock i @Override public Mappings getMappings(String user, String domain) throws ErrorMappingException, RecipientRewriteTableException { - Mappings recipients = MappingsImpl.empty(); + Builder builder = MappingsImpl.builder(); for (Mapping m : findUserDomain(user, domain)) { - recipients = recipients.addAll(m.target); + builder.addAll(m.target); } + Mappings recipients = builder.build(); if (recipients.isEmpty()) { return null; } else { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org