Merge with wip-di-support

Author: sleipnir

README.md

@@ -99,4 +99,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

cloudstate-springboot-starter/pom.xml

@@ -7,4 +7,4 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.METHOD})
-public @interface CloudstateContext {}
+public @interface CloudstateContext {}

cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/CloudstateContext.java

@@ -36,4 +36,4 @@ public CloudState cloudState(CloudstateEntityScan entityScan) throws Exception {
         return new CloudState();
     }
 
-}
+}

cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/autoconfigure/CloudstateAutoConfiguration.java

@@ -42,9 +42,9 @@ public void onApplicationEvent(ContextRefreshedEvent event) throws Exception {
                     log.error("Failure on Cloudstate Server startup", ex);
                     return Done.done();
                 }).thenAccept(done -> {
-            Duration timeElapsed = Duration.between(start, Instant.now());
-            log.debug("Cloudstate Server keep alived for {}", timeElapsed);
-        });
+                    Duration timeElapsed = Duration.between(start, Instant.now());
+                    log.debug("Cloudstate Server keep alived for {}", timeElapsed);
+                });
     }
 
-}
+}

cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/autoconfigure/CloudstateBeanInitialization.java

@@ -35,4 +35,4 @@ public String getUserFunctionPackageName() {
     public void setUserFunctionPackageName(String userFunctionPackageName) {
         this.userFunctionPackageName = userFunctionPackageName;
     }
-}
+}

cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/autoconfigure/CloudstateProperties.java

@@ -30,4 +30,4 @@ public Object create(EntityContext entityContext) {
     public Class<?> entityClass() {
         return entity.getEntityClass();
     }
-}
+}

cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/internal/BaseEntitySupportFactory.java

@@ -29,12 +29,11 @@
 import java.util.stream.Stream;
 
 public final class CloudstateEntityScan implements EntityScan {
-    private static final Logger log = LoggerFactory.getLogger(CloudstateEntityScan.class);
+    Logger log = LoggerFactory.getLogger(CloudstateEntityScan.class);
 
     private final ApplicationContext context;
     private final CloudstateProperties properties;
     private final ClassGraph classGraph;
-    private List<Entity> entities;
 
     public CloudstateProperties getProperties() {
         return properties;
@@ -64,10 +63,6 @@ public CloudstateEntityScan(ApplicationContext context, final CloudstateProperti
     }
 
     public List<Entity> findEntities() {
-        if(Objects.nonNull(entities) && !entities.isEmpty()) {
-            return entities;
-        }
-
         Instant now = Instant.now();
         List<Entity> crdtEntities = getCrdtDescriptors();
         List<Entity> eventSourcedEntities = getEventSourcedDescriptors();
@@ -77,10 +72,8 @@ public List<Entity> findEntities() {
             log.warn("No declared descriptor");
         }
 
-        entities = Stream.concat(crdtEntities.stream(), eventSourcedEntities.stream())
+        return Stream.concat(crdtEntities.stream(), eventSourcedEntities.stream())
                 .collect(Collectors.toList());
-
-        return entities;
     }
 
     private List<Entity> getCrdtDescriptors() {
@@ -92,11 +85,10 @@ private List<Entity> getEventSourcedDescriptors() {
     }
 
     private List<Class<?>> getClassAnnotationWith(Class<? extends Annotation> annotationType) {
-        if ( Objects.nonNull(this.properties) && Objects.nonNull(properties.getUserFunctionPackageName()) ) {
-            log.debug("Scanner set for {}", properties.getUserFunctionPackageName());
+        if ( Objects.nonNull(properties.getUserFunctionPackageName()) ) {
             ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false);
             scanner.addIncludeFilter(new AnnotationTypeFilter(annotationType));
-            Set<BeanDefinition> definitions = scanner.findCandidateComponents(this.properties.getUserFunctionPackageName());
+            Set<BeanDefinition> definitions = scanner.findCandidateComponents(properties.getUserFunctionPackageName());
 
             return definitions.stream()
                     .map(getBeanDefinitionClass())
@@ -136,34 +128,34 @@ private String decaptalized(String string) {
 
     private List<Entity> getEntities(Class<? extends Annotation> annotationType) {
         final List<Class<?>> eventSourcedEntities = getClassAnnotationWith(annotationType);
-        return eventSourcedEntities.stream()
-                .map(this::apply)
-                .collect(Collectors.toList());
-    }
-
-    private Entity apply(Class<?> entity) {
-        Descriptors.ServiceDescriptor descriptor = null;
-        Descriptors.FileDescriptor[] additionalDescriptors = null;
 
-        if (isaBeanDescriptorsType()) {
-            // Then verify if descriptor already declared with bean
-            descriptor = tryGetServiceDescriptor(entity, descriptor);
+        return eventSourcedEntities.stream().map(entity -> {
+            Descriptors.ServiceDescriptor descriptor = null;
+            Descriptors.FileDescriptor[] additionalDescriptors = null;
 
-            // Then verify if descriptor already declared with bean
-            additionalDescriptors = tryGetFileDescriptors(entity, additionalDescriptors);
+            for (Method method: entity.getDeclaredMethods()) {
 
-        } else {
-
-            for (Method method : entity.getDeclaredMethods()) {
-
-                if (method.isAnnotationPresent(EntityServiceDescriptor.class)) {
+                if (method.isAnnotationPresent(EntityServiceDescriptor.class)){
                     try {
                         method.setAccessible(true);
                         descriptor = ((Descriptors.ServiceDescriptor)
                                 method.invoke(null, null));
                     } catch (IllegalAccessException | InvocationTargetException e) {
                         log.error("Failure on load ServiceDescriptor", e);
                     }
+                } else {
+                    // Then verify if descriptor already declared with bean
+                    try{
+                        String serviceDescriptorBeanName = decaptalized(entity.getSimpleName() + "ServiceDescriptor");
+                        log.trace("Trying bind the ServiceDescriptor {}", serviceDescriptorBeanName);
+                        descriptor = (Descriptors.ServiceDescriptor) this.context
+                                .getBean(serviceDescriptorBeanName);
+                    } catch (Exception nbde) {
+                        if (nbde instanceof NoSuchBeanDefinitionException) {
+                            log.trace("No ServiceDescriptor Found");
+                        }
+                    }
+
                 }
 
                 if (method.isAnnotationPresent(EntityAdditionaDescriptors.class)) {
@@ -173,46 +165,26 @@ private Entity apply(Class<?> entity) {
                     } catch (IllegalAccessException | InvocationTargetException e) {
                         log.error("Failure on load AdditionalDescriptors", e);
                     }
-                }
-            }
-        }
-
-        Entity entityType = new Entity(EntityType.EventSourced, entity, descriptor, additionalDescriptors);
-        log.debug("Registering Entity -> {}", entityType);
-        return entityType;
-    }
-
-    private Descriptors.FileDescriptor[] tryGetFileDescriptors(Class<?> entity, Descriptors.FileDescriptor[] additionalDescriptors) {
-        try {
-            String fileDescriptorBeanName = decaptalized(entity.getSimpleName() + "FileDescriptors");
-            log.trace("Trying bind the ServiceDescriptor {}", fileDescriptorBeanName);
-            additionalDescriptors = (Descriptors.FileDescriptor[]) this.context
-                    .getBean(fileDescriptorBeanName);
-        }catch (Exception nbde) {
-            if (nbde instanceof NoSuchBeanDefinitionException) {
-                log.trace("No FileDescriptor Found");
-            }
-        }
-        return additionalDescriptors;
-    }
+                } else {
+                    // Then verify if descriptor already declared with bean
+                    try {
+                        String fileDescriptorBeanName = decaptalized(entity.getSimpleName() + "FileDescriptors");
+                        log.trace("Trying bind the ServiceDescriptor {}", fileDescriptorBeanName);
+                        additionalDescriptors = (Descriptors.FileDescriptor[]) this.context
+                                .getBean(fileDescriptorBeanName);
+                    }catch (Exception nbde) {
+                        if (nbde instanceof NoSuchBeanDefinitionException) {
+                            log.trace("No FileDescriptor Found");
+                        }
+                    }
 
-    private Descriptors.ServiceDescriptor tryGetServiceDescriptor(Class<?> entity, Descriptors.ServiceDescriptor descriptor) {
-        try{
-            String serviceDescriptorBeanName = decaptalized(entity.getSimpleName() + "ServiceDescriptor");
-            log.trace("Trying bind the ServiceDescriptor {}", serviceDescriptorBeanName);
-            descriptor = (Descriptors.ServiceDescriptor) this.context
-                    .getBean(serviceDescriptorBeanName);
-        } catch (Exception nbde) {
-            if (nbde instanceof NoSuchBeanDefinitionException) {
-                log.trace("No ServiceDescriptor Found");
+                }
             }
-        }
-        return descriptor;
-    }
 
-    private boolean isaBeanDescriptorsType() {
-        return Objects.nonNull(properties.getUserFunctionPackageName()) &&
-                !properties.getUserFunctionPackageName().isEmpty();
+            Entity entityType = new Entity(EntityType.EventSourced, entity, descriptor, additionalDescriptors);
+            log.debug("Registering Entity -> {}", entityType);
+            return entityType;
+        }).collect(Collectors.toList());
     }
 
     final class EmptyCLass {}

cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/internal/CloudstateEntityScan.java

@@ -172,4 +172,4 @@ private static void setEnv(Map<String, String> newenv) throws Exception {
         }
     }
 
-}
+}

cloudstate-springboot-starter/src/main/java/io/cloudstate/springboot/starter/internal/CloudstateUtils.java

@@ -6,8 +6,5 @@ logging:
 
 io:
   cloudstate:
-    auto-register: true
-    auto-startup: true
-    user-function-port: 8080
     user-function-interface: "localhost"
-    user-function-package-name: "io.cloudstate.springboot.example"
+    user-function-port: 8080

cloudstate-springboot-starter/src/main/resources/application.yml

@@ -21,4 +21,4 @@ public class ContextLoaderTest {
     public void cloudstate_NotBeNull(){
         assertNotNull(cloudState);
     }
-}
+}

cloudstate-springboot-starter/src/test/java/io/cloudstate/springboot/starter/ContextLoaderTest.java

@@ -34,4 +34,4 @@ public void findEntities_NotBeEmpty(){
         assertFalse(entities.isEmpty());
         assertEquals(2, entities.size());
     }
-}
+}