You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/08/13 15:11:28 UTC
[incubator-streampipes] branch dev updated: [STREAMPIPES-195] add
default constructur and getter/setter for rev attribute
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 4a16d18 [STREAMPIPES-195] add default constructur and getter/setter for rev attribute
4a16d18 is described below
commit 4a16d185ee111a7f9ac461d53cd67a9caf26546f
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Thu Aug 13 17:11:11 2020 +0200
[STREAMPIPES-195] add default constructur and getter/setter for rev attribute
---
.../java/org/apache/streampipes/model/client/user/Element.java | 5 ++++-
.../main/java/org/apache/streampipes/model/client/user/User.java | 7 +++++++
.../src/main/java/org/apache/streampipes/rest/impl/User.java | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Element.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Element.java
index 1801a2e..d4e640b 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Element.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/Element.java
@@ -22,7 +22,10 @@ public class Element {
private String elementId;
private boolean publicElement;
-
+
+ public Element() {
+ }
+
public Element(String elementId, boolean publicElement)
{
this.elementId = elementId;
diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/User.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/User.java
index fa59f73..1cc535f 100644
--- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/User.java
+++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/User.java
@@ -215,4 +215,11 @@ public class User {
this.hideTutorial = hideTutorial;
}
+ public String getRev() {
+ return rev;
+ }
+
+ public void setRev(String rev) {
+ this.rev = rev;
+ }
}
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/User.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/User.java
index f303fcc..2d3e764 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/User.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/User.java
@@ -55,6 +55,7 @@ public class User extends AbstractRestInterface implements IUser {
if (user != null) {
org.apache.streampipes.model.client.user.User existingUser = getUser(user.getEmail());
user.setPassword(existingUser.getPassword());
+ user.setRev(existingUser.getRev());
getUserStorage().updateUser(user);
return ok(Notifications.success("User updated"));
} else {