Merge 1.0.x into master (#71)

* [azure] Update common files for branch 1.0.x (#58) * ci: set github core branch to 2.0.x (#60) * fix: AzureFunction implements AutoCloseable (#67) * refactor: remove wildcards imports (#70) * checkstyle: constructor wrong order (#69) Co-authored-by: micronaut-build <65172877+micronaut-build@users.noreply.github.com>
micronaut-projects · Sep 14, 2020 · efe6d88 · efe6d88
1 parent 309480e
commit efe6d88
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 19 deletions.
diff --git a/azure-function/src/main/java/io/micronaut/azure/function/AzureFunction.java b/azure-function/src/main/java/io/micronaut/azure/function/AzureFunction.java
@@ -46,6 +46,13 @@ public void run() {
         }));
     }
 
+    /**
+     * Default constructor.
+     */
+    protected AzureFunction() {
+        applicationContext.inject(this);
+    }
+
     @Override
     public ApplicationContext getApplicationContext() {
         return this.applicationContext;
@@ -58,11 +65,4 @@ public void close() throws IOException {
             applicationContext = null;
         }
     }
-
-    /**
-     * Default constructor.
-     */
-    protected AzureFunction() {
-        applicationContext.inject(this);
-    }
 }
diff --git a/doc-examples/example-groovy/src/test/groovy/example/BlobFunction.groovy b/doc-examples/example-groovy/src/test/groovy/example/BlobFunction.groovy
@@ -1,8 +1,13 @@
 package example
 
-import com.microsoft.azure.functions.annotation.*
+import com.microsoft.azure.functions.annotation.BlobOutput
+import com.microsoft.azure.functions.annotation.BlobTrigger
+import com.microsoft.azure.functions.annotation.FunctionName
+import com.microsoft.azure.functions.annotation.StorageAccount
 import io.micronaut.azure.function.AzureFunction
-import io.micronaut.context.event.*
+import io.micronaut.context.event.ApplicationEvent
+import io.micronaut.context.event.ApplicationEventPublisher
+
 import javax.inject.Inject
 
 class BlobFunction extends AzureFunction { // <1>

diff --git a/doc-examples/example-groovy/src/test/groovy/example/MyHttpFunction.groovy b/doc-examples/example-groovy/src/test/groovy/example/MyHttpFunction.groovy
@@ -1,7 +1,13 @@
 package example
 
-import com.microsoft.azure.functions.*
-import com.microsoft.azure.functions.annotation.*
+import com.microsoft.azure.functions.ExecutionContext
+import com.microsoft.azure.functions.HttpMethod
+import com.microsoft.azure.functions.HttpRequestMessage
+import com.microsoft.azure.functions.HttpResponseMessage
+
+import com.microsoft.azure.functions.annotation.AuthorizationLevel
+import com.microsoft.azure.functions.annotation.FunctionName
+import com.microsoft.azure.functions.annotation.HttpTrigger
 import io.micronaut.azure.function.http.AzureHttpFunction
 
 class MyHttpFunction extends AzureHttpFunction { // <1>

diff --git a/doc-examples/example-java/src/test/java/example/BlobFunction.java b/doc-examples/example-java/src/test/java/example/BlobFunction.java
@@ -1,8 +1,13 @@
 package example;
 
-import com.microsoft.azure.functions.annotation.*;
+import com.microsoft.azure.functions.annotation.BlobOutput;
+import com.microsoft.azure.functions.annotation.BlobTrigger;
+import com.microsoft.azure.functions.annotation.FunctionName;
+import com.microsoft.azure.functions.annotation.StorageAccount;
 import io.micronaut.azure.function.AzureFunction;
-import io.micronaut.context.event.*;
+import io.micronaut.context.event.ApplicationEvent;
+import io.micronaut.context.event.ApplicationEventPublisher;
+
 import javax.inject.Inject;
 
 public class BlobFunction extends AzureFunction { // <1>

diff --git a/doc-examples/example-java/src/test/java/example/MyHttpFunction.java b/doc-examples/example-java/src/test/java/example/MyHttpFunction.java
@@ -1,7 +1,13 @@
 package example;
 
-import com.microsoft.azure.functions.*;
-import com.microsoft.azure.functions.annotation.*;
+import com.microsoft.azure.functions.ExecutionContext;
+import com.microsoft.azure.functions.HttpMethod;
+import com.microsoft.azure.functions.HttpRequestMessage;
+import com.microsoft.azure.functions.HttpResponseMessage;
+
+import com.microsoft.azure.functions.annotation.AuthorizationLevel;
+import com.microsoft.azure.functions.annotation.FunctionName;
+import com.microsoft.azure.functions.annotation.HttpTrigger;
 import io.micronaut.azure.function.http.AzureHttpFunction;
 import java.util.Optional;
 

diff --git a/doc-examples/example-kotlin/src/test/kotlin/example/BlobFunction.kt b/doc-examples/example-kotlin/src/test/kotlin/example/BlobFunction.kt
@@ -1,6 +1,9 @@
 package example
 
-import com.microsoft.azure.functions.annotation.*
+import com.microsoft.azure.functions.annotation.BlobOutput
+import com.microsoft.azure.functions.annotation.BlobTrigger
+import com.microsoft.azure.functions.annotation.FunctionName
+import com.microsoft.azure.functions.annotation.StorageAccount
 import io.micronaut.azure.function.AzureFunction
 import io.micronaut.context.event.ApplicationEvent
 import io.micronaut.context.event.ApplicationEventPublisher

diff --git a/doc-examples/example-kotlin/src/test/kotlin/example/MyHttpFunction.kt b/doc-examples/example-kotlin/src/test/kotlin/example/MyHttpFunction.kt
@@ -1,9 +1,14 @@
 package example
 
-import com.microsoft.azure.functions.*
-import com.microsoft.azure.functions.annotation.*
+import com.microsoft.azure.functions.ExecutionContext
+import com.microsoft.azure.functions.HttpMethod
+import com.microsoft.azure.functions.HttpRequestMessage
+import com.microsoft.azure.functions.HttpResponseMessage
+import com.microsoft.azure.functions.annotation.AuthorizationLevel
+import com.microsoft.azure.functions.annotation.FunctionName
+import com.microsoft.azure.functions.annotation.HttpTrigger
 import io.micronaut.azure.function.http.AzureHttpFunction
-import java.util.*
+import java.util.Optional
 
 class MyHttpFunction : AzureHttpFunction() { // <1>
     @FunctionName("ExampleTrigger") // <2>