zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix major update integrating with external wisemapping frond end

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2021-12-24 18:03:23 -08:00
parent 76ff1cc83d
commit b3e26caee4
1042 changed files with 1160 additions and 73432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java
View File

@@ -26,9 +26,10 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
@XmlRootElement(name = "collaboration")
@XmlRootElement(name = "collaborations")
@XmlAccessorType(XmlAccessType.PROPERTY)
@JsonAutoDetect(
fieldVisibility = JsonAutoDetect.Visibility.NONE,

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java
View File

@@ -39,7 +39,7 @@ import java.util.Calendar;
public class RestCollaborator {
@JsonIgnore
private Collaborator collaborator;
private final Collaborator collaborator;
public RestCollaborator(@NotNull Collaborator collaborator) {

6
wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java
View File

@@ -80,13 +80,13 @@ public class RestErrors {
public RestErrors(@NotNull String errorMsg, @NotNull Severity severity, @Nullable String debugInfo) {
this._debugInfo = debugInfo;
this.gErrors = new ArrayList<String>();
this.gErrors = new ArrayList<>();
this.gErrors.add(errorMsg);
this.gSeverity = severity;
}
private List<String> processGlobalErrors(@NotNull Errors errors) {
final List<String> result = new ArrayList<String>();
final List<String> result = new ArrayList<>();
final List<ObjectError> globalErrors = errors.getGlobalErrors();
for (ObjectError globalError : globalErrors) {
result.add(globalError.getObjectName());
@@ -100,7 +100,7 @@ public class RestErrors {
public Map<String, String> getFieldErrors() {
Locale locale = LocaleContextHolder.getLocale();
final Map<String, String> result = new HashMap<String, String>();
final Map<String, String> result = new HashMap<>();
if (errors != null) {
final List<FieldError> fieldErrors = errors.getFieldErrors();
for (FieldError fieldError : fieldErrors) {

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java
View File

@@ -26,7 +26,7 @@ import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_
public class RestLabel {
@JsonIgnore
private Label label;
private final Label label;
public RestLabel() {
this(new Label());

10
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java
View File

@@ -23,11 +23,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.model.CollaborationProperties;
import com.wisemapping.model.CollaborationRole;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
import com.wisemapping.model.*;
import com.wisemapping.util.TimeUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -49,9 +45,9 @@ import java.util.Calendar;
@JsonIgnoreProperties(ignoreUnknown = true)
public class RestMindmap {
@JsonIgnore
private Collaborator collaborator;
private final Collaborator collaborator;
@JsonIgnore
private Mindmap mindmap;
private final Mindmap mindmap;
@Nullable
private String properties;

8
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java
View File

@@ -44,10 +44,10 @@ import java.util.TimeZone;
@JsonIgnoreProperties(ignoreUnknown = true)
public class RestMindmapHistory {
static private SimpleDateFormat sdf;
private int id;
private Calendar creation;
private String creator;
static private final SimpleDateFormat sdf;
private final int id;
private final Calendar creation;
private final String creator;
static {
sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java
View File

@@ -37,7 +37,7 @@ import java.util.List;
isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
public class RestMindmapHistoryList {
private List<RestMindmapHistory> changes;
private final List<RestMindmapHistory> changes;
public RestMindmapHistoryList() {
changes = new ArrayList<RestMindmapHistory>();

14
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
View File

@@ -22,11 +22,7 @@ package com.wisemapping.rest.model;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.wisemapping.model.Collaboration;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.Label;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
import com.wisemapping.model.*;
import com.wisemapping.security.Utils;
import com.wisemapping.util.TimeUtils;
import org.jetbrains.annotations.NotNull;
@@ -39,7 +35,7 @@ import java.util.Calendar;
import java.util.LinkedHashSet;
import java.util.Set;
@XmlRootElement(name = "map")
@XmlRootElement(name = "mapinfo")
@XmlAccessorType(XmlAccessType.PROPERTY)
@JsonAutoDetect(
fieldVisibility = JsonAutoDetect.Visibility.NONE,
@@ -51,8 +47,8 @@ import java.util.Set;
public class RestMindmapInfo {
@JsonIgnore
private Mindmap mindmap;
private Collaborator collaborator;
private final Mindmap mindmap;
private final Collaborator collaborator;
public RestMindmapInfo() {
this(new Mindmap(), null);
@@ -152,7 +148,7 @@ public class RestMindmapInfo {
public void setLastModificationTime(String value) {
}
public boolean isPublic() {
public boolean getPublic() {
return mindmap.isPublic();
}

5
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java
View File

@@ -19,9 +19,9 @@
package com.wisemapping.rest.model;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.Mindmap;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import org.jetbrains.annotations.NotNull;
import javax.xml.bind.annotation.XmlAccessType;
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -44,7 +43,7 @@ public class RestMindmapList {
private List<RestMindmapInfo> mindmapsInfo;
public RestMindmapList() {
this(Collections.<Mindmap>emptyList(), null);
this(Collections.emptyList(), null);
}
public RestMindmapList(@NotNull List<Mindmap> mindmaps, @NotNull Collaborator collaborator) {

17
wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java
View File

@@ -22,6 +22,7 @@ package com.wisemapping.rest.model;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.wisemapping.model.User;
import org.jetbrains.annotations.NotNull;
@@ -29,7 +30,6 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Calendar;
import java.util.Set;
@XmlRootElement(name = "user")
@@ -39,9 +39,10 @@ import java.util.Set;
getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(JsonInclude.Include.NON_NULL)
public class RestUser {
private User user;
private final User user;
private String password;
public RestUser() {
@@ -50,20 +51,14 @@ public class RestUser {
public RestUser(@NotNull User user) {
this.user = user;
this.password = user.getPassword();
}
@JsonIgnore
public Calendar getCreationDate() {
return user.getCreationDate();
}
public void setTags(Set<String> tags) {
user.setTags(tags);
}
public Set<String> getTags() {
return user.getTags();
public String getLocale() {
return user.getLocale();
}
public String getFirstname() {
@@ -104,7 +99,7 @@ public class RestUser {
}
public String getPassword() {
return this.password;
return password;
}
@JsonIgnore

76
wise-webapp/src/main/java/com/wisemapping/rest/model/RestUserRegistration.java Normal file
View File

@@ -0,0 +1,76 @@
/*
* Copyright [2015] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.wisemapping.rest.model;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.wisemapping.model.User;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "user")
@XmlAccessorType(XmlAccessType.PROPERTY)
@JsonAutoDetect(
fieldVisibility = JsonAutoDetect.Visibility.NONE,
getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
@JsonIgnoreProperties(ignoreUnknown = true)
public class RestUserRegistration {
private String email;
private String firstname;
private String lastname;
private String password;
private String recaptcha;
@JsonIgnore
public User build() {
final User user = new User();
user.setFirstname(firstname);
user.setLastname(lastname);
user.setEmail(email);
user.setPassword(password);
return user;
}
public String getEmail() {
return email;
}
public String getFirstname() {
return firstname;
}
public String getLastname() {
return lastname;
}
public String getPassword() {
return password;
}
public String getRecaptcha() {
return recaptcha;
}
}