eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-28 08:26:44 +00:00
Code Activity

bug5261: compareservers has optional UUID queryparam. Updated documentation.

Browse Source
This commit is contained in:
Alessandro Stoltenberg
2020-06-25 13:10:10 +02:00
parent 67dbe5556f
commit 113c046dfe
2 changed files with 81 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompareServersResource.java
+51 -26
View File
@@ -1,5 +1,6 @@
package com.sap.sailing.server.gateway.jaxrs.api;
import java.io.FileNotFoundException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URISyntaxException;
@@ -12,6 +13,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
import java.util.logging.Logger;
import javax.ws.rs.GET;
@@ -58,47 +60,54 @@ public class CompareServersResource extends AbstractSailingServerResource {
private static final String[] KEYSTOPRINT = new String[] { "id" };
private static final Set<String> KEYSETTOPRINT = new HashSet<>(Arrays.asList(KEYSTOPRINT));
private static final String serverToOld = "At least one server you are trying to compare has not yet enabled the "
private static final String SERVERTOOLD = "At least one server you are trying to compare has not yet enabled the "
+ LEADERBOARDGROUPSIDENTIFIABLEPATH
+ " endpoint and therefore you need to fallback to running the compareServers shell script.";
private static final String BADREQUEST = "Specify two server names and optionally a valid UUID";
public CompareServersResource() {
}
@GET
@Produces("application/json;charset=UTF-8")
public Response compareServers(@QueryParam("server1") String server1, @QueryParam("server2") String server2) {
public Response compareServers(@QueryParam("server1") String server1, @QueryParam("server2") String server2, @QueryParam("UUID") String uuid) {
final Map<String, Set<Object>> result = new HashMap<>();
Response response = null;
if (!Util.hasLength(server1) || !Util.hasLength(server2)) {
if ((!Util.hasLength(server1) || !Util.hasLength(server2))
|| (Util.hasLength(uuid) && !(UUID.fromString(uuid).toString().equals(uuid)))) {
response = badRequest();
} else {
result.put(server1, new HashSet<>());
result.put(server2, new HashSet<>());
try {
final JSONArray leaderboardgroupList1 = getLeaderboardgroupList(server1);
final JSONArray leaderboardgroupList2 = getLeaderboardgroupList(server2);
for (Object lg1 : leaderboardgroupList1) {
if (!leaderboardgroupList2.contains(lg1)) {
result.get(server1).add(lg1);
} else {
final String lgId = ((JSONObject) lg1).get("id").toString();
Object lgdetail1 = getLeaderboardgroupDetailsById(lgId,
RemoteServerUtil.createBaseUrl(server1));
Object lgdetail2 = getLeaderboardgroupDetailsById(lgId,
RemoteServerUtil.createBaseUrl(server2));
lgdetail1 = removeUnnecessaryFields(lgdetail1);
lgdetail2 = removeUnnecessaryFields(lgdetail2);
if (!lgdetail1.equals(lgdetail2)) {
Pair<Object, Object> jsonPair = removeDuplicateEntries(lgdetail1, lgdetail2);
result.get(server1).add(jsonPair.getA());
result.get(server2).add(jsonPair.getB());
if (Util.hasLength(uuid)) {
Pair<Object, Object> jsonPair = fetchLeaderboardgroupDetailsAndRemoveDuplicates(server1, server2,
uuid);
if (jsonPair.getA() != null && jsonPair.getB() != null) {
result.get(server1).add(jsonPair.getA());
result.get(server2).add(jsonPair.getB());
}
} else {
final JSONArray leaderboardgroupList1 = getLeaderboardgroupList(server1);
final JSONArray leaderboardgroupList2 = getLeaderboardgroupList(server2);
for (Object lg1 : leaderboardgroupList1) {
if (!leaderboardgroupList2.contains(lg1)) {
result.get(server1).add(lg1);
} else {
final String lgId = ((JSONObject) lg1).get("id").toString();
Pair<Object, Object> jsonPair = fetchLeaderboardgroupDetailsAndRemoveDuplicates(server1,
server2, lgId);
if (jsonPair.getA() != null && jsonPair.getB() != null) {
result.get(server1).add(jsonPair.getA());
result.get(server2).add(jsonPair.getB());
}
}
}
}
for (Object lg2 : leaderboardgroupList2) {
if (!leaderboardgroupList1.contains(lg2)) {
result.get(server2).add(lg2);
for (Object lg2 : leaderboardgroupList2) {
if (!leaderboardgroupList1.contains(lg2)) {
result.get(server2).add(lg2);
}
}
}
JSONObject json = new JSONObject();
@@ -110,12 +119,28 @@ public class CompareServersResource extends AbstractSailingServerResource {
} else {
response = Response.status(Status.CONFLICT).entity(streamingOutput(json)).build();
}
} catch (FileNotFoundException e) {
response = Response.status(Status.CONFLICT).entity(e.toString()).build();
logger.warning(e.toString());
} catch (Exception e) {
response = returnInternalServerError(e);
}
}
return response;
}
/**
* Fetches the details for a given leaderboardgroup UUID and removes all the duplicates in the fields.
*/
private Pair<Object, Object> fetchLeaderboardgroupDetailsAndRemoveDuplicates(String server1, String server2,
String leaderboardgroupId) throws Exception {
Object lgdetail1 = getLeaderboardgroupDetailsById(leaderboardgroupId, RemoteServerUtil.createBaseUrl(server1));
lgdetail1 = removeUnnecessaryFields(lgdetail1);
Object lgdetail2 = getLeaderboardgroupDetailsById(leaderboardgroupId, RemoteServerUtil.createBaseUrl(server2));
lgdetail2 = removeUnnecessaryFields(lgdetail2);
Pair<Object, Object> result = removeDuplicateEntries(lgdetail1, lgdetail2);
return result;
}
/**
* Fetches the leaderboardgrouplist from a server.
*/
@@ -125,7 +150,7 @@ public class CompareServersResource extends AbstractSailingServerResource {
final URLConnection leaderboardgroupListC = HttpUrlConnectionHelper.redirectConnection(
RemoteServerUtil.createRemoteServerUrl(baseUrl, LEADERBOARDGROUPSIDENTIFIABLEPATH, null));
if (((HttpURLConnection) leaderboardgroupListC).getResponseCode() == 404) {
throw new Exception(serverToOld);
throw new FileNotFoundException(SERVERTOOLD);
}
final JSONArray result = (JSONArray) parser
.parse(new InputStreamReader(leaderboardgroupListC.getInputStream(), "UTF-8"));
@@ -238,7 +263,7 @@ public class CompareServersResource extends AbstractSailingServerResource {
}
private Response badRequest() {
final Response response = Response.status(Status.BAD_REQUEST).build();
final Response response = Response.status(Status.BAD_REQUEST).entity(BADREQUEST).build();
return response;
}
java/com.sap.sailing.server.gateway/webservices/api/v1/compareServers.html
+30 -24
View File
@@ -13,12 +13,16 @@
<b>Description:</b>
<p>Compares two SAP Sailing Analytics servers based on the content.
The return contains either the missing leaderboardgroup name or if the
leaderboardgroupnames match on both servers the missing parts within the
leaderboardgroups. If the servers contain the exact same content the
return will just have the given server hostnames in it.</p>
<br/>
<table>
The return contains either the missing leaderboardgroup name and id or
if the leaderboardgroupnames match on both servers the missing parts
within the leaderboardgroups. If the servers contain the exact same
content the return will just have the given server hostnames in it.
You may also query for a given leaderboardgroup id, there the same
logic applies. The HTTP return code will be 409 if a mismatch is
detected in your query, if equal content is present on both servers
the response code will be 200.</p>
<br />
<table>
<tr>
<td>Webservice Type:</td>
<td>GET</td>
@@ -34,6 +38,12 @@
<div>server2, the hostname for the second server.</div>
</td>
</tr>
<tr>
<td>Optional query parameters:</td>
<td>
<div>UUID, the leaderboardgroup UUID you want to compare.</div>
</td>
</tr>
<tr>
<td>Request method:</td>
<td>GET</td>
@@ -44,27 +54,24 @@
produces output:<pre>
{
"localhost:8888": [
{
"name": "TestLeaderboardGroupWithDifferentEvents",
"events": []
},
{
"name": "World Cup Series 2019 - Genoa, Italy",
"id": "1f07d1cf-0652-4fc3-83bc-a79612a5aa68",
"leaderboards": [
{
"name": "WCS 2019 Genoa - Nacra 17",
"name": "WCS 2019 Genoa - 49er",
"series": [
{
"name": "Qualifying Series",
"fleets": [
{
"name": "Yellow",
"name": "Blue",
"races": [
{
"name": "R2",
"name": "R1",
"isTracked": true,
"regattaName": "WCS 2019 Genoa - Nacra 17",
"trackedRaceName": "R2 Yellow (Nacra 17)",
"regattaName": "WCS 2019 Genoa - 49er",
"trackedRaceName": "R1 Blue (49er)",
"hasGpsData": true,
"hasWindData": true
}
@@ -75,23 +82,28 @@
]
}
]
},
{
"id": "75e86618-8b0f-4291-9661-6b2a1fa47dff",
"name": "MyTestEventWithStrangeCharact/er*s"
}
],
"localhost:8889": [
{
"name": "World Cup Series 2019 - Genoa, Italy",
"id": "1f07d1cf-0652-4fc3-83bc-a79612a5aa68",
"leaderboards": [
{
"name": "WCS 2019 Genoa - Nacra 17",
"name": "WCS 2019 Genoa - 49er",
"series": [
{
"name": "Qualifying Series",
"fleets": [
{
"name": "Yellow",
"name": "Blue",
"races": [
{
"name": "R2",
"name": "R1",
"isTracked": false,
"trackedRaceName": null,
"hasGpsData": false,
@@ -104,12 +116,6 @@
]
}
]
},
{
"name": "TestLeaderboardGroupWithDifferentEvents",
"events": [
"782dec32-a2a0-41a3-a775-87c80a406f97"
]
}
]
}