You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/11/07 14:27:55 UTC
svn commit: r1768517 - in
/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice:
ErrorWebService.java NetTestWebService.java
Author: solomax
Date: Mon Nov 7 14:27:55 2016
New Revision: 1768517
URL: http://svn.apache.org/viewvc?rev=1768517&view=rev
Log:
no jira: whitespaces are fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java?rev=1768517&r1=1768516&r2=1768517&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java Mon Nov 7 14:27:55 2016
@@ -105,11 +105,11 @@ public class ErrorWebService {
@POST
@Path("/report/")
public void report(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="message") @QueryParam("message") String message) {
- if (sid != null && message != null) {
- Long userId = sessionDao.check(sid);
- if (userId != null && userId != 0) {
- log.error("[CLIENT MESSAGE] " + message);
- }
- }
+ if (sid != null && message != null) {
+ Long userId = sessionDao.check(sid);
+ if (userId != null && userId != 0) {
+ log.error("[CLIENT MESSAGE] " + message);
+ }
+ }
}
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java?rev=1768517&r1=1768516&r2=1768517&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java Mon Nov 7 14:27:55 2016
@@ -42,63 +42,61 @@ import org.slf4j.Logger;
@Path("/networktest")
public class NetTestWebService {
private static final Logger log = Red5LoggerFactory.getLogger(UserWebService.class, webAppRootKey);
- enum TestType {
- UNKNOWN,
- PING,
- JITTER,
- DOWNLOAD_SPEED,
- UPLOAD_SPEED
- }
-
- private static final int PING_PACKET_SIZE = 64;
- private static final int JITTER_PACKET_SIZE = 1024;
- private static final int DOWNLOAD_PACKET_SIZE = 1024*1024;
-
- private final byte[] pingData;
- private final byte[] jitterData;
- private final byte[] downloadData;
+
+ enum TestType {
+ UNKNOWN, PING, JITTER, DOWNLOAD_SPEED, UPLOAD_SPEED
+ }
+
+ private static final int PING_PACKET_SIZE = 64;
+ private static final int JITTER_PACKET_SIZE = 1024;
+ private static final int DOWNLOAD_PACKET_SIZE = 1024 * 1024;
+
+ private final byte[] pingData;
+ private final byte[] jitterData;
+ private final byte[] downloadData;
public NetTestWebService() {
- pingData = new byte[PING_PACKET_SIZE];
- jitterData = new byte[JITTER_PACKET_SIZE];
- downloadData = new byte[DOWNLOAD_PACKET_SIZE];
-
- Arrays.fill(pingData, (byte) '0');
- Arrays.fill(jitterData, (byte) '0');
- Arrays.fill(downloadData, (byte) '0');
+ pingData = new byte[PING_PACKET_SIZE];
+ jitterData = new byte[JITTER_PACKET_SIZE];
+ downloadData = new byte[DOWNLOAD_PACKET_SIZE];
+
+ Arrays.fill(pingData, (byte) '0');
+ Arrays.fill(jitterData, (byte) '0');
+ Arrays.fill(downloadData, (byte) '0');
}
@GET
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@Path("/")
public Response get(@QueryParam("type") String type) {
- TestType testType = getTypeByString(type);
- log.debug("Network test:: get");
+ TestType testType = getTypeByString(type);
+ log.debug("Network test:: get");
- // choose data to send
- byte[] data = new byte[0];
- switch (testType) {
- case PING:
- data = pingData;
- break;
- case JITTER:
- data = jitterData;
- break;
- case DOWNLOAD_SPEED:
- data = downloadData;
- break;
+ // choose data to send
+ byte[] data = new byte[0];
+ switch (testType) {
+ case PING:
+ data = pingData;
+ break;
+ case JITTER:
+ data = jitterData;
+ break;
+ case DOWNLOAD_SPEED:
+ data = downloadData;
+ break;
case UPLOAD_SPEED:
break;
default:
break;
- }
+ }
- ResponseBuilder response = Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).entity(new ByteArrayInputStream(data));
- //response.header("Content-Disposition", "attachment; filename=test.png");
- response.header("Cache-Control", "no-cache");
- response.header("Content-Length", String.valueOf(data.length));
- return response.build();
- }
+ ResponseBuilder response = Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).entity(new ByteArrayInputStream(data));
+ // response.header("Content-Disposition", "attachment;
+ // filename=test.png");
+ response.header("Cache-Control", "no-cache");
+ response.header("Content-Length", String.valueOf(data.length));
+ return response.build();
+ }
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
@@ -106,20 +104,19 @@ public class NetTestWebService {
public void upload(@Multipart(value = "stream", type = MediaType.APPLICATION_OCTET_STREAM) InputStream stream) throws IOException {
byte[] b = new byte[1024];
while (stream.read(b) >= 0 ) {};
- }
-
+ }
- private static TestType getTypeByString(String typeString) {
- if ("ping".equals(typeString)) {
- return TestType.PING;
- } else if ("jitter".equals(typeString)) {
- return TestType.JITTER;
- } else if ("download".equals(typeString)) {
- return TestType.DOWNLOAD_SPEED;
- } else if ("upload".equals(typeString)) {
- return TestType.UPLOAD_SPEED;
- }
+ private static TestType getTypeByString(String typeString) {
+ if ("ping".equals(typeString)) {
+ return TestType.PING;
+ } else if ("jitter".equals(typeString)) {
+ return TestType.JITTER;
+ } else if ("download".equals(typeString)) {
+ return TestType.DOWNLOAD_SPEED;
+ } else if ("upload".equals(typeString)) {
+ return TestType.UPLOAD_SPEED;
+ }
- return TestType.UNKNOWN;
- }
+ return TestType.UNKNOWN;
+ }
}