[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2057] oauth export mapping is fixed

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 7c3ed62  [OPENMEETINGS-2057] oauth export mapping is fixed
7c3ed62 is described below

commit 7c3ed62c5080f25debc1288a5921925bb86f038a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Apr 15 11:43:59 2019 +0700

    [OPENMEETINGS-2057] oauth export mapping is fixed
---
 .../java/org/apache/openmeetings/db/entity/server/OAuthServer.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
index 60e206c..2580c76 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
@@ -39,6 +39,7 @@ import javax.persistence.Table;
 
 import org.apache.openmeetings.db.entity.HistoricalEntity;
 import org.simpleframework.xml.Element;
+import org.simpleframework.xml.ElementMap;
 import org.simpleframework.xml.Root;
 
 @Entity
@@ -105,7 +106,7 @@ public class OAuthServer extends HistoricalEntity {
 	private RequestInfoMethod requestInfoMethod = RequestInfoMethod.GET;
 
 	@ElementCollection(fetch = FetchType.EAGER)
-	@Element(data = true, required = false)
+	@ElementMap(data = true, required = false)
 	@MapKeyColumn(name = "name")
 	@Column(name = "value")
 	@CollectionTable(name = "oauth_mapping", joinColumns = @JoinColumn(name = "oauth_id"))