Repository: openmeetings Updated Branches: refs/heads/master 84a5c2f7f -> 3e74e1f6a
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3e74e1f6 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3e74e1f6 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3e74e1f6 Branch: refs/heads/master Commit: 3e74e1f6af25343b391e87eb4732d28dfd3cf6cd Parents: 84a5c2f Author: Maxim Solodovnik <[email protected]> Authored: Thu Oct 12 23:31:17 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Oct 12 23:31:17 2017 +0700 ---------------------------------------------------------------------- .../db/dao/server/SOAPLoginDao.java | 3 +- .../db/entity/server/SOAPLogin.java | 51 ++++++++++---------- .../web/common/FormSaveRefreshPanel.java | 15 ++++++ .../webservice/TestUserService.java | 20 ++++---- .../openmeetings/webservice/UserWebService.java | 2 - .../webservice/TestBaseService.java | 4 +- 6 files changed, 55 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e74e1f6/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java index 49c0adf..e69061d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java @@ -44,7 +44,7 @@ public class SOAPLoginDao { public String addSOAPLogin(String sessionHash, Long roomId, boolean becomemoderator, boolean showAudioVideoTest, boolean allowSameURLMultipleTimes, Long recordingId, - String landingZone, boolean allowRecording) { + boolean allowRecording) { try { SOAPLogin soapLogin = new SOAPLogin(); soapLogin.setCreated(new Date()); @@ -56,7 +56,6 @@ public class SOAPLoginDao { soapLogin.setSessionHash(sessionHash); soapLogin.setModerator(becomemoderator); soapLogin.setShowAudioVideoTest(showAudioVideoTest); - soapLogin.setLandingZone(landingZone); soapLogin.setAllowRecording(allowRecording); em.persist(soapLogin); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e74e1f6/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java index ebc3063..9efffc4 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java @@ -35,56 +35,53 @@ import javax.persistence.Table; @NamedQueries({ @NamedQuery(name = "getSoapLoginByHash", query = "SELECT s FROM SOAPLogin s WHERE s.hash LIKE :hash") }) - public class SOAPLogin implements Serializable { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name="id") + @Column(name = "id") private Long id; - @Column(name="hash") + @Column(name = "hash") private String hash; - @Column(name="room_id") + @Column(name = "room_id") private Long roomId; - @Column(name="session_hash") + @Column(name = "session_hash") private String sessionHash; - @Column(name="created") + @Column(name = "created") private Date created; - @Column(name="used", nullable = false) + @Column(name = "used", nullable = false) private boolean used; - @Column(name="use_date") + @Column(name = "use_date") private Date useDate; - @Column(name="moderator", nullable = false) + @Column(name = "moderator", nullable = false) private boolean moderator; - @Column(name="showaudiovideotest", nullable = false) + @Column(name = "showaudiovideotest", nullable = false) private boolean showAudioVideoTest; - @Column(name="allow_same_url_multiple_times", nullable = false) + @Column(name = "allow_same_url_multiple_times", nullable = false) private boolean allowSameURLMultipleTimes; - @Column(name="client_url") + @Column(name = "client_url") private String clientURL; - @Column(name="recording_id") + @Column(name = "recording_id") private Long recordingId; - @Column(name="landing_zone") - private String landingZone; - - @Column(name="allow_recording", nullable = false) + @Column(name = "allow_recording", nullable = false) private boolean allowRecording; public Long getId() { return id; } + public void setId(Long id) { this.id = id; } @@ -92,6 +89,7 @@ public class SOAPLogin implements Serializable { public String getHash() { return hash; } + public void setHash(String hash) { this.hash = hash; } @@ -99,6 +97,7 @@ public class SOAPLogin implements Serializable { public Long getRoomId() { return roomId; } + public void setRoomId(Long roomId) { this.roomId = roomId; } @@ -106,6 +105,7 @@ public class SOAPLogin implements Serializable { public String getSessionHash() { return sessionHash; } + public void setSessionHash(String sessionHash) { this.sessionHash = sessionHash; } @@ -113,6 +113,7 @@ public class SOAPLogin implements Serializable { public Date getCreated() { return created; } + public void setCreated(Date created) { this.created = created; } @@ -120,6 +121,7 @@ public class SOAPLogin implements Serializable { public boolean isUsed() { return used; } + public void setUsed(boolean used) { this.used = used; } @@ -127,6 +129,7 @@ public class SOAPLogin implements Serializable { public Date getUseDate() { return useDate; } + public void setUseDate(Date useDate) { this.useDate = useDate; } @@ -134,6 +137,7 @@ public class SOAPLogin implements Serializable { public boolean isModerator() { return moderator; } + public void setModerator(boolean moderator) { this.moderator = moderator; } @@ -141,6 +145,7 @@ public class SOAPLogin implements Serializable { public boolean getShowAudioVideoTest() { return showAudioVideoTest; } + public void setShowAudioVideoTest(boolean showAudioVideoTest) { this.showAudioVideoTest = showAudioVideoTest; } @@ -148,6 +153,7 @@ public class SOAPLogin implements Serializable { public boolean getAllowSameURLMultipleTimes() { return allowSameURLMultipleTimes; } + public void setAllowSameURLMultipleTimes(boolean allowSameURLMultipleTimes) { this.allowSameURLMultipleTimes = allowSameURLMultipleTimes; } @@ -155,6 +161,7 @@ public class SOAPLogin implements Serializable { public String getClientURL() { return clientURL; } + public void setClientURL(String clientURL) { this.clientURL = clientURL; } @@ -162,22 +169,16 @@ public class SOAPLogin implements Serializable { public Long getRecordingId() { return recordingId; } + public void setRecordingId(Long recordingId) { this.recordingId = recordingId; } - public String getLandingZone() { - return landingZone; - } - public void setLandingZone(String landingZone) { - this.landingZone = landingZone; - } - public boolean isAllowRecording() { return allowRecording; } + public void setAllowRecording(boolean allowRecording) { this.allowRecording = allowRecording; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e74e1f6/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java index 5c007e4..7abda78 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java @@ -86,11 +86,26 @@ public abstract class FormSaveRefreshPanel<T> extends Panel { } protected abstract void onSaveSubmit(AjaxRequestTarget target, Form<?> form); + + /** + * Save error handler + * + * @param target Ajax target + * @param form form object + */ protected void onSaveError(AjaxRequestTarget target, Form<?> form) { //no-op } protected abstract void onRefreshSubmit(AjaxRequestTarget target, Form<?> form); + + + /** + * Refresh error handler + * + * @param target Ajax target + * @param form form object + */ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) { //no-op } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e74e1f6/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java index c5478e5..f908f12 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java @@ -68,17 +68,19 @@ public class TestUserService extends AbstractWebServiceTest { RoomOptionsDTO options = new RoomOptionsDTO() .setRoomId(5L) .setModerator(true); - Response resp = getClient(USER_SERVICE_URL) + try (Response resp = getClient(USER_SERVICE_URL) .path("/hash") .query("sid", sid) - .form(new Form().param("user", user.toString()).param("options", options.toString())); - assertNotNull("Valid ServiceResult should be returned", resp); - if (expectError) { - assertEquals("Call should NOT be successful", Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), resp.getStatus()); - return null; - } else { - assertEquals("Call should be successful", Response.Status.OK.getStatusCode(), resp.getStatus()); - return resp.readEntity(ServiceResult.class); + .form(new Form().param("user", user.toString()).param("options", options.toString()))) + { + assertNotNull("Valid ServiceResult should be returned", resp); + if (expectError) { + assertEquals("Call should NOT be successful", Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), resp.getStatus()); + return null; + } else { + assertEquals("Call should be successful", Response.Status.OK.getStatusCode(), resp.getStatus()); + return resp.readEntity(ServiceResult.class); + } } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e74e1f6/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java index c008950..bbc68e7 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java @@ -305,11 +305,9 @@ public class UserWebService extends BaseWebService { log.debug("xmlString " + xmlString); - //TODO LandingZone are not configurable for now String hash = getBean(SOAPLoginDao.class).addSOAPLogin(sid, options.getRoomId(), options.isModerator(), options.isShowAudioVideoTest(), options.isAllowSameURLMultipleTimes(), options.getRecordingId(), - "room", // LandingZone, options.isAllowRecording() ); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e74e1f6/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java b/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java index 015e848..344fb14 100644 --- a/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java +++ b/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java @@ -34,7 +34,7 @@ import org.junit.Test; import com.sun.star.uno.RuntimeException; public class TestBaseService { - private void checkException(Runnable r) { + private static void checkException(Runnable r) { try { r.run(); fail("ServiceException expected"); @@ -55,7 +55,7 @@ public class TestBaseService { assertNull("UserId should be null", sd.getUserId()); } - private void checkRights(Set<Right> rights) { + private static void checkRights(Set<Right> rights) { assertNotNull("NOT null Rights should be returned", rights); assertTrue("Rights should be empty", rights.isEmpty()); }
