autorun components via ApplicationRunner interface

README.md

@@ -9,3 +9,13 @@ Fehler und Verbesserungsvorschläge können gerne als [Github Issue](https://git
 oder Pull Request eingestellt werden. Wir freuen uns über Mitwirkung!
 
 Kontakt: [email protected]
+
+## Ausfuehrung
+
+```
+# Normale Ausfuehrung der LDAP Synchronisation
+java -jar -Dspring.profiles.active=prod ldap-sync-1.2.0.jar 
+
+# Zusaetzlich mit Ausgabe von verwaisten Benutzern (in keiner Berechtigungsgruppe) in LDAP Verzeichnis
+java -jar -Dspring.profiles.active=prod ldap-sync-1.2.0.jar --orphaned
+```

build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'de.pfadfinden.mv'
-version = '1.1.0'
+version = '1.2.0'
 description = 'Sync tool of BdP membership administration and user directory'
 
 sourceCompatibility = '1.8'

src/main/java/de/pfadfinden/mv/LdapSyncApplication.java

@@ -1,44 +1,13 @@
 package de.pfadfinden.mv;
 
-import de.pfadfinden.mv.command.CommandGruppen;
-import de.pfadfinden.mv.command.CommandGruppierungen;
-import de.pfadfinden.mv.command.CommandOrphanedPersons;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class LdapSyncApplication implements CommandLineRunner {
-
-    private final static Logger logger = LoggerFactory.getLogger(LdapSyncApplication.class);
-
-    private CommandGruppierungen commandGruppierungen;
-    private CommandGruppen commandGruppen;
-    private CommandOrphanedPersons commandOrphanedPersons;
-
-    public LdapSyncApplication(CommandGruppierungen commandGruppierungen,
-                               CommandGruppen commandGruppen,
-                               CommandOrphanedPersons commandOrphanedPersons) {
-        this.commandGruppierungen = commandGruppierungen;
-        this.commandGruppen = commandGruppen;
-        this.commandOrphanedPersons = commandOrphanedPersons;
-    }
+public class LdapSyncApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(LdapSyncApplication.class, args);
+        System.exit(SpringApplication.exit(SpringApplication.run(LdapSyncApplication.class, args)));
     }
 
-    @Override
-    public void run(String... args) {
-
-        logger.info("Start MV LDAP Sync");
-
-        this.commandGruppierungen.exec();
-        this.commandGruppen.exec();
-//        this.commandOrphanedPersons.exec();
-
-        System.exit(0);
-    }
 }

src/main/java/de/pfadfinden/mv/command/CommandGruppen.java

@@ -18,6 +18,9 @@
 import org.apache.directory.ldap.client.template.LdapConnectionTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -26,7 +29,8 @@
 import java.util.Set;
 
 @Component
-public class CommandGruppen {
+@Order(20)
+public class CommandGruppen implements ApplicationRunner {
     private final Logger logger = LoggerFactory.getLogger(CommandGruppen.class);
 
     private final CommandIdentitaet commandIdentitaet;
@@ -44,7 +48,8 @@ public CommandGruppen(CommandIdentitaet commandIdentitaet,
         this.ldapEntryService = ldapEntryService;
     }
 
-    public void exec() {
+    @Override
+    public void run(ApplicationArguments args) {
         List<SyncBerechtigungsgruppe> syncBerechtigungsgruppeList = this.syncService.getSyncGruppen();
 
         for(SyncBerechtigungsgruppe berechtigungsgruppe : syncBerechtigungsgruppeList) {
@@ -134,4 +139,5 @@ private void updateBerechtigungsgruppe(SyncBerechtigungsgruppe berechtigungsgrup
             logger.error(modifyResponse.getLdapResult().getDiagnosticMessage());
         }
     }
+
 }

src/main/java/de/pfadfinden/mv/command/CommandGruppierungen.java

@@ -14,14 +14,18 @@
 import org.apache.directory.api.util.GeneralizedTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
 @Component
-public class CommandGruppierungen {
+@Order(10)
+public class CommandGruppierungen implements ApplicationRunner {
     private final Logger logger = LoggerFactory.getLogger(CommandGruppierungen.class);
 
     private IcaService icaService;
@@ -32,7 +36,8 @@ public CommandGruppierungen(IcaService icaService, LdapEntryService ldapEntrySer
         this.ldapEntryService = ldapEntryService;
     }
 
-    public void exec() {
+    @Override
+    public void run(ApplicationArguments args) {
         List<IcaGruppierung> icaGruppierungList = this.icaService.getGruppierungen();
         for(IcaGruppierung icaGruppierung : icaGruppierungList){
             execGruppierung(icaGruppierung);

src/main/java/de/pfadfinden/mv/command/CommandOrphanedPersons.java

@@ -4,12 +4,16 @@
 import de.pfadfinden.mv.service.LdapEntryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 @Component
-public class CommandOrphanedPersons {
+@Order(50)
+public class CommandOrphanedPersons implements ApplicationRunner {
     private final Logger logger = LoggerFactory.getLogger(CommandOrphanedPersons.class);
 
     private final LdapEntryService ldapEntryService;
@@ -18,8 +22,14 @@ public CommandOrphanedPersons(LdapEntryService ldapEntryService) {
         this.ldapEntryService = ldapEntryService;
     }
 
-    public void exec() {
+    @Override
+    public void run(ApplicationArguments args) {
+        if(args.containsOption("orphaned")) this.logOrphanedPersons();
+    }
+
+    private void logOrphanedPersons() {
         List<IcaIdentitaet> identitaetList = ldapEntryService.findOrphanedPersons();
         identitaetList.forEach(icaIdentitaet -> logger.info("Orphaned User: {} {}",icaIdentitaet.getIcaId(),icaIdentitaet.getCn()));
     }
+
 }