Merge pull request #1 from tamayok/master

1.0.1

Author: jalakoo

README.md

@@ -1,4 +1,4 @@
-# Tealium Library for Java Version 1.0.0
+# Tealium Library for Java
 
 This mobile library leverages the power of Tealium's [AudienceStream™](http://tealium.com/products/audiencestream/) making them natively available to Java applications.
 
@@ -21,7 +21,8 @@ The Tealium AudienceStream™ Influence DMP (data management platform) enables y
 * If you have **account specific questions** please contact your Tealium account manager
 
 ## Change Log
-
+- 1.0.1 Bug Fix
+    - LogLevel enum converted to public API 
 - 1.0.0 Initial Release
 - Tealium universal data sources added for all dispatches:
     - event_name (transitionary - will be deprecated)

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tealium</groupId>
     <artifactId>java</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>TealiumJava</name>
 
     <packaging>jar</packaging>

src/main/java/com/tealium/DataManager.java

@@ -52,7 +52,7 @@ public DataManager(LibraryContext libraryContext) {
         } catch (IOException e) {
             // File must be corrupt/unreadable etc
             this.persistentCache = new HashMap<>();
-            this.context.getLogger().log(e, Logger.Level.ERRORS);
+            this.context.getLogger().log(e, LogLevel.ERRORS);
         }
     }
 

src/main/java/com/tealium/FileUtils.java

@@ -49,7 +49,7 @@ static final void deletePersistentFile(LibraryContext context) {
             file = FileUtils.getPersistentFile(context);
             file.delete();
         } catch (IOException e) {
-            context.getLogger().log(e, Logger.Level.ERRORS);
+            context.getLogger().log(e, LogLevel.ERRORS);
         }
     }
 

src/main/java/com/tealium/LogLevel.java

@@ -0,0 +1,15 @@
+package com.tealium;
+
+public enum LogLevel {
+    NONE(3), ERRORS(2), WARNINGS(1), VERBOSE(0);
+
+    private final int priority;
+
+    private LogLevel(int priority) {
+        this.priority = priority;
+    }
+
+    int getPriority() {
+        return priority;
+    }
+}

src/main/java/com/tealium/Logger.java

@@ -10,34 +10,20 @@
  */
 final class Logger {
 
-    static enum Level {
-        NONE(3), ERRORS(2), WARNINGS(1), VERBOSE(0);
-
-        private final int priority;
-
-        private Level(int priority) {
-            this.priority = priority;
-        }
-
-        int getPriority() {
-            return priority;
-        }
-    };
-
-    private final Level level;
+    private final LogLevel level;
     private final PrintStream out;
 
-    public Level getLevel() {
+    public LogLevel getLevel() {
         return level;
     }
 
-    public Logger(Level level) {
+    public Logger(LogLevel level) {
         super();
         this.level = level;
         out = System.out;
     }
 
-    public boolean isLogging(Level level) {
+    public boolean isLogging(LogLevel level) {
         return level.getPriority() >= this.level.getPriority();
     }
 
@@ -49,13 +35,13 @@ public boolean isLogging(Level level) {
      * @param level
      *            Level of message.
      */
-    public void log(String message, Level level) {
+    public void log(String message, LogLevel level) {
         if (isLogging(level)) {
             out.println(message);
         }
     };
 
-    public void log(Throwable t, Level level) {
+    public void log(Throwable t, LogLevel level) {
         if (isLogging(level)) {
             out.println(t);
             t.printStackTrace(out);

src/main/java/com/tealium/Tealium.java

@@ -27,7 +27,7 @@ public static class Builder {
         private final String account;
         private final String profile;
         private final String environment;
-        private Logger.Level logLevel = Logger.Level.VERBOSE;
+        private LogLevel logLevel = LogLevel.VERBOSE;
         private int timeout = 5000;
 
         /**
@@ -58,7 +58,7 @@ public Tealium build() {
                     this.timeout);
         }
 
-        public Builder setLogLevel(Logger.Level level) {
+        public Builder setLogLevel(LogLevel level) {
             if (level == null) {
                 throw new IllegalArgumentException("Invalid log level.");
             }
@@ -168,7 +168,7 @@ public void track(String eventTitle, Map<String, ?> data, Tealium.DispatchCallba
         try {
             this.collect.dispatch(contextData, callback);
         } catch (IOException e) {
-            this.libraryContext.getLogger().log(e, Logger.Level.ERRORS);
+            this.libraryContext.getLogger().log(e, LogLevel.ERRORS);
         }
     }
 

src/test/java/com/tealium/DataManagerTest.java

@@ -92,7 +92,7 @@ public void testNewPersistentData() throws Exception {
         String account = "account";
         String profile = "profile";
         String env = "env";
-        LibraryContext ctx = new LibraryContext(account, profile, env, new Logger(Logger.Level.VERBOSE));
+        LibraryContext ctx = new LibraryContext(account, profile, env, new Logger(LogLevel.VERBOSE));
         FileUtils.deletePersistentFile(ctx);
 
         DataManager data = new DataManager(ctx);

src/test/java/com/tealium/LoggerTest.java

@@ -5,6 +5,6 @@
 public class LoggerTest {
 	@Test
 	public void test() throws Exception{
-		new Logger(Logger.Level.VERBOSE).log("Hello Test", Logger.Level.VERBOSE);
+		new Logger(LogLevel.VERBOSE).log("Hello Test", LogLevel.VERBOSE);
 	} 
 }

src/test/java/com/tealium/TealiumTest.java

@@ -7,7 +7,6 @@
 
 import org.junit.Test;
 
-import com.tealium.Logger.Level;
 import com.tealium.Tealium.DispatchCallback;
 
 public class TealiumTest {
@@ -20,7 +19,7 @@ public void testTealiumInit() throws Exception {
     @Test
     public void testTealiumInitWithLogLevel() throws Exception {
         new Tealium.Builder("tealiummobile", "main", "dev")
-                .setLogLevel(Level.WARNINGS)
+                .setLogLevel(LogLevel.WARNINGS)
                 .build();
 
     }