Fixed some of other collection errors in the rest/service/core layer that weren't addressed before. Removed export and import methods that were leftover as well.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/abe35157 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/abe35157 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/abe35157 Branch: refs/heads/USERGRID-1246-MASTER Commit: abe351575a3d413f42878efaa983d1aee06e3f72 Parents: 61698fc Author: George Reyes <g...@apache.org> Authored: Fri Apr 29 11:54:52 2016 -0700 Committer: George Reyes <g...@apache.org> Committed: Mon May 2 10:50:49 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/usergrid/mq/Message.java | 13 +++------- .../org/apache/usergrid/mq/QueryProcessor.java | 3 --- .../main/java/org/apache/usergrid/mq/Queue.java | 10 ++------ .../persistence/cassandra/CassandraService.java | 3 +-- .../org/apache/usergrid/utils/ListUtils.java | 2 +- stack/corepersistence/queryindex/pom.xml | 2 +- .../persistence/index/utils/MapUtils.java | 2 +- .../organizations/OrganizationResource.java | 23 +++++++++++++++++ .../organizations/users/UsersResource.java | 2 +- .../session/HttpServletRequestSession.java | 2 +- .../usergrid/services/ServicePayload.java | 8 +++--- .../services/queues/ImportQueueListener.java | 7 ------ .../resources/usergrid-services-context.xml | 26 -------------------- .../org/apache/usergrid/ServiceITSetup.java | 12 +++------ .../org/apache/usergrid/ServiceITSetupImpl.java | 26 +++----------------- .../test/resources/usergrid-test-context.xml | 6 ----- 16 files changed, 44 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/core/src/main/java/org/apache/usergrid/mq/Message.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/mq/Message.java b/stack/core/src/main/java/org/apache/usergrid/mq/Message.java index aea24ec..7c6a75f 100644 --- a/stack/core/src/main/java/org/apache/usergrid/mq/Message.java +++ b/stack/core/src/main/java/org/apache/usergrid/mq/Message.java @@ -37,16 +37,9 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.uuid.UUIDComparator; +import com.google.common.collect.Iterators; -import static org.apache.commons.collections.IteratorUtils.asEnumeration; -import static org.apache.commons.collections.MapUtils.getBooleanValue; -import static org.apache.commons.collections.MapUtils.getByteValue; -import static org.apache.commons.collections.MapUtils.getDoubleValue; -import static org.apache.commons.collections.MapUtils.getFloatValue; -import static org.apache.commons.collections.MapUtils.getIntValue; -import static org.apache.commons.collections.MapUtils.getLongValue; -import static org.apache.commons.collections.MapUtils.getShortValue; -import static org.apache.commons.collections.MapUtils.getString; +import static org.apache.commons.collections4.MapUtils.*; import static org.apache.usergrid.utils.ClassUtils.cast; import static org.apache.usergrid.utils.ConversionUtils.bytes; import static org.apache.usergrid.utils.ConversionUtils.coerceMap; @@ -268,7 +261,7 @@ public class Message { @JsonIgnore @SuppressWarnings("unchecked") public Enumeration<String> getPropertyNames() { - return asEnumeration( properties.keySet().iterator() ); + return Iterators.asEnumeration( properties.keySet().iterator() ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/core/src/main/java/org/apache/usergrid/mq/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/mq/QueryProcessor.java b/stack/core/src/main/java/org/apache/usergrid/mq/QueryProcessor.java index 3e02b83..94371a7 100644 --- a/stack/core/src/main/java/org/apache/usergrid/mq/QueryProcessor.java +++ b/stack/core/src/main/java/org/apache/usergrid/mq/QueryProcessor.java @@ -19,7 +19,6 @@ package org.apache.usergrid.mq; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -27,7 +26,6 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.commons.collections.comparators.ComparatorChain; import org.apache.usergrid.mq.Query.FilterOperator; import org.apache.usergrid.mq.Query.FilterPredicate; @@ -35,7 +33,6 @@ import org.apache.usergrid.mq.Query.SortPredicate; import org.apache.usergrid.persistence.Entity; import org.apache.usergrid.utils.NumberUtils; -import static org.apache.usergrid.mq.Query.SortDirection.DESCENDING; public class QueryProcessor { http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/core/src/main/java/org/apache/usergrid/mq/Queue.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/mq/Queue.java b/stack/core/src/main/java/org/apache/usergrid/mq/Queue.java index 75e66fc..4502bcf 100644 --- a/stack/core/src/main/java/org/apache/usergrid/mq/Queue.java +++ b/stack/core/src/main/java/org/apache/usergrid/mq/Queue.java @@ -31,14 +31,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import static java.util.UUID.nameUUIDFromBytes; -import static org.apache.commons.collections.MapUtils.getBooleanValue; -import static org.apache.commons.collections.MapUtils.getByteValue; -import static org.apache.commons.collections.MapUtils.getDoubleValue; -import static org.apache.commons.collections.MapUtils.getFloatValue; -import static org.apache.commons.collections.MapUtils.getIntValue; -import static org.apache.commons.collections.MapUtils.getLongValue; -import static org.apache.commons.collections.MapUtils.getShortValue; -import static org.apache.commons.collections.MapUtils.getString; + +import static org.apache.commons.collections4.MapUtils.*; import static org.apache.usergrid.utils.MapUtils.hashMap; http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java index ff4f252..97c7263 100644 --- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java +++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java @@ -47,8 +47,7 @@ import java.util.*; import static me.prettyprint.cassandra.service.FailoverPolicy.ON_FAIL_TRY_ALL_AVAILABLE; import static me.prettyprint.hector.api.factory.HFactory.*; -import static org.apache.commons.collections.MapUtils.getIntValue; -import static org.apache.commons.collections.MapUtils.getString; +import static org.apache.commons.collections4.MapUtils.*; import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute; import static org.apache.usergrid.utils.ConversionUtils.bytebuffer; import static org.apache.usergrid.utils.JsonUtils.mapToFormattedJsonString; http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java index 6b90389..9d98e31 100644 --- a/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java +++ b/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ListUtils extends org.apache.commons.collections.ListUtils { +public class ListUtils { private static final Logger logger = LoggerFactory.getLogger( ListUtils.class ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/corepersistence/queryindex/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/pom.xml b/stack/corepersistence/queryindex/pom.xml index a9d5d64e..68db422 100644 --- a/stack/corepersistence/queryindex/pom.xml +++ b/stack/corepersistence/queryindex/pom.xml @@ -145,7 +145,7 @@ <version>${commons.io.version}</version> <type>jar</type> </dependency> - + <dependency> <groupId>org.apache.usergrid</groupId> <artifactId>common</artifactId> http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/MapUtils.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/MapUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/MapUtils.java index a7c0b06..72776d9 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/MapUtils.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/MapUtils.java @@ -34,7 +34,7 @@ import static org.apache.commons.lang.StringUtils.isNotBlank; import static org.apache.usergrid.persistence.index.utils.ClassUtils.cast; -public class MapUtils extends org.apache.commons.collections.MapUtils { +public class MapUtils { public static <A, B> void addMapSet( Map<A, Set<B>> map, A a, B b ) { addMapSet( map, false, a, b ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java index 886bf61..ebf80df 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java @@ -17,7 +17,10 @@ package org.apache.usergrid.rest.management.organizations; +import java.util.HashSet; import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -278,6 +281,26 @@ public class OrganizationResource extends AbstractContextResource { return response; } + + protected Set<String> getSetFromCommaSeparatedString( String input ) { + Set<String> ret = new HashSet<>(); + StringTokenizer tokenizer = new StringTokenizer(input, ","); + + while (tokenizer.hasMoreTokens()) { + ret.add(tokenizer.nextToken()); + } + + return ret; + } + + + protected Map<String, Object> getConfigData(OrganizationConfig orgConfig, String itemsParam, + boolean includeDefaults, boolean includeOverrides) { + boolean itemsParamEmpty = itemsParam == null || itemsParam.isEmpty() || itemsParam.equals("*"); + return orgConfig.getOrgConfigCustomMap(itemsParamEmpty ? null : getSetFromCommaSeparatedString(itemsParam), + includeDefaults, includeOverrides); + } + @JSONP @RequireSystemAccess @GET http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java index 40ba92e..b429660 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import static org.apache.commons.collections.MapUtils.getObject; +import static org.apache.commons.collections4.MapUtils.getObject; import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException; import static org.apache.usergrid.utils.ConversionUtils.getBoolean; import static org.apache.usergrid.utils.ConversionUtils.string; http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/session/HttpServletRequestSession.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/session/HttpServletRequestSession.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/session/HttpServletRequestSession.java index 6128ae7..976b280 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/session/HttpServletRequestSession.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/session/HttpServletRequestSession.java @@ -24,7 +24,7 @@ import java.util.UUID; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.collections.EnumerationUtils; +import org.apache.commons.collections4.EnumerationUtils; import org.apache.shiro.session.InvalidSessionException; import org.apache.shiro.session.Session; http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/services/src/main/java/org/apache/usergrid/services/ServicePayload.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/ServicePayload.java b/stack/services/src/main/java/org/apache/usergrid/services/ServicePayload.java index 6b08f7a..d63ed4d 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/ServicePayload.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/ServicePayload.java @@ -24,10 +24,10 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.apache.usergrid.utils.JsonUtils; +import org.apache.commons.collections4.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.SingletonListIterator; -import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.collections.iterators.SingletonListIterator; +import org.apache.usergrid.utils.JsonUtils; import static org.apache.usergrid.utils.JsonUtils.normalizeJsonTree; @@ -193,7 +193,7 @@ public class ServicePayload { return batch.iterator(); } if ( properties != null ) { - return new SingletonListIterator( properties ); + return new SingletonListIterator<>( properties ); } return EmptyIterator.INSTANCE; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java b/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java index a95475d..5fcca19 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java @@ -20,13 +20,8 @@ package org.apache.usergrid.services.queues; import java.util.List; import java.util.Properties; -import org.apache.usergrid.persistence.core.metrics.MetricsFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - -import org.apache.usergrid.management.importer.ImportService; -import org.apache.usergrid.management.importer.ImportServiceImpl; import org.apache.usergrid.persistence.EntityManagerFactory; import org.apache.usergrid.persistence.queue.QueueMessage; @@ -46,8 +41,6 @@ public class ImportQueueListener extends QueueListener { */ private static final Logger logger = LoggerFactory.getLogger( ImportQueueListener.class ); - @Autowired - ImportService importService; public static String QUEUE_NAME = "import_v1"; //TODO: someway to tell the base class what the queuename is. The scope would be different. http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/services/src/main/resources/usergrid-services-context.xml ---------------------------------------------------------------------- diff --git a/stack/services/src/main/resources/usergrid-services-context.xml b/stack/services/src/main/resources/usergrid-services-context.xml index c064f60..2778f1a 100644 --- a/stack/services/src/main/resources/usergrid-services-context.xml +++ b/stack/services/src/main/resources/usergrid-services-context.xml @@ -98,14 +98,6 @@ <property name="managementService" ref="managementService"/> </bean> - <bean id="exportService" class="org.apache.usergrid.management.export.ExportServiceImpl"> - <property name="managementService" ref="managementService"/> - <property name="emf" ref="entityManagerFactory"/> - <property name="sch" ref="schedulerService"/> - </bean> - - <bean id="exportJob" class="org.apache.usergrid.management.export.ExportJob"/> - <bean id="serviceModule" class="org.apache.usergrid.services.guice.ServiceModuleImpl"/> @@ -115,22 +107,4 @@ <constructor-arg name="smf" ref="serviceManagerFactory"/> </bean> - <bean id="importService" class="org.apache.usergrid.management.importer.ImportServiceImpl"> - <property name="managementService" ref="managementService"/> - <property name="emf" ref="entityManagerFactory"/> - <property name="sch" ref="schedulerService"/> - </bean> - - <!--<bean id="importQueueListener" class="org.apache.usergrid.services.queues.ImportQueueListener"--> - <!--scope="singleton">--> - <!--<constructor-arg orgAppName="emf" ref="entityManagerFactory" />--> - <!--<constructor-arg orgAppName="metricsService" ref="metricsFactory" />--> - <!--<constructor-arg orgAppName="smf" ref="serviceManagerFactory" />--> - <!--<constructor-arg orgAppName="props" ref="properties" />--> - - <!--</bean>--> - - <bean id="importJob" class="org.apache.usergrid.management.importer.ImportJob"/> - <bean id="fileImportJob" class="org.apache.usergrid.management.importer.FileImportJob"/> - </beans> http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java b/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java index 6cdb0ea..8dd35f7 100644 --- a/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java +++ b/stack/services/src/test/java/org/apache/usergrid/ServiceITSetup.java @@ -17,17 +17,15 @@ package org.apache.usergrid; +import java.util.Properties; +import java.util.UUID; + import org.apache.usergrid.management.ApplicationCreator; import org.apache.usergrid.management.ManagementService; -import org.apache.usergrid.management.export.ExportService; -import org.apache.usergrid.management.importer.ImportService; import org.apache.usergrid.security.providers.SignInProviderFactory; import org.apache.usergrid.security.tokens.TokenService; import org.apache.usergrid.services.ServiceManagerFactory; -import java.util.Properties; -import java.util.UUID; - public interface ServiceITSetup extends CoreITSetup { ManagementService getMgmtSvc(); @@ -40,10 +38,6 @@ public interface ServiceITSetup extends CoreITSetup { Properties getProps(); - ExportService getExportService(); - - ImportService getImportService(); - void refreshIndex(UUID appid); /** http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java b/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java index ac40ae3..04ac903 100644 --- a/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java +++ b/stack/services/src/test/java/org/apache/usergrid/ServiceITSetupImpl.java @@ -18,9 +18,8 @@ package org.apache.usergrid; import java.util.Properties; +import java.util.UUID; -import org.apache.usergrid.corepersistence.GuiceFactory; -import org.apache.usergrid.management.AppInfoMigrationPlugin; import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.slf4j.Logger; @@ -28,22 +27,14 @@ import org.slf4j.LoggerFactory; import org.apache.shiro.SecurityUtils; +import org.apache.usergrid.corepersistence.GuiceFactory; +import org.apache.usergrid.management.AppInfoMigrationPlugin; import org.apache.usergrid.management.ApplicationCreator; import org.apache.usergrid.management.ManagementService; -import org.apache.usergrid.management.export.ExportService; -import org.apache.usergrid.management.importer.ImportService; import org.apache.usergrid.persistence.cassandra.CassandraService; import org.apache.usergrid.security.providers.SignInProviderFactory; import org.apache.usergrid.security.tokens.TokenService; import org.apache.usergrid.services.ServiceManagerFactory; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.config.PropertiesFactoryBean; - -import java.util.Properties; -import java.util.UUID; /** A {@link org.junit.rules.TestRule} that sets up services. */ @@ -56,8 +47,6 @@ public class ServiceITSetupImpl extends CoreITSetupImpl implements ServiceITSetu private TokenService tokenService; private SignInProviderFactory providerFactory; private Properties properties; - private ExportService exportService; - private ImportService importService; private AppInfoMigrationPlugin appInfoMigrationPlugin; @@ -70,8 +59,6 @@ public class ServiceITSetupImpl extends CoreITSetupImpl implements ServiceITSetu providerFactory = springResource.getBean( SignInProviderFactory.class ); properties = springResource.getBean( "properties", Properties.class ); smf = springResource.getBean( ServiceManagerFactory.class ); - exportService = springResource.getBean( ExportService.class ); - importService = springResource.getBean( ImportService.class ); try { appInfoMigrationPlugin = springResource.getBean(GuiceFactory.class) @@ -125,13 +112,6 @@ public class ServiceITSetupImpl extends CoreITSetupImpl implements ServiceITSetu return managementService; } - @Override - public ExportService getExportService() { return exportService; } - - @Override - public ImportService getImportService() { return importService; } - - public ServiceManagerFactory getSmf() { if ( smf == null ) { smf = springResource.getBean( ServiceManagerFactory.class ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/abe35157/stack/services/src/test/resources/usergrid-test-context.xml ---------------------------------------------------------------------- diff --git a/stack/services/src/test/resources/usergrid-test-context.xml b/stack/services/src/test/resources/usergrid-test-context.xml index ec1e2d2..5687147 100644 --- a/stack/services/src/test/resources/usergrid-test-context.xml +++ b/stack/services/src/test/resources/usergrid-test-context.xml @@ -55,10 +55,4 @@ <property name="reposLocation" value="${usergrid.temp.files}"/> </bean> - <!--<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.S3BinaryStore">--> - <!--<constructor-arg name="accessId" value="xx" />--> - <!--<constructor-arg name="secretKey" value="xx" />--> - <!--<constructor-arg name="bucketName" value="xx" />--> - <!--</bean>--> - </beans>
