private constructors,static factory instantiations

Author: ankushs92

build.gradle

@@ -1,12 +1,17 @@
 apply plugin: 'groovy'
 apply plugin: 'eclipse'
 apply plugin : 'idea'
- 
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+
 sourceCompatibility = 1.8
+group ="in.ankushs"
+archivesBaseName = "dbip"
 version = '1.0'
 
 jar {
-    baseName = "Java DbIp"
+    baseName = "Java DB-IP"
     manifest {
         attributes 'Implementation-Title': 'Gradle Quickstart',
                    'Implementation-Version': version
@@ -44,11 +49,73 @@ eclipse {
   }
 }
 
+
+task javadocJar(type: Jar) {
+	classifier = 'javadoc'
+	from javadoc
+}
+
+task sourcesJar(type: Jar) {
+	classifier = 'sources'
+	from sourceSets.main.allSource
+}
+
+artifacts {
+	archives javadocJar, sourcesJar
+}
+
+signing {
+	sign configurations.archives
+}
+
 
 uploadArchives {
     repositories {
-       flatDir {
-           dirs 'repos'
-       }
+	   mavenDeployer{
+		   beforeDeployment{MavenDeployment deployment->
+			   signing.signPom(deployment)
+		   }
+	    
+		   repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
+			   authentication(userName: ossrhUsername, password: ossrhPassword)
+			 }
+	   	   
+		   pom{
+			   project{
+				   name 'Java DbIP'
+				   description 'A Java library for the DB-IP IP address to city dataset '
+				   packaging 'jar'
+				   url 'https://github.com/ankushs92/Java-DB-IP'
+			       inceptionYear '2016'
+				   
+				   scm {
+					   connection 'scm:git:git@github.com:ankushs92/Java-DB-IP.git'
+					   developerConnection 'scm:git:git@github.com:ankushs92/Java-DB-IP.git'
+					   url 'git@github.com:ankushs92/Java-DB-IP.git'
+					 }
+				   
+				   licenses {
+					   license {
+						 name 'The MIT License'
+						 url 'https://github.com/ankushs92/Java-DB-IP/blob/master/LICENSE.md'
+					   }
+				   }
+				   developers {
+					   developer {
+						 name 'Ankush Sharma'
+						 email 'ankush20058@gmail.com'
+					   }
+					}
+				   issueManagement{
+					   system 'Github'
+					   url 'https://github.com/ankushs92/Java-DB-IP/issues'
+					   
+				   }
+			   }
+		   }
+	       flatDir {
+	           dirs 'repos'
+	   }
     }
+  }
 }

gradle.properties

@@ -0,0 +1,6 @@
+#signing.keyId=
+#signing.password=
+#signing.secretKeyRingFile=
+#
+#ossrhUsername=
+#ossrhPassword=

src/main/java/in/ankushs/dbip/api/DbIpClient.java

@@ -28,8 +28,8 @@ public final class DbIpClient {
 	 * The dbip-city-latest.csv.gz file 
 	 * */
 	private final File file ;
-	
-	private final GeoEntityLookupService lookupService = new GeoEntityLookupServiceImpl();
+	//Singleton
+	private final GeoEntityLookupService lookupService = GeoEntityLookupServiceImpl.getInstance();
 
 	/*
 	 * Indicates whether the file has been loaded into the JVM.
@@ -50,7 +50,7 @@ public DbIpClient(final File gzip){
 		if(!flag){
 			flag = true;
 			logger.info("Loading db ip into repository ");
-			new ResourceImporter().load(gzip);
+			ResourceImporter.getInstance().load(gzip);
 			logger.info("Loading finished");
 		}
 		else{

src/main/java/in/ankushs/dbip/importer/ResourceImporter.java

@@ -17,6 +17,7 @@
 
 import in.ankushs.dbip.model.GeoAttributes;
 import in.ankushs.dbip.model.GeoAttributesImpl;
+import in.ankushs.dbip.parser.CsvParser;
 import in.ankushs.dbip.parser.CsvParserImpl;
 import in.ankushs.dbip.repository.DbIpRepository;
 import in.ankushs.dbip.repository.JavaMapDbIpRepositoryImpl;
@@ -31,10 +32,13 @@
 public final class ResourceImporter {
 
 	private static final Logger logger = LoggerFactory.getLogger(ResourceImporter.class);
-	private final DbIpRepository repository = new JavaMapDbIpRepositoryImpl();
-	private ResourceImporter instance = null;
+	private final DbIpRepository repository = JavaMapDbIpRepositoryImpl.getInstance();
+	private final CsvParser csvParser =  CsvParserImpl.getInstance();
+	private static ResourceImporter instance = null;
 
-	public ResourceImporter getInstance() {
+	private ResourceImporter(){}
+	
+	public static ResourceImporter getInstance() {
 		if (instance == null) {
 			return new ResourceImporter();
 		}
@@ -66,7 +70,7 @@ public void load(final File file) {
 			int i = 0;
 			while ((line = reader.readLine()) != null) {
 				i++;
-				final String[] array = new CsvParserImpl().parseRecord(line);
+				final String[] array = csvParser.parseRecord(line);
 				final GeoAttributes geoAttributes = new GeoAttributesImpl.Builder().withCity(array[4])
 						.withCountry(CountryResolver.resolveToFullName(array[2])).withProvince(array[3])
 						.withEndIp(InetAddresses.forString(array[1])).withStartIp(InetAddresses.forString(array[0]))

src/main/java/in/ankushs/dbip/lookup/GeoEntityLookupServiceImpl.java

@@ -15,13 +15,15 @@
 public final class GeoEntityLookupServiceImpl implements GeoEntityLookupService {
 
 	private static final String UNKNOWN = "Unknown";
-	private final DbIpRepository repository = new JavaMapDbIpRepositoryImpl();
 
-	private GeoEntityLookupServiceImpl instance = null;
+	private final DbIpRepository repository = JavaMapDbIpRepositoryImpl.getInstance();
 
-	public GeoEntityLookupServiceImpl getInstance(){
+	private static GeoEntityLookupServiceImpl instance = null;
+	
+	private GeoEntityLookupServiceImpl(){}
+	public static GeoEntityLookupServiceImpl getInstance(){
 		if(instance==null){
-			return this;
+			return new GeoEntityLookupServiceImpl();
 		}
 		return instance;
 	}
@@ -37,4 +39,8 @@ public GeoEntity lookup(final InetAddress inetAddress) {
 		}
 		return geoEntity;
 	}
+	
+	public static void main(String[] args) {
+		GeoEntityLookupService g1 = getInstance();
+	}
 }

src/main/java/in/ankushs/dbip/parser/CsvParserImpl.java

@@ -8,6 +8,7 @@ public final class CsvParserImpl implements CsvParser {
 
 	public static CsvParserImpl parser = null;
 
+	private CsvParserImpl(){}
 	public static CsvParserImpl getInstance(){
 		if(parser==null){
 			return new CsvParserImpl();

src/main/java/in/ankushs/dbip/repository/JavaMapDbIpRepositoryImpl.java

@@ -19,6 +19,8 @@
 public final class JavaMapDbIpRepositoryImpl implements DbIpRepository {
 
 	private static JavaMapDbIpRepositoryImpl instance = null;
+	
+	private JavaMapDbIpRepositoryImpl(){}
 	public static JavaMapDbIpRepositoryImpl getInstance(){
 		if(instance==null){
 			return new JavaMapDbIpRepositoryImpl();

src/main/java/in/ankushs/dbip/utils/CountryResolver.java

@@ -5,7 +5,7 @@
 
 public final class CountryResolver {
     private static final Map<String, String> countries = new HashMap<String,String>();
-    		
+    private CountryResolver(){}
 	static{
 		countries.put("AF", "Afghanistan");
 		countries.put("AL", "Albania");

src/main/java/in/ankushs/dbip/utils/GzipUtils.java

@@ -11,7 +11,7 @@
  * @author Ankush Sharma
  */
 public class GzipUtils {
-	
+	private GzipUtils(){}
 	/**
 	 * Checks if the file is gzipped.
 	 * @param file The file to be tested