fix packages and add set/get port and domain in restclient,

inc version to 1.1.0

build.gradle

 group 'com.ipgallery.common'
 group 'com.ipgallery.common'
-version '1.0.0'
+version '1.1.0'
 
 
 apply plugin: 'java'
 apply plugin: 'java'
 apply plugin: 'maven-publish'
 apply plugin: 'maven-publish'
@@ -18,7 +18,8 @@ dependencies {
     compile 'redis.clients:jedis:2.4.2'
     compile 'redis.clients:jedis:2.4.2'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.2.3'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.2.3'
     compile 'com.googlecode.libphonenumber:libphonenumber:5.8'
     compile 'com.googlecode.libphonenumber:libphonenumber:5.8'
-    compile 'com.google.gdata:gdata-core-1.0:1.36.0'
+    compile group: 'com.google.gdata', name: 'core', version: '1.47.1'
+//    compile 'com.google.gdata:gdata-core-1.0:1.36.0'
     compile 'org.apache.httpcomponents:httpclient:4.1'
     compile 'org.apache.httpcomponents:httpclient:4.1'
     compile 'org.apache.httpcomponents:httpmime:4.1'
     compile 'org.apache.httpcomponents:httpmime:4.1'
     compile 'javax.ws.rs:javax.ws.rs-api:2.0'
     compile 'javax.ws.rs:javax.ws.rs-api:2.0'

src/main/java/common/CacheClient.java

-package utils.common;
+package common;
 
 
 public interface CacheClient
 public interface CacheClient
 {
 {

src/main/java/common/ConfigFile.java

-package utils.common;
+package common;
 
 
 import java.util.Map.Entry;
 import java.util.Map.Entry;
 import java.io.FileInputStream;
 import java.io.FileInputStream;

src/main/java/common/General.java

-package utils.common;
+package common;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.DateFormat;

src/main/java/common/GuavaCacheClient.java

+package common;
+
+/**
+ * Created by amir on 09/06/16.
+ * this cache client is not persist, thus faster then redis
+ */
+public class GuavaCacheClient implements CacheClient{
+
+    public GuavaCacheClient() {
+
+    }
+
+    @Override
+    public void set(String key, String value) {
+
+    }
+
+    @Override
+    public void set(String key, String value, int expiration) {
+
+    }
+
+    @Override
+    public void setExpiration(String key, int expiration) {
+
+    }
+
+    @Override
+    public String get(String key) {
+        return null;
+    }
+
+    @Override
+    public void delete(String key) {
+
+    }
+
+    @Override
+    public void deleteByPattern(String pattern) {
+
+    }
+
+    @Override
+    public String[] getByPattern(String pattern) {
+        return new String[0];
+    }
+}

src/main/java/common/JsonHandler.java

-package utils.common;
+package common;
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.DeserializationFeature;

src/main/java/common/Log4jFileAlterationListenerImpl.java

-package utils.common;
+package common;
 
 
 import java.io.File;
 import java.io.File;
 import java.util.Date;
 import java.util.Date;
+
 import org.apache.commons.io.monitor.FileAlterationListener;
 import org.apache.commons.io.monitor.FileAlterationListener;
 import org.apache.commons.io.monitor.FileAlterationObserver;
 import org.apache.commons.io.monitor.FileAlterationObserver;
+
 /**
 /**
  * @author ziv
  * @author ziv
- *
  */
  */
 public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
 public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
- 
-	Log4jHandler logger = new Log4jHandler(Log4jFileAlterationListenerImpl.class.getName());
-	
+
+    Log4jHandler logger = new Log4jHandler(Log4jFileAlterationListenerImpl.class.getName());
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -19,7 +20,7 @@ public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
     public void onStart(final FileAlterationObserver observer) {
     public void onStart(final FileAlterationObserver observer) {
 //    	logger.debug("The WindowsFileListener has started on " + observer.getDirectory().getAbsolutePath());
 //    	logger.debug("The WindowsFileListener has started on " + observer.getDirectory().getAbsolutePath());
     }
     }
- 
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -27,7 +28,7 @@ public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
     public void onDirectoryCreate(final File directory) {
     public void onDirectoryCreate(final File directory) {
 //    	logger.debug(directory.getAbsolutePath() + " was created.");
 //    	logger.debug(directory.getAbsolutePath() + " was created.");
     }
     }
- 
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -35,7 +36,7 @@ public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
     public void onDirectoryChange(final File directory) {
     public void onDirectoryChange(final File directory) {
 //    	logger.debug(directory.getAbsolutePath() + " was modified");
 //    	logger.debug(directory.getAbsolutePath() + " was modified");
     }
     }
- 
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -43,7 +44,7 @@ public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
     public void onDirectoryDelete(final File directory) {
     public void onDirectoryDelete(final File directory) {
 //    	logger.debug(directory.getAbsolutePath() + " was deleted.");
 //    	logger.debug(directory.getAbsolutePath() + " was deleted.");
     }
     }
- 
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -56,28 +57,27 @@ public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
 //        logger.debug("----------> writable: " + file.canWrite());
 //        logger.debug("----------> writable: " + file.canWrite());
 //        logger.debug("----------> executable: " + file.canExecute());
 //        logger.debug("----------> executable: " + file.canExecute());
     }
     }
- 
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
     @Override
     @Override
     public void onFileChange(final File file) {
     public void onFileChange(final File file) {
-    	String fileName = file.getAbsolutePath();
-    	if ( !fileName.endsWith("~") ) 
-    	{//don't allow changes from the linux automatic backup file
+        String fileName = file.getAbsolutePath();
+        if (!fileName.endsWith("~")) {//don't allow changes from the linux automatic backup file
 //    		logger.debug(fileName + " was modified.");
 //    		logger.debug(fileName + " was modified.");
 //    		logger.debug("----------> length: " + file.length());
 //    		logger.debug("----------> length: " + file.length());
 //    		logger.debug("----------> last modified: " + new Date(file.lastModified()));
 //    		logger.debug("----------> last modified: " + new Date(file.lastModified()));
 //    		logger.debug("----------> readable: " + file.canRead());
 //    		logger.debug("----------> readable: " + file.canRead());
 //    		logger.debug("----------> writable: " + file.canWrite());
 //    		logger.debug("----------> writable: " + file.canWrite());
 //    		logger.debug("----------> executable: " + file.canExecute());
 //    		logger.debug("----------> executable: " + file.canExecute());
-    		try {
-    			org.apache.log4j.xml.DOMConfigurator.configure(fileName);
-    	        logger.warning( "Log4j configuration has been reloaded from file < "+ fileName + " >.");
-    		}catch(Exception e) {
-    			logger.debug("Failed to load XML File with exception: " + e);
-    		}
-    	}
+            try {
+                org.apache.log4j.xml.DOMConfigurator.configure(fileName);
+                logger.warning("Log4j configuration has been reloaded from file < " + fileName + " >.");
+            } catch (Exception e) {
+                logger.debug("Failed to load XML File with exception: " + e);
+            }
+        }
     }
     }
 
 
     /**
     /**
@@ -87,7 +87,7 @@ public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
     public void onFileDelete(final File file) {
     public void onFileDelete(final File file) {
 //        logger.debug(file.getAbsoluteFile() + " was deleted.");
 //        logger.debug(file.getAbsoluteFile() + " was deleted.");
     }
     }
- 
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -95,5 +95,5 @@ public class Log4jFileAlterationListenerImpl implements FileAlterationListener {
     public void onStop(final FileAlterationObserver observer) {
     public void onStop(final FileAlterationObserver observer) {
 //        logger.debug("The WindowsFileListener has stopped on " + observer.getDirectory().getAbsolutePath());
 //        logger.debug("The WindowsFileListener has stopped on " + observer.getDirectory().getAbsolutePath());
     }
     }
-    
+
 }
 }

src/main/java/common/Log4jFileChangeListener.java

-package utils.common;
+package common;
 
 
 import java.io.File;
 import java.io.File;
 
 

src/main/java/common/Log4jFileMonitor.java

-package utils.common;
+package common;
 
 
 import java.io.File;
 import java.io.File;
 
 

src/main/java/common/Log4jHandler.java

-package utils.common;
+package common;
 
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.LogManager;

src/main/java/common/Log4jWrapper.java

-package utils.common;
+package common;
 
 
 import org.apache.log4j.FileAppender;
 import org.apache.log4j.FileAppender;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.LogManager;

src/main/java/common/Network.java

-package utils.common;
+package common;
 
 
 import java.net.InetAddress;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.net.UnknownHostException;

src/main/java/common/RedisCacheClient.java

-package utils.common;
+package common;
 
 
 import java.util.Set;
 import java.util.Set;
 
 

src/main/java/common/SimpleLogger.java

-package utils.common;
+package common;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.util.logging.FileHandler;
 import java.util.logging.FileHandler;

src/main/java/common/XmlHelper.java

-package utils.common;
+package common;
 
 
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;

src/main/java/common/configuration/ConfigProperties.java

-package utils.common.configuration;
+package common.configuration;
 
 
 import java.io.File;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileInputStream;

src/main/java/common/configuration/ConfigPropertiesChangeListener.java

-package utils.common.configuration;
+package common.configuration;
 
 
 public interface ConfigPropertiesChangeListener
 public interface ConfigPropertiesChangeListener
 {
 {

src/main/java/common/configuration/EnumPropertyType.java

-package utils.common.configuration;
+package common.configuration;
 
 
 /**
 /**
  * Created by amir on 04/04/16.
  * Created by amir on 04/04/16.

src/main/java/common/configuration/IConfigurationProvider.java

-package utils.common.configuration;
+package common.configuration;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

src/main/java/common/configuration/PropertyEntry.java

-package utils.common.configuration;
+package common.configuration;
 
 
 /**
 /**
  * Created by amir on 04/04/16.
  * Created by amir on 04/04/16.

src/main/java/common/package-info.java

-/**
- * 
- */
-/**
- * @author adi
- *
- */
-package utils.common;
\ No newline at end of file

src/main/java/common/uniqueKeyHandler.java

-package utils.common;
+package common;
 
 
 import java.util.UUID;
 import java.util.UUID;
 
 

src/main/java/http/HttpConst.java

-package utils.http;
+package http;
 
 
 public  class HttpConst {
 public  class HttpConst {
 
 

src/main/java/http/StringResponse.java

-package utils.http;
+package http;
 
 
 public class StringResponse {
 public class StringResponse {
 	
 	

src/main/java/http/simpleHttpClient/SimpleHttpClient.java

-package utils.http.simpleHttpClient;
+package http.simpleHttpClient;
 
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-//import javax.ws.rs.core.HttpHeaders;
-//import javax.ws.rs.core.MediaType;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.List;
 import org.apache.http.Header;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.CookieStore;
-//import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.conn.scheme.PlainSocketFactory;
 import org.apache.http.conn.scheme.PlainSocketFactory;
 import org.apache.http.conn.scheme.Scheme;
 import org.apache.http.conn.scheme.Scheme;
@@ -22,8 +11,17 @@ import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import utils.http.simpleHttpClient.SimpleHttpRequest;
-import utils.http.simpleHttpClient.SimpleHttpResponse;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.List;
+
+//import javax.ws.rs.core.HttpHeaders;
+//import javax.ws.rs.core.MediaType;
+//import org.apache.http.client.methods.HttpGet;
 
 
 public class SimpleHttpClient {
 public class SimpleHttpClient {
 	
 	

src/main/java/http/simpleHttpClient/SimpleHttpRequest.java

-package utils.http.simpleHttpClient;
+package http.simpleHttpClient;
 
 
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.ArrayList;

src/main/java/http/simpleHttpClient/SimpleHttpResponse.java

-package utils.http.simpleHttpClient;
+package http.simpleHttpClient;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

src/main/java/http/simpleRestClient/SimpleRestClient.java

-package utils.http.simpleRestClient;
+package http.simpleRestClient;
 
 
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -9,10 +9,10 @@ import java.util.Map.Entry;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MediaType;
 
 
-import utils.http.StringResponse;
-import utils.http.simpleHttpClient.SimpleHttpClient;
-import utils.http.simpleHttpClient.SimpleHttpRequest;
-import utils.http.simpleHttpClient.SimpleHttpResponse;
+import http.StringResponse;
+import http.simpleHttpClient.SimpleHttpClient;
+import http.simpleHttpClient.SimpleHttpRequest;
+import http.simpleHttpClient.SimpleHttpResponse;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonParser;
@@ -49,7 +49,24 @@ import com.google.gdata.util.common.base.PercentEscaper;
 			this.headers = new HashMap<String, String>();
 			this.headers = new HashMap<String, String>();
 		this.headers.put(headerName, headerValue);
 		this.headers.put(headerName, headerValue);
 	}
 	}
-	/******************************************************************************
+
+		public String getDomain() {
+			return domain;
+		}
+
+		public void setDomain(String domain) {
+			this.domain = domain;
+		}
+
+		public int getPort() {
+			return port;
+		}
+
+		public void setPort(int port) {
+			this.port = port;
+		}
+
+		/******************************************************************************
 	 *  
 	 *  
 	 *  HTTP get methods
 	 *  HTTP get methods
 	 *
 	 *

src/main/java/http/simpleRestClient/SimpleRestResponse.java

-package utils.http.simpleRestClient;
+package http.simpleRestClient;
 
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/itm/ITMManager.java

-package utils.itm;
+package itm;
 
 
 /*
 /*
  * 
  * 
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Level;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.Semaphore;
 
 
-import utils.common.SimpleLogger;
+import common.SimpleLogger;
 import itc.ItcMessage;
 import itc.ItcMessage;
 import itc.ItcMessageQueue;
 import itc.ItcMessageQueue;
 
 

src/main/java/itm/ITMMessage.java

-package utils.itm;
+package itm;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 

src/main/java/itm/ITMThread.java

-package utils.itm;
+package itm;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.Semaphore;
@@ -6,7 +6,7 @@ import java.util.logging.Level;
 
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParseException;
 
 
-import utils.common.SimpleLogger;
+import common.SimpleLogger;
 import itc.ItcMessage;
 import itc.ItcMessage;
 import itc.ItcMessageQueue;
 import itc.ItcMessageQueue;
 
 

src/main/java/mtqm/MultiThreadQueueHander.java

-package utils.mtqm;
+package mtqm;
 
 
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Map.Entry;
 
 
-import utils.common.Log4jHandler;
+import common.Log4jHandler;
 
 
 
 
 public class MultiThreadQueueHander
 public class MultiThreadQueueHander

src/main/java/mtqm/MultiThreadQueueManager.java

-package utils.mtqm;
+package mtqm;
 
 
 import itc.ItcMessage;
 import itc.ItcMessage;
 import itc.ItcMessageQueue;
 import itc.ItcMessageQueue;
@@ -7,7 +7,7 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collection;
 import java.util.List;
 import java.util.List;
-import utils.common.Log4jHandler;
+import common.Log4jHandler;
 
 
 /**
 /**
  * this manager holds thread that handle async jobs
  * this manager holds thread that handle async jobs
@@ -187,7 +187,7 @@ public class MultiThreadQueueManager
 
 
 	public int getQueueNumber(String key)
 	public int getQueueNumber(String key)
 	{
 	{
-		return (utils.common.General.abs(key.hashCode()) % this.mNumOfThreads);
+		return (common.General.abs(key.hashCode()) % this.mNumOfThreads);
 	}
 	}
 	
 	
 	/**
 	/**

src/main/java/otm/IOfflineTaskJob.java

-package utils.otm;
+package otm;
 
 
 public abstract class IOfflineTaskJob implements Runnable
 public abstract class IOfflineTaskJob implements Runnable
 {
 {

src/main/java/otm/OfflineTask.java

-package utils.otm;
+package otm;
 
 
 import java.util.TimerTask;
 import java.util.TimerTask;
 
 

src/main/java/otm/OfflineTaskManager.java

-package utils.otm;
+package otm;
 
 
 import itc.ItcMessage;
 import itc.ItcMessage;
 import itc.ItcMessageQueue;
 import itc.ItcMessageQueue;
@@ -11,8 +11,8 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.Timer;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
-import utils.common.Log4jHandler;
-import utils.mtqm.MultiThreadQueueManager;
+import common.Log4jHandler;
+import mtqm.MultiThreadQueueManager;
 
 
 /**
 /**
  * need to change to ScheduledThreadPoolExecutor and concurrent hash map
  * need to change to ScheduledThreadPoolExecutor and concurrent hash map

src/main/java/timerManager/ITimerEventListener.java

-package utils.timerManager;
+package timerManager;
 
 
 public interface ITimerEventListener
 public interface ITimerEventListener
 {
 {

src/main/java/timerManager/TimerManager.java

-package utils.timerManager;
+package timerManager;
 
 
 import java.util.Map;
 import java.util.Map;
 import java.util.UUID;
 import java.util.UUID;
 
 
-import utils.common.Log4jHandler;
-import utils.otm.IOfflineTaskJob;
-import utils.otm.OfflineTaskManager;
+import common.Log4jHandler;
+import otm.IOfflineTaskJob;
+import otm.OfflineTaskManager;
 
 
 /**
 /**
  * 
  *