From commits-return-6673-archive-asf-public=cust-asf.ponee.io@tamaya.incubator.apache.org Fri Mar 15 21:53:42 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 184F2180627 for ; Fri, 15 Mar 2019 22:53:41 +0100 (CET) Received: (qmail 90178 invoked by uid 500); 15 Mar 2019 21:53:41 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 90169 invoked by uid 99); 15 Mar 2019 21:53:41 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Mar 2019 21:53:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 945B285388; Fri, 15 Mar 2019 21:53:40 +0000 (UTC) Date: Fri, 15 Mar 2019 21:53:40 +0000 To: "commits@tamaya.apache.org" Subject: [incubator-tamaya-extensions] branch master updated: TAMAYA-384 Fixed checkstyle issues, added package info. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155268682039.19170.1501501413752879598@gitbox.apache.org> From: anatole@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-tamaya-extensions X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 601ed29346b6fbaa60d6a399da62895fbd3cd215 X-Git-Newrev: 861427e481e00a32f81ce3932f7f451c17f3d9a7 X-Git-Rev: 861427e481e00a32f81ce3932f7f451c17f3d9a7 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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