tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pottlin...@apache.org
Subject incubator-tamaya-extensions git commit: TAMAYA-294: Fix typos.
Date Sat, 21 Oct 2017 20:59:30 GMT
Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master 257ec8eab -> 49eafdcba


TAMAYA-294: Fix typos.


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

Branch: refs/heads/master
Commit: 49eafdcba2ebea24978e1398d31a97bd1d177eb9
Parents: 257ec8e
Author: Phil Ottlinger <pottlinger@apache.org>
Authored: Sat Oct 21 22:59:11 2017 +0200
Committer: Phil Ottlinger <pottlinger@apache.org>
Committed: Sat Oct 21 22:59:11 2017 +0200

----------------------------------------------------------------------
 .../org/apache/tamaya/json/JSONVisitor.java     | 10 ++++---
 .../apache/tamaya/jndi/JNDIPropertySource.java  | 29 ++++++++++----------
 .../tamaya/jndi/JNDIPropertySourceTest.java     |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/49eafdcb/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java
----------------------------------------------------------------------
diff --git a/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java b/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java
index b7aa532..92c81fe 100644
--- a/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java
+++ b/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java
@@ -18,10 +18,10 @@
  */
 package org.apache.tamaya.json;
 
-import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.spi.PropertyValue;
-
-import java.util.*;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.Map;
 
 import javax.json.JsonArray;
 import javax.json.JsonObject;
@@ -29,6 +29,8 @@ import javax.json.JsonString;
 import javax.json.JsonStructure;
 import javax.json.JsonValue;
 
+import org.apache.tamaya.ConfigException;
+
 /**
  * Visitor implementation to read a JSON formatted input source.
  */

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/49eafdcb/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java b/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java
index b344dc4..00ad746 100644
--- a/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java
+++ b/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java
@@ -18,25 +18,24 @@
  */
 package org.apache.tamaya.jndi;
 
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertyValue;
-import org.apache.tamaya.spisupport.BasePropertySource;
-import org.osgi.service.component.annotations.Component;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameClassPair;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.spisupport.BasePropertySource;
+import org.osgi.service.component.annotations.Component;
+
 /**
  * Propertysource that accesses JNDI as source for configuration entries.
  */
@@ -52,7 +51,7 @@ public class JNDIPropertySource extends BasePropertySource {
 
     /** The root context, not null. */
     private Context context;
-    /** The scannable property, default is {@code false}. */
+    /** The scanable property, default is {@code false}. */
     private boolean scannable = false;
 
     /**
@@ -85,7 +84,7 @@ public class JNDIPropertySource extends BasePropertySource {
     }
 
     /**
-     * If the property source is not scannable, an empty map is returned, otherwise
+     * If the property source is not scanable, an empty map is returned, otherwise
      * the current JNDI context is mapped to configuration map:
      * <ul>
      *   <li>For each leave entry one entry is created.</li>
@@ -115,7 +114,7 @@ public class JNDIPropertySource extends BasePropertySource {
      * If set to true, the property source will return a String representation of the JNDI
      * tree when calling {@code getProperties()}.
      * @see #getProperties()
-     * @param val true, to activate scannable (default is false).
+     * @param val true, to activate scanable (default is false).
      */
     public void setScannable(boolean val){
         this.scannable = val;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/49eafdcb/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
b/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
index 8d94966..1f06855 100644
--- a/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
+++ b/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
 public class JNDIPropertySourceTest{
 
     private InitialContext createFSContext() throws NamingException, MalformedURLException
{
-        Hashtable env = new Hashtable();
+        Hashtable<String, String> env = new Hashtable<String, String>();
         env.put (Context.INITIAL_CONTEXT_FACTORY,
                 "com.sun.jndi.fscontext.RefFSContextFactory");
         return new InitialContext(env);


Mime
View raw message