Update DataLayerAPIVerticle.java

He identado algunas cosas con el formatter automatico de Java para que se lea mejor.

backend/src/main/java/net/miarma/contaminus/server/DataLayerAPIVerticle.java

@@ -19,6 +19,7 @@ import io.vertx.ext.web.handler.CorsHandler;
 import io.vertx.jdbcclient.JDBCPool;
 import net.miarma.contaminus.common.ConfigManager;
 import net.miarma.contaminus.common.Constants;
+import net.miarma.contaminus.common.SingleJsonResponse;
 import net.miarma.contaminus.database.DatabaseManager;
 import net.miarma.contaminus.database.QueryBuilder;
 import net.miarma.contaminus.database.entities.Actuator;
@@ -27,6 +28,7 @@ import net.miarma.contaminus.database.entities.DeviceLatestValuesView;
 import net.miarma.contaminus.database.entities.DevicePollutionMap;
 import net.miarma.contaminus.database.entities.DeviceSensorHistory;
 import net.miarma.contaminus.database.entities.DeviceSensorValue;
+import net.miarma.contaminus.database.entities.Group;
 import net.miarma.contaminus.database.entities.Sensor;
 
 /*
@@ -152,77 +154,149 @@ public class DataLayerAPIVerticle extends AbstractVerticle {
 	}
 	
 	private void getAllSensors(RoutingContext context) {
-		String query = QueryBuilder.select(Sensor.class).build();
+		String query = QueryBuilder
-	    dbManager.execute(query, Sensor.class, onSuccess -> {
+			.select(Sensor.class)
-	        context.response().putHeader("content-type", "application/json").end(gson.toJson(onSuccess));
+			.build();
-	    }, onFailure -> context.fail(500, onFailure));
+		
+		dbManager.execute(query, Sensor.class,
+			onSuccess -> {
+				context.response()
+					.putHeader("content-type", "application/json; charset=utf-8")
+					.end(gson.toJson(onSuccess));
+			},
+			onFailure -> {
+				context.fail(500, onFailure);
+			});
 	}
 	
 	private void getSensorById(RoutingContext context) {
-		int sensorId = Integer.parseInt(context.pathParam("id"));
+		Integer sensorId = Integer.parseInt(context.request().getParam("sensorId"));
-        String query = QueryBuilder.where(QueryBuilder.select(Sensor.class), sensorId).build();
+		Sensor sensor = new Sensor(sensorId, null, null, null, null, null);
-		dbManager.execute(query, Sensor.class, onSuccess -> {
+		
-            context.response().putHeader("content-type", "application/json").end(gson.toJson(onSuccess));
+		String query = QueryBuilder
-        }, onFailure -> {
+			.select(sensor)
-            context.fail(500, onFailure);
+			.build();
-        });
+		
+		dbManager.execute(query, Sensor.class,
+			onSuccess -> {
+				context.response()
+					.putHeader("content-type", "application/json; charset=utf-8")
+					.end(gson.toJson(onSuccess));
+			},
+			onFailure -> {
+				context.fail(500, onFailure);
+			});
 	}
 	
 	private void addSensor(RoutingContext context) {
-		Sensor sensor = gson.fromJson(context.body().asString(), Sensor.class);
+		JsonObject body = context.body().asJsonObject();
-        String query = QueryBuilder.insert(sensor).build();
+		Sensor sensor = gson.fromJson(body.toString(), Sensor.class);
-        dbManager.execute(query, Sensor.class, onSuccess -> {
+		
-            context.response().putHeader("content-type", "application/json").end(gson.toJson(onSuccess));
+		String query = QueryBuilder
-        }, onFailure -> {
+			.insert(sensor)
-            context.fail(500, onFailure);
+			.build();
-        });
+		
+		dbManager.execute(query, Sensor.class,
+			onSuccess -> {
+				context.response()
+					.putHeader("content-type", "application/json; charset=utf-8")
+					.end(gson.toJson(SingleJsonResponse.of("Sensor added successfully")));
+			},
+			onFailure -> {
+				context.fail(500, onFailure);
+			});
 	}
 	
 	private void updateSensor(RoutingContext context) {
-		Sensor sensor = gson.fromJson(context.body().asString(), Sensor.class);
+		JsonObject body = context.body().asJsonObject();
-        String query = QueryBuilder.where(QueryBuilder.update(sensor), sensor).build();
+		Sensor sensor = gson.fromJson(body.toString(), Sensor.class);
-        dbManager.execute(query, Sensor.class, onSuccess -> {
+		
-            context.response().putHeader("content-type", "application/json").end(gson.toJson(onSuccess));
+		String query = QueryBuilder
-        }, onFailure -> {
+			.update(sensor)
-            context.fail(500, onFailure);
+			.build();
-        });
+		
+		dbManager.execute(query, Sensor.class,
+			onSuccess -> {
+				context.response()
+					.putHeader("content-type", "application/json; charset=utf-8")
+					.end(gson.toJson(SingleJsonResponse.of("Sensor updated successfully")));
+			},
+			onFailure -> {
+				context.fail(500, onFailure);
+			});
 	}
 	
 	private void getAllActuators(RoutingContext context) {
-		String query = QueryBuilder.select(Actuator.class).build();
+		String query = QueryBuilder
-	    dbManager.execute(query, Actuator.class, onSuccess -> {
+			.select(Actuator.class)
-	        context.response().putHeader("content-type", "application/json").end(gson.toJson(onSuccess));
+			.build();
-	    }, onFailure -> context.fail(500, onFailure));
+		
+		dbManager.execute(query, Actuator.class,
+			onSuccess -> {
+				context.response()
+					.putHeader("content-type", "application/json; charset=utf-8")
+					.end(gson.toJson(onSuccess));
+			},
+			onFailure -> {
+				context.fail(500, onFailure);
+			});
 	}
 	
 	private void getActuatorById(RoutingContext context) {
-		int actuatorId = Integer.parseInt(context.pathParam("id"));
+		Integer actuatorId = Integer.parseInt(context.request().getParam("actuatorId"));
-        String query = QueryBuilder.where(QueryBuilder.select(Actuator.class), actuatorId).build();
+		Actuator actuator = new Actuator(actuatorId, null, null, null);
-        dbManager.execute(query, Actuator.class, onSuccess -> {
+		
-            context.response().putHeader("content-type", "application/json").end(gson.toJson(onSuccess));
+		String query = QueryBuilder
-        }, onFailure -> {
+			.select(actuator)
-            context.fail(500, onFailure);
+			.build();
-        });
+		
+		dbManager.execute(query, Actuator.class,
+			onSuccess -> {
+				context.response()
+					.putHeader("content-type", "application/json; charset=utf-8")
+					.end(gson.toJson(onSuccess));
+			},
+			onFailure -> {
+				context.fail(500, onFailure);
+			});
 	}
 	
 	private void addActuator(RoutingContext context) {
-		Actuator actuator = gson.fromJson(context.body().asString(), Actuator.class);
+		JsonObject body = context.body().asJsonObject();
-        String query = QueryBuilder.insert(actuator).build();
+		Actuator actuator = gson.fromJson(body.toString(), Actuator.class);
-        dbManager.execute(query, Actuator.class, onSuccess -> {
+		
-            context.response().putHeader("content-type", "application/json").end(gson.toJson(onSuccess));
+		String query = QueryBuilder
-        }, onFailure -> {
+			.insert(actuator)
-            context.fail(500, onFailure);
+			.build();
-        });
+		
+		dbManager.execute(query, Actuator.class,
+			onSuccess -> {
+				context.response()
+					.putHeader("content-type", "application/json; charset=utf-8")
+					.end(gson.toJson(SingleJsonResponse.of("Actuator added successfully")));
+			},
+			onFailure -> {
+				context.fail(500, onFailure);
+			});
 	}
 	
 	private void updateActuator(RoutingContext context) {
-		Actuator actuator = gson.fromJson(context.body().asString(), Actuator.class);
+		JsonObject body = context.body().asJsonObject();
-        String query = QueryBuilder.where(QueryBuilder.update(actuator), actuator).build();
+		Actuator actuator = gson.fromJson(body.toString(), Actuator.class);
-        dbManager.execute(query, Actuator.class, onSuccess -> {
+		
-            context.response().putHeader("content-type", "application/json").end(gson.toJson(onSuccess));
+		String query = QueryBuilder
-        }, onFailure -> {
+			.update(actuator)
-            context.fail(500, onFailure);
+			.build();
-        });
+		
+		dbManager.execute(query, Actuator.class,
+			onSuccess -> {
+				context.response()
+					.putHeader("content-type", "application/json; charset=utf-8")
+					.end(gson.toJson(SingleJsonResponse.of("Actuator updated successfully")));
+			},
+			onFailure -> {
+				context.fail(500, onFailure);
+			});
 	}
 		
 	private void getLatestValuesView(RoutingContext context) {