From 7be3a9cbcdb1f506953ea01bfe8baffad125c187 Mon Sep 17 00:00:00 2001
From: ambpro <amin.boudeffa@softeam.fr>
Date: Mon, 21 Oct 2019 17:54:08 +0200
Subject: [PATCH] #408 #409 Fixes and improvements related to the bts and cc
 connectors

---
 .../add-connector-dialog.component.html       |  32 +-
 .../edit-project/edit-project.component.html  |  32 +-
 .../client/api/ProjectCreationResource.java   |  37 --
 .../client/api/ProjectEditionResource.java    | 364 +++++++++++-------
 4 files changed, 254 insertions(+), 211 deletions(-)

diff --git a/administration/scava-administration/src/app/layout/project/components/edit-project/add-connector/add-connector-dialog.component.html b/administration/scava-administration/src/app/layout/project/components/edit-project/add-connector/add-connector-dialog.component.html
index 69d07c660..aefa9dbf9 100644
--- a/administration/scava-administration/src/app/layout/project/components/edit-project/add-connector/add-connector-dialog.component.html
+++ b/administration/scava-administration/src/app/layout/project/components/edit-project/add-connector/add-connector-dialog.component.html
@@ -293,8 +293,8 @@ <h4 class="modal-title">Add connector</h4>
                 </div>
             </div>
             <div class="form-group" *ngIf="repository._type == 'org.eclipse.scava.repository.model.cc.sympa.SympaMailingList'">
-                <label for="mailingListName">Mailing List Name</label>
-                <input type="text" class="form-control" name="mailingListName" [(ngModel)]="repository.mailingListName" #mailingListNameInput="ngModel" required>
+                <label for="MailingListName">Mailing List Name</label>
+                <input type="text" class="form-control" name="MailingListName" [(ngModel)]="repository.MailingListName" #mailingListNameInput="ngModel" required>
                 <div *ngIf="mailingListNameInput.dirty && mailingListNameInput.invalid">
                     <small class="form-text text-danger" *ngIf="mailingListNameInput.errors.required">
                         This field is required.
@@ -302,8 +302,8 @@ <h4 class="modal-title">Add connector</h4>
                 </div>
             </div>
             <div class="form-group" *ngIf="repository._type == 'org.eclipse.scava.repository.model.cc.sympa.SympaMailingList'">
-                <label for="mailingListDescription">Mailing List Description</label>
-                <input type="text" class="form-control" name="mailingListDescription" [(ngModel)]="repository.mailingListDescription" #mailingListDescriptionInput="ngModel" required>
+                <label for="MailingListDescription">Mailing List Description</label>
+                <input type="text" class="form-control" name="MailingListDescription" [(ngModel)]="repository.MailingListDescription" #mailingListDescriptionInput="ngModel" required>
                 <div *ngIf="mailingListDescriptionInput.dirty && mailingListDescriptionInput.invalid">
                     <small class="form-text text-danger" *ngIf="mailingListDescriptionInput.errors.required">
                         This field is required.
@@ -338,8 +338,8 @@ <h4 class="modal-title">Add connector</h4>
                 </div>
             </div>
             <div class="form-group" *ngIf="repository._type == 'org.eclipse.scava.repository.model.cc.mbox.Mbox'">
-                <label for="mboxName">Mbox Name</label>
-                <input type="text" class="form-control" name="mboxName" [(ngModel)]="repository.mboxName" #mboxNameInput="ngModel" required>
+                <label for="MboxName">Mbox Name</label>
+                <input type="text" class="form-control" name="MboxName" [(ngModel)]="repository.MboxName" #mboxNameInput="ngModel" required>
                 <div *ngIf="mboxNameInput.dirty && mboxNameInput.invalid">
                     <small class="form-text text-danger" *ngIf="mboxNameInput.errors.required">
                         This field is required.
@@ -347,8 +347,8 @@ <h4 class="modal-title">Add connector</h4>
                 </div>
             </div>
             <div class="form-group" *ngIf="repository._type == 'org.eclipse.scava.repository.model.cc.mbox.Mbox'">
-                <label for="mboxDescription">Mbox Description</label>
-                <input type="text" class="form-control" name="mboxDescription" [(ngModel)]="repository.mboxDescription" #mboxDescriptionInput="ngModel" required>
+                <label for="MboxDescription">Mbox Description</label>
+                <input type="text" class="form-control" name="MboxDescription" [(ngModel)]="repository.MboxDescription" #mboxDescriptionInput="ngModel" required>
                 <div *ngIf="mboxDescriptionInput.dirty && mboxDescriptionInput.invalid">
                     <small class="form-text text-danger" *ngIf="mboxDescriptionInput.errors.required">
                         This field is required.
@@ -374,8 +374,8 @@ <h4 class="modal-title">Add connector</h4>
             </div>
             <!-- ECLIPSE FORUM -->
             <div class="form-group" *ngIf="repository._type == 'org.eclipse.scava.repository.model.cc.eclipseforums.EclipseForum'">
-                <label for="forumId">Forum Id</label>
-                <input type="text" class="form-control" name="forumId" [(ngModel)]="repository.forumId" #forumIdInput="ngModel" required>
+                <label for="forum_id">Forum Id</label>
+                <input type="text" class="form-control" name="forum_id" [(ngModel)]="repository.forum_id" #forumIdInput="ngModel" required>
                 <div *ngIf="forumIdInput.dirty && forumIdInput.invalid">
                     <small class="form-text text-danger" *ngIf="forumIdInput.errors.required">
                         This field is required.
@@ -383,8 +383,8 @@ <h4 class="modal-title">Add connector</h4>
                 </div>
             </div>
             <div class="form-group" *ngIf="repository._type == 'org.eclipse.scava.repository.model.cc.eclipseforums.EclipseForum'">
-                <label for="forumName">Forum Name</label>
-                <input type="text" class="form-control" name="forumName" [(ngModel)]="repository.forumName" #forumNameInput="ngModel" required>
+                <label for="forum_name">Forum Name</label>
+                <input type="text" class="form-control" name="forum_name" [(ngModel)]="repository.forum_name" #forumNameInput="ngModel" required>
                 <div *ngIf="forumNameInput.dirty && forumNameInput.invalid">
                     <small class="form-text text-danger" *ngIf="forumNameInput.errors.required">
                         This field is required.
@@ -392,8 +392,8 @@ <h4 class="modal-title">Add connector</h4>
                 </div>
             </div>
             <div class="form-group" *ngIf="repository._type == 'org.eclipse.scava.repository.model.cc.eclipseforums.EclipseForum'">
-                <label for="clientId">Client Id</label>
-                <input type="text" class="form-control" name="clientId" [(ngModel)]="repository.clientId" #clientIdInput="ngModel" required>
+                <label for="client_id">Client Id</label>
+                <input type="text" class="form-control" name="client_id" [(ngModel)]="repository.client_id" #clientIdInput="ngModel" required>
                 <div *ngIf="clientIdInput.dirty && clientIdInput.invalid">
                     <small class="form-text text-danger" *ngIf="clientIdInput.errors.required">
                         This field is required.
@@ -401,8 +401,8 @@ <h4 class="modal-title">Add connector</h4>
                 </div>
             </div>
             <div class="form-group" *ngIf="repository._type == 'org.eclipse.scava.repository.model.cc.eclipseforums.EclipseForum'">
-                <label for="clientSecret">Client Secret</label>
-                <input type="text" class="form-control" name="clientSecret" [(ngModel)]="repository.clientSecret" #clientSecretInput="ngModel" required>
+                <label for="client_secret">Client Secret</label>
+                <input type="text" class="form-control" name="client_secret" [(ngModel)]="repository.client_secret" #clientSecretInput="ngModel" required>
                 <div *ngIf="clientSecretInput.dirty && clientSecretInput.invalid">
                     <small class="form-text text-danger" *ngIf="clientSecretInput.errors.required">
                         This field is required.
diff --git a/administration/scava-administration/src/app/layout/project/components/edit-project/edit-project.component.html b/administration/scava-administration/src/app/layout/project/components/edit-project/edit-project.component.html
index 0e75ba237..9bea909b9 100755
--- a/administration/scava-administration/src/app/layout/project/components/edit-project/edit-project.component.html
+++ b/administration/scava-administration/src/app/layout/project/components/edit-project/edit-project.component.html
@@ -248,28 +248,28 @@ <h2>Edit Project <b>{{project?.shortName}}</b></h2>
                         <input type="text" class="form-control" name="cc.description-{{i + 1}}" [(ngModel)]="cc.description">
                     </td>
                 </tr>
-                <tr *ngIf="cc?.mailingListName != null" class="row">
+                <tr *ngIf="cc?.MailingListName != null" class="row">
                     <td class="col-2">&nbsp;&nbsp;&nbsp;&nbsp;Mailing List Name: </td>
                     <td class="col-10">
-                        <input type="text" class="form-control" name="cc.mailingListName-{{i + 1}}" [(ngModel)]="cc.mailingListName">
+                        <input type="text" class="form-control" name="cc.MailingListName-{{i + 1}}" [(ngModel)]="cc.MailingListName">
                     </td>
                 </tr>
-                <tr *ngIf="cc?.mailingListDescription != null" class="row">
+                <tr *ngIf="cc?.MailingListDescription != null" class="row">
                     <td class="col-2">&nbsp;&nbsp;&nbsp;&nbsp;Mailing List Description: </td>
                     <td class="col-10">
-                        <input type="text" class="form-control" name="cc.mailingListDescription-{{i + 1}}" [(ngModel)]="cc.mailingListDescription">
+                        <input type="text" class="form-control" name="cc.MailingListDescription-{{i + 1}}" [(ngModel)]="cc.MailingListDescription">
                     </td>
                 </tr>
-                <tr *ngIf="cc?.mboxName != null" class="row">
+                <tr *ngIf="cc?.MboxName != null" class="row">
                     <td class="col-2">&nbsp;&nbsp;&nbsp;&nbsp;Mbox Name: </td>
                     <td class="col-10">
-                        <input type="text" class="form-control" name="cc.mboxName-{{i + 1}}" [(ngModel)]="cc.mboxName">
+                        <input type="text" class="form-control" name="cc.MboxName-{{i + 1}}" [(ngModel)]="cc.MboxName">
                     </td>
                 </tr>
-                <tr *ngIf="cc?.mboxDescription != null" class="row">
+                <tr *ngIf="cc?.MboxDescription != null" class="row">
                     <td class="col-2">&nbsp;&nbsp;&nbsp;&nbsp;Mbox Description: </td>
                     <td class="col-10">
-                        <input type="text" class="form-control" name="cc.mboxDescription-{{i + 1}}" [(ngModel)]="cc.mboxDescription">
+                        <input type="text" class="form-control" name="cc.MboxDescription-{{i + 1}}" [(ngModel)]="cc.MboxDescription">
                     </td>
                 </tr>
                 <tr *ngIf="cc?.compressedFileExtension != null" class="row">
@@ -314,28 +314,28 @@ <h2>Edit Project <b>{{project?.shortName}}</b></h2>
                         <input type="text" class="form-control" name="cc.password-{{i + 1}}" [(ngModel)]="cc.password">
                     </td>
                 </tr>
-                <tr *ngIf="cc?.forumId != null" class="row">
+                <tr *ngIf="cc?.forum_id != null" class="row">
                     <td class="col-2">&nbsp;&nbsp;&nbsp;&nbsp;Forum Id: </td>
                     <td class="col-10">
-                        <input type="text" class="form-control" name="cc.forumId-{{i + 1}}" [(ngModel)]="cc.forumId">
+                        <input type="text" class="form-control" name="cc.forum_id-{{i + 1}}" [(ngModel)]="cc.forum_id">
                     </td>
                 </tr>
-                <tr *ngIf="cc?.forumName != null" class="row">
+                <tr *ngIf="cc?.forum_name != null" class="row">
                     <td class="col-2">&nbsp;&nbsp;&nbsp;&nbsp;Forum Name: </td>
                     <td class="col-10">
-                        <input type="text" class="form-control" name="cc.forumName-{{i + 1}}" [(ngModel)]="cc.forumName">
+                        <input type="text" class="form-control" name="cc.forum_name-{{i + 1}}" [(ngModel)]="cc.forum_name">
                     </td>
                 </tr>
-                <tr *ngIf="cc?.clientId != null" class="row">
+                <tr *ngIf="cc?.client_id != null" class="row">
                     <td class="col-2">&nbsp;&nbsp;&nbsp;&nbsp;Client Id: </td>
                     <td class="col-10">
-                        <input type="text" class="form-control" name="cc.clientId-{{i + 1}}" [(ngModel)]="cc.clientId">
+                        <input type="text" class="form-control" name="cc.client_id-{{i + 1}}" [(ngModel)]="cc.client_id">
                     </td>
                 </tr>
-                <tr *ngIf="cc?.clientSecret != null" class="row">
+                <tr *ngIf="cc?.client_secret != null" class="row">
                     <td class="col-2">&nbsp;&nbsp;&nbsp;&nbsp;Client Secret: </td>
                     <td class="col-10">
-                        <input type="text" class="form-control" name="cc.clientSecret-{{i + 1}}" [(ngModel)]="cc.clientSecret">
+                        <input type="text" class="form-control" name="cc.client_secret-{{i + 1}}" [(ngModel)]="cc.client_secret">
                     </td>
                 </tr>
             </tbody>
diff --git a/metric-platform/platform/org.eclipse.scava.platform.client.api/src/org/eclipse/scava/platform/client/api/ProjectCreationResource.java b/metric-platform/platform/org.eclipse.scava.platform.client.api/src/org/eclipse/scava/platform/client/api/ProjectCreationResource.java
index 3f873c58c..94c2ffa62 100644
--- a/metric-platform/platform/org.eclipse.scava.platform.client.api/src/org/eclipse/scava/platform/client/api/ProjectCreationResource.java
+++ b/metric-platform/platform/org.eclipse.scava.platform.client.api/src/org/eclipse/scava/platform/client/api/ProjectCreationResource.java
@@ -45,43 +45,6 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class ProjectCreationResource extends ServerResource {
-	
-	public static void main(String[] args) throws Exception {
-		String j = "{\"name\":\"hi\",\"homePage\":\"hi\",\"description\":\"hi\",\"vcsRepositories\":[{\"name\":\"hi\",\"url\":\"hi\",\"type\":\"git\"}],\"bts\":[{\"product\":\"hi\",\"url\":\"hi\",\"component\":\"hi\"}],\"communication_channels\":[{\"name\":\"hi\",\"url\":\"hi\",\"newsgroup\":\"hi\"}]}";
-
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode json = mapper.readTree(j);
-		
-		Project project = new Project();
-		project.setName(json.get("name").asText());
-		project.setHomePage(json.get("homePage").asText());
-		project.setDescription(json.get("description").asText());
-		
-		for (JsonNode vcs : (ArrayNode)json.get("vcsRepositories")) {
-			VcsRepository repo = null;
-			if (vcs.get("type").asText().equals("svn")) {
-				repo = new SvnRepository();
-			} else if (vcs.get("type").asText().equals("git")) {
-				repo = new GitRepository();
-			}
-			repo.setName(vcs.get("name").asText());
-			repo.setUrl(vcs.get("url").asText());
-			project.getVcsRepositories().add(repo);
-		}
-		for (JsonNode cc : (ArrayNode)json.get("communication_channels")) {
-			NntpNewsGroup newsgroup = new NntpNewsGroup();
-			newsgroup.setName(cc.get("name").asText());
-			newsgroup.setUrl(cc.get("url").asText());
-			project.getCommunicationChannels().add(newsgroup);
-		}
-		for (JsonNode bts : (ArrayNode)json.get("bts")) {
-			Bugzilla bugs = new Bugzilla();
-			bugs.setProduct(bts.get("product").asText());
-			bugs.setUrl(bts.get("url").asText());
-			bugs.setComponent(bts.get("component").asText());
-			project.getBugTrackingSystems().add(bugs);
-		}
-	}
 
 	@Post
 	public Representation createProject(Representation entity) {
diff --git a/metric-platform/platform/org.eclipse.scava.platform.client.api/src/org/eclipse/scava/platform/client/api/ProjectEditionResource.java b/metric-platform/platform/org.eclipse.scava.platform.client.api/src/org/eclipse/scava/platform/client/api/ProjectEditionResource.java
index d404eaab0..031869676 100644
--- a/metric-platform/platform/org.eclipse.scava.platform.client.api/src/org/eclipse/scava/platform/client/api/ProjectEditionResource.java
+++ b/metric-platform/platform/org.eclipse.scava.platform.client.api/src/org/eclipse/scava/platform/client/api/ProjectEditionResource.java
@@ -275,13 +275,13 @@ private void editProject(JsonNode json, Project project) {
 					communication.setUrl(ccJson.get("url").asText());
 					((NntpNewsGroup) communication).setName(ccJson.get("name").asText());
 					((NntpNewsGroup) communication).setPort(ccJson.get("port").asInt());
-					if (ccJson.get("interval").asText() != null && !ccJson.get("interval").asText().equals("")) {
+					if (ccJson.has("interval")) {
 						((NntpNewsGroup) communication).setInterval(ccJson.get("interval").asInt());
 					}
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((NntpNewsGroup) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((NntpNewsGroup) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
@@ -291,41 +291,58 @@ private void editProject(JsonNode json, Project project) {
 					((Irc) communication).setName(ccJson.get("name").asText());
 					((Irc) communication).setDescription(ccJson.get("description").asText());
 					((Irc) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Irc) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Irc) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
 					break;
+				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof SympaMailingList) {
+					communication.setUrl(ccJson.get("url").asText());
+					((SympaMailingList) communication).setMailingListName(ccJson.get("MailingListName").asText());
+					((SympaMailingList) communication).setMailingListDescription(ccJson.get("MailingListDescription").asText());
+					((SympaMailingList) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
+					if (ccJson.has("username")) {
+						((SympaMailingList) communication).setUsername(ccJson.get("username").asText());
+					}
+					if (ccJson.has("password")) {
+						((SympaMailingList) communication).setPassword(ccJson.get("password").asText());
+					}
+					exist = true;
+					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof Mbox) {
 					communication.setUrl(ccJson.get("url").asText());
-					((Mbox) communication).setMboxName(ccJson.get("mboxName").asText());
-					((Mbox) communication).setMboxDescription(ccJson.get("mboxDescription").asText());
+					((Mbox) communication).setMboxName(ccJson.get("MboxName").asText());
+					((Mbox) communication).setMboxDescription(ccJson.get("MboxDescription").asText());
 					((Mbox) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Mbox) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Mbox) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
 					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof EclipseForum) {
-					((EclipseForum) communication).setForum_id(ccJson.get("forumId").asText());
-					((EclipseForum) communication).setForum_name(ccJson.get("forumName").asText());
-					((EclipseForum) communication).setClient_id(ccJson.get("clientId").asText());
-					((EclipseForum) communication).setClient_secret(ccJson.get("clientSecret").asText());
+					((EclipseForum) communication).setForum_id(ccJson.get("forum_id").asText());
+					((EclipseForum) communication).setForum_name(ccJson.get("forum_name").asText());
+					((EclipseForum) communication).setClient_id(ccJson.get("client_id").asText());
+					((EclipseForum) communication).setClient_secret(ccJson.get("client_secret").asText());
 					exist = true;
 					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof DocumentationSystematic) {
 					if (ccJson.get("loginOption").asText().equals("option1")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 					} else if (ccJson.get("loginOption").asText().equals("option2")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 						((DocumentationSystematic) communication).setLoginURL(ccJson.get("loginURL").asText());
 						((DocumentationSystematic) communication).setUsername(ccJson.get("username").asText());
 						((DocumentationSystematic) communication).setUsernameFieldName(ccJson.get("usernameFieldName").asText());
@@ -344,13 +361,13 @@ private void editProject(JsonNode json, Project project) {
 					communication.setUrl(ccJson.get("url").asText());
 					((NntpNewsGroup) communication).setName(ccJson.get("name").asText());
 					((NntpNewsGroup) communication).setPort(ccJson.get("port").asInt());
-					if (ccJson.get("interval").asText() != null && !ccJson.get("interval").asText().equals("")) {
+					if (ccJson.has("interval")) {
 						((NntpNewsGroup) communication).setInterval(ccJson.get("interval").asInt());
 					}
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((NntpNewsGroup) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((NntpNewsGroup) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
@@ -360,54 +377,58 @@ private void editProject(JsonNode json, Project project) {
 					((Irc) communication).setName(ccJson.get("name").asText());
 					((Irc) communication).setDescription(ccJson.get("description").asText());
 					((Irc) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Irc) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Irc) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.sympa.SympaMailingList":
 					communication = new SympaMailingList();
 					communication.setUrl(ccJson.get("url").asText());
-					((SympaMailingList) communication).setMailingListName(ccJson.get("mailingListName").asText());
-					((SympaMailingList) communication).setMailingListDescription(ccJson.get("mailingListDescription").asText());
+					((SympaMailingList) communication).setMailingListName(ccJson.get("MailingListName").asText());
+					((SympaMailingList) communication).setMailingListDescription(ccJson.get("MailingListDescription").asText());
 					((SympaMailingList) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((SympaMailingList) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((SympaMailingList) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.mbox.Mbox":
 					communication = new Mbox();
 					communication.setUrl(ccJson.get("url").asText());
-					((Mbox) communication).setMboxName(ccJson.get("mboxName").asText());
-					((Mbox) communication).setMboxDescription(ccJson.get("mboxDescription").asText());
+					((Mbox) communication).setMboxName(ccJson.get("MboxName").asText());
+					((Mbox) communication).setMboxDescription(ccJson.get("MboxDescription").asText());
 					((Mbox) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Mbox) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Mbox) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.eclipseforums.EclipseForum":
 					communication = new EclipseForum();
-					((EclipseForum) communication).setForum_id(ccJson.get("forumId").asText());
-					((EclipseForum) communication).setForum_name(ccJson.get("forumName").asText());
-					((EclipseForum) communication).setClient_id(ccJson.get("clientId").asText());
-					((EclipseForum) communication).setClient_secret(ccJson.get("clientSecret").asText());
+					((EclipseForum) communication).setForum_id(ccJson.get("forum_id").asText());
+					((EclipseForum) communication).setForum_name(ccJson.get("forum_name").asText());
+					((EclipseForum) communication).setClient_id(ccJson.get("client_id").asText());
+					((EclipseForum) communication).setClient_secret(ccJson.get("client_secret").asText());
 					break;
 				case "org.eclipse.scava.repository.model.documentation.systematic.DocumentationSystematic":
 					communication = new DocumentationSystematic();
 					if (ccJson.get("loginOption").asText().equals("option1")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 					} else if (ccJson.get("loginOption").asText().equals("option2")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 						((DocumentationSystematic) communication).setLoginURL(ccJson.get("loginURL").asText());
 						((DocumentationSystematic) communication).setUsername(ccJson.get("username").asText());
 						((DocumentationSystematic) communication).setUsernameFieldName(ccJson.get("usernameFieldName").asText());
@@ -638,13 +659,13 @@ private void editGithubProject(JsonNode json, Project project) {
 					communication.setUrl(ccJson.get("url").asText());
 					((NntpNewsGroup) communication).setName(ccJson.get("name").asText());
 					((NntpNewsGroup) communication).setPort(ccJson.get("port").asInt());
-					if (ccJson.get("interval").asText() != null && !ccJson.get("interval").asText().equals("")) {
+					if (ccJson.has("interval")) {
 						((NntpNewsGroup) communication).setInterval(ccJson.get("interval").asInt());
 					}
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((NntpNewsGroup) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((NntpNewsGroup) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
@@ -654,41 +675,58 @@ private void editGithubProject(JsonNode json, Project project) {
 					((Irc) communication).setName(ccJson.get("name").asText());
 					((Irc) communication).setDescription(ccJson.get("description").asText());
 					((Irc) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Irc) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Irc) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
 					break;
+				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof SympaMailingList) {
+					communication.setUrl(ccJson.get("url").asText());
+					((SympaMailingList) communication).setMailingListName(ccJson.get("MailingListName").asText());
+					((SympaMailingList) communication).setMailingListDescription(ccJson.get("MailingListDescription").asText());
+					((SympaMailingList) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
+					if (ccJson.has("username")) {
+						((SympaMailingList) communication).setUsername(ccJson.get("username").asText());
+					}
+					if (ccJson.has("password")) {
+						((SympaMailingList) communication).setPassword(ccJson.get("password").asText());
+					}
+					exist = true;
+					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof Mbox) {
 					communication.setUrl(ccJson.get("url").asText());
-					((Mbox) communication).setMboxName(ccJson.get("mboxName").asText());
-					((Mbox) communication).setMboxDescription(ccJson.get("mboxDescription").asText());
+					((Mbox) communication).setMboxName(ccJson.get("MboxName").asText());
+					((Mbox) communication).setMboxDescription(ccJson.get("MboxDescription").asText());
 					((Mbox) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Mbox) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Mbox) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
 					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof EclipseForum) {
-					((EclipseForum) communication).setForum_id(ccJson.get("forumId").asText());
-					((EclipseForum) communication).setForum_name(ccJson.get("forumName").asText());
-					((EclipseForum) communication).setClient_id(ccJson.get("clientId").asText());
-					((EclipseForum) communication).setClient_secret(ccJson.get("clientSecret").asText());
+					((EclipseForum) communication).setForum_id(ccJson.get("forum_id").asText());
+					((EclipseForum) communication).setForum_name(ccJson.get("forum_name").asText());
+					((EclipseForum) communication).setClient_id(ccJson.get("client_id").asText());
+					((EclipseForum) communication).setClient_secret(ccJson.get("client_secret").asText());
 					exist = true;
 					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof DocumentationSystematic) {
 					if (ccJson.get("loginOption").asText().equals("option1")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 					} else if (ccJson.get("loginOption").asText().equals("option2")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 						((DocumentationSystematic) communication).setLoginURL(ccJson.get("loginURL").asText());
 						((DocumentationSystematic) communication).setUsername(ccJson.get("username").asText());
 						((DocumentationSystematic) communication).setUsernameFieldName(ccJson.get("usernameFieldName").asText());
@@ -707,13 +745,13 @@ private void editGithubProject(JsonNode json, Project project) {
 					communication.setUrl(ccJson.get("url").asText());
 					((NntpNewsGroup) communication).setName(ccJson.get("name").asText());
 					((NntpNewsGroup) communication).setPort(ccJson.get("port").asInt());
-					if (ccJson.get("interval").asText() != null && !ccJson.get("interval").asText().equals("")) {
+					if (ccJson.has("interval")) {
 						((NntpNewsGroup) communication).setInterval(ccJson.get("interval").asInt());
 					}
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((NntpNewsGroup) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((NntpNewsGroup) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
@@ -723,56 +761,58 @@ private void editGithubProject(JsonNode json, Project project) {
 					((Irc) communication).setName(ccJson.get("name").asText());
 					((Irc) communication).setDescription(ccJson.get("description").asText());
 					((Irc) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Irc) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Irc) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.sympa.SympaMailingList":
 					communication = new SympaMailingList();
 					communication.setUrl(ccJson.get("url").asText());
-					((SympaMailingList) communication).setMailingListName(ccJson.get("mailingListName").asText());
-					((SympaMailingList) communication)
-							.setMailingListDescription(ccJson.get("mailingListDescription").asText());
-					((SympaMailingList) communication)
-							.setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					((SympaMailingList) communication).setMailingListName(ccJson.get("MailingListName").asText());
+					((SympaMailingList) communication).setMailingListDescription(ccJson.get("MailingListDescription").asText());
+					((SympaMailingList) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
+					if (ccJson.has("username")) {
 						((SympaMailingList) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((SympaMailingList) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.mbox.Mbox":
 					communication = new Mbox();
 					communication.setUrl(ccJson.get("url").asText());
-					((Mbox) communication).setMboxName(ccJson.get("mboxName").asText());
-					((Mbox) communication).setMboxDescription(ccJson.get("mboxDescription").asText());
+					((Mbox) communication).setMboxName(ccJson.get("MboxName").asText());
+					((Mbox) communication).setMboxDescription(ccJson.get("MboxDescription").asText());
 					((Mbox) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Mbox) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Mbox) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.eclipseforums.EclipseForum":
 					communication = new EclipseForum();
-					((EclipseForum) communication).setForum_id(ccJson.get("forumId").asText());
-					((EclipseForum) communication).setForum_name(ccJson.get("forumName").asText());
-					((EclipseForum) communication).setClient_id(ccJson.get("clientId").asText());
-					((EclipseForum) communication).setClient_secret(ccJson.get("clientSecret").asText());
+					((EclipseForum) communication).setForum_id(ccJson.get("forum_id").asText());
+					((EclipseForum) communication).setForum_name(ccJson.get("forum_name").asText());
+					((EclipseForum) communication).setClient_id(ccJson.get("client_id").asText());
+					((EclipseForum) communication).setClient_secret(ccJson.get("client_secret").asText());
 					break;
 				case "org.eclipse.scava.repository.model.documentation.systematic.DocumentationSystematic":
 					communication = new DocumentationSystematic();
 					if (ccJson.get("loginOption").asText().equals("option1")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 					} else if (ccJson.get("loginOption").asText().equals("option2")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 						((DocumentationSystematic) communication).setLoginURL(ccJson.get("loginURL").asText());
 						((DocumentationSystematic) communication).setUsername(ccJson.get("username").asText());
 						((DocumentationSystematic) communication).setUsernameFieldName(ccJson.get("usernameFieldName").asText());
@@ -990,13 +1030,13 @@ private void editGitlabProject(JsonNode json, Project project) {
 					communication.setUrl(ccJson.get("url").asText());
 					((NntpNewsGroup) communication).setName(ccJson.get("name").asText());
 					((NntpNewsGroup) communication).setPort(ccJson.get("port").asInt());
-					if (ccJson.get("interval").asText() != null && !ccJson.get("interval").asText().equals("")) {
+					if (ccJson.has("interval")) {
 						((NntpNewsGroup) communication).setInterval(ccJson.get("interval").asInt());
 					}
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((NntpNewsGroup) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((NntpNewsGroup) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
@@ -1006,41 +1046,58 @@ private void editGitlabProject(JsonNode json, Project project) {
 					((Irc) communication).setName(ccJson.get("name").asText());
 					((Irc) communication).setDescription(ccJson.get("description").asText());
 					((Irc) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Irc) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Irc) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
 					break;
+				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof SympaMailingList) {
+					communication.setUrl(ccJson.get("url").asText());
+					((SympaMailingList) communication).setMailingListName(ccJson.get("MailingListName").asText());
+					((SympaMailingList) communication).setMailingListDescription(ccJson.get("MailingListDescription").asText());
+					((SympaMailingList) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
+					if (ccJson.has("username")) {
+						((SympaMailingList) communication).setUsername(ccJson.get("username").asText());
+					}
+					if (ccJson.has("password")) {
+						((SympaMailingList) communication).setPassword(ccJson.get("password").asText());
+					}
+					exist = true;
+					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof Mbox) {
 					communication.setUrl(ccJson.get("url").asText());
-					((Mbox) communication).setMboxName(ccJson.get("mboxName").asText());
-					((Mbox) communication).setMboxDescription(ccJson.get("mboxDescription").asText());
+					((Mbox) communication).setMboxName(ccJson.get("MboxName").asText());
+					((Mbox) communication).setMboxDescription(ccJson.get("MboxDescription").asText());
 					((Mbox) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Mbox) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Mbox) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
 					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof EclipseForum) {
-					((EclipseForum) communication).setForum_id(ccJson.get("forumId").asText());
-					((EclipseForum) communication).setForum_name(ccJson.get("forumName").asText());
-					((EclipseForum) communication).setClient_id(ccJson.get("clientId").asText());
-					((EclipseForum) communication).setClient_secret(ccJson.get("clientSecret").asText());
+					((EclipseForum) communication).setForum_id(ccJson.get("forum_id").asText());
+					((EclipseForum) communication).setForum_name(ccJson.get("forum_name").asText());
+					((EclipseForum) communication).setClient_id(ccJson.get("client_id").asText());
+					((EclipseForum) communication).setClient_secret(ccJson.get("client_secret").asText());
 					exist = true;
 					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof DocumentationSystematic) {
 					if (ccJson.get("loginOption").asText().equals("option1")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 					} else if (ccJson.get("loginOption").asText().equals("option2")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 						((DocumentationSystematic) communication).setLoginURL(ccJson.get("loginURL").asText());
 						((DocumentationSystematic) communication).setUsername(ccJson.get("username").asText());
 						((DocumentationSystematic) communication).setUsernameFieldName(ccJson.get("usernameFieldName").asText());
@@ -1059,13 +1116,13 @@ private void editGitlabProject(JsonNode json, Project project) {
 					communication.setUrl(ccJson.get("url").asText());
 					((NntpNewsGroup) communication).setName(ccJson.get("name").asText());
 					((NntpNewsGroup) communication).setPort(ccJson.get("port").asInt());
-					if (ccJson.get("interval").asText() != null && !ccJson.get("interval").asText().equals("")) {
+					if (ccJson.has("interval")) {
 						((NntpNewsGroup) communication).setInterval(ccJson.get("interval").asInt());
 					}
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((NntpNewsGroup) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((NntpNewsGroup) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
@@ -1075,56 +1132,58 @@ private void editGitlabProject(JsonNode json, Project project) {
 					((Irc) communication).setName(ccJson.get("name").asText());
 					((Irc) communication).setDescription(ccJson.get("description").asText());
 					((Irc) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Irc) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Irc) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.sympa.SympaMailingList":
 					communication = new SympaMailingList();
 					communication.setUrl(ccJson.get("url").asText());
-					((SympaMailingList) communication).setMailingListName(ccJson.get("mailingListName").asText());
-					((SympaMailingList) communication)
-							.setMailingListDescription(ccJson.get("mailingListDescription").asText());
-					((SympaMailingList) communication)
-							.setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					((SympaMailingList) communication).setMailingListName(ccJson.get("MailingListName").asText());
+					((SympaMailingList) communication).setMailingListDescription(ccJson.get("MailingListDescription").asText());
+					((SympaMailingList) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
+					if (ccJson.has("username")) {
 						((SympaMailingList) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((SympaMailingList) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.mbox.Mbox":
 					communication = new Mbox();
 					communication.setUrl(ccJson.get("url").asText());
-					((Mbox) communication).setMboxName(ccJson.get("mboxName").asText());
-					((Mbox) communication).setMboxDescription(ccJson.get("mboxDescription").asText());
+					((Mbox) communication).setMboxName(ccJson.get("MboxName").asText());
+					((Mbox) communication).setMboxDescription(ccJson.get("MboxDescription").asText());
 					((Mbox) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Mbox) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Mbox) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.eclipseforums.EclipseForum":
 					communication = new EclipseForum();
-					((EclipseForum) communication).setForum_id(ccJson.get("forumId").asText());
-					((EclipseForum) communication).setForum_name(ccJson.get("forumName").asText());
-					((EclipseForum) communication).setClient_id(ccJson.get("clientId").asText());
-					((EclipseForum) communication).setClient_secret(ccJson.get("clientSecret").asText());
+					((EclipseForum) communication).setForum_id(ccJson.get("forum_id").asText());
+					((EclipseForum) communication).setForum_name(ccJson.get("forum_name").asText());
+					((EclipseForum) communication).setClient_id(ccJson.get("client_id").asText());
+					((EclipseForum) communication).setClient_secret(ccJson.get("client_secret").asText());
 					break;
 				case "org.eclipse.scava.repository.model.documentation.systematic.DocumentationSystematic":
 					communication = new DocumentationSystematic();
 					if (ccJson.get("loginOption").asText().equals("option1")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 					} else if (ccJson.get("loginOption").asText().equals("option2")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 						((DocumentationSystematic) communication).setLoginURL(ccJson.get("loginURL").asText());
 						((DocumentationSystematic) communication).setUsername(ccJson.get("username").asText());
 						((DocumentationSystematic) communication).setUsernameFieldName(ccJson.get("usernameFieldName").asText());
@@ -1334,13 +1393,13 @@ private void editEclipseProject(JsonNode json, Project project) {
 					communication.setUrl(ccJson.get("url").asText());
 					((NntpNewsGroup) communication).setName(ccJson.get("name").asText());
 					((NntpNewsGroup) communication).setPort(ccJson.get("port").asInt());
-					if (ccJson.get("interval").asText() != null && !ccJson.get("interval").asText().equals("")) {
+					if (ccJson.has("interval")) {
 						((NntpNewsGroup) communication).setInterval(ccJson.get("interval").asInt());
 					}
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((NntpNewsGroup) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((NntpNewsGroup) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
@@ -1350,41 +1409,58 @@ private void editEclipseProject(JsonNode json, Project project) {
 					((Irc) communication).setName(ccJson.get("name").asText());
 					((Irc) communication).setDescription(ccJson.get("description").asText());
 					((Irc) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Irc) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Irc) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
 					break;
+				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof SympaMailingList) {
+					communication.setUrl(ccJson.get("url").asText());
+					((SympaMailingList) communication).setMailingListName(ccJson.get("MailingListName").asText());
+					((SympaMailingList) communication).setMailingListDescription(ccJson.get("MailingListDescription").asText());
+					((SympaMailingList) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
+					if (ccJson.has("username")) {
+						((SympaMailingList) communication).setUsername(ccJson.get("username").asText());
+					}
+					if (ccJson.has("password")) {
+						((SympaMailingList) communication).setPassword(ccJson.get("password").asText());
+					}
+					exist = true;
+					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof Mbox) {
 					communication.setUrl(ccJson.get("url").asText());
-					((Mbox) communication).setMboxName(ccJson.get("mboxName").asText());
-					((Mbox) communication).setMboxDescription(ccJson.get("mboxDescription").asText());
+					((Mbox) communication).setMboxName(ccJson.get("MboxName").asText());
+					((Mbox) communication).setMboxDescription(ccJson.get("MboxDescription").asText());
 					((Mbox) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Mbox) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Mbox) communication).setPassword(ccJson.get("password").asText());
 					}
 					exist = true;
 					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof EclipseForum) {
-					((EclipseForum) communication).setForum_id(ccJson.get("forumId").asText());
-					((EclipseForum) communication).setForum_name(ccJson.get("forumName").asText());
-					((EclipseForum) communication).setClient_id(ccJson.get("clientId").asText());
-					((EclipseForum) communication).setClient_secret(ccJson.get("clientSecret").asText());
+					((EclipseForum) communication).setForum_id(ccJson.get("forum_id").asText());
+					((EclipseForum) communication).setForum_name(ccJson.get("forum_name").asText());
+					((EclipseForum) communication).setClient_id(ccJson.get("client_id").asText());
+					((EclipseForum) communication).setClient_secret(ccJson.get("client_secret").asText());
 					exist = true;
 					break;
 				} else if (communication.getId().equals(ccJson.get("_id").asText()) && communication instanceof DocumentationSystematic) {
 					if (ccJson.get("loginOption").asText().equals("option1")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 					} else if (ccJson.get("loginOption").asText().equals("option2")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 						((DocumentationSystematic) communication).setLoginURL(ccJson.get("loginURL").asText());
 						((DocumentationSystematic) communication).setUsername(ccJson.get("username").asText());
 						((DocumentationSystematic) communication).setUsernameFieldName(ccJson.get("usernameFieldName").asText());
@@ -1403,13 +1479,13 @@ private void editEclipseProject(JsonNode json, Project project) {
 					communication.setUrl(ccJson.get("url").asText());
 					((NntpNewsGroup) communication).setName(ccJson.get("name").asText());
 					((NntpNewsGroup) communication).setPort(ccJson.get("port").asInt());
-					if (ccJson.get("interval").asText() != null && !ccJson.get("interval").asText().equals("")) {
+					if (ccJson.has("interval")) {
 						((NntpNewsGroup) communication).setInterval(ccJson.get("interval").asInt());
 					}
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((NntpNewsGroup) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((NntpNewsGroup) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
@@ -1419,54 +1495,58 @@ private void editEclipseProject(JsonNode json, Project project) {
 					((Irc) communication).setName(ccJson.get("name").asText());
 					((Irc) communication).setDescription(ccJson.get("description").asText());
 					((Irc) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Irc) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Irc) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.sympa.SympaMailingList":
 					communication = new SympaMailingList();
 					communication.setUrl(ccJson.get("url").asText());
-					((SympaMailingList) communication).setMailingListName(ccJson.get("mailingListName").asText());
-					((SympaMailingList) communication).setMailingListDescription(ccJson.get("mailingListDescription").asText());
+					((SympaMailingList) communication).setMailingListName(ccJson.get("MailingListName").asText());
+					((SympaMailingList) communication).setMailingListDescription(ccJson.get("MailingListDescription").asText());
 					((SympaMailingList) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((SympaMailingList) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((SympaMailingList) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.mbox.Mbox":
 					communication = new Mbox();
 					communication.setUrl(ccJson.get("url").asText());
-					((Mbox) communication).setMboxName(ccJson.get("mboxName").asText());
-					((Mbox) communication).setMboxDescription(ccJson.get("mboxDescription").asText());
+					((Mbox) communication).setMboxName(ccJson.get("MboxName").asText());
+					((Mbox) communication).setMboxDescription(ccJson.get("MboxDescription").asText());
 					((Mbox) communication).setCompressedFileExtension(ccJson.get("compressedFileExtension").asText());
-					if (ccJson.get("username").asText() != null && !ccJson.get("username").asText().equals("")) {
+					if (ccJson.has("username")) {
 						((Mbox) communication).setUsername(ccJson.get("username").asText());
 					}
-					if (ccJson.get("password").asText() != null && !ccJson.get("password").asText().equals("")) {
+					if (ccJson.has("password")) {
 						((Mbox) communication).setPassword(ccJson.get("password").asText());
 					}
 					break;
 				case "org.eclipse.scava.repository.model.cc.eclipseforums.EclipseForum":
 					communication = new EclipseForum();
-					((EclipseForum) communication).setForum_id(ccJson.get("forumId").asText());
-					((EclipseForum) communication).setForum_name(ccJson.get("forumName").asText());
-					((EclipseForum) communication).setClient_id(ccJson.get("clientId").asText());
-					((EclipseForum) communication).setClient_secret(ccJson.get("clientSecret").asText());
+					((EclipseForum) communication).setForum_id(ccJson.get("forum_id").asText());
+					((EclipseForum) communication).setForum_name(ccJson.get("forum_name").asText());
+					((EclipseForum) communication).setClient_id(ccJson.get("client_id").asText());
+					((EclipseForum) communication).setClient_secret(ccJson.get("client_secret").asText());
 					break;
 				case "org.eclipse.scava.repository.model.documentation.systematic.DocumentationSystematic":
 					communication = new DocumentationSystematic();
 					if (ccJson.get("loginOption").asText().equals("option1")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 					} else if (ccJson.get("loginOption").asText().equals("option2")) {
 						communication.setUrl(ccJson.get("url").asText());
-						((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						if (ccJson.has("executionFrequency")) {
+							((DocumentationSystematic) communication).setExecutionFrequency(Integer.parseInt(ccJson.get("executionFrequency").asText()));
+						}
 						((DocumentationSystematic) communication).setLoginURL(ccJson.get("loginURL").asText());
 						((DocumentationSystematic) communication).setUsername(ccJson.get("username").asText());
 						((DocumentationSystematic) communication).setUsernameFieldName(ccJson.get("usernameFieldName").asText());