Merge pull request #229 from deftdevs/spring-java

Use Spring Java instead of Sprint Scanner to resolve dependencies

Author: pathob

.doc/CODE_CONVENTIONS.adoc

@@ -157,15 +157,15 @@ public interface EntitiesResource {
 ----
 @Path(BootstrAPI.ENTITIES)
 @ResourceFilters(AdminOnlyResourceFilter.class)
-@Component
 public class EntitiesResourceImpl implements EntitiesResource {
 
     private static final Logger log = LoggerFactory.getLogger(EntitiesResourceImpl.class);
 
     private final EntitiesService entitiesService;
 
-    @Inject
-    public EntitiesResourceImpl(EntitiesService entitiesService) {
+    public EntitiesResourceImpl(
+            final EntitiesService entitiesService) {
+
         this.entitiesService = entitiesService;
     }
 

commons/pom.xml

@@ -141,12 +141,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>

commons/src/main/java/com/deftdevs/bootstrapi/commons/rest/AbstractPermissionsResourceImpl.java

@@ -3,18 +3,14 @@
 import com.deftdevs.bootstrapi.commons.model.PermissionsGlobalModel;
 import com.deftdevs.bootstrapi.commons.rest.api.PermissionsResource;
 import com.deftdevs.bootstrapi.commons.service.api.PermissionsService;
-import org.springframework.stereotype.Component;
 
-import javax.inject.Inject;
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.core.Response;
 
-@Component
 public abstract class AbstractPermissionsResourceImpl implements PermissionsResource {
 
     private final PermissionsService permissionsService;
 
-    @Inject
     public AbstractPermissionsResourceImpl(PermissionsService permissionsService) {
         this.permissionsService = permissionsService;
     }

commons/src/main/java/com/deftdevs/bootstrapi/commons/rest/AbstractSettingsSecurityResourceImpl.java

@@ -4,15 +4,13 @@
 import com.deftdevs.bootstrapi.commons.rest.api.SettingsSecurityResource;
 import com.deftdevs.bootstrapi.commons.service.api.SettingsSecurityService;
 
-import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 
 public abstract class AbstractSettingsSecurityResourceImpl<B extends SettingsSecurityModel, S extends SettingsSecurityService<B>>
         implements SettingsSecurityResource<B> {
 
     private final S settingsSecurityService;
 
-    @Inject
     public AbstractSettingsSecurityResourceImpl(
             final S settingsSecurityService) {
 

confluence/it.log

@@ -49,9 +49,9 @@
     </developers>
 
     <properties>
-        <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
         <confluence.version>8.5.22</confluence.version>
         <confluence.data.version>8.5.6</confluence.data.version>
+        <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
         <ajp.port>8109</ajp.port>
         <!-- other properties -->
         <confluence.ancillary.plugins.version>20.0.41</confluence.ancillary.plugins.version>
@@ -206,26 +206,31 @@
         </dependency>
 
         <dependency>
-            <groupId>com.atlassian.plugin</groupId>
-            <artifactId>atlassian-spring-scanner-annotation</artifactId>
+            <groupId>com.atlassian.plugins</groupId>
+            <artifactId>atlassian-plugins-osgi-javaconfig</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <artifactId>spring-beans</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>jakarta.ws.rs</groupId>
-            <artifactId>jakarta.ws.rs-api</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -329,19 +334,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>com.atlassian.plugin</groupId>
-                <artifactId>atlassian-spring-scanner-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>atlassian-spring-scanner</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin</artifactId>

confluence/pom.xml

@@ -0,0 +1,16 @@
+package com.deftdevs.bootstrapi.confluence;
+
+import com.deftdevs.bootstrapi.confluence.config.AtlassianConfig;
+import com.deftdevs.bootstrapi.confluence.config.HelperConfig;
+import com.deftdevs.bootstrapi.confluence.config.ServiceConfig;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({
+        AtlassianConfig.class,
+        HelperConfig.class,
+        ServiceConfig.class,
+})
+public class AppConfig {
+}

confluence/src/main/java/com/deftdevs/bootstrapi/confluence/AppConfig.java

@@ -0,0 +1,167 @@
+package com.deftdevs.bootstrapi.confluence.config;
+
+import com.atlassian.applinks.core.ApplinkStatusService;
+import com.atlassian.applinks.spi.auth.AuthenticationConfigurationManager;
+import com.atlassian.applinks.spi.link.MutatingApplicationLinkService;
+import com.atlassian.applinks.spi.util.TypeAccessor;
+import com.atlassian.cache.CacheManager;
+import com.atlassian.confluence.languages.LocaleManager;
+import com.atlassian.confluence.plugins.lookandfeel.SiteLogoManager;
+import com.atlassian.confluence.security.PermissionManager;
+import com.atlassian.confluence.security.SpacePermissionManager;
+import com.atlassian.confluence.setup.settings.GlobalSettingsManager;
+import com.atlassian.confluence.themes.ColourSchemeManager;
+import com.atlassian.confluence.user.UserAccessor;
+import com.atlassian.crowd.embedded.api.CrowdDirectoryService;
+import com.atlassian.favicon.core.FaviconManager;
+import com.atlassian.gadgets.directory.spi.ExternalGadgetSpecStore;
+import com.atlassian.gadgets.spec.GadgetSpecFactory;
+import com.atlassian.mail.server.MailServerManager;
+import com.atlassian.oauth.consumer.ConsumerService;
+import com.atlassian.oauth.consumer.ConsumerTokenStore;
+import com.atlassian.oauth.serviceprovider.ServiceProviderConsumerStore;
+import com.atlassian.oauth.serviceprovider.ServiceProviderTokenStore;
+import com.atlassian.plugins.authentication.api.config.IdpConfigService;
+import com.atlassian.plugins.authentication.api.config.SsoConfigService;
+import com.atlassian.sal.api.ApplicationProperties;
+import com.atlassian.sal.api.license.LicenseHandler;
+import com.atlassian.user.UserManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static com.atlassian.plugins.osgi.javaconfig.OsgiServices.importOsgiService;
+
+@Configuration
+public class AtlassianConfig {
+
+    @Bean
+    public ApplicationProperties applicationProperties() {
+        return importOsgiService(ApplicationProperties.class);
+    }
+
+    @Bean
+    public ApplinkStatusService applinkStatusService() {
+        return importOsgiService(ApplinkStatusService.class);
+    }
+
+    @Bean
+    public AuthenticationConfigurationManager authenticationConfigurationManager() {
+        return importOsgiService(AuthenticationConfigurationManager.class);
+    }
+
+    @Bean
+    public CacheManager cacheManager() {
+        return importOsgiService(CacheManager.class);
+    }
+
+    @Bean
+    public ColourSchemeManager colourSchemeManager() {
+        return importOsgiService(ColourSchemeManager.class);
+    }
+
+    @Bean
+    public ConsumerService consumerService() {
+        return importOsgiService(ConsumerService.class);
+    }
+
+    @Bean
+    public ConsumerTokenStore consumerTokenStore() {
+        return importOsgiService(ConsumerTokenStore.class);
+    }
+
+    @Bean
+    public CrowdDirectoryService crowdDirectoryService() {
+        return importOsgiService(CrowdDirectoryService.class);
+    }
+
+    @Bean
+    public ExternalGadgetSpecStore externalGadgetSpecStore() {
+        return importOsgiService(ExternalGadgetSpecStore.class);
+    }
+
+    @Bean
+    public FaviconManager faviconManager() {
+        return importOsgiService(FaviconManager.class);
+    }
+
+    @Bean
+    public GadgetSpecFactory gadgetSpecFactory() {
+        return importOsgiService(GadgetSpecFactory.class);
+    }
+
+    @Bean
+    public GlobalSettingsManager globalSettingsManager() {
+        return importOsgiService(GlobalSettingsManager.class);
+    }
+
+    @Bean
+    public IdpConfigService idpConfigService() {
+        return importOsgiService(IdpConfigService.class);
+    }
+
+    @Bean
+    public LicenseHandler licenseHandler() {
+        return importOsgiService(LicenseHandler.class);
+    }
+
+    @Bean
+    public LocaleManager localeManager() {
+        return importOsgiService(LocaleManager.class);
+    }
+
+    @Bean
+    public MailServerManager mailServerManager() {
+        return importOsgiService(MailServerManager.class);
+    }
+
+    @Bean
+    public MutatingApplicationLinkService mutatingApplicationLinkService() {
+        return importOsgiService(MutatingApplicationLinkService.class);
+    }
+
+    @Bean
+    public PermissionManager permissionManager() {
+        return importOsgiService(PermissionManager.class);
+    }
+
+    @Bean
+    public ServiceProviderConsumerStore serviceProviderConsumerStore() {
+        return importOsgiService(ServiceProviderConsumerStore.class);
+    }
+
+    @Bean
+    public ServiceProviderTokenStore serviceProviderTokenStore() {
+        return importOsgiService(ServiceProviderTokenStore.class);
+    }
+
+    @Bean
+    public SiteLogoManager siteLogoManager() {
+        return importOsgiService(SiteLogoManager.class);
+    }
+
+    @Bean
+    public SpacePermissionManager spacePermissionManager() {
+        return importOsgiService(SpacePermissionManager.class);
+    }
+
+    @Bean
+    public SsoConfigService ssoConfigService() {
+        return importOsgiService(SsoConfigService.class);
+    }
+
+    @Bean
+    public TypeAccessor typeAccessor() {
+        return importOsgiService(TypeAccessor.class);
+    }
+
+    @Bean
+    public UserAccessor userAccessor() {
+        return importOsgiService(UserAccessor.class);
+    }
+
+    @Bean
+    public UserManager userManager() {
+        return importOsgiService(UserManager.class);
+    }
+
+}

confluence/src/main/java/com/deftdevs/bootstrapi/confluence/config/AtlassianConfig.java

@@ -0,0 +1,25 @@
+package com.deftdevs.bootstrapi.confluence.config;
+
+import com.deftdevs.bootstrapi.commons.helper.api.ApplicationLinksAuthConfigHelper;
+import com.deftdevs.bootstrapi.confluence.helper.ApplicationLinksAuthConfigHelperImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class HelperConfig {
+
+    @Autowired
+    private AtlassianConfig atlassianConfig;
+
+    @Bean
+    public ApplicationLinksAuthConfigHelper applicationLinksAuthConfigHelper() {
+        return new ApplicationLinksAuthConfigHelperImpl(
+                atlassianConfig.authenticationConfigurationManager(),
+                atlassianConfig.consumerService(),
+                atlassianConfig.consumerTokenStore(),
+                atlassianConfig.serviceProviderConsumerStore(),
+                atlassianConfig.serviceProviderTokenStore());
+    }
+
+}