Replaced all tabs with spaces in java and pom.xml
[so.git] / common / src / main / java / org / onap / so / client / sdno / SDNOValidatorImpl.java
index 882a390..4aafd14 100644 (file)
@@ -24,9 +24,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.UUID;
-
 import javax.ws.rs.NotFoundException;
-
 import org.onap.aai.domain.yang.GenericVnf;
 import org.onap.so.client.aai.AAIObjectType;
 import org.onap.so.client.aai.AAIResourcesClient;
@@ -41,88 +39,91 @@ import org.onap.so.client.sdno.beans.RequestHealthDiagnostic;
 import org.onap.so.client.sdno.beans.SDNO;
 import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapConsumer;
 import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapPublisher;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class SDNOValidatorImpl implements SDNOValidator {
 
-       private final static String clientName = "MSO";
-       private final static String HEALTH_DIAGNOSTIC_CODE_DEFAULT = "default";
-
-       @Override
-       public boolean healthDiagnostic(String vnfId, UUID uuid, String requestingUserId) throws IOException, Exception {
-               
-               AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
-               AAIResourcesClient client = new AAIResourcesClient();
-               GenericVnf vnf = client.get(GenericVnf.class, uri).orElseThrow(() -> new NotFoundException(vnfId + " not found in A&AI"));
-               
-               SDNO requestDiagnostic = buildRequestDiagnostic(vnf, uuid, requestingUserId);
-               ObjectMapper mapper = new ObjectMapper();
-               String json = mapper.writeValueAsString(requestDiagnostic);
-               this.submitRequest(json);
-               boolean status = this.pollForResponse(uuid.toString());
-               return status;          
-       }
-       
-       @Override
-       public boolean healthDiagnostic(GenericVnf genericVnf, UUID uuid, String requestingUserId) throws IOException, Exception {
-               
-               SDNO requestDiagnostic = buildRequestDiagnostic(genericVnf, uuid, requestingUserId);
-               ObjectMapper mapper = new ObjectMapper();
-               String json = mapper.writeValueAsString(requestDiagnostic);
-               this.submitRequest(json);
-               boolean status = this.pollForResponse(uuid.toString());
-               return status;          
-       }
-
-       protected SDNO buildRequestDiagnostic(GenericVnf vnf, UUID uuid, String requestingUserId) {
-               
-               Optional<String> nfRole;
-               if (vnf.getNfRole() == null) {
-                       nfRole = Optional.empty();
-               } else {
-                       nfRole = Optional.of(vnf.getNfRole());
-               }
-               Input input = new Input();
-               SDNO parentRequest = new SDNO();
-               Body body = new Body();
-               parentRequest.setBody(body);
-               parentRequest.setNodeType(nfRole.orElse("NONE").toUpperCase());
-               parentRequest.setOperation("health-diagnostic");
-               
-               body.setInput(input);
-               
-               RequestHealthDiagnostic request = new RequestHealthDiagnostic();
-
-               request.setRequestClientName(clientName);
-               request.setRequestNodeName(vnf.getVnfName());
-               request.setRequestNodeUuid(vnf.getVnfId());
-               request.setRequestNodeType(nfRole.orElse("NONE").toUpperCase());
-               request.setRequestNodeIp(vnf.getIpv4OamAddress()); //generic-vnf oam ip
-               request.setRequestUserId(requestingUserId); //mech id?
-               request.setRequestId(uuid.toString()); //something to identify this request by for polling
-               request.setHealthDiagnosticCode(HEALTH_DIAGNOSTIC_CODE_DEFAULT);
-               
-               input.setRequestHealthDiagnostic(request);
-               
-               return parentRequest;
-       }
-       protected void submitRequest(String json) throws FileNotFoundException, IOException, InterruptedException {
-               
-               DmaapPublisher publisher = new SDNOHealthCheckDmaapPublisher();
-               publisher.send(json);
-       }
-       protected boolean pollForResponse(String uuid) throws Exception {
-               DmaapConsumer consumer = this.getConsumer(uuid);
-               return consumer.consume();
-       }
-       
-
-       
-       protected DmaapConsumer getConsumer(String uuid) throws FileNotFoundException, IOException {
-               return new SDNOHealthCheckDmaapConsumer(uuid);
-       }
-       
-
-       
+    private final static String clientName = "MSO";
+    private final static String HEALTH_DIAGNOSTIC_CODE_DEFAULT = "default";
+
+    @Override
+    public boolean healthDiagnostic(String vnfId, UUID uuid, String requestingUserId) throws IOException, Exception {
+
+        AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
+        AAIResourcesClient client = new AAIResourcesClient();
+        GenericVnf vnf = client.get(GenericVnf.class, uri)
+                .orElseThrow(() -> new NotFoundException(vnfId + " not found in A&AI"));
+
+        SDNO requestDiagnostic = buildRequestDiagnostic(vnf, uuid, requestingUserId);
+        ObjectMapper mapper = new ObjectMapper();
+        String json = mapper.writeValueAsString(requestDiagnostic);
+        this.submitRequest(json);
+        boolean status = this.pollForResponse(uuid.toString());
+        return status;
+    }
+
+    @Override
+    public boolean healthDiagnostic(GenericVnf genericVnf, UUID uuid, String requestingUserId)
+            throws IOException, Exception {
+
+        SDNO requestDiagnostic = buildRequestDiagnostic(genericVnf, uuid, requestingUserId);
+        ObjectMapper mapper = new ObjectMapper();
+        String json = mapper.writeValueAsString(requestDiagnostic);
+        this.submitRequest(json);
+        boolean status = this.pollForResponse(uuid.toString());
+        return status;
+    }
+
+    protected SDNO buildRequestDiagnostic(GenericVnf vnf, UUID uuid, String requestingUserId) {
+
+        Optional<String> nfRole;
+        if (vnf.getNfRole() == null) {
+            nfRole = Optional.empty();
+        } else {
+            nfRole = Optional.of(vnf.getNfRole());
+        }
+        Input input = new Input();
+        SDNO parentRequest = new SDNO();
+        Body body = new Body();
+        parentRequest.setBody(body);
+        parentRequest.setNodeType(nfRole.orElse("NONE").toUpperCase());
+        parentRequest.setOperation("health-diagnostic");
+
+        body.setInput(input);
+
+        RequestHealthDiagnostic request = new RequestHealthDiagnostic();
+
+        request.setRequestClientName(clientName);
+        request.setRequestNodeName(vnf.getVnfName());
+        request.setRequestNodeUuid(vnf.getVnfId());
+        request.setRequestNodeType(nfRole.orElse("NONE").toUpperCase());
+        request.setRequestNodeIp(vnf.getIpv4OamAddress()); // generic-vnf oam ip
+        request.setRequestUserId(requestingUserId); // mech id?
+        request.setRequestId(uuid.toString()); // something to identify this request by for polling
+        request.setHealthDiagnosticCode(HEALTH_DIAGNOSTIC_CODE_DEFAULT);
+
+        input.setRequestHealthDiagnostic(request);
+
+        return parentRequest;
+    }
+
+    protected void submitRequest(String json) throws FileNotFoundException, IOException, InterruptedException {
+
+        DmaapPublisher publisher = new SDNOHealthCheckDmaapPublisher();
+        publisher.send(json);
+    }
+
+    protected boolean pollForResponse(String uuid) throws Exception {
+        DmaapConsumer consumer = this.getConsumer(uuid);
+        return consumer.consume();
+    }
+
+
+
+    protected DmaapConsumer getConsumer(String uuid) throws FileNotFoundException, IOException {
+        return new SDNOHealthCheckDmaapConsumer(uuid);
+    }
+
+
+
 }