Ver 4.1.1 - GitHubClient - HttpClient

Author: l-gu

src/main/java/org/telosys/tools/commons/bundles/BundlesManager.java

@@ -53,6 +53,10 @@ public BundlesManager(TelosysToolsCfg cfg) {
 		this.telosysToolsCfg = cfg;
 	}
 
+	private GitHubClient getGitHubClient() {
+		return new GitHubClient( telosysToolsCfg.getCfgFileAbsolutePath() ) ; 
+	}
+	
 	//--------------------------------------------------------------------------------------------------
 	/**
 	 * Returns the DOWNLOADS folder's full path in the file system <br>
@@ -162,7 +166,8 @@ public BundleStatus downloadAndInstallBundle( String userName, String bundleName
 	 */
 	public BundleStatus downloadBundle( String userName, String bundleName, String downloadFolderInProject )  {
 		BundleStatus status = new BundleStatus();
-		GitHubClient gitHubClient = new GitHubClient( telosysToolsCfg.getProperties() ) ; 
+		// GitHubClient gitHubClient = new GitHubClient( telosysToolsCfg.getProperties() ) ;
+		GitHubClient gitHubClient = getGitHubClient(); // v 4.1.1
 		String destinationFile = buildDestinationFileName(bundleName, downloadFolderInProject) ;
 		status.log("-> Download bundle '" + bundleName + "' ");
 		status.log("   in '" + destinationFile + "' ");
@@ -189,7 +194,8 @@ public BundleStatus downloadBundle( String userName, String bundleName, String d
 	public BundlesFromGitHub getGitHubBundlesList( String githubUserName ) throws Exception {
 
 		// HTTP request to GitHub 
-		GitHubClient gitHubClient = new GitHubClient( telosysToolsCfg.getProperties() ) ; 
+		// GitHubClient gitHubClient = new GitHubClient( telosysToolsCfg.getProperties() ) ;  
+		GitHubClient gitHubClient = getGitHubClient(); // v 4.1.1
 		GitHubRepositoriesResponse githubResponse = gitHubClient.getRepositories(githubUserName);
 
 		// Build list of bundles names (can be void)
@@ -210,7 +216,8 @@ public BundlesFromGitHub getGitHubBundlesList( String githubUserName ) throws Ex
 	public GitHubRateLimitResponse getGitHubRateLimit() throws Exception {
 
 		// HTTP request to GitHub 
-		GitHubClient gitHubClient = new GitHubClient( telosysToolsCfg.getProperties() ) ; 
+		// GitHubClient gitHubClient = new GitHubClient( telosysToolsCfg.getProperties() ) ; 
+		GitHubClient gitHubClient = getGitHubClient(); // v 4.1.1
 		return gitHubClient.getRateLimit();
 	}
 

src/main/java/org/telosys/tools/commons/github/GitHubClient.java

@@ -25,6 +25,8 @@
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
+import org.telosys.tools.commons.PropertiesManager;
+import org.telosys.tools.commons.cfg.TelosysToolsCfg;
 import org.telosys.tools.commons.http.Base64;
 import org.telosys.tools.commons.http.HttpClient;
 import org.telosys.tools.commons.http.HttpResponse;
@@ -37,22 +39,45 @@
  */
 public class GitHubClient {
 
-	public static final String VERSION = "2.1" ; // GitHub Client Version (for checking in CLI and Download)
+//	public static final String VERSION = "2.1" ; // GitHub Client Version (for checking in CLI and Download)
+	public static final String VERSION = "3 (2024-01-05)" ; // GitHub Client Version (for checking in CLI and Download)
 
 	public static final String GIT_HUB_HOST_URL = "https://api.github.com" ;
 
 	public static final String GIT_HUB_REPO_URL_PATTERN =  "https://github.com/${USER}/${REPO}/archive/master.zip" ;
 
 
-	private final Properties proxyProperties ;
+//	private final Properties proxyProperties ;
+	private final String propertiesFileAbsolutePath ;
 
-	/**
-	 * Constructor
-	 * @param proxyProperties
-	 */
-	public GitHubClient(Properties proxyProperties) {
+//	/**
+//	 * Constructor
+//	 * @param proxyProperties
+//	 */
+//	public GitHubClient(Properties proxyProperties) {
+//		super();
+//		this.proxyProperties = proxyProperties;
+//	}
+	public GitHubClient(String propertiesFileAbsolutePath) {
 		super();
-		this.proxyProperties = proxyProperties;
+		if ( propertiesFileAbsolutePath == null ) {
+			throw new IllegalArgumentException("File path argument is mandatory");
+		}
+		this.propertiesFileAbsolutePath = propertiesFileAbsolutePath;
+	}
+	
+	private HttpClient buildHttpClient() {
+		// TODO : load properties 
+		PropertiesManager propertiesManager = new PropertiesManager(propertiesFileAbsolutePath) ;
+		Properties properties = propertiesManager.load(); // Ret NULL if file not found
+		if ( properties != null ) {
+			return new HttpClient(properties);
+		}
+		else {
+			// Properties file not found, no properties loaded : use default values
+			return new HttpClient();
+		}
+		
 	}
 
 	private Map<String, String> buildRequestHeaders() {
@@ -71,7 +96,8 @@ private Map<String, String> buildRequestHeaders() {
 	}
 
 	private HttpResponse httpGet( String url ) throws Exception {
-		HttpClient httpClient = new HttpClient(proxyProperties);
+//		HttpClient httpClient = new HttpClient(proxyProperties);
+		HttpClient httpClient = buildHttpClient();
 		HttpResponse response;
 		try {
 			// Sometimes GitHub return a 403 status code 
@@ -206,7 +232,9 @@ public final long downloadRepository(String userName, String repoName, String de
 		String url = GitHubUtil.buildGitHubURL(userName, repoName, GIT_HUB_REPO_URL_PATTERN);
 
 		long bytesCount = 0 ;
-		HttpClient httpClient = new HttpClient(proxyProperties);
+//		HttpClient httpClient = new HttpClient(proxyProperties);
+		HttpClient httpClient = buildHttpClient();
+		
 		bytesCount = httpClient.downloadFile(url, destinationFile);
 		return bytesCount ;
 	}

src/test/java/org/telosys/tools/commons/github/GitHubClientIT.java

@@ -53,11 +53,16 @@ public void testGetRepositoriesWithoutProperties() throws Exception  {
 		getRepositories( null );
 	}
 
+	private GitHubClient buildGitHubClient() {
+		return new GitHubClient( TestsEnv.getTestFile("cfg/telosys-tools.cfg").getAbsolutePath() ); // v 4.1.1
+	}
+	
 	private void getRepositories( Properties properties ) throws Exception  {
 		System.out.println("Getting repositories... ");
 		printJavaVersion() ;
 
-		GitHubClient gitHubClient = new GitHubClient( properties );
+//		GitHubClient gitHubClient = new GitHubClient( properties );
+		GitHubClient gitHubClient = buildGitHubClient(); // v 4.1.1
 
 		GitHubRepositoriesResponse githubResponse = gitHubClient.getRepositories(GITHUB_USER);
 
@@ -76,8 +81,9 @@ public void testDownloadRepository() throws Exception {
 
 		printJavaVersion() ;
 
-		Properties properties = TestsEnv.loadSpecificProxyProperties() ;
-		GitHubClient gitHubClient = new GitHubClient( properties);
+//		Properties properties = TestsEnv.loadSpecificProxyProperties() ;
+//		GitHubClient gitHubClient = new GitHubClient( properties);
+		GitHubClient gitHubClient = buildGitHubClient(); // v 4.1.1
 
 		String repoName = "plantuml" ; // "basic-templates-TT210" ;
 		String destinationFile = TestsEnv.getTmpDownloadFolderFullPath() + "/" + repoName + ".zip" ;
@@ -92,7 +98,8 @@ public void testGetRateLimit() throws Exception {
 
 		GitHubUser.clear();
 
-		GitHubClient gitHubClient = new GitHubClient(null);
+//		GitHubClient gitHubClient = new GitHubClient(null);
+		GitHubClient gitHubClient = buildGitHubClient(); // v 4.1.1
 		GitHubRateLimitResponse rateLimit = gitHubClient.getRateLimit();
 
 		System.out.println(rateLimit);
@@ -106,7 +113,8 @@ public void testGetRateLimitWithBadUser() throws Exception {
 		// User + password
 		GitHubUser.set("fake-user-azer7766-OuPMK", "xxxxx");
 
-		GitHubClient gitHubClient = new GitHubClient(null);
+//		GitHubClient gitHubClient = new GitHubClient(null);
+		GitHubClient gitHubClient = buildGitHubClient(); // v 4.1.1
 		GitHubRateLimitResponse rateLimit = gitHubClient.getRateLimit(); 
 
 		System.out.println(rateLimit); // limit='60', remaining='60'