Version 3.2.3

Update for API changes

Author: ChrisdeG

.gitignore

@@ -25,3 +25,4 @@ test/*
 test2/*
 test/widgets/*
 bin/main/*
+log4j.xml.old

log4j.xml

@@ -68,7 +68,7 @@
  *
  */
 public class MendixUtil {
-	private static final String MXBACKUPAPIV1 = "https://deploy.mendix.com/api/1/apps/";
+	private static final String MXBACKUPAPIV1 = "https://deploy.mendix.com/api/1/apps";
 	// json fields in api response
 	private static final String CREATED_ON = "CreatedOn";
 	private static final String SNAPSHOT_ID = "SnapshotID";
@@ -472,7 +472,7 @@ public void GetAppList(List list, String filter) {
 				if (response.code() == 401) {
 					consoleWrite("Unauthorized, Check your username and api-key ");
 				} else {
-					consoleWrite("Error getting apps:"  + response.code());
+					consoleWrite("Error getting apps: "  + response.code());
 				}
 			}
 		} catch (Exception e) {
@@ -493,7 +493,7 @@ public void getEnvironmentList(int selectionCount, List environmentlist){
 			String appid = apps.getJSONObject(AppIndexByListIndex(selectionCount)).getString(APP_ID);
 
 			Request request = new Request.Builder()
-					.url(MXBACKUPAPIV1 + appid +"/environments")
+					.url(MXBACKUPAPIV1 + "/" + appid +"/environments")
 					.get()
 					.addHeader(MENDIX_USER_NAME, apiuser)
 					.addHeader(MENDIX_API_KEY, apikey)
@@ -614,7 +614,7 @@ public boolean GetBackupList(int selectionCount, String environment ) {
 			OkHttpClient client = getClient(60);
 
 			Request request = new Request.Builder()
-					.url(MXBACKUPAPIV1+appid+"/environments/"+environment+"/snapshots")
+					.url(MXBACKUPAPIV1+"/"+appid+"/environments/"+environment+"/snapshots")
 					.get()
 					.addHeader(MENDIX_USER_NAME, apiuser)
 					.addHeader(MENDIX_API_KEY, apikey)
@@ -692,7 +692,7 @@ public void run()
 					OkHttpClient client = getClient(60);
 
 					Request request = new Request.Builder()
-							.url(MXBACKUPAPIV1+appid+"/environments/"+environment+"/snapshots/"+backupid)
+							.url(MXBACKUPAPIV1+"/"+appid+"/environments/"+environment+"/snapshots/"+backupid)
 							.get()
 							.addHeader(MENDIX_USER_NAME, apiuser)
 							.addHeader(MENDIX_API_KEY, apikey)
@@ -814,7 +814,7 @@ public void run()
 					MediaType JSON = MediaType.parse("application/json; charset=utf-8");
 					RequestBody requestBody = RequestBody.create(JSON, "{\"comment\":\"Backup tool " + apiuser + "\"}");
 					Request request = new Request.Builder()
-							.url(MXBACKUPAPIV1+appid+"/environments/"+environment+"/snapshots/")
+							.url(MXBACKUPAPIV1+"/"+appid+"/environments/"+environment+"/snapshots/")
 							.post(requestBody)
 							.addHeader(MENDIX_USER_NAME, apiuser)
 							.addHeader(MENDIX_API_KEY, apikey)
@@ -877,7 +877,7 @@ public void run()
 					OkHttpClient client = getClient(60);
 
 					Request request = new Request.Builder()
-							.url(MXBACKUPAPIV1+appid+"/environments/"+environment+"/snapshots/"+backupid)
+							.url(MXBACKUPAPIV1+"/"+appid+"/environments/"+environment+"/snapshots/"+backupid)
 							.get()
 							.addHeader(MENDIX_USER_NAME, apiuser)
 							.addHeader(MENDIX_API_KEY, apikey)

out/MendixBackupRestoreTool.exe

@@ -142,7 +142,7 @@ public void widgetSelected(SelectionEvent e) {
 		Label lblCopyrightChrisDe = new Label(shlSettings, SWT.NONE);
 		lblCopyrightChrisDe.setToolTipText("");
 		lblCopyrightChrisDe.setBounds(18, 341, 221, 23);
-		lblCopyrightChrisDe.setText("V 3.2.1 - Chris de Gelder");
+		lblCopyrightChrisDe.setText("V 3.2.3 - Chris de Gelder");
 
 		lblPostgresDirectory = new Label(shlSettings, SWT.NONE);
 		lblPostgresDirectory.setText("Postgres directory (no bin)");

out/MendixBackupRestoreTool.jar

@@ -1 +1,2 @@
 /META-INF/
+/main/

src/main/java/com/ccdg/app/MendixUtil.java

@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Sat Mar 06 18:46:22 CET 2021
+#Tue Mar 23 12:48:23 CET 2021
 m2e.projectLocation=C\:\\Users\\Chris de Gelder\\Documents\\GitHub\\BackupRestoreTool\\MendixBackupRestore
 m2e.projectName=MendixBackupRestoreTool
 groupId=com.ccdg.app