Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit fed7e6ff authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Fix bean initialization

parent 57994433
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 34 deletions
pom.xml
+ 8
− 9
View file @ fed7e6ff
......@@ -53,18 +53,18 @@
<commons-net.version>3.8.0</commons-net.version>
<commons-validator.version>1.7</commons-validator.version>
<cxf-xjc-runtime.version>3.3.2</cxf-xjc-runtime.version>
<cxf.version>3.5.5</cxf.version>
<cxf.version>3.5.6</cxf.version>
<ehcache.version>2.10.9.2</ehcache.version>
<freemarker.version>2.3.31</freemarker.version>
<freemarker.version>2.3.32</freemarker.version>
<h2.version>2.1.214</h2.version>
<hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
<hamcrest.version>2.2</hamcrest.version>
<hibernate-jpa.version>1.0.2.Final</hibernate-jpa.version>
<hibernate.validator.version>7.0.1.Final</hibernate.validator.version>
<hibernate.version>5.6.9.Final</hibernate.version>
<httpclient.version>4.5.13</httpclient.version>
<hibernate.validator.version>7.0.5.Final</hibernate.validator.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<httpclient.version>4.5.14</httpclient.version>
<jackson-databind.version>2.14.1</jackson-databind.version>
<jackson.version>2.14.1</jackson.version>
<jackson.version>2.15.2</jackson.version>
<javaee-api.version>7.0</javaee-api.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<javax.mail.version>1.6.2</javax.mail.version>
......@@ -77,16 +77,15 @@
<junit-platform-surefire-provider.version>1.3.2</junit-platform-surefire-provider.version>
<junitparams.version>1.1.1</junitparams.version>
<logback.version>1.2.11</logback.version>
<mysql.jdbc.version>8.0.32</mysql.jdbc.version>
<mysql.jdbc.version>8.0.33</mysql.jdbc.version>
<metro.version>2.2.1-1</metro.version>
<!-- mockito.version>2.23.4</mockito.version -->
<mockito.version>4.10.0</mockito.version>
<orika.version>1.5.4</orika.version>
<servlet-api.version>3.0.1</servlet-api.version>
<slf4j.version>1.7.36</slf4j.version>
<spring-modules-jakarta-commons.version>0.8</spring-modules-jakarta-commons.version>
<spring-boot.version>2.7.12</spring-boot.version>
<spring-boot.tomcat.version>9.0.74</spring-boot.tomcat.version>
<spring-boot.tomcat.version>9.0.75</spring-boot.tomcat.version>
<spring.security.version>5.8.3</spring.security.version>
<spring.version>5.3.27</spring.version>
<xmlunit.version>2.9.0</xmlunit.version>
......
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/ServicesBeansConfiguration.java
+ 1
− 0
View file @ fed7e6ff
......@@ -9,6 +9,7 @@ import org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean;
@Configuration
@ComponentScan(basePackages = {
"eu.europa.ec.edelivery.smp.data.dao",
"eu.europa.ec.edelivery.smp.conversion",
"eu.europa.ec.edelivery.smp.security",
"eu.europa.ec.edelivery.smp.services",
......
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDao.java
+ 0
− 3
View file @ fed7e6ff
......@@ -26,7 +26,6 @@ import static eu.europa.ec.edelivery.smp.data.dao.QueryNames.*;
@Repository
public class DocumentDao extends BaseDao<DBDocument> {
/**
* Method returns the document for the resource
*
......@@ -85,7 +84,6 @@ public class DocumentDao extends BaseDao<DBDocument> {
TypedQuery<DBDocumentVersion> query = memEManager.createNamedQuery(QUERY_DOCUMENT_VERSION_LIST_FOR_RESOURCE, DBDocumentVersion.class);
query.setParameter(PARAM_RESOURCE_ID, dbResource.getId());
return query.getResultList();
}
/**
......@@ -98,6 +96,5 @@ public class DocumentDao extends BaseDao<DBDocument> {
TypedQuery<DBDocumentVersion> query = memEManager.createNamedQuery(QUERY_DOCUMENT_VERSION_LIST_FOR_SUBRESOURCE, DBDocumentVersion.class);
query.setParameter(PARAM_SUBRESOURCE_ID, subresource.getId());
return query.getResultList();
}
}
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/AbstractResourceHandler.java
+ 1
− 1
View file @ fed7e6ff
......@@ -32,7 +32,7 @@ public class AbstractResourceHandler {
final List<ResourceDefinitionSpi> resourceDefinitionSpiList;
final ResourceStorage resourceStorage;
public AbstractResourceHandler(List<ResourceDefinitionSpi> resourceDefinitionSpiList, ResourceStorage resourceStorage) {
protected AbstractResourceHandler(List<ResourceDefinitionSpi> resourceDefinitionSpiList, ResourceStorage resourceStorage) {
this.resourceDefinitionSpiList = resourceDefinitionSpiList;
this.resourceStorage = resourceStorage;
}
......
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerService.java
+ 6
− 5
View file @ fed7e6ff
......@@ -28,8 +28,8 @@ import eu.europa.ec.smp.spi.resource.ResourceHandlerSpi;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.ByteArrayOutputStream;
import java.util.List;
......@@ -47,12 +47,14 @@ public class ResourceHandlerService extends AbstractResourceHandler {
protected static final SMPLogger LOG = SMPLoggerFactory.getLogger(ResourceHandlerService.class);
final ResourceMemberDao resourceMemberDao;
final GroupDao groupDao;
final SMLIntegrationService integrationService;
public ResourceHandlerService(List<ResourceDefinitionSpi> resourceDefinitionSpiList, ResourceStorage resourceStorage,
ResourceMemberDao resourceMemberDao, GroupDao groupDao,SMLIntegrationService integrationService) {
public ResourceHandlerService(List<ResourceDefinitionSpi> resourceDefinitionSpiList,
ResourceMemberDao resourceMemberDao,
GroupDao groupDao,
ResourceStorage resourceStorage,
SMLIntegrationService integrationService) {
super(resourceDefinitionSpiList, resourceStorage);
this.resourceMemberDao = resourceMemberDao;
this.groupDao = groupDao;
......@@ -61,7 +63,6 @@ public class ResourceHandlerService extends AbstractResourceHandler {
public void readResource(ResourceRequest resourceRequest,
ResourceResponse resourceResponse) {
LOG.debug("Handle the READ action for resource request [{}]", resourceRequest);
ResolvedData resolvedData = resourceRequest.getResolvedData();
ResourceHandlerSpi handlerSpi = getResourceHandler(resolvedData.getResourceDef());
......
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceStorage.java
+ 8
− 5
View file @ fed7e6ff
......@@ -11,8 +11,8 @@ import eu.europa.ec.edelivery.smp.data.model.doc.DBSubresource;
import eu.europa.ec.edelivery.smp.logging.SMPLogger;
import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
/**
......@@ -28,19 +28,22 @@ public class ResourceStorage {
final ResourceDao resourceDao;
final SubresourceDao subresourceDao;
public ResourceStorage(DocumentDao documentDao, ResourceDao resourceDao,SubresourceDao subresourceDao) {
public ResourceStorage(DocumentDao documentDao, ResourceDao resourceDao, SubresourceDao subresourceDao) {
this.documentDao = documentDao;
this.resourceDao = resourceDao;
this.subresourceDao = subresourceDao;
}
byte[] getDocumentContentForResource(DBResource dbResource) {
Optional<DBDocumentVersion> documentVersion = documentDao.getCurrentDocumentVersionForResource(dbResource);
public byte[] getDocumentContentForResource(DBResource dbResource) {
LOG.debug("getDocumentContentForResource: [{}]", dbResource);
Optional<DBDocumentVersion> documentVersion = this.documentDao.getCurrentDocumentVersionForResource(dbResource);
return documentVersion.isPresent() ? documentVersion.get().getContent() : null;
}
byte[] getDocumentContentForSubresource(DBSubresource subresource) {
public byte[] getDocumentContentForSubresource(DBSubresource subresource) {
LOG.debug("getDocumentContentForSubresource: [{}]", subresource);
Optional<DBDocumentVersion> documentVersion = documentDao.getCurrentDocumentVersionForSubresource(subresource);
return documentVersion.isPresent() ? documentVersion.get().getContent() : null;
......
smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java
+ 8
− 5
View file @ fed7e6ff
......@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.Import;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
......@@ -38,9 +39,9 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
/**
* This is the entry point of the DomiSMP application (beans)configuration/setup.
*
* <p>
* The SMPWebAppConfig is initiated from the web.xml.
*
* <p>
* The following configurations: ServicesBeansConfiguration, SMPDatabaseConfig, UISecurityConfigurerAdapter, WSSecurityConfigurerAdapter
* are configured from the SMPWebAppConfig
*
......@@ -64,8 +65,8 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
* <tr><td>utils</td><td>smp-server-library</td><td>SMPWebAppConfig</td></tr>
* <tr><td>ui</td><td>smp-webapp</td><td>SMPWebAppConfig</td></tr>
* </table>
*
*
* <p>
* <p>
* @author gutowpa
* @since 3.0.0
*/
......@@ -82,7 +83,9 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
"eu.europa.ec.edelivery.smp.utils",
"eu.europa.ec.edelivery.smp.cron",
// spi properties
"eu.europa.ec.smp.spi",})
"eu.europa.ec.smp.spi"},
excludeFilters = {
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = SMPWebAppConfig.class)})
public class SMPWebAppConfig implements WebMvcConfigurer {
private static final Logger LOG = LoggerFactory.getLogger(SMPWebAppConfig.class);
......
smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/monitor/MonitorResource.java
+ 1
− 6
View file @ fed7e6ff
package eu.europa.ec.edelivery.smp.monitor;
import eu.europa.ec.edelivery.smp.data.dao.DocumentDao;
import eu.europa.ec.edelivery.smp.data.dao.DomainDao;
import eu.europa.ec.edelivery.smp.data.model.DBDomain;
import eu.europa.ec.edelivery.smp.data.ui.auth.SMPAuthority;
......@@ -35,13 +34,9 @@ public class MonitorResource {
private static final String TEST_NAME = "urn:test:document:is-alive";
private static final String TEST_EXTENSION_XML = "<Extension xmlns=\"http://docs.oasis-open.org/bdxr/ns/SMP/2016/05\"><ex:dummynode xmlns:ex=\"http://test.eu\">Sample not mandatory extension</ex:dummynode></Extension>";
private static final String TEST_DB_SUCCESSFUL_ROLLBACK = "TEST_DB_SUCCESSFUL_ROLLBACK MESSAGE";
private final DocumentDao documentDao;
private final DomainDao domainDao;
public MonitorResource(DocumentDao documentDao, DomainDao domainDao) {
this.documentDao = documentDao;
public MonitorResource(DomainDao domainDao) {
this.domainDao = domainDao;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about