/ - Diff - EDIT - EDIT Project Management

     /**
     * Copyright (C) 2007 EDIT
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     package eu.etaxonomy.cdm.io.api.application;
     import org.apache.log4j.Logger;

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java
6	6	* The contents of this file are subject to the Mozilla Public License Version 1.1
7	7	* See LICENSE.TXT at the top of this package for the full license terms.
8	8	*/
9
10	9	package eu.etaxonomy.cdm.io.berlinModel;
11	10
12	11	import java.sql.ResultSet;

      * European Distributed Institute of Taxonomy
      * http://www.e-taxonomy.eu
      */
     package eu.etaxonomy.cdm.io.common;
     import org.apache.log4j.Logger;
-...
      * @since 17.11.2008
      */
     public class CdmDefaultIOBase<T extends IIoConfigurator> {
     	@SuppressWarnings("unused")
         @SuppressWarnings("unused")
     	private static final Logger logger = Logger.getLogger(CdmDefaultIOBase.class);
     	public static final String DEFAULT_IO_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/defaultIoApplicationContext.xml";
     	protected ICdmRepository cdmApp = null;
     	/**
     	 * Creates a new {@link CdmApplicationController} if it does not exist yet
     	 * or if createNew is <ocde>true</code>
+    	 *
     	 * @param config
     	 * @param destination
     	 * @param omitTermLoading
     	 * @param createNew
     	 * @return
     	 */
     	protected boolean startApplicationController(IIoConfigurator config,
     			ICdmDataSource cdmSource, boolean omitTermLoading, boolean createNew) {
-...
     	public void setCdmAppController(ICdmRepository cdmApp) {
     		this.cdmApp = cdmApp;
+    	}
+    }
+    }

     <?xml version="1.0" encoding="UTF-8"?>
     <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:context="http://www.springframework.org/schema/context"
       xmlns:security="http://www.springframework.org/schema/security"
       xsi:schemaLocation=
           "http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
            http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-4.2.xsd">
       <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
       <!-- TODO move to defaultApplicationContext in ext -->
       <!-- includes external services beans e.g. my/cdm/ext/geo/IGeoServiceAreaMapping  -->
       <context:component-scan base-package="eu/etaxonomy/cdm/ext"/>
       <!-- includes service beans e.g. in eu/etaxonomy/cdm/api -->
       <context:component-scan base-package="eu/etaxonomy/cdm/io"/>
     </beans>

     <?xml version="1.0" encoding="UTF-8"?>
     <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:context="http://www.springframework.org/schema/context"
       xmlns:security="http://www.springframework.org/schema/security"
       xsi:schemaLocation=
           "http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
            http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-4.2.xsd">
       <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
       <!-- TODO move to defaultApplicationContext in ext -->
       <!-- includes external services beans e.g. my/cdm/ext/geo/IGeoServiceAreaMapping  -->
       <context:component-scan base-package="eu/etaxonomy/cdm/ext"/>
       <!-- includes service beans e.g. in eu/etaxonomy/cdm/api -->
       <context:component-scan base-package="eu/etaxonomy/cdm/io"/>
     </beans>

     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     package eu.etaxonomy.cdm.database;
     import static eu.etaxonomy.cdm.common.XmlHelp.getBeansRoot;
-...
             extends CdmDataSourceBase
             implements ICdmPersistentSource {
         @SuppressWarnings("unused")
         private static final Logger logger = Logger.getLogger(CdmPersistentDataSource.class);
     	public static final String DATASOURCE_BEAN_POSTFIX = "DataSource";
-...
     	/**
     	 * Returns the default CdmDataSource
     	 * @return the default CdmDataSource
     	 * @throws DataSourceNotFoundException
     	 */
     	public final static CdmPersistentDataSource NewDefaultInstance() throws DataSourceNotFoundException {
     		return NewInstance("default");
-...
     	/**
     	 * Returns the default CdmDataSource
     	 * @return the default CdmDataSource
     	 * @throws DataSourceNotFoundException
     	 */
     	public final static CdmPersistentDataSource NewLocalHsqlInstance() throws DataSourceNotFoundException{
     		return NewInstance("localDefaultHsql");

             String queryString = TermVocabularyDto.getTermCollectionDtoSelect();
             if (!termTypeWithSubType.isEmpty()){
                 queryString += " where a.termType in (:termTypes) ";
                 queryString += " WHERE a.termType in (:termTypes) ";
                 if (pattern != null){
                     queryString += " AND a.titleCache like :pattern";
+                }

         private final JsonView xmlView;
         @Autowired
         private final ICdmRepository applicationConfiguration;
         private final ICdmRepository repository;
         @Autowired
         private JsonConfig jsonConfig;
-...
         private final IProgressMonitor monitor;
         /**
+         *
          * @param applicationConfiguration
          * @param monitor
          */
         protected LocalXMLEntityFactory(
                 ICdmRepository applicationConfiguration,
                 IProgressMonitor monitor) {
             this.applicationConfiguration = applicationConfiguration;
             this.repository = applicationConfiguration;
             this.monitor = monitor;
             this.xmlView = new JsonView();
             xmlView.setType(Type.XML);
-...
             initJsonConfigs();
+        }
         /**
+         *
          */
         private void initControllers() {
         	classificationListController = (ClassificationListController) applicationConfiguration
         	classificationListController = (ClassificationListController) repository
         			.getBean("classificationListController");
         	classificationController = (ClassificationController) applicationConfiguration
         	classificationController = (ClassificationController) repository
         			.getBean("classificationController");
         	taxonNodePrintAppController = (TaxonNodePrintAppController) applicationConfiguration
         	taxonNodePrintAppController = (TaxonNodePrintAppController) repository
         			.getBean("taxonNodePrintAppController");
         	nameController = (NameController) applicationConfiguration
         	nameController = (NameController) repository
         			.getBean("nameController");
         	featureTreeListController = (TermTreeListController) applicationConfiguration
         	featureTreeListController = (TermTreeListController) repository
         			.getBean("featureTreeListController");
         	featureTreeController = (TermTreeController) applicationConfiguration
         	featureTreeController = (TermTreeController) repository
         			.getBean("featureTreeController");
         	termNodeController = (TermNodeController) applicationConfiguration
         	termNodeController = (TermNodeController) repository
         			.getBean("featureNodeController");
         	taxonPortalController = (TaxonPortalController) applicationConfiguration
         	taxonPortalController = (TaxonPortalController) repository
         			.getBean("taxonPortalController");
         	polytomousKeyNodeDtoController = (PolytomousKeyNodeDtoController) applicationConfiguration.getBean("polytomousKeyNodeDtoController");
         	polytomousKeyNodeDtoController = (PolytomousKeyNodeDtoController) repository.getBean("polytomousKeyNodeDtoController");
+        }
         /**
+         *
          */
         private void initJsonConfigs() {
             jsonConfig = (JsonConfig) applicationConfiguration.getBean("jsonConfig");
             jsonConfigPortal = (JsonConfig) applicationConfiguration
             jsonConfig = (JsonConfig) repository.getBean("jsonConfig");
             jsonConfigPortal = (JsonConfig) repository
                     .getBean("jsonConfigPortal");
+        }

     /**
      * @author l.morris
      * @since Mar 7, 2013
+     *
      */
     public class PubTest {
-...
     	private static PublishConfigurator configurator;
     	private static Publisher publisher;
     	public static final String DEFAULT_PRINT_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/defaultPrintApplicationContext.xml";
     	/**
     	 * @throws java.lang.Exception
     	 */
     	public static void setUpBeforeClass() throws Exception {
     		ICdmDataSource dataSource = customDataSource();

       <context:component-scan base-package="eu/etaxonomy/cdm/ext" />
       <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>
       <context:component-scan base-package="eu/etaxonomy/cdm/io">
         <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.pesi.*" />
         <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.faunaEuropaea.*" />
         <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.erms.*" />
         <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.eflora.*" />
         <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.berlinModel.*" />
       </context:component-scan>
       <context:component-scan base-package="eu/etaxonomy/cdm/io"/>
       <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="properties">

     /**
      * @author a.kohlbecker
      * @since Mar 3, 2014
+     *
      */
     public class ClassificationIT extends WebServiceTestBase  {
         public static final Logger logger = Logger.getLogger(ClassificationIT.class);
-...
             logger.debug("response: " + response);
             assertTrue(response.contains("My Classification"));
+        }
+    }
+    }

     /**
      * @author a.kohlbecker
      * @date May 18, 2020
+     *
      */
     public class ForceSchemaCreateIT extends WebServiceTestBase {
-...
             assertTrue(response.contains("DB_CREATE_DATE"));
             // TODO check for DB_CREATE_DATE value no older than 5 minutes
+        }
+    }
+    }

     import java.io.File;
     import java.io.IOException;
     import java.nio.charset.Charset;
     import org.apache.commons.io.FileUtils;
     import org.apache.log4j.Logger;
-...
                 try {
                     File targetFile = new File(staticResourcesFolder + path + StaticSwaggerApiDoc.JSON);
                     new File(targetFile.getParent()).mkdirs();
                     FileUtils.write(targetFile, response);
                     FileUtils.write(targetFile, response, Charset.defaultCharset());
                     logger.info(response.length() + " characters of swagger-resources written to " + targetFile.getAbsolutePath());
                 } catch (IOException e) {
                     logger.error(e);
+                }
+            }
+        }
         @Test
         public void fetchSwaggerGroups(){
             String swagger2Endpoint= "/v2/api-docs";
             String staticApiDocFolder = "./target/classes/"+ StaticSwaggerApiDoc.SWAGGER_STATIC + "/api-docs/";
             staticApiDocFolder = staticApiDocFolder.replace("/", File.separator);
             for(SwaggerGroupsConfig group : SwaggerGroupsConfig.values()) {
                 logger.info(group.groupName());
                 String response =  httpGetJson(swagger2Endpoint, "group=" + group.groupName());
                 response = response.replaceAll(",\"host\":\"([^\"]*)", ",\"host\":\"" + StaticSwaggerApiDoc.HOST);
                 response = response.replaceAll(",\"basePath\":\"([^\"]*)", ",\"basePath\":\"" + StaticSwaggerApiDoc.BASE_PATH);
                 try {
                     FileUtils.write(new File(staticApiDocFolder + group.name() + StaticSwaggerApiDoc.JSON), response);
                     FileUtils.write(new File(staticApiDocFolder + group.name() + StaticSwaggerApiDoc.JSON), response, Charset.defaultCharset());
                 } catch (IOException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
-...
     //        File pwd = new File("pom.xml");
     //        System.err.println(pwd.getAbsolutePath());
+        }
+    }
+    }

         public DataSourceException(String message, Throwable cause) {
             super(message, cause);
+        }
+    }
+    }

     /**
      * @author a.kohlbecker
      * @since Oct 5, 2012
+     *
      */
     public class DataSourceProperties {
         private static final String CDMLIB_REMOTE_XSL_BASE_PATH = "cdmlib-remote.xslBasePath";
         private static final Properties emptyProperties = new Properties();
         private String currentDataSourceId = null;
         private Map<String, Properties> propsMap;
         public DataSourceProperties() {
             super();
+        }
         public Map<String, Properties> getPropsMap() {
             return propsMap;
+        }
         public void setPropsMap(Map<String, Properties> propsMap) {
             this.propsMap = propsMap;
+        }
         private static final Properties emptyProperties = new Properties();
         public String getCurrentDataSourceId() {
             return currentDataSourceId;
+        }
         /**
          * will be set by {@link DataSourceConfigurer} only
+         *
          * @param currentDataSourceId
          */
         protected void setCurrentDataSourceId(String currentDataSourceId) {
             this.currentDataSourceId = currentDataSourceId;
+        }
         public DataSourceProperties() {
             super();
+        }
         /**
          * returns the XslBasePath for the current data source from the cdm bean definition file
+         *
          * This file is usually {@code ./.cdmLibrary/datasources.xml}
+         *
          * @param beanName
          * @return
          */
         public String getXslBasePath(String defaultPath) {
             String xslBasePath = currentDataSourceProperties().getProperty(CDMLIB_REMOTE_XSL_BASE_PATH, defaultPath);
             xslBasePath = xslBasePath.replaceAll("/$", "");
             return xslBasePath;
+        }
         private Properties currentDataSourceProperties() {
-...
             return emptyProperties;
+        }
+    }
+    }

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/EhCacheDiskStoreConfiguration.java
21	21	/**
22	22	* @author a.kohlbecker
23	23	* @since Feb 1, 2017
24		*
25	24	*/
26	25	@Configuration
27	26	public class EhCacheDiskStoreConfiguration {

     /**
      * @author a.kohlbecker
      * @since 20.07.2010
+     *
      */
     public abstract class AbstractWebApplicationConfigurer  implements InitializingBean {
-...
                                 + java.io.File.separator
                                 + CDMLIB_REMOTE_PROPERTIES
                         );
                     if (in != null) {
                         userDefinedProperties.load(in);
+                    }
                     userDefinedProperties.load(in);
                 } catch (IOException e) {
                     logger.debug("No per user " + CDMLIB_REMOTE_PROPERTIES + " found.");
+                }
-...
         protected void addErrorMessageToServletContextAttributes(String errorMessage) {
             Object o = webApplicationContext.getServletContext().getAttribute(ATTRIBUTE_ERROR_MESSAGES);
             List<String> messages;
             if(o != null  && o instanceof List<?>){
             if(o instanceof List<?>){
                 messages = (List<String>) o;
             } else {
                 messages = new ArrayList<String>();
                 messages = new ArrayList<>();
+            }
             messages.add(errorMessage);
             webApplicationContext.getServletContext().setAttribute(ATTRIBUTE_ERROR_MESSAGES, messages);
+        }
+    }
+    }

     import java.io.File;
     import java.io.FileInputStream;
     import java.io.IOException;
     import java.nio.charset.Charset;
     import java.util.Properties;
     import org.apache.commons.io.FileUtils;
-...
+     *
      * @author a.kohlbecker
      * @since Oct 6, 2016
+     *
      */
     @EnableWebSecurity
     @Import(OAuth2ServerConfiguration.class)
-...
          * Check for full authentication for remoting services
          * @author a.kohlbecker
          * @since Oct 6, 2016
+         *
          */
         @Configuration
         @Order(2)
-...
+         *
          * @author a.kohlbecker
          * @since Jan 16, 2017
+         *
          */
         @Configuration
         @Order(1)
-...
+         *
          * @author a.kohlbecker
          * @since Oct 6, 2016
+         *
          */
         @Configuration
         public static class DefaultWebSecurityConfigurationAdapter extends WebSecurityConfigurerAdapter {
-...
+            }
+        }
         /**
          * @param globalManagementClients
          * @throws IOException
          */
         private void makeManagingUsersPropertiesFile(File propertiesFile) throws IOException {
             propertiesFile.createNewFile();
             FileUtils.write(
-...
                     + "# This properties file should contain entries in the form\n"
                     + "#    username=password\n"
                     + "# -------------------------------------------------------------------------------------------\n"
                     + "#\n"
                     + "#\n",
                     Charset.defaultCharset()
                     );
+            }
+    }

         /**
          * @author a.kohlbecker
          * @since Oct 6, 2016
+         *
          */
         @Configuration
         @EnableAuthorizationServer
-...
                  * Client for 'implicit grant'
                  */
                 builder.withClient(CLIENT_ID)
                 //.resourceIds(RESOURCE_ID)
                 .authorizedGrantTypes("authorization_code", "refresh_token", "implicit")
                 .authorities("ROLE_CLIENT")
                 .scopes("read", "write", "trust")
                 .secret("secret") // secret for login of the client into /oauth/token
                 .autoApprove("read");
                 // @formatter:on
                     //.resourceIds(RESOURCE_ID)
                     .authorizedGrantTypes("authorization_code", "refresh_token", "implicit")
                     .authorities("ROLE_CLIENT")
                     .scopes("read", "write", "trust")
                     .secret("secret") // secret for login of the client into /oauth/token
                     .autoApprove("read");
                     // @formatter:on
+            }

                     includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, response, taxonInitStrategy, null);
+        }
         public  EntityMediaContext<Taxon> loadMediaForTaxonAndRelated(UUID uuid,
         public  EntityMediaContext<Taxon> loadMediaForTaxonAndRelated(UUID taxonUuid,
                 UuidList relationshipUuids, UuidList relationshipInversUuids,
                 Boolean includeTaxonDescriptions, Boolean includeOccurrences, Boolean includeTaxonNameDescriptions,
                 HttpServletResponse response,
-...
             boolean includeUnpublished = NO_UNPUBLISHED;
             Taxon taxon = getCdmBaseInstance(Taxon.class, uuid, response, taxonInitStrategy);
             Taxon taxon = getCdmBaseInstance(Taxon.class, taxonUuid, response, taxonInitStrategy);
             taxon = checkExistsAndAccess(taxon, includeUnpublished, response);
             Set<TaxonRelationshipEdge> includeRelationships = ControllerUtils.loadIncludeRelationships(relationshipUuids, relationshipInversUuids, termService);
-...
                 @RequestParam(value = "size", required = false) Integer size,
                 HttpServletRequest request, HttpServletResponse response)throws IOException {
             boolean includeUnpublished = NO_UNPUBLISHED;
             logger.info("doGetSubtreeMedia() " + requestPathAndQuery(request));
-...
             return mediafilteredForPreferredRepresentations;
+        }
         /**
          * @param includeTaxonDescriptions
          * @param includeOccurrences
          * @param includeTaxonNameDescriptions
          * @param taxon
          * @param includeRelationships
          * @param media
          */
         public List<Media> addTaxonomicChildrenMedia(Boolean includeTaxonDescriptions, Boolean includeOccurrences,
                 Boolean includeTaxonNameDescriptions, Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships,
                 List<Media> media) {
-...
             return media;
+        }
         /**
+         *
          * @param taxon
          * @param includeRelationships
          * @param type
          * @param mimeTypes
          * @param widthOrDuration
          * @param height
          * @param size
          * @return
          */
         private List<Media> listMediaForTaxon(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships,
                 Boolean includeTaxonDescriptions, Boolean includeOccurrences, Boolean includeTaxonNameDescriptions, List<String> propertyPath) {
-...
             return media;
+        }
         public class EntityMediaContext<T extends IdentifiableEntity> {
             T entity;
             List<Media> media;
             /**
              * @param entity
              * @param media
              */
             public EntityMediaContext(T entity, List<Media> media) {
             private T entity;
             private List<Media> media;
             public EntityMediaContext(T entity, List<Media> media) {
                 this.entity = HibernateProxyHelper.deproxy(entity);
                 this.media = media;
+            }
             public T getEntity() {
                 return entity;
+            }
             public List<Media> getMedia() {
                 return media;
+            }
             /**
              * @param addTaxonomicChildrenMedia
              */
-...
                 this.media = media;
+            }
+        }
     // ---------------------- code snippet preserved for possible later use --------------------

             this.service = service;
+        }
         /* (non-Javadoc)
          * @see eu.etaxonomy.cdm.remote.controller.AbstractOaiPmhController#finishModelAndView(eu.etaxonomy.cdm.model.common.LSID, eu.etaxonomy.cdm.remote.dto.oaipmh.MetadataPrefix, org.springframework.web.servlet.ModelAndView)
          */
         @Override
         protected void finishModelAndView(LSID identifier,
                 MetadataPrefix metadataPrefix, ModelAndView modelAndView)
-...
+            }
+        }
         /**
          * @param identifier
          * @param metadataPrefix
          * @return
          * @throws IdDoesNotExistException
          */
         private  List<TaxonBase> obtainCoveredTaxaList(
                 LSID identifier, MetadataPrefix metadataPrefix)
                 throws IdDoesNotExistException {
-...
             List<TaxonBase> list = service.listCoveredTaxa(reference, true, TAXON_INIT_STRATEGY);
             return list;
+        }
+    }
+    }

     /**
      * @author a.kohlbecker
      * @since Jan 24, 2013
+     *
      */
     public class ControllerUtils {
         /**
          * @param relationshipUuids
          * @param relationshipInversUuids
          * @param includeRelationships
          * @return
          */
         public static Set<TaxonRelationshipEdge> loadIncludeRelationships(UuidList relationshipUuids, UuidList relationshipInversUuids, ITermService termService) {
             Set<TaxonRelationshipEdge> includeRelationships = null;
             if(relationshipUuids != null || relationshipInversUuids != null){
-...
+            }
             return includeRelationships;
+        }
+    }
+    }

      * <P>
+     *
      * @author p.kelbert
      * @version 1.0
      * @since march 10 2014
      */
     public class OccurrenceSearch implements RemoteResponse {
         private OccurrenceSearchRequest request;

cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote.xml
104	104	<entry key="constantConverter">
105	105	<bean class="eu.etaxonomy.cdm.remote.dto.assembler.converter.ConstantConverter"/>
106	106	</entry>
107
108	107	</map>
109	108	</property>
110	109	</bean>

         <!--
             This applicationContext is not a full cdm application context. It only covers the remote components
             without service and persistence. The cacheManager is usually provided via a Java config class in
             eu/etaxonomy/cdm/service/api/conf which cannot  use in this context. Therefore we are
             eu/etaxonomy/cdm/service/api/conf which cannot be used in this context. Therefore we are
             using the EhCacheManagerFactoryBean here to initialize the cacheManager bean.
          -->
         <bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">

     <?xml version="1.0" encoding="UTF-8"?>
     <ehcache>
       <!--
         This configuration is loaded by the default cache configuration. An in only to be used in specific
         Test contexts.
         This configuration is loaded by the default cache configuration. It is only to be used in specific
         test contexts.
       -->
       <defaultCache maxElementsInMemory="10" eternal="false"
         timeToIdleSeconds="120" timeToLiveSeconds="120" overflowToDisk="true" />

     	/**
     	 * Constructor, opens an spring ApplicationContext by using the according data source
     	 * and the default database schema validation type
+    	 *
     	 * @param dataSource
     	 */
     	public static CdmApplicationController NewInstance(ICdmDataSource dataSource){
     		return CdmApplicationController.NewInstance(null, dataSource, defaultDbSchemaValidation, false);
-...
     		return CdmApplicationController.NewInstance(null, dataSource, dbSchemaValidation, false);
+    	}
     	public static CdmApplicationController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading){
     		return CdmApplicationController.NewInstance(null, dataSource, dbSchemaValidation, omitTermLoading);
+    	}
-...
     	//		return new CdmApplicationController(applicationContextResource, dataSource, dbSchemaValidation, omitTermLoading, progressMonitor,listeners);
     	//	}
     	/**
     	 * @return
     	 */
     	protected static ClassPathResource getClasspathResource(){
     		return new ClassPathResource(DEFAULT_APPLICATION_CONTEXT_RESOURCE);
+    	}
     	/**
     	 * @return
     	 * @throws DataSourceNotFoundException
     	 */
     	protected static CdmPersistentDataSource getDefaultDatasource() throws DataSourceNotFoundException{
     		CdmPersistentDataSource dataSource = CdmPersistentDataSource.NewDefaultInstance();
     		return dataSource;
+    	}
     	/**
+    	 *
     	 * FIXME:Remoting this constructor is added only to allow extension of this cntroller
     	 * class. and should be removed after refactoring
     	 */
     	protected CdmApplicationController(){
     		applicationContextResource = null;
     		progressMonitor = null;
+    	}
     	/**
     	 * Constructor, opens an spring 2.5 ApplicationContext by using the according data
     	 * source
+    	 *
     	 * @param dataSource
     	 * @param dbSchemaValidation
     	 * @param omitTermLoading
     	 */
     	protected CdmApplicationController(Resource applicationContextResource, ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation,
     	        HibernateConfiguration hibernateConfig,
-...
     		setNewDataSource(dataSource, dbSchemaValidation, hibernateConfig, omitTermLoading, listeners);
+    	}
     	/**
     	 * Sets the application context to a new spring ApplicationContext by using the
     	 * according data source and initializes the Controller.

         //    logger.setLevel(Level.TRACE);
     //        Logger.getLogger("org.hibernate.SQL").setLevel(Level.TRACE);
             logger.trace("listMedia() - START");
             if (logger.isTraceEnabled()){logger.trace("listMedia() - START");}
             Set<Taxon> taxa = new HashSet<>();
             List<Media> taxonMedia = new ArrayList<>();
-...
             // --- resolve related taxa
             if (includeRelationships != null && ! includeRelationships.isEmpty()) {
                 logger.trace("listMedia() - resolve related taxa");
                 if (logger.isTraceEnabled()){logger.trace("listMedia() - resolve related taxa");}
                 taxa = listRelatedTaxa(taxon, includeRelationships, null, includeUnpublished, null, null, null);
+            }
             taxa.add((Taxon) dao.load(taxon.getUuid()));
             if(includeTaxonDescriptions != null && includeTaxonDescriptions){
                 logger.trace("listMedia() - includeTaxonDescriptions");
                 if (logger.isTraceEnabled()){logger.trace("listMedia() - includeTaxonDescriptions");}
                 List<TaxonDescription> taxonDescriptions = new ArrayList<>();
                 // --- TaxonDescriptions
                 for (Taxon t : taxa) {
-...
             if(includeOccurrences != null && includeOccurrences) {
                 logger.trace("listMedia() - includeOccurrences");
                 if (logger.isTraceEnabled()){logger.trace("listMedia() - includeOccurrences");}
                 @SuppressWarnings("rawtypes")
                 Set<SpecimenOrObservationBase> specimensOrObservations = new HashSet<>();
                 // --- Specimens
-...
+            }
             if(includeTaxonNameDescriptions != null && includeTaxonNameDescriptions) {
                 logger.trace("listMedia() - includeTaxonNameDescriptions");
                 if (logger.isTraceEnabled()){logger.trace("listMedia() - includeTaxonNameDescriptions");}
                 // --- TaxonNameDescription
                 Set<TaxonNameDescription> nameDescriptions = new HashSet<>();
                 for (Taxon t : taxa) {
                     nameDescriptions .addAll(t.getName().getDescriptions());
                     nameDescriptions.addAll(t.getName().getDescriptions());
+                }
                 for(TaxonNameDescription nameDescription: nameDescriptions){
                     if (!limitToGalleries || nameDescription.isImageGallery()) {
-...
             logger.trace("listMedia() - initialize");
             beanInitializer.initializeAll(taxonMedia, propertyPath);
             logger.trace("listMedia() - END");
             if (logger.isTraceEnabled()){logger.trace("listMedia() - END");}
             return taxonMedia;
+        }

cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
24	24	<import resource="classpath:/eu/etaxonomy/cdm/persistence.xml" />
25	25	<import resource="classpath:/eu/etaxonomy/cdm/services_base_test.xml"/>
26	26
27
28	27	<!-- security -->
29	28	<bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.Md5PasswordEncoder"/>
30	29	<bean id="saltSource" class="org.springframework.security.authentication.dao.ReflectionSaltSource">

Project

General

Profile

EDIT

Revision 41502854

Added by Andreas Müller over 2 years ago