ref #8842 claning up - removing obsolete classes and renaming

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index bf6a876fa12a9dbd5743a0e1695a24bea4abe958..a70147aec7ae54ec7551d04bb72a8ef562f63abe 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -89,8 +89,7 @@ import eu.etaxonomy.cdm.persistence.hibernate.permission.voter.TaxonBaseVoter;
 import eu.etaxonomy.cdm.persistence.hibernate.permission.voter.TaxonNodeVoter;\r
 import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;\r
 import eu.etaxonomy.taxeditor.service.CachedCommonServiceImpl;\r
-import eu.etaxonomy.taxeditor.service.CdmAuthenticatedHttpInvokerRequestExecutor;\r
-import eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor;\r
+import eu.etaxonomy.taxeditor.service.AuthenticatingHttpInvokerRequestExecutor;\r
 import eu.etaxonomy.taxeditor.service.ICachedCommonService;\r
 import eu.etaxonomy.taxeditor.service.RemoteInvocationTermCacher;\r
 import eu.etaxonomy.taxeditor.session.CdmEntitySessionManager;\r
@@ -192,7 +191,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
      * @return\r
      */\r
     public IEditGeoService getEditGeoService() {\r
-        return (IEditGeoService) getService(IEditGeoService.class, "/remoting/editgeo.service", new CdmServiceRequestExecutor());\r
+        return (IEditGeoService) getService(IEditGeoService.class, "/remoting/editgeo.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     /**\r
@@ -227,102 +226,102 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
 \r
     @Override\r
     public IAgentService getAgentService(){\r
-        return (IAgentService) getService(IAgentService.class, "/remoting/agent.service", new CdmServiceRequestExecutor());\r
+        return (IAgentService) getService(IAgentService.class, "/remoting/agent.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IAnnotationService getAnnotationService(){\r
-        return (IAnnotationService) getService(IAnnotationService.class, "/remoting/annotation.service", new CdmServiceRequestExecutor());\r
+        return (IAnnotationService) getService(IAnnotationService.class, "/remoting/annotation.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IDatabaseService getDatabaseService(){\r
-        return (IDatabaseService) getService(IDatabaseService.class, "/remoting/database.service", new CdmServiceRequestExecutor());\r
+        return (IDatabaseService) getService(IDatabaseService.class, "/remoting/database.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public INameService getNameService(){\r
-        return (INameService) getService(INameService.class, "/remoting/name.service", new CdmServiceRequestExecutor());\r
+        return (INameService) getService(INameService.class, "/remoting/name.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IReferenceService getReferenceService(){\r
-        return (IReferenceService) getService(IReferenceService.class, "/remoting/reference.service", new CdmServiceRequestExecutor());\r
+        return (IReferenceService) getService(IReferenceService.class, "/remoting/reference.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public ITaxonService getTaxonService(){\r
-        return (ITaxonService) getService(ITaxonService.class, "/remoting/taxon.service", new CdmServiceRequestExecutor());\r
+        return (ITaxonService) getService(ITaxonService.class, "/remoting/taxon.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IClassificationService getClassificationService(){\r
-        return (IClassificationService) getService(IClassificationService.class, "/remoting/classification.service", new CdmServiceRequestExecutor());\r
+        return (IClassificationService) getService(IClassificationService.class, "/remoting/classification.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public ITaxonNodeService getTaxonNodeService(){\r
-        return (ITaxonNodeService) getService(ITaxonNodeService.class, "/remoting/taxonnode.service", new CdmServiceRequestExecutor());\r
+        return (ITaxonNodeService) getService(ITaxonNodeService.class, "/remoting/taxonnode.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IDescriptionService getDescriptionService(){\r
-        return (IDescriptionService) getService(IDescriptionService.class, "/remoting/description.service", new CdmServiceRequestExecutor());\r
+        return (IDescriptionService) getService(IDescriptionService.class, "/remoting/description.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IOccurrenceService getOccurrenceService(){\r
-        return (IOccurrenceService) getService(IOccurrenceService.class, "/remoting/occurrence.service", new CdmServiceRequestExecutor());\r
+        return (IOccurrenceService) getService(IOccurrenceService.class, "/remoting/occurrence.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IPrimerService getPrimerService(){\r
-        return (IPrimerService) getService(IPrimerService.class, "/remoting/primer.service", new CdmServiceRequestExecutor());\r
+        return (IPrimerService) getService(IPrimerService.class, "/remoting/primer.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IAmplificationService getAmplificationService(){\r
-        return (IAmplificationService) getService(IAmplificationService.class, "/remoting/amplification.service", new CdmServiceRequestExecutor());\r
+        return (IAmplificationService) getService(IAmplificationService.class, "/remoting/amplification.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public ISequenceService getSequenceService(){\r
-        return (ISequenceService) getService(ISequenceService.class, "/remoting/sequence.service", new CdmServiceRequestExecutor());\r
+        return (ISequenceService) getService(ISequenceService.class, "/remoting/sequence.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IEventBaseService getEventBaseService() {\r
-        return (IEventBaseService) getService(IEventBaseService.class, "/remoting/eventbase.service", new CdmServiceRequestExecutor());\r
+        return (IEventBaseService) getService(IEventBaseService.class, "/remoting/eventbase.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IMediaService getMediaService(){\r
-        return (IMediaService) getService(IMediaService.class, "/remoting/media.service", new CdmServiceRequestExecutor());\r
+        return (IMediaService) getService(IMediaService.class, "/remoting/media.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public ITermService getTermService(){\r
-        return (ITermService) getService(ITermService.class, "/remoting/term.service", new CdmServiceRequestExecutor());\r
+        return (ITermService) getService(ITermService.class, "/remoting/term.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IRightsService getRightsService(){\r
-        return (IRightsService) getService(IRightsService.class, "/remoting/rights.service", new CdmServiceRequestExecutor());\r
+        return (IRightsService) getService(IRightsService.class, "/remoting/rights.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public ICommonService getCommonService(){\r
-        return (ICommonService) getService(ICommonService.class, "/remoting/common.service", new CdmServiceRequestExecutor());\r
+        return (ICommonService) getService(ICommonService.class, "/remoting/common.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public ILocationService getLocationService(){\r
-        return (ILocationService) getService(ILocationService.class, "/remoting/location.service", new CdmServiceRequestExecutor());\r
+        return (ILocationService) getService(ILocationService.class, "/remoting/location.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IUserService getUserService(){\r
-        return (IUserService) getService(IUserService.class, "/remoting-public/user.service", new CdmServiceRequestExecutor());\r
+        return (IUserService) getService(IUserService.class, "/remoting-public/user.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
 \r
@@ -341,7 +340,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
 \r
     @Override\r
     public IGrantedAuthorityService getGrantedAuthorityService(){\r
-        return (IGrantedAuthorityService) getService(IGrantedAuthorityService.class, "/remoting/grantedauthority.service", new CdmServiceRequestExecutor());\r
+        return (IGrantedAuthorityService) getService(IGrantedAuthorityService.class, "/remoting/grantedauthority.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
 \r
@@ -374,57 +373,57 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
 \r
     @Override\r
     public ICollectionService getCollectionService(){\r
-        return (ICollectionService) getService(ICollectionService.class, "/remoting/collection.service", new CdmServiceRequestExecutor());\r
+        return (ICollectionService) getService(ICollectionService.class, "/remoting/collection.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IFeatureTreeService getFeatureTreeService(){\r
-        return (IFeatureTreeService) getService(IFeatureTreeService.class, "/remoting/featuretree.service", new CdmServiceRequestExecutor());\r
+        return (IFeatureTreeService) getService(IFeatureTreeService.class, "/remoting/featuretree.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
     @Override\r
     public ITermTreeService getTermTreeService() {\r
-       return (ITermTreeService) getService(ITermTreeService.class, "/remoting/termtree.service", new CdmServiceRequestExecutor());\r
+       return (ITermTreeService) getService(ITermTreeService.class, "/remoting/termtree.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IFeatureNodeService getFeatureNodeService(){\r
-        return (IFeatureNodeService) getService(IFeatureNodeService.class, "/remoting/featurenode.service", new CdmServiceRequestExecutor());\r
+        return (IFeatureNodeService) getService(IFeatureNodeService.class, "/remoting/featurenode.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
        @Override\r
        public ITermNodeService getTermNodeService() {\r
-        return (ITermNodeService) getService(ITermNodeService.class, "/remoting/termnode.service", new CdmServiceRequestExecutor());\r
+        return (ITermNodeService) getService(ITermNodeService.class, "/remoting/termnode.service", new AuthenticatingHttpInvokerRequestExecutor());\r
        }\r
 \r
     @Override\r
     public IVocabularyService getVocabularyService(){\r
-        return (IVocabularyService) getService(IVocabularyService.class, "/remoting/vocabulary.service", new CdmServiceRequestExecutor());\r
+        return (IVocabularyService) getService(IVocabularyService.class, "/remoting/vocabulary.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IIdentificationKeyService getIdentificationKeyService(){\r
-        return (IIdentificationKeyService) getService(IIdentificationKeyService.class, "/remoting/identificationkey.service", new CdmServiceRequestExecutor());\r
+        return (IIdentificationKeyService) getService(IIdentificationKeyService.class, "/remoting/identificationkey.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IPolytomousKeyService getPolytomousKeyService(){\r
-        return (IPolytomousKeyService) getService(IPolytomousKeyService.class, "/remoting/polytomouskey.service", new CdmServiceRequestExecutor());\r
+        return (IPolytomousKeyService) getService(IPolytomousKeyService.class, "/remoting/polytomouskey.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
 \r
     @Override\r
     public IPolytomousKeyNodeService getPolytomousKeyNodeService(){\r
-        return (IPolytomousKeyNodeService) getService(IPolytomousKeyNodeService.class, "/remoting/polytomouskeynode.service", new CdmServiceRequestExecutor());\r
+        return (IPolytomousKeyNodeService) getService(IPolytomousKeyNodeService.class, "/remoting/polytomouskeynode.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IProgressMonitorService getProgressMonitorService() {\r
-        return (IProgressMonitorService) getService(IProgressMonitorService.class, "/remoting/progressmonitor.service", new CdmAuthenticatedHttpInvokerRequestExecutor());\r
+        return (IProgressMonitorService) getService(IProgressMonitorService.class, "/remoting/progressmonitor.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IDescriptiveDataSetService getDescriptiveDataSetService(){\r
-        return (IDescriptiveDataSetService) getService(IDescriptiveDataSetService.class, "/remoting/descriptivedataset.service", new CdmServiceRequestExecutor());\r
+        return (IDescriptiveDataSetService) getService(IDescriptiveDataSetService.class, "/remoting/descriptivedataset.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     /**\r
@@ -432,30 +431,30 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
      */\r
     @Override\r
     public IRegistrationService getRegistrationService() {\r
-        return (IRegistrationService) getService(IRegistrationService.class, "/remoting/registration.service", new CdmServiceRequestExecutor());\r
+        return (IRegistrationService) getService(IRegistrationService.class, "/remoting/registration.service", new AuthenticatingHttpInvokerRequestExecutor());\r
 \r
     }\r
 \r
     @Override\r
     public IGroupService getGroupService(){\r
-        return (IGroupService) getService(IGroupService.class, "/remoting/group.service", new CdmServiceRequestExecutor());\r
+        return (IGroupService) getService(IGroupService.class, "/remoting/group.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IPreferenceService getPreferenceService(){\r
-        return (IPreferenceService) getService(IPreferenceService.class, "/remoting/preference.service", new CdmServiceRequestExecutor());\r
+        return (IPreferenceService) getService(IPreferenceService.class, "/remoting/preference.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
 \r
     @Override\r
     public IEntityValidationService getEntityValidationService(){\r
-        return (IEntityValidationService) getService(IEntityValidationService.class, "/remoting/entityvalidation.service", new CdmServiceRequestExecutor());\r
+        return (IEntityValidationService) getService(IEntityValidationService.class, "/remoting/entityvalidation.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
 \r
     @Override\r
     public IEntityConstraintViolationService getEntityConstraintViolationService(){\r
-        return (IEntityConstraintViolationService) getService(IEntityConstraintViolationService.class, "/remoting/entityconstraintviolation.service", new CdmServiceRequestExecutor());\r
+        return (IEntityConstraintViolationService) getService(IEntityConstraintViolationService.class, "/remoting/entityconstraintviolation.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
@@ -509,16 +508,16 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
     }\r
 \r
     public IIOService getIOService() {\r
-        return (IIOService) getService(IIOService.class, "/remoting/io.service", new CdmServiceRequestExecutor());\r
+        return (IIOService) getService(IIOService.class, "/remoting/io.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public ILongRunningTasksService getLongRunningTasksService() {\r
-        return (ILongRunningTasksService) getService(ILongRunningTasksService.class, "/remoting/longrunningtasks.service", new CdmServiceRequestExecutor());\r
+        return (ILongRunningTasksService) getService(ILongRunningTasksService.class, "/remoting/longrunningtasks.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
     public ITestService getTestService() {\r
-        return (ITestService) getService(ITestService.class, "/remoting/test.service", new CdmServiceRequestExecutor());\r
+        return (ITestService) getService(ITestService.class, "/remoting/test.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
 }\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
index 3208cc70e69b2cbb25cec0302547f10d74fa3509..5d73b7ad27c83c8da39d3681222f1f4254ae15f5 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
@@ -52,6 +52,7 @@ public class CdmApplicationState {
 
     private ICdmDataChangeService dataChangeService;
 
+    //FIXME SecurityContextHolder.getContext()
     private SecurityContext securityContext;
 
     private static CdmServiceCacher cdmServiceCacher;

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/AuthenticatingHttpInvokerRequestExecutor.java
similarity index 84%
rename from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
rename to eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/AuthenticatingHttpInvokerRequestExecutor.java
index f621c0b52c8142bd87ff6fe1de68daf7dd814ce2..6b67d133e83d010766d7eba9eababb9a74f90b62 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/AuthenticatingHttpInvokerRequestExecutor.java
@@ -15,21 +15,20 @@ import org.apache.http.client.methods.HttpPost;
 import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
-
-import eu.etaxonomy.cdm.api.application.CdmApplicationState;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
  * @author cmathew
  * @date 27 Jan 2015
  *
  */
-public class CdmAuthenticatedHttpInvokerRequestExecutor extends TimestampingHttpInvokerRequestExecutor {
+public class AuthenticatingHttpInvokerRequestExecutor extends TimestampingHttpInvokerRequestExecutor {
 
     @Override
     protected HttpPost createHttpPost(HttpInvokerClientConfiguration config) throws IOException {
        HttpPost postMethod = super.createHttpPost(config);
 
-        SecurityContext securityContext = CdmApplicationState.getCurrentSecurityContext();
+        SecurityContext securityContext = SecurityContextHolder.getContext();
         if(securityContext != null) {
             Authentication auth = securityContext.getAuthentication();
             if ((auth != null) && (auth.getName() != null) &&

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
deleted file mode 100644 (file)
index 2ed9cf6..0000000
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package eu.etaxonomy.taxeditor.service;
-
-// @Component
-public class CdmServiceRequestExecutor extends CdmAuthenticatedHttpInvokerRequestExecutor {
-
-
-}

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TermServiceRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TermServiceRequestExecutor.java
deleted file mode 100644 (file)
index bce159d..0000000
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TermServiceRequestExecutor.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.etaxonomy.taxeditor.service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.springframework.remoting.support.RemoteInvocationResult;
-
-import eu.etaxonomy.cdm.api.cache.CdmServiceCacher;
-import eu.etaxonomy.cdm.model.term.TermType;
-
-
-public class TermServiceRequestExecutor extends CdmServiceRequestExecutor {
-    private static final Logger logger = Logger.getLogger(TermServiceRequestExecutor.class);
-
-       private static Map<TermType, RemoteInvocationResult> termTypeMap = new HashMap<>();
-
-       private static CdmServiceCacher cdmServiceCacher;
-
-       public static void setDefaultCacher(CdmServiceCacher csc) {
-        cdmServiceCacher = csc;
-    }
-
-}