Skip to content
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.

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

sync with tractus-X #508

Merged
merged 48 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
8028ac4
feat(irs-api):[#199] register policy definition for certain bpnls
ds-psosnowski Mar 5, 2024
1898634
feat(irs-api):[#199] merge and conflicts resolve
ds-psosnowski Mar 5, 2024
c65f58e
feat(irs-api):[#199] added changelog entry
ds-psosnowski Mar 11, 2024
f9a886b
feat(irs-api):[#199] added test
ds-psosnowski Mar 12, 2024
4975d01
feat(irs-api):[#199] update
ds-psosnowski Mar 12, 2024
eba7540
feat(irs-api):[#199] added tests
ds-psosnowski Mar 13, 2024
dcdd24e
feat(irs-api):[#199] test clean up
ds-psosnowski Mar 13, 2024
58a3212
feat(impl): [#199] Harden test and clean method signature
dsmf Mar 13, 2024
9340fb4
feat(impl): [#199] Fix warnings
dsmf Mar 13, 2024
05ec245
feat(impl): [#199] Deduplicate by extraction to findBpnsByPolicyId
dsmf Mar 13, 2024
038b85a
feat(impl): [#199] Avoid too many methods by extraction to helper class
dsmf Mar 13, 2024
c999b0a
feat(impl): [#199] Add tests
dsmf Mar 13, 2024
6a32fde
feat(irs-api):[#199] corrections after review
ds-psosnowski Mar 14, 2024
eea278b
feat(irs-api):[#199] corrections after review
ds-psosnowski Mar 14, 2024
29b7560
feat(irs-api):[#199] added test
ds-psosnowski Mar 14, 2024
f6626c1
Merge branch 'main' into feature/#199-register-policy-definition-for-…
dsmf Mar 15, 2024
a2f32d9
feat(irs-api):[#199] corrections after review
ds-psosnowski Mar 18, 2024
be88258
feat(irs):[#199] corrections after review
ds-psosnowski Mar 19, 2024
c4a4de9
feat(irs):[#199] main merge
ds-psosnowski Mar 19, 2024
4758554
feat(irs):[#199] corrections after review
ds-psosnowski Mar 22, 2024
df7a662
Merge branch 'main' into feature/#199-register-policy-definition-for-…
ds-psosnowski Mar 22, 2024
2d4e1cb
feat(irs):[#199] updated insomnia collection
ds-psosnowski Mar 22, 2024
2962615
feat(irs):[#199] sonar issues fix
ds-psosnowski Mar 22, 2024
740b188
feat(irs):[#199] sonar issues fix
ds-psosnowski Mar 22, 2024
13136f5
feat(irs):[#199] changed spaces in irs request collection
ds-psosnowski Mar 22, 2024
20c7e49
feat(irs):[#199] revert white signs in request collection
ds-psosnowski Mar 22, 2024
e0ab6b3
feat(irs):[#199] changed spaces to tabs in irs request collection
ds-psosnowski Mar 22, 2024
7703420
Merge pull request #802 from catenax-ng/feature/#199-register-policy-…
ds-psosnowski Mar 22, 2024
ff53d66
feat(impl):[#359] update registry impl for lookup
ds-ext-kmassalski Mar 22, 2024
4a71ae8
feat(impl):[XXX] update sb to fix security CVE's
ds-ext-kmassalski Mar 22, 2024
5c605df
feat(impl):[XXX] update sb to fix secur
ds-ext-kmassalski Mar 22, 2024
f67923c
feat(impl):[#359] fix pmd
ds-ext-kmassalski Mar 22, 2024
5017c8c
feat(impl):[#359] fix pmd
ds-ext-kmassalski Mar 22, 2024
788a585
Merge branch 'main' into feature/359-registry-update-impl-for-lookup
ds-ext-kmassalski Mar 25, 2024
56f8ebd
feat(impl):[#359] support new encoded endpoint
ds-ext-kmassalski Mar 25, 2024
058fa3a
doc(doc):[#000] add bpn l s and a
mkanal Mar 25, 2024
136949c
Merge pull request #835 from catenax-ng/chore/#000-add-bpn-to-gloassary
dsmf Mar 25, 2024
cdb9197
chore(collection):[#TRI-996] Correct param "jobStates" in collection …
dsmf Mar 25, 2024
7f3d204
Merge pull request #837 from catenax-ng/chore/correct-param-jobstates
dsmf Mar 25, 2024
4a35ddd
Merge pull request #832 from catenax-ng/feature/XXX-update-db-version
ds-ext-kmassalski Mar 26, 2024
81cd1ff
feat(impl):[#359] update changelog
ds-ext-kmassalski Mar 27, 2024
1d9952d
Merge pull request #836 from eclipse-tractusx/main
ds-ext-kmassalski Mar 27, 2024
aad0a12
Merge branch 'refs/heads/main' into feature/359-registry-update-impl-…
dsmf Mar 27, 2024
f9f8645
Merge remote-tracking branch 'origin/feature/359-registry-update-impl…
dsmf Mar 27, 2024
ec2cb5b
Merge branch 'refs/heads/main' into feature/359-registry-update-impl-…
dsmf Mar 27, 2024
ca34021
chore(changelog): [#359] Fixed sentence in CHANGELOG.md
dsmf Mar 27, 2024
7a990b2
feat(impl):[#359] add new helper class
ds-ext-kmassalski Mar 27, 2024
338fce3
Merge pull request #829 from catenax-ng/feature/359-registry-update-i…
dsmf Mar 27, 2024
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: 8 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
_**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_

## [Unreleased]
### Changed
- IRS now supports Asset Administration Shell v3.1 - adjusted lookup shells endpoint changes (assetIds query param is encoded). #359
-
### Added
- Extended EdcPolicyDefinitionService to check if a policy in the edc exists

## [4.8.0] - 2024-03-18
### Changed
- Improved maintainability in EdcSubmodelClientImpl by reduced method visibility and better naming (in context of #448).
- EdcPolicyDefinitionService, EdcContractDefinitionService and EdcAssetService return throw AlreadyExist exceptions when Conflict is returned from
EDC
- EdcPolicyDefinitionService, EdcContractDefinitionService and EdcAssetService throw AlreadyExist exceptions when
conflict is returned from EDC
- Added AssetAdministrationShellDescriptor specificAssetIds support for externalSubjectId required for data provisioning
- Registering a job - aspects array is now accepting full urn of aspect model instead of name only, eg. 'urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt' instead 'SingleLevelBomAsBuilt'. #439
- Changed the version of irs-registry-client from 1.6.0-SNAPSHOT to 1.6.0
- Policies can now be registered for certain bpnls. #199


## Fixed
- Fixed missing timeouts including configuration. #448
Expand Down Expand Up @@ -191,7 +196,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
- Added role "admin_irs" again

### Changed
- Deprecated query parameter 'jobStates' was removed from GET {{IRS_HOST}}/irs/jobs endpoint
- Deprecated query parameter 'jobStates' was removed from GET {{IRS_HOST}}/irs/jobs endpoint. TRI-996
- Moved OAuth2 JWT token claim to configuration. The fields can be configured with `oauth.resourceClaim`, `oauth.irsNamespace`, `oauth.roles`.
- ESS
- Added Tombstone to ESS investigation in case required aspect models "PartAsPlanned" or "PartSiteInformationAsPlanned" are missing
Expand Down
92 changes: 46 additions & 46 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ maven/mavencentral/io.github.resilience4j/resilience4j-retry/2.1.0, Apache-2.0,
maven/mavencentral/io.github.resilience4j/resilience4j-spring-boot3/2.1.0, Apache-2.0, approved, #10913
maven/mavencentral/io.github.resilience4j/resilience4j-spring6/2.1.0, Apache-2.0, approved, #10915
maven/mavencentral/io.github.resilience4j/resilience4j-timelimiter/2.1.0, Apache-2.0, approved, #10166
maven/mavencentral/io.micrometer/micrometer-commons/1.11.9, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9243
maven/mavencentral/io.micrometer/micrometer-core/1.11.9, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9238
maven/mavencentral/io.micrometer/micrometer-observation/1.11.9, Apache-2.0, approved, #9242
maven/mavencentral/io.micrometer/micrometer-commons/1.11.10, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9243
maven/mavencentral/io.micrometer/micrometer-core/1.11.10, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9238
maven/mavencentral/io.micrometer/micrometer-observation/1.11.10, Apache-2.0, approved, #9242
maven/mavencentral/io.micrometer/micrometer-registry-prometheus/1.11.4, Apache-2.0, approved, #9805
maven/mavencentral/io.minio/minio/8.5.6, Apache-2.0, approved, #9097
maven/mavencentral/io.netty.incubator/netty-incubator-transport-classes-io_uring/0.0.21.Final, Apache-2.0, approved, #9622
Expand Down Expand Up @@ -174,7 +174,7 @@ maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.15, Apache
maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.16, Apache-2.0, approved, #11362
maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.15, Apache-2.0, approved, #5929
maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.15, Apache-2.0, approved, #5919
maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.3, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, ee4j.cdi
maven/mavencentral/jakarta.json/jakarta.json-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
Expand All @@ -183,7 +183,7 @@ maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR
maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jta
maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation
maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.1, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.2, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/javax.jms/javax.jms-api/2.0.1, CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0, approved, #1516
maven/mavencentral/joda-time/joda-time/2.10.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
Expand All @@ -209,9 +209,9 @@ maven/mavencentral/net.sf.saxon/Saxon-HE/10.6, MPL-2.0 AND W3C, approved, #7945
maven/mavencentral/org.apache.commons/commons-compress/1.24.0, Apache-2.0 AND BSD-3-Clause AND bzip2-1.0.6 AND LicenseRef-Public-Domain, approved, #10368
maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apache.commons/commons-pool2/2.11.1, Apache-2.0, approved, CQ23795
maven/mavencentral/org.apache.groovy/groovy-json/4.0.18, Apache-2.0, approved, #7411
maven/mavencentral/org.apache.groovy/groovy-xml/4.0.18, Apache-2.0, approved, #10179
maven/mavencentral/org.apache.groovy/groovy/4.0.18, Apache-2.0 AND BSD-3-Clause AND MIT, approved, #1742
maven/mavencentral/org.apache.groovy/groovy-json/4.0.20, Apache-2.0, approved, #7411
maven/mavencentral/org.apache.groovy/groovy-xml/4.0.20, Apache-2.0, approved, #10179
maven/mavencentral/org.apache.groovy/groovy/4.0.20, Apache-2.0 AND BSD-3-Clause AND MIT, approved, #1742
maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527
maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.16, Apache-2.0, approved, CQ23528
maven/mavencentral/org.apache.httpcomponents/httpmime/4.5.13, Apache-2.0, approved, CQ11718
Expand Down Expand Up @@ -426,44 +426,44 @@ maven/mavencentral/org.slf4j/slf4j-api/2.0.12, MIT, approved, #5915
maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.2.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.2.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.2.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.1.9, Apache-2.0, approved, #9348
maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.1.9, Apache-2.0, approved, #9342
maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.1.9, Apache-2.0, approved, #9341
maven/mavencentral/org.springframework.boot/spring-boot-configuration-metadata/3.1.9, Apache-2.0, approved, #11032
maven/mavencentral/org.springframework.boot/spring-boot-properties-migrator/3.1.9, Apache-2.0, approved, #10675
maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.1.9, Apache-2.0, approved, #9344
maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.1.9, Apache-2.0, approved, #9338
maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.1.9, Apache-2.0, approved, #9336
maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/3.1.9, Apache-2.0, approved, #8800
maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.1.9, Apache-2.0, approved, #9343
maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.1.9, Apache-2.0, approved, #8806
maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.1.9, Apache-2.0, approved, #9337
maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.1.9, Apache-2.0, approved, #9353
maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.1.9, Apache-2.0, approved, #9351
maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.1.9, Apache-2.0, approved, #9335
maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.1.9, Apache-2.0, approved, #9347
maven/mavencentral/org.springframework.boot/spring-boot-starter/3.1.9, Apache-2.0, approved, #9349
maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.1.9, Apache-2.0, approved, #9339
maven/mavencentral/org.springframework.boot/spring-boot-test/3.1.9, Apache-2.0, approved, #9346
maven/mavencentral/org.springframework.boot/spring-boot/3.1.9, Apache-2.0, approved, #9352
maven/mavencentral/org.springframework.data/spring-data-commons/3.1.9, Apache-2.0, approved, #8805
maven/mavencentral/org.springframework.security/spring-security-config/6.1.7, Apache-2.0, approved, #9736
maven/mavencentral/org.springframework.security/spring-security-core/6.1.7, Apache-2.0, approved, #9801
maven/mavencentral/org.springframework.security/spring-security-crypto/6.1.7, Apache-2.0 AND ISC, approved, #9735
maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.1.7, Apache-2.0, approved, #9740
maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.1.7, Apache-2.0, approved, #9741
maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.1.7, Apache-2.0, approved, #9345
maven/mavencentral/org.springframework.security/spring-security-test/6.1.7, Apache-2.0, approved, #10674
maven/mavencentral/org.springframework.security/spring-security-web/6.1.7, Apache-2.0, approved, #9800
maven/mavencentral/org.springframework/spring-aop/6.0.17, Apache-2.0, approved, #5940
maven/mavencentral/org.springframework/spring-beans/6.0.17, Apache-2.0, approved, #5937
maven/mavencentral/org.springframework/spring-context/6.0.17, Apache-2.0, approved, #5936
maven/mavencentral/org.springframework/spring-core/6.0.17, Apache-2.0 AND BSD-3-Clause, approved, #5948
maven/mavencentral/org.springframework/spring-expression/6.0.17, Apache-2.0, approved, #3284
maven/mavencentral/org.springframework/spring-jcl/6.0.17, Apache-2.0, approved, #3283
maven/mavencentral/org.springframework/spring-test/6.0.17, Apache-2.0, approved, #7003
maven/mavencentral/org.springframework/spring-web/6.0.17, Apache-2.0, approved, #5942
maven/mavencentral/org.springframework/spring-webmvc/6.0.17, Apache-2.0, approved, #5944
maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.1.10, Apache-2.0, approved, #9348
maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.1.10, Apache-2.0, approved, #9342
maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.1.10, Apache-2.0, approved, #9341
maven/mavencentral/org.springframework.boot/spring-boot-configuration-metadata/3.1.10, Apache-2.0, approved, #11032
maven/mavencentral/org.springframework.boot/spring-boot-properties-migrator/3.1.10, Apache-2.0, approved, #10675
maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.1.10, Apache-2.0, approved, #9344
maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.1.10, Apache-2.0, approved, #9338
maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.1.10, Apache-2.0, approved, #9336
maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/3.1.10, Apache-2.0, approved, #8800
maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.1.10, Apache-2.0, approved, #9343
maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.1.10, Apache-2.0, approved, #8806
maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.1.10, Apache-2.0, approved, #9337
maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.1.10, Apache-2.0, approved, #9353
maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.1.10, Apache-2.0, approved, #9351
maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.1.10, Apache-2.0, approved, #9335
maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.1.10, Apache-2.0, approved, #9347
maven/mavencentral/org.springframework.boot/spring-boot-starter/3.1.10, Apache-2.0, approved, #9349
maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.1.10, Apache-2.0, approved, #9339
maven/mavencentral/org.springframework.boot/spring-boot-test/3.1.10, Apache-2.0, approved, #9346
maven/mavencentral/org.springframework.boot/spring-boot/3.1.10, Apache-2.0, approved, #9352
maven/mavencentral/org.springframework.data/spring-data-commons/3.1.10, Apache-2.0, approved, #8805
maven/mavencentral/org.springframework.security/spring-security-config/6.1.8, Apache-2.0, approved, #9736
maven/mavencentral/org.springframework.security/spring-security-core/6.1.8, Apache-2.0, approved, #9801
maven/mavencentral/org.springframework.security/spring-security-crypto/6.1.8, Apache-2.0 AND ISC, approved, #9735
maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.1.8, Apache-2.0, approved, #9740
maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.1.8, Apache-2.0, approved, #9741
maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.1.8, Apache-2.0, approved, #9345
maven/mavencentral/org.springframework.security/spring-security-test/6.1.8, Apache-2.0, approved, #10674
maven/mavencentral/org.springframework.security/spring-security-web/6.1.8, Apache-2.0, approved, #9800
maven/mavencentral/org.springframework/spring-aop/6.0.18, Apache-2.0, approved, #5940
maven/mavencentral/org.springframework/spring-beans/6.0.18, Apache-2.0, approved, #5937
maven/mavencentral/org.springframework/spring-context/6.0.18, Apache-2.0, approved, #5936
maven/mavencentral/org.springframework/spring-core/6.0.18, Apache-2.0 AND BSD-3-Clause, approved, #5948
maven/mavencentral/org.springframework/spring-expression/6.0.18, Apache-2.0, approved, #3284
maven/mavencentral/org.springframework/spring-jcl/6.0.18, Apache-2.0, approved, #3283
maven/mavencentral/org.springframework/spring-test/6.0.18, Apache-2.0, approved, #7003
maven/mavencentral/org.springframework/spring-web/6.0.18, Apache-2.0, approved, #5942
maven/mavencentral/org.springframework/spring-webmvc/6.0.18, Apache-2.0, approved, #5944
maven/mavencentral/org.testcontainers/junit-jupiter/1.18.3, MIT, approved, #7941
maven/mavencentral/org.testcontainers/junit-jupiter/1.19.1, MIT, approved, #10344
maven/mavencentral/org.testcontainers/testcontainers/1.18.3, MIT, approved, #7938
Expand Down
2 changes: 0 additions & 2 deletions charts/irs-helm/templates/configmap-spring-app-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ data:
{{- end }}
{{- end }}

apiAllowedBpn: {{ tpl (.Values.bpn | default "") . | quote }}

{{- if .Values.config.content }}
{{- tpl (toYaml .Values.config.content) . | nindent 4 }}
{{- end }}
Loading
Loading