ivan/unifi4j
1
0
Fork 0
mirror of https://github.com/Voronsky/unifi4j.git synced 2025-12-12 16:16:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactored methods with learning

Browse Source
This commit is contained in:
Voronsky
2024-08-28 23:52:33 -04:00
parent cd11abbca4
commit b6659e2fca
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/voronsky/unifi4j/Unifi.java
View File

@@ -3,7 +3,6 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Profile;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestClient; import org.springframework.web.client.RestClient;
@@ -26,12 +25,15 @@ public class Unifi {
).build(); ).build();
} }
@Profile("!DataRetrieval") /**
public ResponseEntity<String> getHosts() { * Returns the raw JSON response from the hosts endpoint
* @return JSON string
*/
public String getHosts() {
try{ try{
log.info("Obtaining hosts from console.."); log.info("Obtaining hosts from console..");
log.info(this.endpoint); log.info(this.endpoint);
return this.restClient.get().uri("/hosts").retrieve().toEntity(String.class); return this.restClient.get().uri("/hosts").retrieve().body(String.class);
} }
catch (Exception e){ catch (Exception e){
log.error(e.toString()); log.error(e.toString());
@@ -39,19 +41,28 @@ public class Unifi {
return null; return null;
} }
public List<String> getHardware() throws Exception{ /**
* Returns a list of only the hardware names associated with the account
* @return A list of hardware names
* @throws Exception
*/
public List<String> getHardwareList() throws Exception{
List<String> hardwares = new ArrayList<>(); List<String> hardwares = new ArrayList<>();
ResponseEntity<String> p = this.restClient.get().uri("/hosts").retrieve().toEntity(String.class); ResponseEntity<String> json = this.restClient.get().uri("/hosts").retrieve().toEntity(String.class);
//Data p = this.restClient.get().uri("/hosts").retrieve().body(Data.class); log.debug("JSON response: "+json);
log.info("Response Obj: "+p);
// Map the JSON String from the response to a Json node object // Map the JSON String from the response to a Json node object
JsonNode jsonObject = new ObjectMapper().readTree(p.getBody()); JsonNode jsonObject = new ObjectMapper().readTree(json.getBody());
log.info("JSON Tree object: "+jsonObject); ObjectMapper mapper = new ObjectMapper();
log.info("Reported State: " + jsonObject.get("data").get(0).get("reportedState").get("hardware")); UnifiResponse ur = mapper.readValue(jsonObject.toString(), UnifiResponse.class);
ObjectMapper objMapper = new ObjectMapper(); List<Data> data = ur.data();
Hardware h = objMapper.treeToValue(jsonObject.get("data").get(0).get("reportedState").asText(), Hardware.class); log.info("List: "+ur);
hardwares.add(h.name()); log.info("REEE: "+data);
for(Data itr: data){
log.info("RS: "+itr.reportedState().hardware());
hardwares.add(itr.reportedState().hardware().name());
}
return hardwares; return hardwares;
} }