tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pottlin...@apache.org
Subject incubator-tamaya-sandbox git commit: TAMAYA-218: Fix warnings.
Date Tue, 28 Nov 2017 23:08:48 GMT
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master 122222ca3 -> bb340e091


TAMAYA-218: Fix warnings.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/bb340e09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/bb340e09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/bb340e09

Branch: refs/heads/master
Commit: bb340e09107bd9bf487557c31bde390058add076
Parents: 122222c
Author: Phil Ottlinger <pottlinger@apache.org>
Authored: Wed Nov 29 00:04:44 2017 +0100
Committer: Phil Ottlinger <pottlinger@apache.org>
Committed: Wed Nov 29 00:04:44 2017 +0100

----------------------------------------------------------------------
 .../apache/tamaya/metamodel/CachedFilter.java   |  4 ++--
 .../tamaya/metamodel/EnabledPropertySource.java | 15 ++++++-------
 .../org/apache/tamaya/metamodel/HideFilter.java |  5 ++---
 .../tamaya/metamodel/MetaConfiguration.java     | 22 ++++++++++----------
 .../apache/tamaya/metamodel/Refreshable.java    |  2 --
 5 files changed, 21 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/bb340e09/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java
index d2a343c..b9cd370 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java
@@ -109,8 +109,8 @@ public class CachedFilter implements PropertyFilter{
     }
 
     private static final class CachedEntry{
-        long ttl;
-        PropertyValue value;
+        private long ttl;
+        private PropertyValue value;
 
         public CachedEntry (PropertyValue value, long ttl){
             this.ttl = ttl;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/bb340e09/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
b/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
index 2dcf101..3eafd38 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
@@ -18,19 +18,16 @@
  */
 package org.apache.tamaya.metamodel;
 
-import org.apache.tamaya.metamodel.internal.resolver.JavaResolver;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertyValue;
-import org.apache.tamaya.spisupport.PropertySourceComparator;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.logging.Logger;
 
+import org.apache.tamaya.metamodel.internal.resolver.JavaResolver;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.spisupport.PropertySourceComparator;
+
 
 /**
  * Wrapped property source that allows enabling a property source using an
@@ -113,7 +110,7 @@ public final class EnabledPropertySource
 
     @Override
     public String toString() {
-        return "DynamicPropertySource{" +
+        return "EnabledPropertySource{" +
                 "\n enabled=" + enabledExpression +
                 "\n wrapped=" + wrapped +
                 '}';

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/bb340e09/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java
index 6a1e116..7e02333 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java
@@ -18,13 +18,12 @@
  */
 package org.apache.tamaya.metamodel;
 
+import java.util.Map;
+
 import org.apache.tamaya.metamodel.spi.ItemFactory;
 import org.apache.tamaya.spi.FilterContext;
 import org.apache.tamaya.spi.PropertyFilter;
 import org.apache.tamaya.spi.PropertyValue;
-import org.apache.tamaya.spi.PropertyValueBuilder;
-
-import java.util.Map;
 
 /**
  * Simple filter that never changes a key/value pair returned, regardless if a value

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/bb340e09/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
index d896cb0..a08e418 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
@@ -18,26 +18,26 @@
  */
 package org.apache.tamaya.metamodel;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.Configuration;
 import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.metamodel.spi.MetaConfigurationReader;
 import org.apache.tamaya.spi.ConfigurationBuilder;
-import org.apache.tamaya.spi.ConfigurationContext;
 import org.apache.tamaya.spi.ServiceContextManager;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 /**
  * Accessor singleton for accessing/loading meta-configuration.
  */

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/bb340e09/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java
index dc51554..60ece93 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java
@@ -18,8 +18,6 @@
  */
 package org.apache.tamaya.metamodel;
 
-import org.apache.tamaya.spi.ConfigurationContext;
-
 /**
  * Common interface for refreshable items.
  */


Mime
View raw message