You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/03/01 17:47:59 UTC
[13/14] incubator-tamaya git commit: Fixed minor issues.
Fixed minor issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/4a08901c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4a08901c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4a08901c
Branch: refs/heads/master
Commit: 4a08901c7e7ccd9e1febe9a765b1dfe2b2e8ccee
Parents: f6e889e
Author: anatole <an...@apache.org>
Authored: Tue Mar 1 17:47:03 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 1 17:47:03 2016 +0100
----------------------------------------------------------------------
.../apache/tamaya/resource/ConfigResources.java | 21 +-------------------
.../apache/tamaya/resource/ResourceLocator.java | 1 -
.../tamaya/resource/ResourceResolver.java | 4 ----
.../internal/DefaultResourceResolver.java | 4 +---
.../resource/internal/URLResourceLocator.java | 1 -
5 files changed, 2 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4a08901c/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java b/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java
index a560d21..ae08148 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java
@@ -19,11 +19,8 @@
package org.apache.tamaya.resource;
import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertySourceProvider;
import org.apache.tamaya.spi.ServiceContextManager;
-import java.net.URI;
/**
* Singleton Accessor for accessing the current {@link org.apache.tamaya.resource.ResourceResolver} instance.
@@ -50,21 +47,5 @@ public final class ConfigResources {
return resolver;
}
- /**
- * Access a PropertySource for a given URI.
- * @param uri the target uri, pointing to a file, a remote location or something else.
- * @return a {@link PropertySource} for accessing the configuration data, or {@link PropertySource.EMPTY}.
- */
- public static PropertySource getPropertySource(URI uri){
- return getResourceResolver().getPropertySource(uri);
- }
- /**
- * Access a PropertySourceProvider for a given URI, that may point to several resources.
- * @param uri the target uri, pointing to one or many resources, a remote location or something else.
- * @return a {@link PropertySource} for accessing the configuration data, or {@link PropertySourceProvider.EMPTY}.
- */
- public static PropertySourceProvider getPropertySourceProvider(URI uri){
- return getResourceResolver().getPropertySourceProvider(uri);
- }
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4a08901c/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
index 861adbd..c301eea 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
@@ -20,7 +20,6 @@ package org.apache.tamaya.resource;
import java.net.URL;
import java.util.Collection;
-import java.util.List;
/**
* Delegate interface for loading URLs from a given data resource locator pattern String.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4a08901c/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java
index 8916351..7e9acc8 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java
@@ -18,10 +18,6 @@
*/
package org.apache.tamaya.resource;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertySourceProvider;
-
-import java.net.URI;
import java.net.URL;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4a08901c/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java
index 59c1188..6cdb2e2 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java
@@ -20,12 +20,9 @@ package org.apache.tamaya.resource.internal;
import org.apache.tamaya.resource.BaseResourceResolver;
import org.apache.tamaya.resource.ResourceLocator;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertySourceProvider;
import org.apache.tamaya.spi.ServiceContextManager;
import javax.annotation.Priority;
-import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -48,6 +45,7 @@ public class DefaultResourceResolver extends BaseResourceResolver {
Collection<URL> found = locator.lookup(classLoader, expression);
if(!found.isEmpty()) {
resources.addAll(found);
+ break;
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4a08901c/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java
index c013b4d..7a9d012 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java
@@ -21,7 +21,6 @@ package org.apache.tamaya.resource.internal;
import org.apache.tamaya.resource.ResourceLocator;
import javax.annotation.Priority;
-import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;