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.git
The following commit(s) were added to refs/heads/master by this push:
new ffedea7 TAMAYA-379: Remove checkstyle exceptions for pkg imports
new 7b685e2 Merge pull request #36 from acoburn/TAMAYA-379
ffedea7 is described below
commit ffedea7c63006c78a769a1e4e2f689d814980ee7
Author: Aaron Coburn <[email protected]>
AuthorDate: Tue Jan 22 09:40:42 2019 -0500
TAMAYA-379: Remove checkstyle exceptions for pkg imports
This removes the checkstyle exceptions introduced when
initially enabling checkstyle enforcement.
---
.../src/main/resources/checkstyle/style.xml | 2 +-
.../java/org/apache/tamaya/ConfigurationProvider.java | 5 ++++-
.../main/java/org/apache/tamaya/spi/Experimental.java | 6 +++++-
.../tamaya/core/internal/CoreConfigurationBuilder.java | 18 +++++++++++++++++-
.../apache/tamaya/core/internal/OSGIServiceLoader.java | 9 ++++++++-
.../apache/tamaya/spisupport/DefaultConfiguration.java | 16 ++++++++++++----
.../tamaya/spisupport/DefaultConfigurationBuilder.java | 8 +++++++-
.../tamaya/spisupport/DefaultConfigurationContext.java | 7 ++++++-
.../apache/tamaya/spisupport/PropertyFiltering.java | 5 ++++-
.../JavaConfigurationPropertySource.java | 6 +++++-
10 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/buildconfigurations/src/main/resources/checkstyle/style.xml
b/buildconfigurations/src/main/resources/checkstyle/style.xml
index 08ccbb4..5a43f94 100644
--- a/buildconfigurations/src/main/resources/checkstyle/style.xml
+++ b/buildconfigurations/src/main/resources/checkstyle/style.xml
@@ -85,7 +85,7 @@ under the License.
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport">
<property name="excludes"
-
value="java.io,java.net,java.util,java.lang.annotation,org.osgi.framework,org.apache.tamaya,org.apache.tamaya.spi,org.apache.tamaya.core.internal.converters"/>
+ value="java.io,java.net,java.util"/>
</module>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
diff --git
a/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
b/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
index cbe1e50..72c9102 100644
--- a/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
+++ b/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
@@ -18,7 +18,10 @@
*/
package org.apache.tamaya;
-import org.apache.tamaya.spi.*;
+import org.apache.tamaya.spi.ConfigurationBuilder;
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.ConfigurationProviderSpi;
+import org.apache.tamaya.spi.ServiceContextManager;
import java.util.logging.Logger;
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/Experimental.java
b/code/api/src/main/java/org/apache/tamaya/spi/Experimental.java
index 9831820..db4b21f 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/Experimental.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/Experimental.java
@@ -18,7 +18,11 @@
*/
package org.apache.tamaya.spi;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* This is a simple annotation for flaging out functionality or features the
Tamaya team is not sure if it is already
diff --git
a/code/core/src/main/java/org/apache/tamaya/core/internal/CoreConfigurationBuilder.java
b/code/core/src/main/java/org/apache/tamaya/core/internal/CoreConfigurationBuilder.java
index 62d6a58..3aeac8c 100644
---
a/code/core/src/main/java/org/apache/tamaya/core/internal/CoreConfigurationBuilder.java
+++
b/code/core/src/main/java/org/apache/tamaya/core/internal/CoreConfigurationBuilder.java
@@ -22,7 +22,23 @@ import org.apache.tamaya.Configuration;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConfigurationBuilder;
-import org.apache.tamaya.core.internal.converters.*;
+import org.apache.tamaya.core.internal.converters.BigDecimalConverter;
+import org.apache.tamaya.core.internal.converters.BigIntegerConverter;
+import org.apache.tamaya.core.internal.converters.BooleanConverter;
+import org.apache.tamaya.core.internal.converters.ByteConverter;
+import org.apache.tamaya.core.internal.converters.CharConverter;
+import org.apache.tamaya.core.internal.converters.ClassConverter;
+import org.apache.tamaya.core.internal.converters.CurrencyConverter;
+import org.apache.tamaya.core.internal.converters.DoubleConverter;
+import org.apache.tamaya.core.internal.converters.FileConverter;
+import org.apache.tamaya.core.internal.converters.FloatConverter;
+import org.apache.tamaya.core.internal.converters.IntegerConverter;
+import org.apache.tamaya.core.internal.converters.LongConverter;
+import org.apache.tamaya.core.internal.converters.NumberConverter;
+import org.apache.tamaya.core.internal.converters.PathConverter;
+import org.apache.tamaya.core.internal.converters.ShortConverter;
+import org.apache.tamaya.core.internal.converters.URIConverter;
+import org.apache.tamaya.core.internal.converters.URLConverter;
import org.apache.tamaya.spisupport.DefaultConfigurationBuilder;
import org.apache.tamaya.spisupport.DefaultConfigurationContext;
diff --git
a/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
b/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
index d0d7284..e0f9947 100644
---
a/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
+++
b/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
@@ -27,7 +27,14 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.tamaya.spisupport.PriorityServiceComparator;
-import org.osgi.framework.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceFactory;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
/**
* A bundle listener that registers services defined in META-INF/services, when
diff --git
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java
index 916722d..a5cf45b 100644
---
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java
+++
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java
@@ -18,8 +18,16 @@
*/
package org.apache.tamaya.spisupport;
-import org.apache.tamaya.*;
-import org.apache.tamaya.spi.*;
+import org.apache.tamaya.ConfigException;
+import org.apache.tamaya.ConfigOperator;
+import org.apache.tamaya.ConfigQuery;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.ConfigurationSnapshot;
+import org.apache.tamaya.TypeLiteral;
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.ConversionContext;
+import org.apache.tamaya.spi.PropertyConverter;
+import org.apache.tamaya.spi.PropertyValue;
import java.util.*;
import java.util.logging.Level;
@@ -27,7 +35,7 @@ import java.util.logging.Logger;
/**
* Implementation of the Configuration API. This class uses the current {@link
ConfigurationContext} to evaluate the
- * chain of {@link PropertySource} and {@link
org.apache.tamaya.spi.PropertyFilter}
+ * chain of {@link org.apache.tamaya.spi.PropertySource} and {@link
org.apache.tamaya.spi.PropertyFilter}
* instances to evaluate the current Configuration.
*/
public class DefaultConfiguration implements Configuration {
@@ -147,7 +155,7 @@ public class DefaultConfiguration implements Configuration {
}
/**
- * Get the current properties, composed by the loaded {@link
PropertySource} and filtered
+ * Get the current properties, composed by the loaded {@link
org.apache.tamaya.spi.PropertySource} and filtered
* by registered {@link org.apache.tamaya.spi.PropertyFilter}.
*
* @return the final properties.
diff --git
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java
index 95c4d50..3cd459d 100644
---
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java
+++
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java
@@ -20,8 +20,14 @@ package org.apache.tamaya.spisupport;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.TypeLiteral;
-import org.apache.tamaya.spi.*;
import org.apache.tamaya.spi.ConfigurationBuilder;
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.PropertyConverter;
+import org.apache.tamaya.spi.PropertyFilter;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertySourceProvider;
+import org.apache.tamaya.spi.ServiceContext;
+import org.apache.tamaya.spi.ServiceContextManager;
import org.apache.tamaya.spisupport.propertysource.CLIPropertySource;
import org.apache.tamaya.spisupport.propertysource.EnvironmentPropertySource;
import
org.apache.tamaya.spisupport.propertysource.JavaConfigurationPropertySource;
diff --git
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContext.java
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContext.java
index e10b1cf..0645edc 100644
---
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContext.java
+++
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContext.java
@@ -19,7 +19,12 @@
package org.apache.tamaya.spisupport;
import org.apache.tamaya.TypeLiteral;
-import org.apache.tamaya.spi.*;
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.PropertyConverter;
+import org.apache.tamaya.spi.PropertyFilter;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.spi.ServiceContext;
import java.util.*;
import java.util.concurrent.locks.ReentrantReadWriteLock;
diff --git
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyFiltering.java
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyFiltering.java
index c6943bf..eeb1314 100644
---
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyFiltering.java
+++
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyFiltering.java
@@ -18,7 +18,10 @@
*/
package org.apache.tamaya.spisupport;
-import org.apache.tamaya.spi.*;
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.FilterContext;
+import org.apache.tamaya.spi.PropertyFilter;
+import org.apache.tamaya.spi.PropertyValue;
import java.util.*;
import java.util.logging.Level;
diff --git
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/JavaConfigurationPropertySource.java
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/JavaConfigurationPropertySource.java
index 0759918..598808d 100644
---
a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/JavaConfigurationPropertySource.java
+++
b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/JavaConfigurationPropertySource.java
@@ -19,7 +19,11 @@
package org.apache.tamaya.spisupport.propertysource;
import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.spi.*;
+import org.apache.tamaya.spi.ChangeSupport;
+import org.apache.tamaya.spi.ClassloaderAware;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.spi.ServiceContextManager;
import org.apache.tamaya.spisupport.PropertySourceComparator;
import java.io.IOException;
