From c4e051e8d0e3dcb3a0ba306600dd612bcd2292c1 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Tue, 11 Sep 2012 12:55:18 -0700 Subject: [PATCH] CSPACE-5271: Fixed up some NetBeans package-starred import statements to restore individual imports. --- .../CollectionSpaceJaxRsApplication.java | 5 +- .../common/vocabulary/AuthorityResource.java | 49 +++++++++---------- .../services/common/ResourceBase.java | 19 +++---- .../services/common/ServiceMain.java | 8 +-- 4 files changed, 35 insertions(+), 46 deletions(-) diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java index 4279f1a22..2b6cb52df 100644 --- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java +++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java @@ -64,7 +64,10 @@ import java.util.Set; //import org.collectionspace.services.common.FileUtils; import org.collectionspace.services.authorization.PermissionResource; import org.collectionspace.services.authorization.RoleResource; -import org.collectionspace.services.common.*; +import org.collectionspace.services.common.ResourceBase; +import org.collectionspace.services.common.ResourceMap; +import org.collectionspace.services.common.ResourceMapHolder; +import org.collectionspace.services.common.ResourceMapImpl; import org.collectionspace.services.common.relation.RelationResource; import org.collectionspace.services.common.security.SecurityInterceptor; import org.jboss.resteasy.core.Dispatcher; diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java index d4681fcc0..814d7be5e 100644 --- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java +++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java @@ -23,6 +23,23 @@ */ package org.collectionspace.services.common.vocabulary; +import java.util.List; +import java.util.Map; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Request; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriBuilder; +import javax.ws.rs.core.UriInfo; import org.collectionspace.services.client.IClientQueryParams; import org.collectionspace.services.client.IQueryManager; import org.collectionspace.services.client.PoxPayloadIn; @@ -32,6 +49,10 @@ import org.collectionspace.services.common.ResourceBase; import org.collectionspace.services.common.ResourceMap; import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.ServiceMessages; +import org.collectionspace.services.common.StoredValuesUriTemplate; +import org.collectionspace.services.common.UriTemplateFactory; +import org.collectionspace.services.common.UriTemplateRegistry; +import org.collectionspace.services.common.UriTemplateRegistryKey; import org.collectionspace.services.common.api.RefName; import org.collectionspace.services.common.api.Tools; import org.collectionspace.services.common.authorityref.AuthorityRefDocList; @@ -48,7 +69,6 @@ import org.collectionspace.services.common.document.DocumentNotFoundException; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.document.Hierarchy; import org.collectionspace.services.common.query.QueryManager; -import org.collectionspace.services.common.vocabulary.RefNameServiceUtils; import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityDocumentModelHandler; import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityItemDocumentModelHandler; import org.collectionspace.services.common.workflow.service.nuxeo.WorkflowDocumentModelHandler; @@ -57,6 +77,7 @@ import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.lifecycle.TransitionDef; import org.collectionspace.services.nuxeo.client.java.DocumentModelHandler; import org.collectionspace.services.nuxeo.client.java.RepositoryJavaClientImpl; +import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.collectionspace.services.workflow.WorkflowCommon; import org.jboss.resteasy.util.HttpResponseCodes; import org.nuxeo.ecm.core.api.DocumentModel; @@ -65,32 +86,6 @@ import org.nuxeo.ecm.core.api.repository.RepositoryInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.collectionspace.services.common.*; - -import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; -import org.collectionspace.services.config.service.ServiceBindingType; - -import org.collectionspace.services.nuxeo.util.NuxeoUtils; - /** * The Class AuthorityResource. */ diff --git a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java index 6909eea35..69147eaed 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java +++ b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java @@ -23,18 +23,20 @@ */ package org.collectionspace.services.common; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.ws.rs.*; +import javax.ws.rs.core.*; import org.collectionspace.services.client.IClientQueryParams; import org.collectionspace.services.client.IQueryManager; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; -import org.collectionspace.services.common.UriTemplateFactory.UriTemplateType; -import org.collectionspace.services.common.UriTemplateRegistryKey; import org.collectionspace.services.common.api.RefName; import org.collectionspace.services.common.api.Tools; import org.collectionspace.services.common.authorityref.AuthorityRefList; import org.collectionspace.services.common.config.ServiceConfigUtils; -import org.collectionspace.services.common.context.JaxRsContext; +import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; import org.collectionspace.services.common.context.RemoteServiceContext; import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.document.DocumentFilter; @@ -46,6 +48,7 @@ import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthRe import org.collectionspace.services.config.ClientType; import org.collectionspace.services.config.service.DocHandlerParams; import org.collectionspace.services.config.service.ListResultField; +import org.collectionspace.services.config.service.ServiceBindingType; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.nuxeo.client.java.DocumentModelHandler; import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; @@ -54,14 +57,6 @@ import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; import org.nuxeo.ecm.core.api.repository.RepositoryInstance; -import javax.ws.rs.*; -import javax.ws.rs.core.*; - - -import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; -import org.collectionspace.services.config.service.ServiceBindingType; -import org.collectionspace.services.config.tenant.TenantBindingType; - /** * $LastChangedRevision: $ diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java index b810e7d3e..2a9cab010 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java +++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java @@ -401,8 +401,8 @@ public class ServiceMain { * Populate a registry of URI templates by querying each resource * for its own entries in the registry. * - * These entries consist of one or more URI templates for - * building URIs for accessing that resource. + * These entries consist of one or more URI templates associated + * with that resource, for building URIs to access that resource. */ private synchronized void populateUriTemplateRegistry() { if (uriTemplateRegistry.isEmpty()) { @@ -419,10 +419,6 @@ public class ServiceMain { // there should be a Contacts entry in that registry only for use in // building URIs for resources that have contacts as a sub-resource // (This may also fall out during implementation of CSPACE-2698.) - - // FIXME: Temporary for debugging in-process work on CSPACE-5271. - // Please remove the following statement once that issue is resolved. - uriTemplateRegistry.dump(); } } -- 2.47.3