Merged in bugfix/EL-363-element-dependencies-arent-consid (pull request #183)

EL-363: Added fixes for module dependencie.

Author: patrickt

deployment-jetty/src/main/java/dev/getelements/elements/deployment/jetty/loader/ElementBinder.java

@@ -19,15 +19,30 @@ public ElementBinder(final Element element) {
     @Override
     protected void configure() {
 
+        bindElement(element);
+
+        final var registry = element.getElementRegistry();
+
         element.getElementRecord()
+                .dependencies()
+                .stream()
+                .flatMap(dep -> dep.findDependencies(registry))
+                .distinct()
+                .forEach(this::bindElement);
+
+    }
+
+    private void bindElement(final Element source) {
+
+        source.getElementRecord()
                 .attributes()
                 .stream()
                 .filter(a -> a.value() != null)
                 .forEach(this::bindAttribute);
 
-        element.getElementRecord()
+        source.getElementRecord()
                 .services()
-                .forEach(this::bindService);
+                .forEach(service -> bindService(source, service));
 
     }
 
@@ -39,7 +54,7 @@ private <T> void bindAttribute(final Attribute<T> attribute) {
     }
 
     @SuppressWarnings("unchecked")
-    private <T> void bindService(final ElementServiceRecord service) {
+    private <T> void bindService(final Element source, final ElementServiceRecord service) {
 
         final var export = service.export();
         final var exposedTypes = export.exposed();
@@ -49,8 +64,8 @@ private <T> void bindService(final ElementServiceRecord service) {
         final Class<T> primaryType = (Class<T>) exposedTypes.getFirst();
 
         final Optional<Supplier<T>> found = export.isNamed()
-                ? element.getServiceLocator().findInstance(primaryType, export.name())
-                : element.getServiceLocator().findInstance(primaryType);
+                ? source.getServiceLocator().findInstance(primaryType, export.name())
+                : source.getServiceLocator().findInstance(primaryType);
 
         found.ifPresent(supplier -> {
             final var binding = bindFactory(supplier);

sdk-element-standard-kt/src/main/resources/archetype-resources/element/src/main/kotlin/__packageInPathFormat__/OpenAPISecurityConfig.kt

@@ -1,6 +1,5 @@
 package ${package}
 
-import dev.getelements.elements.sdk.jakarta.rs.AuthSchemes.SESSION_SECRET
 import io.swagger.v3.oas.annotations.ExternalDocumentation
 import io.swagger.v3.oas.annotations.OpenAPIDefinition
 import io.swagger.v3.oas.annotations.info.Contact
@@ -26,15 +25,15 @@ import io.swagger.v3.oas.annotations.enums.SecuritySchemeType.APIKEY
         description = "Please see the Namazu Elements Manual for more information."
     ),
     security = [
-        SecurityRequirement(name = SESSION_SECRET)
+        SecurityRequirement(name = dev.getelements.elements.sdk.model.Headers.SESSION_SECRET)
     ]
 )
 @SecuritySchemes(
     value = [SecurityScheme(
         type = APIKEY,
         `in` = HEADER,
-        name = SESSION_SECRET,
-        paramName = SESSION_SECRET,
+        name = dev.getelements.elements.sdk.model.Headers.SESSION_SECRET,
+        paramName = dev.getelements.elements.sdk.model.Headers.SESSION_SECRET,
         description = "Session secret required for authenticated endpoints"
     )]
 )

sdk-element-standard/src/main/resources/archetype-resources/element/src/main/java/OpenAPISecurityConfig.java

@@ -3,6 +3,7 @@
 #set( $symbol_escape = '\' )
 package ${package};
 
+import dev.get${artifactId}s.${artifactId}s.sdk.model.Headers;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Contact;
@@ -11,7 +12,6 @@
 import io.swagger.v3.oas.annotations.security.SecurityScheme;
 import io.swagger.v3.oas.annotations.security.SecuritySchemes;
 
-import static dev.getelements.elements.sdk.jakarta.rs.AuthSchemes.SESSION_SECRET;
 import static io.swagger.v3.oas.annotations.enums.SecuritySchemeIn.HEADER;
 import static io.swagger.v3.oas.annotations.enums.SecuritySchemeType.APIKEY;
 
@@ -30,15 +30,15 @@
                 description = "Please see the Namazu Elements Manual for more information."
         ),
         security = {
-                @SecurityRequirement(name = SESSION_SECRET)
+                @SecurityRequirement(name = dev.getelements.elements.sdk.model.Headers.SESSION_SECRET)
         }
 )
 @SecuritySchemes({
         @SecurityScheme(
                 type = APIKEY,
                 in = HEADER,
-                name = SESSION_SECRET,
-                paramName = SESSION_SECRET,
+                name = dev.getelements.elements.sdk.model.Headers.SESSION_SECRET,
+                paramName = dev.getelements.elements.sdk.model.Headers.SESSION_SECRET,
                 description = "Session secret required for authenticated endpoints")
 })
 public class OpenAPISecurityConfig {}

…ents/elements/service/util/Services.java …ments/elements/sdk/service/Services.javaservice/src/main/java/dev/getelements/elements/service/util/Services.java renamed to sdk-service/src/main/java/dev/getelements/elements/sdk/service/Services.java service/src/main/java/dev/getelements/elements/service/util/Services.java renamed to sdk-service/src/main/java/dev/getelements/elements/sdk/service/Services.java

@@ -1,4 +1,4 @@
-package dev.getelements.elements.service.util;
+package dev.getelements.elements.sdk.service;
 
 import dev.getelements.elements.sdk.model.exception.ForbiddenException;
 import dev.getelements.elements.sdk.model.exception.NotImplementedException;

service/src/main/java/dev/getelements/elements/service/appleiap/AppleIapReceiptServiceProvider.java

@@ -2,7 +2,7 @@
 
 import dev.getelements.elements.sdk.model.user.User;
 import dev.getelements.elements.sdk.service.appleiap.AppleIapReceiptService;
-import dev.getelements.elements.service.util.Services;
+import dev.getelements.elements.sdk.service.Services;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;

service/src/main/java/dev/getelements/elements/service/application/ApplicationStatusServiceProvider.java

@@ -5,7 +5,7 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 
-import static dev.getelements.elements.service.util.Services.forbidden;
+import static dev.getelements.elements.sdk.service.Services.forbidden;
 
 public class ApplicationStatusServiceProvider implements Provider<ElementStatusService> {
 

service/src/main/java/dev/getelements/elements/service/application/FirebaseApplicationConfigurationServiceProvider.java

@@ -6,7 +6,7 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 
-import static dev.getelements.elements.service.util.Services.forbidden;
+import static dev.getelements.elements.sdk.service.Services.forbidden;
 
 public class FirebaseApplicationConfigurationServiceProvider implements Provider<FirebaseApplicationConfigurationService> {
 

service/src/main/java/dev/getelements/elements/service/application/MatchmakingConfigurationServiceProvider.java

@@ -6,7 +6,7 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 
-import static dev.getelements.elements.service.util.Services.forbidden;
+import static dev.getelements.elements.sdk.service.Services.forbidden;
 
 public class MatchmakingConfigurationServiceProvider implements Provider<MatchmakingApplicationConfigurationService> {
 

service/src/main/java/dev/getelements/elements/service/application/PSNApplicationConfigurationServiceProvider.java

@@ -2,7 +2,7 @@
 
 import dev.getelements.elements.sdk.model.user.User;
 import dev.getelements.elements.sdk.service.application.PSNApplicationConfigurationService;
-import dev.getelements.elements.service.util.Services;
+import dev.getelements.elements.sdk.service.Services;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;

service/src/main/java/dev/getelements/elements/service/auth/AuthSchemeServiceProvider.java

@@ -7,7 +7,7 @@
 import jakarta.inject.Provider;
 
 import static dev.getelements.elements.sdk.model.user.User.Level.SUPERUSER;
-import static dev.getelements.elements.service.util.Services.forbidden;
+import static dev.getelements.elements.sdk.service.Services.forbidden;
 
 public class AuthSchemeServiceProvider implements Provider<AuthSchemeService> {