Skip to content

Commit 656315d

Browse files
committed
improved the code
1 parent ccd88a2 commit 656315d

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

src/main/java/mate/academy/rickandmorty/Application.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
@RequiredArgsConstructor
1010
@SpringBootApplication
1111
public class Application implements CommandLineRunner {
12-
private final CharacterService charactersService;
12+
private final CharacterService characterService;
1313

1414
public static void main(String[] args) {
1515
SpringApplication.run(Application.class, args);
1616
}
1717

1818
@Override
1919
public void run(String... args) throws Exception {
20-
charactersService.fetchToDb();
20+
characterService.fetchToDb();
2121
}
2222
}

src/main/java/mate/academy/rickandmorty/controller/CharacterController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import mate.academy.rickandmorty.service.CharacterService;
1414
import org.springframework.web.bind.annotation.GetMapping;
1515
import org.springframework.web.bind.annotation.RequestMapping;
16+
import org.springframework.web.bind.annotation.RequestParam;
1617
import org.springframework.web.bind.annotation.RestController;
1718

1819
@Tag(name = "Rick and Morty characters API",
@@ -52,7 +53,7 @@ CharacterDto getRandomCharacter() {
5253
List<CharacterDto> search(
5354
@Parameter(description = "Search parameter, name or "
5455
+ "part of a name, to look for", example = "Alice")
55-
CharacterSearchParameters searchParameters) {
56+
@RequestParam CharacterSearchParameters searchParameters) {
5657
return characterService.search(searchParameters);
5758
}
5859
}

src/main/java/mate/academy/rickandmorty/repository/character/CharacterSpecificationProviderManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public SpecificationProvider<Character> getSpecificationProvider(String key) {
1919
.filter(p -> p.getKey().equals(key))
2020
.findFirst()
2121
.orElseThrow(
22-
() -> new RuntimeException("")
22+
() -> new RuntimeException("Can't provide specification "
23+
+ "for key: " + key)
2324
);
2425
}
2526
}

src/main/java/mate/academy/rickandmorty/service/CharacterServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void fetchToDb() {
3232

3333
@Override
3434
public CharacterDto getRandomCharacter() {
35-
long randomId = new Random().nextLong(characterRepository.count() + 1);
35+
long randomId = new Random().nextInt((int) (characterRepository.count() + 1));
3636
Character randomCharacter =
3737
characterRepository.findById(randomId)
3838
.orElseThrow(

src/main/java/mate/academy/rickandmorty/service/RickAndMortyClient.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ private RickAndMortyResponseDataDto getResponseObject(HttpRequest httpRequest) {
4646
getHttpResponse(httpRequest).body(),
4747
RickAndMortyResponseDataDto.class);
4848
} catch (JsonProcessingException e) {
49-
throw new ObjectMapperException("Failed to read httpResponse: ", e);
49+
throw new ObjectMapperException("URL: " + httpRequest.uri()
50+
+ " Failed to read httpResponse: ", e);
5051
}
5152
}
5253

@@ -61,7 +62,9 @@ private HttpResponse<String> getHttpResponse(HttpRequest httpRequest) {
6162
}
6263
return response;
6364
} catch (IOException | InterruptedException e) {
64-
throw new ApiException("Cannot get all characters from API: ", e);
65+
throw new ApiException("URL: "
66+
+ httpRequest.uri()
67+
+ " Cannot get all characters from API: ", e);
6568
}
6669
}
6770
}

0 commit comments

Comments
 (0)