From 44358ee4f829dcf165a29e91fffc228e139c6406 Mon Sep 17 00:00:00 2001
From: jpmsilva <30354367+jpmsilva@users.noreply.github.com>
Date: Tue, 9 Oct 2018 00:41:44 +0100
Subject: [PATCH] Removed reliance on generic types

---
 .../github/jpmsilva/jsystemd/annotations.xml  | 19 +++++++++++++++++--
 .../jsystemd/SystemdAutoConfiguration.java    | 14 ++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/jsystemd-spring-boot-starter/src/main/annotations/com/github/jpmsilva/jsystemd/annotations.xml b/jsystemd-spring-boot-starter/src/main/annotations/com/github/jpmsilva/jsystemd/annotations.xml
index eb0863a..11daf1a 100644
--- a/jsystemd-spring-boot-starter/src/main/annotations/com/github/jpmsilva/jsystemd/annotations.xml
+++ b/jsystemd-spring-boot-starter/src/main/annotations/com/github/jpmsilva/jsystemd/annotations.xml
@@ -4,24 +4,39 @@
       <val val="&quot;WeakerAccess&quot;"/>
     </annotation>
   </item>
-  <item
-    name='com.github.jpmsilva.jsystemd.SystemdAutoConfiguration org.springframework.context.ApplicationListener&lt;org.springframework.boot.context.event.ApplicationReadyEvent&gt; systemdApplicationReadyListener(com.github.jpmsilva.jsystemd.Systemd) 0'>
+  <item name='com.github.jpmsilva.jsystemd.SystemdAutoConfiguration SystemdAutoConfiguration(com.github.jpmsilva.jsystemd.Systemd) 0'>
     <annotation name='java.lang.SuppressWarnings'>
       <val val="&quot;SpringJavaInjectionPointsAutowiringInspection&quot;"/>
     </annotation>
   </item>
+  <item name='com.github.jpmsilva.jsystemd.SystemdAutoConfiguration void started(org.springframework.boot.context.event.ApplicationReadyEvent) 0'>
+    <annotation name='java.lang.SuppressWarnings'>
+      <val val="&quot;unused&quot;"/>
+    </annotation>
+  </item>
   <item
     name='com.github.jpmsilva.jsystemd.SystemdAutoConfiguration.SystemdStatusProviderConfiguration SystemdStatusProviderConfiguration(com.github.jpmsilva.jsystemd.Systemd, org.springframework.beans.factory.ObjectProvider&lt;java.util.List&lt;com.github.jpmsilva.jsystemd.SystemdNotifyStatusProvider&gt;&gt;) 0'>
     <annotation name='java.lang.SuppressWarnings'>
       <val val="&quot;SpringJavaInjectionPointsAutowiringInspection&quot;"/>
     </annotation>
   </item>
+  <item
+    name='com.github.jpmsilva.jsystemd.SystemdAutoConfiguration.SystemdStatusProviderConfiguration SystemdStatusProviderConfiguration(com.github.jpmsilva.jsystemd.Systemd, org.springframework.context.ConfigurableApplicationContext, org.springframework.beans.factory.ObjectProvider&lt;java.util.List&lt;com.github.jpmsilva.jsystemd.SystemdNotifyStatusProvider&gt;&gt;) 0'>
+    <annotation name='java.lang.SuppressWarnings'>
+      <val val="&quot;SpringJavaInjectionPointsAutowiringInspection&quot;"/>
+    </annotation>
+  </item>
   <item
     name='com.github.jpmsilva.jsystemd.SystemdNotifyApplicationRunStatusProvider.ApplicationState'>
     <annotation name='java.lang.SuppressWarnings'>
       <val val="&quot;unused&quot;"/>
     </annotation>
   </item>
+  <item name='com.github.jpmsilva.jsystemd.SystemdNotifyTomcatStatusProvider SystemdNotifyTomcatStatusProvider()'>
+    <annotation name='java.lang.SuppressWarnings'>
+      <val val="&quot;WeakerAccess&quot;"/>
+    </annotation>
+  </item>
   <item
     name='com.github.jpmsilva.jsystemd.SystemdSpringApplicationRunListener SystemdSpringApplicationRunListener(org.springframework.boot.SpringApplication, java.lang.String[]) 1'>
     <annotation name='java.lang.SuppressWarnings'>
diff --git a/jsystemd-spring-boot-starter/src/main/java/com/github/jpmsilva/jsystemd/SystemdAutoConfiguration.java b/jsystemd-spring-boot-starter/src/main/java/com/github/jpmsilva/jsystemd/SystemdAutoConfiguration.java
index baf87c5..96523e2 100644
--- a/jsystemd-spring-boot-starter/src/main/java/com/github/jpmsilva/jsystemd/SystemdAutoConfiguration.java
+++ b/jsystemd-spring-boot-starter/src/main/java/com/github/jpmsilva/jsystemd/SystemdAutoConfiguration.java
@@ -30,10 +30,10 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
 
 /**
@@ -47,10 +47,16 @@
 @ConditionalOnSystemd
 public class SystemdAutoConfiguration {
 
-  @Bean
+  private final Systemd systemd;
+
   @Autowired
-  ApplicationListener<ApplicationReadyEvent> systemdApplicationReadyListener(Systemd systemd) {
-    return event -> systemd.ready();
+  public SystemdAutoConfiguration(Systemd systemd) {
+    this.systemd = systemd;
+  }
+
+  @EventListener
+  public void started (ApplicationReadyEvent event) {
+    systemd.ready();
   }
 
   @Bean