Skip to content

Commit 04e6f5d

Browse files
committed
Merge branch 'main' into feat/refactor-other-repos-arch
2 parents 220f35a + 24db574 commit 04e6f5d

File tree

14 files changed

+122
-19
lines changed

14 files changed

+122
-19
lines changed

basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-http/src/main/java/org/eclipse/digitaltwin/basyx/aasdiscoveryservice/http/AasDiscoveryServiceHTTPConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,9 @@ public class AasDiscoveryServiceHTTPConfiguration {
4343
public CorsPathPatternProvider getAasDiscoveryServiceCorsUrlProvider() {
4444
return new CorsPathPatternProvider("/lookup/shells/**");
4545
}
46+
47+
@Bean
48+
public CorsPathPatternProvider getAasDiscoveryServiceDescriptionCorsUrlProvider() {
49+
return new CorsPathPatternProvider("/description");
50+
}
4651
}

basyx.aasenvironment/basyx.aasenvironment-http/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/http/AASEnvironmentConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ public CorsPathPatternProvider getAASEnvironmentSerializationRepoCorsUrlProvider
4747
public CorsPathPatternProvider getAASEnvironmentUploadRepoCorsUrlProvider() {
4848
return new CorsPathPatternProvider("/upload");
4949
}
50+
51+
@Bean
52+
public CorsPathPatternProvider getAASEnvironmentDescriptionRepoCorsUrlProvider() {
53+
return new CorsPathPatternProvider("/description");
54+
}
5055
}

basyx.aasregistry/basyx.aasregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/configuration/RestConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ public CorsPathPatternProvider getAasRegistryServiceCorsUrlProvider() {
6363
return new CorsPathPatternProvider("/shell-descriptors/**");
6464
}
6565

66+
@Bean
67+
public CorsPathPatternProvider getAasRegistryServiceDescriptionCorsUrlProvider() {
68+
return new CorsPathPatternProvider("/description");
69+
}
70+
6671
@Bean
6772
public SerializationExtension getExtension() {
6873
return new Aas4JHTTPSerializationExtension();

basyx.aasrepository/basyx.aasrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/aasrepository/http/AasRepoConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,9 @@ public class AasRepoConfiguration {
4242
public CorsPathPatternProvider getAasRepoCorsUrlProvider() {
4343
return new CorsPathPatternProvider("/shells/**");
4444
}
45+
46+
@Bean
47+
public CorsPathPatternProvider getAasRepoDescriptionCorsUrlProvider() {
48+
return new CorsPathPatternProvider("/description");
49+
}
4550
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*******************************************************************************
2+
* Copyright (C) 2025 the Eclipse BaSyx Authors
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining
5+
* a copy of this software and associated documentation files (the
6+
* "Software"), to deal in the Software without restriction, including
7+
* without limitation the rights to use, copy, modify, merge, publish,
8+
* distribute, sublicense, and/or sell copies of the Software, and to
9+
* permit persons to whom the Software is furnished to do so, subject to
10+
* the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be
13+
* included in all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
19+
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
20+
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21+
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22+
*
23+
* SPDX-License-Identifier: MIT
24+
******************************************************************************/
25+
26+
package org.eclipse.digitaltwin.basyx.aasxfileserver.http;
27+
28+
import org.eclipse.digitaltwin.basyx.aasxfileserver.AASXFileServer;
29+
import org.eclipse.digitaltwin.basyx.http.CorsPathPatternProvider;
30+
import org.springframework.context.annotation.Bean;
31+
import org.springframework.context.annotation.Configuration;
32+
33+
/**
34+
* {@link AASXFileServer} HTTP configuration
35+
*
36+
* @author zielstor
37+
*
38+
*/
39+
@Configuration
40+
public class AASXFileServerHTTPConfiguration {
41+
42+
@Bean
43+
public CorsPathPatternProvider getAASXFileServerCorsUrlProvider() {
44+
return new CorsPathPatternProvider("/packages/**");
45+
}
46+
47+
@Bean
48+
public CorsPathPatternProvider getAASXFileServerDescriptionCorsUrlProvider() {
49+
return new CorsPathPatternProvider("/description");
50+
}
51+
}

basyx.common/basyx.authorization/src/main/java/org/eclipse/digitaltwin/basyx/authorization/CommonSecurityConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
5353
.requestMatchers("/v3/**").permitAll()
5454
.requestMatchers("/api-docs/**").permitAll()
5555
.requestMatchers("api-docs/swagger-config/**").permitAll()
56+
.requestMatchers(HttpMethod.GET, "/description").permitAll()
5657
.anyRequest().authenticated()
5758
)
5859
.oauth2ResourceServer(oauth2 -> oauth2

basyx.common/basyx.client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.nimbusds</groupId>
6565
<artifactId>oauth2-oidc-sdk</artifactId>
66-
<version>11.22.1</version>
66+
<version>11.22.2</version>
6767
</dependency>
6868

6969
</dependencies>

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/http/ConceptDescriptionRepoConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,9 @@ public class ConceptDescriptionRepoConfiguration {
4242
public CorsPathPatternProvider getConceptDescriptionRepoCorsUrlProvider() {
4343
return new CorsPathPatternProvider("/concept-descriptions/**");
4444
}
45+
46+
@Bean
47+
public CorsPathPatternProvider getConceptDescriptionRepoDescriptionCorsUrlProvider() {
48+
return new CorsPathPatternProvider("/description");
49+
}
4550
}

basyx.submodelregistry/basyx.submodelregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/configuration/RestConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ public CorsPathPatternProvider getSubmodelRegistryServiceCorsUrlProvider() {
6565
return new CorsPathPatternProvider("/submodel-descriptors/**");
6666
}
6767

68+
@Bean
69+
public CorsPathPatternProvider getSubmodelRegistryServiceDescriptionCorsUrlProvider() {
70+
return new CorsPathPatternProvider("/description");
71+
}
72+
6873
@Bean
6974
public SerializationExtension getSubmodelRegistryExtension() {
7075
return new Aas4JHTTPSerializationExtension();

basyx.submodelrepository/basyx.submodelrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/http/SubmodelRepoConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,9 @@ public class SubmodelRepoConfiguration {
4242
public CorsPathPatternProvider getSubmodelRepoCorsUrlProvider() {
4343
return new CorsPathPatternProvider("/submodels/**");
4444
}
45+
46+
@Bean
47+
public CorsPathPatternProvider getSubmodelRepoDescriptionCorsUrlProvider() {
48+
return new CorsPathPatternProvider("/description");
49+
}
4550
}

0 commit comments

Comments
 (0)