[go: nahoru, domu]
Skip to content

Commit

Permalink
Merge pull request #39 from antonin77/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@usfalami
usfalami committed Feb 9, 2024
2 parents 612579f + 0c364bd commit 5eb0221
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 60 deletions.
53 changes: 22 additions & 31 deletions src/main/java/org/usf/trace/api/server/controller/ApiController.java
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,25 @@
package org.usf.trace.api.server.controller;

import static java.util.Objects.isNull;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
import static org.springframework.http.ResponseEntity.accepted;
import static org.usf.trace.api.server.Utils.requireSingle;
import static org.usf.traceapi.core.Session.nextId;

import java.time.Instant;
import java.util.List;
import java.util.concurrent.TimeUnit;

import javax.servlet.http.HttpServletRequest;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.CacheControl;
import org.springframework.http.ResponseEntity;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.usf.trace.api.server.FilterCriteria;
import org.usf.trace.api.server.RequestDao;
import org.usf.trace.api.server.SessionQueueService;
import org.usf.traceapi.core.ApiRequest;
import org.usf.traceapi.core.ApiSession;
import org.usf.traceapi.core.ApplicationInfo;
import org.usf.traceapi.core.MainSession;
import org.usf.traceapi.core.Session;
import org.usf.traceapi.core.*;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
import java.time.Instant;
import java.util.List;
import java.util.concurrent.TimeUnit;

import static java.util.Objects.isNull;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
import static org.springframework.http.ResponseEntity.accepted;
import static org.usf.trace.api.server.Utils.requireSingle;
import static org.usf.traceapi.core.Session.nextId;

@Slf4j
@CrossOrigin
Expand Down Expand Up @@ -70,7 +56,7 @@ else if(isNull(req.getApplication().getAddress())) {
}
}

@GetMapping("session/api")
@GetMapping("session/request")
public List<Session> getIncomingRequestByCriteria(
@RequestParam(required = false, name = "name") String[] name,
@RequestParam(required = false, name = "env") String[] env,
Expand All @@ -82,7 +68,7 @@ public List<Session> getIncomingRequestByCriteria(
return dao.getIncomingRequestByCriteria(lazy, fc, ApiRequest::new);
}

@GetMapping("session/api/{id}")
@GetMapping("session/request/{id}")
public ResponseEntity<Session> getIncomingRequestById(@PathVariable String id) { // without tree
return ResponseEntity.ok().cacheControl(CacheControl.maxAge(1, TimeUnit.DAYS)).body(requireSingle(dao.getIncomingRequestById(true, ApiRequest::new, id)));
}
Expand All @@ -104,10 +90,15 @@ public ResponseEntity<MainSession> getMainRequestById(@PathVariable String id) {
return ResponseEntity.ok().cacheControl(CacheControl.maxAge(1, TimeUnit.DAYS)).body(requireSingle(dao.getMainRequestById(true, ApiRequest::new, id)));
}

@GetMapping("incoming/request/{id}/out")
@GetMapping("session/api/{id}/out")
public ApiRequest getOutcomingRequestById(@PathVariable String id) {
return dao.getOutcomingRequestById(id);
}

@GetMapping("session/request/{id}/tree")
public Session getTreebyId(@PathVariable String id){
return dao.getTreebyId(id);
}
}


29 changes: 0 additions & 29 deletions src/main/java/org/usf/trace/api/server/controller/TreeController.java
View file

This file was deleted.

0 comments on commit 5eb0221

Please sign in to comment.