Skip to content

Commit

Permalink
code formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
sayandeep-ai committed Jan 4, 2024
1 parent 3eb5527 commit 96484d0
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ default ResponseEntity<DigitalSkyServiceProvider> addDigitalSkyServiceProvider(
) @Valid @RequestBody DigitalSkyServiceProvider digitalSkyServiceProvider
) {
try {
System.out.println("Create DigitalSkyServiceProvider " + digitalSkyServiceProvider.toString());
System.out.println(
"Create DigitalSkyServiceProvider " + digitalSkyServiceProvider.toString()
);
Dao.DigitalSkyServiceProvider mm = Dao.DigitalSkyServiceProvider.create(
DaoInstance.getInstance().getSession(),
DigitalSkyServiceProvider.fromOa(digitalSkyServiceProvider)
Expand Down Expand Up @@ -119,11 +121,17 @@ default ResponseEntity<DigitalSkyServiceProvider> addDigitalSkyServiceProvider(
description = "",
tags = { "digitalSkyServiceProvider" },
responses = {
@ApiResponse(responseCode = "400", description = "Invalid digitalSkyServiceProvider value")
@ApiResponse(
responseCode = "400",
description = "Invalid digitalSkyServiceProvider value"
)
},
security = { @SecurityRequirement(name = "jwt") }
)
@RequestMapping(method = RequestMethod.DELETE, value = "/digitalSkyServiceProvider/{digitalSkyServiceProviderId}")
@RequestMapping(
method = RequestMethod.DELETE,
value = "/digitalSkyServiceProvider/{digitalSkyServiceProviderId}"
)
default ResponseEntity<Void> deleteDigitalSkyServiceProvider(
@Parameter(
name = "digitalSkyServiceProviderId",
Expand All @@ -132,7 +140,10 @@ default ResponseEntity<Void> deleteDigitalSkyServiceProvider(
in = ParameterIn.PATH
) @PathVariable("digitalSkyServiceProviderId") UUID digitalSkyServiceProviderId
) {
Dao.DigitalSkyServiceProvider.delete(DaoInstance.getInstance().getSession(), digitalSkyServiceProviderId);
Dao.DigitalSkyServiceProvider.delete(
DaoInstance.getInstance().getSession(),
digitalSkyServiceProviderId
);
return ResponseEntity.ok().build();
// return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
}
Expand All @@ -154,7 +165,9 @@ default ResponseEntity<Void> deleteDigitalSkyServiceProvider(
content = {
@Content(
mediaType = "application/json",
array = @ArraySchema(schema = @Schema(implementation = DigitalSkyServiceProvider.class))
array = @ArraySchema(
schema = @Schema(implementation = DigitalSkyServiceProvider.class)
)
)
}
),
Expand Down Expand Up @@ -183,7 +196,9 @@ default ResponseEntity<List<DigitalSkyServiceProvider>> findDigitalSkyServicePro
// }
// }
// );
List<Dao.DigitalSkyServiceProvider> les = Dao.DigitalSkyServiceProvider.getAll(DaoInstance.getInstance().getSession());
List<Dao.DigitalSkyServiceProvider> les = Dao.DigitalSkyServiceProvider.getAll(
DaoInstance.getInstance().getSession()
);
List<DigitalSkyServiceProvider> leso = les
.stream()
.map(x -> in.ispirt.pushpaka.registry.models.DigitalSkyServiceProvider.toOa(x))
Expand Down Expand Up @@ -217,7 +232,10 @@ default ResponseEntity<List<DigitalSkyServiceProvider>> findDigitalSkyServicePro
}
),
@ApiResponse(responseCode = "400", description = "Invalid ID supplied"),
@ApiResponse(responseCode = "404", description = "DigitalSkyServiceProvider not found")
@ApiResponse(
responseCode = "404",
description = "DigitalSkyServiceProvider not found"
)
},
security = { @SecurityRequirement(name = "jwt") }
)
Expand Down Expand Up @@ -249,8 +267,13 @@ default ResponseEntity<DigitalSkyServiceProvider> getDigitalSkyServiceProviderBy
// }
// }
// );
Dao.DigitalSkyServiceProvider le = Dao.DigitalSkyServiceProvider.get(DaoInstance.getInstance().getSession(), digitalSkyServiceProviderId);
return ResponseEntity.ok(in.ispirt.pushpaka.registry.models.DigitalSkyServiceProvider.toOa(le));
Dao.DigitalSkyServiceProvider le = Dao.DigitalSkyServiceProvider.get(
DaoInstance.getInstance().getSession(),
digitalSkyServiceProviderId
);
return ResponseEntity.ok(
in.ispirt.pushpaka.registry.models.DigitalSkyServiceProvider.toOa(le)
);
}

/**
Expand All @@ -270,7 +293,10 @@ default ResponseEntity<DigitalSkyServiceProvider> getDigitalSkyServiceProviderBy
responses = { @ApiResponse(responseCode = "405", description = "Invalid input") },
security = { @SecurityRequirement(name = "jwt") }
)
@RequestMapping(method = RequestMethod.PUT, value = "/digitalSkyServiceProvider/{digitalSkyServiceProviderId}")
@RequestMapping(
method = RequestMethod.PUT,
value = "/digitalSkyServiceProvider/{digitalSkyServiceProviderId}"
)
default ResponseEntity<DigitalSkyServiceProvider> updateDigitalSkyServiceProvider(
@Parameter(
name = "digitalSkyServiceProviderId",
Expand All @@ -289,7 +315,9 @@ default ResponseEntity<DigitalSkyServiceProvider> updateDigitalSkyServiceProvide
digitalSkyServiceProviderId,
DigitalSkyServiceProvider.fromOa(digitalSkyServiceProvider)
);
return ResponseEntity.ok(in.ispirt.pushpaka.registry.models.DigitalSkyServiceProvider.toOa(le));
return ResponseEntity.ok(
in.ispirt.pushpaka.registry.models.DigitalSkyServiceProvider.toOa(le)
);
// return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
)
@Controller
@RequestMapping("${openapi.pushpakaRegistry.base-path:/api/v1}")
public class DigitalSkyServiceProviderApiController implements DigitalSkyServiceProviderApi {
public class DigitalSkyServiceProviderApiController
implements DigitalSkyServiceProviderApi {
private final NativeWebRequest request;

@Autowired
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1955,7 +1955,10 @@ public DigitalSkyServiceProvider(
// Hibernate needs a default (no-arg) constructor to create model objects.
public DigitalSkyServiceProvider() {}

public static DigitalSkyServiceProvider create(Session s, DigitalSkyServiceProvider m)
public static DigitalSkyServiceProvider create(
Session s,
DigitalSkyServiceProvider m
)
throws DaoException, ConstraintViolationException {
LegalEntity le = LegalEntity.get(s, m.getLegalEntity().getId());
if (le == null) {
Expand All @@ -1973,12 +1976,17 @@ public static DigitalSkyServiceProvider create(Session s, DigitalSkyServiceProvi
}

public static List<DigitalSkyServiceProvider> getAll(Session s) {
return s.createQuery("from DigitalSkyServiceProvider", DigitalSkyServiceProvider.class).getResultList();
return s
.createQuery("from DigitalSkyServiceProvider", DigitalSkyServiceProvider.class)
.getResultList();
}

public static DigitalSkyServiceProvider get(Session s, UUID id) {
return s
.createQuery("from DigitalSkyServiceProvider where id= :id", DigitalSkyServiceProvider.class)
.createQuery(
"from DigitalSkyServiceProvider where id= :id",
DigitalSkyServiceProvider.class
)
.setString("id", id.toString())
.uniqueResult();
}
Expand All @@ -1992,9 +2000,16 @@ public static void delete(Session s, UUID id) {
t.commit();
}

public static DigitalSkyServiceProvider update(Session s, UUID id, DigitalSkyServiceProvider le) {
public static DigitalSkyServiceProvider update(
Session s,
UUID id,
DigitalSkyServiceProvider le
) {
DigitalSkyServiceProvider leo = s
.createQuery("from DigitalSkyServiceProvider where id= :id", DigitalSkyServiceProvider.class)
.createQuery(
"from DigitalSkyServiceProvider where id= :id",
DigitalSkyServiceProvider.class
)
.setString("id", id.toString())
.uniqueResult();
leo.setTimestampUpdated(OffsetDateTime.now());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,14 @@ public static DigitalSkyServiceProvider toOa(Dao.DigitalSkyServiceProvider x) {

public static Dao.DigitalSkyServiceProvider fromOa(DigitalSkyServiceProvider m) {
OffsetDateTime n = OffsetDateTime.now();
Dao.DigitalSkyServiceProvider u = new Dao.DigitalSkyServiceProvider(m.id, LegalEntity.fromOa(m.getLegalEntity()), n, n, n, n);
Dao.DigitalSkyServiceProvider u = new Dao.DigitalSkyServiceProvider(
m.id,
LegalEntity.fromOa(m.getLegalEntity()),
n,
n,
n,
n
);
return u;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public void testScenario_1_a_1()
Logging.severe("JWT ParseException");
}
}

// // Scenario 1.a.2 Manufacturers
// @Ignore
// @Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package in.ispirt.pushpaka.integration;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nimbusds.jwt.SignedJWT;
import java.io.IOException;
import java.text.ParseException;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
Expand All @@ -24,10 +29,6 @@
import org.apache.http.util.EntityUtils;
import org.junit.Ignore;
import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.Date;
import java.text.ParseException;

public class TestUtils {
private static ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
Expand Down Expand Up @@ -150,7 +151,8 @@ public static UUID userCreate(String jwt)
return extractUuid(reb);
}

public static UUID pilotCreate(String jwt) throws ClientProtocolException, IOException, JsonProcessingException, ParseException {
public static UUID pilotCreate(String jwt)
throws ClientProtocolException, IOException, JsonProcessingException, ParseException {
SignedJWT jwts = TestUtils.parseJwt(jwt);
UUID uid = UUID.fromString(jwts.getJWTClaimsSet().getSubject());
StringEntity e = new StringEntity(
Expand Down Expand Up @@ -446,7 +448,6 @@ public static UUID traderCreate(String jwt, UUID leid)
}

public static void grantCaaAdmin(String jwt, UUID id) {

assertEquals(1, 2);
}

Expand Down Expand Up @@ -477,5 +478,4 @@ public static void assertJwt(SignedJWT t) throws ParseException {
);
assertTrue(new Date().before(t.getJWTClaimsSet().getExpirationTime()));
}

}

0 comments on commit 96484d0

Please sign in to comment.