tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [incubator-tamaya-extensions] branch master updated: TAMAYA-384 Fixed checkstyle issues, added package info.
Date Fri, 15 Mar 2019 21:53:40 GMT
This is an automated email from the ASF dual-hosted git repository.

anatole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git


The following commit(s) were added to refs/heads/master by this push:
     new 861427e  TAMAYA-384 Fixed checkstyle issues, added package info.
861427e is described below

commit 861427e481e00a32f81ce3932f7f451c17f3d9a7
Author: Anatole Tresch <atsticks@gmail.com>
AuthorDate: Fri Mar 15 22:53:28 2019 +0100

    TAMAYA-384 Fixed checkstyle issues, added package info.
---
 .../spring/TamayaSpringConfigurator.java            | 11 +++++++++--
 .../tamaya/integration/spring/MyApplication.java    |  1 -
 .../{MyApplication.java => package-info.java}       | 21 ++++-----------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/modules/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfigurator.java
b/modules/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfigurator.java
index 71d4c66..a95103a 100644
--- a/modules/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfigurator.java
+++ b/modules/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfigurator.java
@@ -37,8 +37,6 @@ import java.util.logging.Logger;
  */
 public class TamayaSpringConfigurator implements ImportSelector {
 
-    private Logger LOG = Logger.getLogger(TamayaSpringConfigurator.class.getName());
-
     @Override
     public String[] selectImports(AnnotationMetadata importingClassMetadata) {
         AnnotationAttributes attributes =
@@ -58,6 +56,9 @@ public class TamayaSpringConfigurator implements ImportSelector {
         return configClasses.toArray(new String[configClasses.size()]);
     }
 
+    /**
+     * Configuration active when Tamaya is extending the current Spring configuration only.
+     */
     public static class ExtendingOnlyConfig {
 
         @Bean
@@ -73,6 +74,9 @@ public class TamayaSpringConfigurator implements ImportSelector {
 
     }
 
+    /**
+     * Configuration active when Tamaya is overriding the current Spring configuration (default).
+     */
     public static class DefaultConfig {
 
         @Bean
@@ -88,6 +92,9 @@ public class TamayaSpringConfigurator implements ImportSelector {
 
     }
 
+    /**
+     * Configuration which enables Tamaya Configuration Injection Mechanisms within Spring
(default).
+     */
     public static class TamayaInjectionConfig {
 
         @Bean
diff --git a/modules/spring/src/test/java/org/apache/tamaya/integration/spring/MyApplication.java
b/modules/spring/src/test/java/org/apache/tamaya/integration/spring/MyApplication.java
index d44ffa2..771f2f9 100644
--- a/modules/spring/src/test/java/org/apache/tamaya/integration/spring/MyApplication.java
+++ b/modules/spring/src/test/java/org/apache/tamaya/integration/spring/MyApplication.java
@@ -21,7 +21,6 @@ package org.apache.tamaya.integration.spring;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
 
 @SpringBootApplication
 @EnableTamayaConfig
diff --git a/modules/spring/src/test/java/org/apache/tamaya/integration/spring/MyApplication.java
b/modules/spring/src/test/java/org/apache/tamaya/integration/spring/package-info.java
similarity index 61%
copy from modules/spring/src/test/java/org/apache/tamaya/integration/spring/MyApplication.java
copy to modules/spring/src/test/java/org/apache/tamaya/integration/spring/package-info.java
index d44ffa2..9ca210a 100644
--- a/modules/spring/src/test/java/org/apache/tamaya/integration/spring/MyApplication.java
+++ b/modules/spring/src/test/java/org/apache/tamaya/integration/spring/package-info.java
@@ -16,21 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tamaya.integration.spring;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-
-@SpringBootApplication
-@EnableTamayaConfig
-public class MyApplication {
-
-    public static void main (String[] args) {
-        ApplicationContext context =
-                SpringApplication.run(MyApplication.class, args);
-
-    }
-
-}
+/**
+ * Tamaya Spring Configuration Extension Module.
+ */
+package org.apache.tamaya.integration.spring;
\ No newline at end of file


Mime
View raw message