merge branch develop to main #1

Merged
Meraj merged 6 commits from develop into main 2026-05-18 23:33:27 +00:00
4 changed files with 260 additions and 20 deletions
+18 -15
View File
@@ -7,7 +7,8 @@ public class Rational {
// Constructor
public Rational(int numerator, int denominator) {
if (denominator == 0) {
throw new IllegalArgumentException("Denominator cannot be zero");
// throw new IllegalArgumentException("Denominator cannot be zero");
System.out.println("Error: denominator cannot be zero");
}
this.numerator = numerator;
this.denominator = denominator;
@@ -54,42 +55,44 @@ public class Rational {
// TODO: Instance method - this - other
// Formula: a/b - c/d = (a*d - c*b) / (b*d)
public Rational subtract(Rational other) {
// YOUR CODE HERE
return null; // Remove this line when implemented
int newNumerator = this.numerator * other.denominator - other.numerator * this.denominator;
int newDenominator = this.denominator * other.denominator;
return new Rational(newNumerator, newDenominator);
}
// TODO: Static method - r1 - r2
public static Rational subtract(Rational r1, Rational r2) {
// YOUR CODE HERE
return null; // Remove this line when implemented
return r1.subtract(r2);
}
// TODO: Instance method - this * other
// Formula: (a/b) * (c/d) = (a*c) / (b*d)
public Rational multiply(Rational other) {
// YOUR CODE HERE
return null; // Remove this line when implemented
int newNumerator = this.numerator * other.numerator;
int newDenominator = this.denominator * other.denominator;
return new Rational(newNumerator, newDenominator);
}
// TODO: Static method - r1 * r2
public static Rational multiply(Rational r1, Rational r2) {
// YOUR CODE HERE
return null; // Remove this line when implemented
return r1.multiply(r2);
}
// TODO: Instance method - this / other
// Formula: (a/b) ÷ (c/d) = (a*d) / (b*c)
public Rational divide(Rational other) {
// YOUR CODE HERE
// HINT: Division is multiplication by reciprocal
// Don't forget to check if other.numerator is zero!
return null; // Remove this line when implemented
int newNumerator = this.numerator * other.denominator;
int newDenominator = this.denominator * other.numerator;
if (newDenominator == 0) {
System.out.println("Can't divide: new denominator is zero");
return null;
}
return new Rational(newNumerator, newDenominator);
}
// TODO: Static method - r1 / r2
public static Rational divide(Rational r1, Rational r2) {
// YOUR CODE HERE
return null; // Remove this line when implemented
return r1.divide(r2);
}
// PROVIDED - String representation
+10
View File
@@ -21,12 +21,22 @@ public class Main {
break;
case 2:
System.out.println("Please enter genre ID: ");
long genreId = scanner.nextLong();
scanner.nextLine();
System.out.println("Enter page number: ");
long pageNum = scanner.nextLong();
scanner.nextLine();
movieService.displayMoviesByGenre(genreId, pageNum);
// TODO: Get genre ID and page from user, then call movieService.displayMoviesByGenre()
break;
case 3:
System.out.println("Please enter movie ID: ");
long movieID = scanner.nextLong();
movieService.displayMovieDetails(movieID);
// TODO (BONUS): Get movie ID from user, then call movieService.displayMovieDetails()
+195
View File
@@ -15,10 +15,205 @@ public class Movie {
private String year;
private String imdb_rating;
private String country;
private String actors;
private String awards;
private String director;
private String imdb_id;
private String imdb_votes;
private String metascore;
private String plot;
private String rated;
private String released;
private String runtime;
private String type;
private String writer;
public Movie(Long id, String title, List<String> genres, List<String> images,
String year, String imdb_rating, String country, String actors,
String awards, String director, String imdb_id, String imdb_votes,
String metascore, String plot, String rated, String released,
String runtime, String type, String writer) {
this.id = id;
this.title = title;
this.genres = genres;
this.images = images;
this.year = year;
this.imdb_rating = imdb_rating;
this.country = country;
this.actors = actors;
this.awards = awards;
this.director = director;
this.imdb_id = imdb_id;
this.imdb_votes = imdb_votes;
this.metascore = metascore;
this.plot = plot;
this.rated = rated;
this.released = released;
this.runtime = runtime;
this.type = type;
this.writer = writer;
}
// TODO: Create a constructor with all fields
public Movie(Long id, String title) {
this.id = id;
this.title = title;
}
// TODO: Create a simple constructor with id and title only
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public List<String> getGenres() {
return genres;
}
public void setGenres(List<String> genres) {
this.genres = genres;
}
public List<String> getImages() {
return images;
}
public void setImages(List<String> images) {
this.images = images;
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getImdb_rating() {
return imdb_rating;
}
public void setImdb_rating(String imdb_rating) {
this.imdb_rating = imdb_rating;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getActors() {
return actors;
}
public void setActors(String actors) {
this.actors = actors;
}
public String getAwards() {
return awards;
}
public void setAwards(String awards) {
this.awards = awards;
}
public String getDirector() {
return director;
}
public void setDirector(String director) {
this.director = director;
}
public String getImdb_id() {
return imdb_id;
}
public void setImdb_id(String imdb_id) {
this.imdb_id = imdb_id;
}
public String getImdb_votes() {
return imdb_votes;
}
public void setImdb_votes(String imdb_votes) {
this.imdb_votes = imdb_votes;
}
public String getMetascore() {
return metascore;
}
public void setMetascore(String metascore) {
this.metascore = metascore;
}
public String getPlot() {
return plot;
}
public void setPlot(String plot) {
this.plot = plot;
}
public String getRated() {
return rated;
}
public void setRated(String rated) {
this.rated = rated;
}
public String getReleased() {
return released;
}
public void setReleased(String released) {
this.released = released;
}
public String getRuntime() {
return runtime;
}
public void setRuntime(String runtime) {
this.runtime = runtime;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getWriter() {
return writer;
}
public void setWriter(String writer) {
this.writer = writer;
}
// TODO: Create getters and setters for all fields
}
+37 -5
View File
@@ -103,11 +103,26 @@ public class MovieService {
* PUT ALL PARSING CODE INSIDE try-catch
*/
public void displayMoviesByGenre(Long genreId, Long page) {
// TODO: Write your code here
// All parsing code must be inside try-catch
try {
// Your code here
String jsonResponse = getMoviesByGenreList(genreId, page);
JsonObject jsonObject = JsonParser.parseString(jsonResponse).getAsJsonObject();
JsonArray jsonMovies = jsonObject.getAsJsonArray("movies");
System.out.println("\nMovies for genre " + genreId + " (Page " + page + "):");
for (JsonElement element: jsonMovies) {
JsonObject movie = element.getAsJsonObject();
long id = movie.get("id").getAsLong();
String title = movie.get("title").getAsString();
String year = movie.get("year").getAsString();
System.out.println("ID: " + id + " | " + title + " (" + year + ")");
}
long total = jsonObject.get("total").getAsLong();
long totalPages = jsonObject.get("total_pages").getAsLong();
System.out.println("Total: " + total +"\n" + "Total pages: " + totalPages);
// Your code here
} catch (Exception e) {
System.err.println("ERROR: " + e.getMessage());
}
@@ -121,10 +136,10 @@ public class MovieService {
private String getMovieById(Long movieId) {
try {
// TODO: Complete this method
// String url = MOVIE_BY_ID_URL + movieId;
// HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).build();
// HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
// if (response.statusCode() == 200) return response.body();
String url = MOVIE_BY_ID_URL + movieId;
HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).build();
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
if (response.statusCode() == 200) return response.body();
return null;
} catch (Exception e) {
@@ -181,6 +196,23 @@ public class MovieService {
return;
}
try {
JsonObject movieObject = JsonParser.parseString(jsonResponse).getAsJsonObject();
Gson gson = new Gson();
Movie movie = gson.fromJson(jsonResponse, Movie.class);
System.out.println("________________________ " + movie.getTitle().toUpperCase()+ " (" + movie.getYear() +
") ________________________");
System.out.println("IMDB rating: " + movie.getImdb_rating() +
" | Votes: " + movie.getImdb_votes());
System.out.println("Director: " + movie.getDirector());
System.out.println("Cast: " + movie.getActors());
System.out.println("Genre: " + movie.getGenres());
System.out.println("Runtime: " + movie.getRuntime() +
" | Rated: " + movie.getRated());
System.out.println("Country: " + movie.getCountry() +
" | Released: " + movie.getReleased());
System.out.println("Plot: " + movie.getPlot());
System.out.println("Awards: " + movie.getAwards());
// TODO: Parse jsonResponse to JsonObject
// HINT: Use JsonParser.parseString(jsonResponse).getAsJsonObject()
// TODO: use Gson to parse the json