Skip to content

4.4 issues #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
borditamas merged 3 commits into from
Jul 20, 2021
Merged

4.4 issues #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
522b7ef
fixing alias
rbocsi Mar 17, 2021
c9a740d
Merge branch 'development' into 4.4-issues
borditamas Apr 9, 2021
74224fa
Merge branch 'development' into 4.4-issues
borditamas Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions client-skeleton-consumer/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path=".apt_generated">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
Expand Down
6 changes: 3 additions & 3 deletions client-skeleton-consumer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eu.arrowhead</groupId>
<artifactId>client-skeleton</artifactId>
<version>4.3.0.0</version>
<groupId>eu.arrowhead</groupId>
<artifactId>application-skeleton-java-spring</artifactId>
<version>4.4.0.0</version>
</parent>

<artifactId>arrowhead-client-skeleton-consumer</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/eu/arrowhead/client/skeleton/consumer/ConsumerApplicationInitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;

import eu.arrowhead.client.library.ArrowheadService;
import eu.arrowhead.client.library.config.ApplicationInitListener;
import ai.aitia.arrowhead.application.library.ArrowheadService;
import ai.aitia.arrowhead.application.library.config.ApplicationInitListener;
import eu.arrowhead.common.core.CoreSystem;

@Component
Expand All @@ -29,7 +29,7 @@ public class ConsumerApplicationInitListener extends ApplicationInitListener {
protected void customInit(final ContextRefreshedEvent event) {

//Checking the availability of necessary core systems
checkCoreSystemReachability(CoreSystem.SERVICE_REGISTRY);
checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY);
checkCoreSystemReachability(CoreSystem.ORCHESTRATOR);


Expand Down
2 changes: 1 addition & 1 deletion ...t-skeleton-consumer/src/main/java/eu/arrowhead/client/skeleton/consumer/ConsumerMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.springframework.context.annotation.ComponentScan;
import org.springframework.http.HttpMethod;

import eu.arrowhead.client.library.ArrowheadService;
import ai.aitia.arrowhead.application.library.ArrowheadService;
import eu.arrowhead.common.CommonConstants;
import eu.arrowhead.common.dto.shared.OrchestrationFlags.Flag;
import eu.arrowhead.common.dto.shared.OrchestrationFormRequestDTO;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/eu/arrowhead/client/skeleton/consumer/security/ConsumerSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;

import eu.arrowhead.client.library.config.DefaultSecurityConfig;
import ai.aitia.arrowhead.application.library.config.DefaultSecurityConfig;

@Configuration
@ConditionalOnWebApplication
Expand Down
2 changes: 1 addition & 1 deletion client-skeleton-consumer/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ server.ssl.enabled=true
server.ssl.key-store-type=PKCS12
server.ssl.key-store=classpath:certificates/consumer_skeleton.p12
server.ssl.key-store-password=123456
server.ssl.key-alias=consumerskeleton
server.ssl.key-alias=consumer_skeleton
server.ssl.key-password=123456
server.ssl.client-auth=need
server.ssl.trust-store-type=PKCS12
Expand Down
11 changes: 0 additions & 11 deletions client-skeleton-provider/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path=".apt_generated">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
Expand Down
6 changes: 3 additions & 3 deletions client-skeleton-provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eu.arrowhead</groupId>
<artifactId>client-skeleton</artifactId>
<version>4.3.0.0</version>
<groupId>eu.arrowhead</groupId>
<artifactId>application-skeleton-java-spring</artifactId>
<version>4.4.0.0</version>
</parent>

<artifactId>arrowhead-client-skeleton-provider</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions .../src/main/java/eu/arrowhead/client/skeleton/provider/ProviderApplicationInitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;

import eu.arrowhead.client.library.ArrowheadService;
import eu.arrowhead.client.library.config.ApplicationInitListener;
import eu.arrowhead.client.library.util.ClientCommonConstants;
import ai.aitia.arrowhead.application.library.ArrowheadService;
import ai.aitia.arrowhead.application.library.config.ApplicationInitListener;
import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;
import eu.arrowhead.client.skeleton.provider.security.ProviderSecurityConfig;
import eu.arrowhead.common.CommonConstants;
import eu.arrowhead.common.Utilities;
Expand All @@ -36,7 +36,7 @@ public class ProviderApplicationInitListener extends ApplicationInitListener {
@Autowired
private ProviderSecurityConfig providerSecurityConfig;

@Value(ClientCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
@Value(ApplicationCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
private boolean tokenSecurityFilterEnabled;

@Value(CommonConstants.$SERVER_SSL_ENABLED_WD)
Expand All @@ -52,7 +52,7 @@ public class ProviderApplicationInitListener extends ApplicationInitListener {
protected void customInit(final ContextRefreshedEvent event) {

//Checking the availability of necessary core systems
checkCoreSystemReachability(CoreSystem.SERVICE_REGISTRY);
checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY);
if (sslEnabled && tokenSecurityFilterEnabled) {
checkCoreSystemReachability(CoreSystem.AUTHORIZATION);

Expand Down
4 changes: 2 additions & 2 deletions ...main/java/eu/arrowhead/client/skeleton/provider/security/ProviderAccessControlFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Component;

import eu.arrowhead.client.library.util.ClientCommonConstants;
import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;
import eu.arrowhead.common.CommonConstants;
import eu.arrowhead.common.security.AccessControlFilter;

@Component
@ConditionalOnExpression(CommonConstants.$SERVER_SSL_ENABLED_WD + " and !" + ClientCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
@ConditionalOnExpression(CommonConstants.$SERVER_SSL_ENABLED_WD + " and !" + ApplicationCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
public class ProviderAccessControlFilter extends AccessControlFilter {

@Override
Expand Down
7 changes: 3 additions & 4 deletions .../src/main/java/eu/arrowhead/client/skeleton/provider/security/ProviderSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;

import eu.arrowhead.client.library.config.DefaultSecurityConfig;
import eu.arrowhead.client.library.util.ClientCommonConstants;
import eu.arrowhead.common.CommonConstants;
import ai.aitia.arrowhead.application.library.config.DefaultSecurityConfig;
import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;

@Configuration
@EnableWebSecurity
Expand All @@ -17,7 +16,7 @@ public class ProviderSecurityConfig extends DefaultSecurityConfig {
//=================================================================================================
// members

@Value(ClientCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
@Value(ApplicationCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
private boolean tokenSecurityFilterEnabled;

private ProviderTokenSecurityFilter tokenSecurityFilter;
Expand Down
2 changes: 1 addition & 1 deletion client-skeleton-provider/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ token.security.filter.enabled=true
server.ssl.key-store-type=PKCS12
server.ssl.key-store=classpath:certificates/provider_skeleton.p12
server.ssl.key-store-password=123456
server.ssl.key-alias=providerskeleton
server.ssl.key-alias=provider_skeleton
server.ssl.key-password=123456
server.ssl.client-auth=need
server.ssl.trust-store-type=PKCS12
Expand Down
11 changes: 0 additions & 11 deletions client-skeleton-publisher/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path=".apt_generated">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
Expand Down
6 changes: 3 additions & 3 deletions client-skeleton-publisher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eu.arrowhead</groupId>
<artifactId>client-skeleton</artifactId>
<version>4.3.0.0</version>
<groupId>eu.arrowhead</groupId>
<artifactId>application-skeleton-java-spring</artifactId>
<version>4.4.0.0</version>
</parent>

<artifactId>arrowhead-client-skeleton-publisher</artifactId>
Expand Down
20 changes: 10 additions & 10 deletions ...rc/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;

import eu.arrowhead.client.library.ArrowheadService;
import eu.arrowhead.client.library.config.ApplicationInitListener;
import eu.arrowhead.client.library.util.ClientCommonConstants;
import ai.aitia.arrowhead.application.library.ArrowheadService;
import ai.aitia.arrowhead.application.library.config.ApplicationInitListener;
import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;
import eu.arrowhead.client.skeleton.publisher.constants.PublisherConstants;
import eu.arrowhead.client.skeleton.publisher.event.PresetEventType;
import eu.arrowhead.client.skeleton.publisher.security.PublisherSecurityConfig;
Expand All @@ -43,19 +43,19 @@ public class PublisherApplicationInitListener extends ApplicationInitListener {
@Autowired
private PublisherSecurityConfig publisherSecurityConfig;

@Value(ClientCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
@Value(ApplicationCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
private boolean tokenSecurityFilterEnabled;

@Value(CommonConstants.$SERVER_SSL_ENABLED_WD)
private boolean sslEnabled;

@Value(ClientCommonConstants.$CLIENT_SYSTEM_NAME)
@Value(ApplicationCommonConstants.$APPLICATION_SYSTEM_NAME)
private String clientSystemName;

@Value(ClientCommonConstants.$CLIENT_SERVER_ADDRESS_WD)
@Value(ApplicationCommonConstants.$APPLICATION_SERVER_ADDRESS_WD)
private String clientSystemAddress;

@Value(ClientCommonConstants.$CLIENT_SERVER_PORT_WD)
@Value(ApplicationCommonConstants.$APPLICATION_SERVER_PORT_WD)
private int clientSystemPort;

private final Logger logger = LogManager.getLogger(PublisherApplicationInitListener.class);
Expand All @@ -68,7 +68,7 @@ public class PublisherApplicationInitListener extends ApplicationInitListener {
protected void customInit(final ContextRefreshedEvent event) {

//Checking the availability of necessary core systems
checkCoreSystemReachability(CoreSystem.SERVICE_REGISTRY);
checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY);

if (sslEnabled && tokenSecurityFilterEnabled) {
checkCoreSystemReachability(CoreSystem.AUTHORIZATION);
Expand All @@ -82,9 +82,9 @@ protected void customInit(final ContextRefreshedEvent event) {
logger.info("TokenSecurityFilter in not active");
}

if ( arrowheadService.echoCoreSystem(CoreSystem.EVENT_HANDLER) ) {
if ( arrowheadService.echoCoreSystem(CoreSystem.EVENTHANDLER) ) {

arrowheadService.updateCoreServiceURIs(CoreSystem.EVENT_HANDLER);
arrowheadService.updateCoreServiceURIs(CoreSystem.EVENTHANDLER);

publishInitStartedEvent();
}
Expand Down
10 changes: 5 additions & 5 deletions ...keleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;

import eu.arrowhead.client.library.ArrowheadService;
import eu.arrowhead.client.library.util.ClientCommonConstants;
import ai.aitia.arrowhead.application.library.ArrowheadService;
import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;
import eu.arrowhead.client.skeleton.publisher.constants.PublisherConstants;
import eu.arrowhead.client.skeleton.publisher.event.PresetEventType;
import eu.arrowhead.common.CommonConstants;
Expand All @@ -30,13 +30,13 @@ public class PublisherMain implements ApplicationRunner {
//=================================================================================================
// members

@Value(ClientCommonConstants.$CLIENT_SYSTEM_NAME)
@Value(ApplicationCommonConstants.$APPLICATION_SYSTEM_NAME)
private String clientSystemName;

@Value(ClientCommonConstants.$CLIENT_SERVER_ADDRESS_WD)
@Value(ApplicationCommonConstants.$APPLICATION_SERVER_ADDRESS_WD)
private String clientSystemAddress;

@Value(ClientCommonConstants.$CLIENT_SERVER_PORT_WD)
@Value(ApplicationCommonConstants.$APPLICATION_SERVER_PORT_WD)
private int clientSystemPort;

@Value(CommonConstants.$SERVER_SSL_ENABLED_WD)
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/eu/arrowhead/client/skeleton/publisher/security/PublisherAccessControlFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Component;

import eu.arrowhead.client.library.util.ClientCommonConstants;
import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;
import eu.arrowhead.common.CommonConstants;
import eu.arrowhead.common.security.AccessControlFilter;

@Component
@ConditionalOnExpression(CommonConstants.$SERVER_SSL_ENABLED_WD + " and !" + ClientCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
@ConditionalOnExpression(CommonConstants.$SERVER_SSL_ENABLED_WD + " and !" + ApplicationCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
public class PublisherAccessControlFilter extends AccessControlFilter {

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/eu/arrowhead/client/skeleton/publisher/security/PublisherSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;

import eu.arrowhead.client.library.config.DefaultSecurityConfig;
import eu.arrowhead.client.library.util.ClientCommonConstants;
import ai.aitia.arrowhead.application.library.config.DefaultSecurityConfig;
import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;

@Configuration
@EnableWebSecurity
Expand All @@ -16,7 +16,7 @@ public class PublisherSecurityConfig extends DefaultSecurityConfig {
//=================================================================================================
// members

@Value(ClientCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
@Value(ApplicationCommonConstants.$TOKEN_SECURITY_FILTER_ENABLED_WD)
private boolean tokenSecurityFilterEnabled;

private PublisherTokenSecurityFilter tokenSecurityFilter;
Expand Down
10 changes: 5 additions & 5 deletions ...lisher/src/main/java/eu/arrowhead/client/skeleton/publisher/service/PublisherService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import eu.arrowhead.client.library.ArrowheadService;
import eu.arrowhead.client.library.util.ClientCommonConstants;
import ai.aitia.arrowhead.application.library.ArrowheadService;
import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;
import eu.arrowhead.client.skeleton.publisher.PublisherApplicationInitListener;
import eu.arrowhead.client.skeleton.publisher.event.PresetEventType;
import eu.arrowhead.common.CommonConstants;
Expand All @@ -24,13 +24,13 @@ public class PublisherService {
//=================================================================================================
// members

@Value(ClientCommonConstants.$CLIENT_SYSTEM_NAME)
@Value(ApplicationCommonConstants.$APPLICATION_SYSTEM_NAME)
private String clientSystemName;

@Value(ClientCommonConstants.$CLIENT_SERVER_ADDRESS_WD)
@Value(ApplicationCommonConstants.$APPLICATION_SERVER_ADDRESS_WD)
private String clientSystemAddress;

@Value(ClientCommonConstants.$CLIENT_SERVER_PORT_WD)
@Value(ApplicationCommonConstants.$APPLICATION_SERVER_PORT_WD)
private int clientSystemPort;

@Value(CommonConstants.$SERVER_SSL_ENABLED_WD)
Expand Down
11 changes: 0 additions & 11 deletions client-skeleton-subscriber/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path=".apt_generated">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
Expand Down
6 changes: 3 additions & 3 deletions client-skeleton-subscriber/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eu.arrowhead</groupId>
<artifactId>client-skeleton</artifactId>
<version>4.3.0.0</version>
<groupId>eu.arrowhead</groupId>
<artifactId>application-skeleton-java-spring</artifactId>
<version>4.4.0.0</version>
</parent>

<artifactId>arrowhead-client-skeleton-subscriber</artifactId>
Expand Down
Loading