Merge pull request 'matin mortazavi' (#1) from develop into main
Excellent work. All mandatory tasks have been implemented correctly. The code quality is great. Well done!(100/100)
This commit was merged in pull request #1.
This commit is contained in:
@@ -55,26 +55,42 @@ public class Rational {
|
|||||||
// Formula: a/b - c/d = (a*d - c*b) / (b*d)
|
// Formula: a/b - c/d = (a*d - c*b) / (b*d)
|
||||||
public Rational subtract(Rational other) {
|
public Rational subtract(Rational other) {
|
||||||
// YOUR CODE HERE
|
// YOUR CODE HERE
|
||||||
return null; // Remove this line when implemented
|
int NewNumerator = ((this.numerator)*other.denominator)-((this.denominator)*other.numerator) ;
|
||||||
|
int NewDenominator = (this.denominator)*other.denominator;
|
||||||
|
|
||||||
|
return new Rational(NewNumerator ,NewDenominator);
|
||||||
|
|
||||||
|
|
||||||
|
// Remove this line when implemented
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Static method - r1 - r2
|
// TODO: Static method - r1 - r2
|
||||||
public static Rational subtract(Rational r1, Rational r2) {
|
public static Rational subtract(Rational r1, Rational r2) {
|
||||||
// YOUR CODE HERE
|
// YOUR CODE HERE
|
||||||
return null; // Remove this line when implemented
|
int NewNumerator = (r1.numerator* r2.denominator)-(r1.denominator* r2.numerator) ;
|
||||||
|
int NewDenominator = r1.denominator* r2.denominator ;
|
||||||
|
|
||||||
|
return new Rational(NewNumerator ,NewDenominator);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Instance method - this * other
|
// TODO: Instance method - this * other
|
||||||
// Formula: (a/b) * (c/d) = (a*c) / (b*d)
|
// Formula: (a/b) * (c/d) = (a*c) / (b*d)
|
||||||
public Rational multiply(Rational other) {
|
public Rational multiply(Rational other) {
|
||||||
// YOUR CODE HERE
|
// 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
|
// TODO: Static method - r1 * r2
|
||||||
public static Rational multiply(Rational r1, Rational r2) {
|
public static Rational multiply(Rational r1, Rational r2) {
|
||||||
|
int NewNumerator = r1.numerator* r2.numerator ;
|
||||||
|
int NewDenominator = r1.denominator* r2.denominator ;
|
||||||
|
|
||||||
|
return new Rational(NewNumerator ,NewDenominator);
|
||||||
// YOUR CODE HERE
|
// YOUR CODE HERE
|
||||||
return null; // Remove this line when implemented
|
//return null; // Remove this line when implemented
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Instance method - this / other
|
// TODO: Instance method - this / other
|
||||||
@@ -83,13 +99,32 @@ public class Rational {
|
|||||||
// YOUR CODE HERE
|
// YOUR CODE HERE
|
||||||
// HINT: Division is multiplication by reciprocal
|
// HINT: Division is multiplication by reciprocal
|
||||||
// Don't forget to check if other.numerator is zero!
|
// Don't forget to check if other.numerator is zero!
|
||||||
return null; // Remove this line when implemented
|
// return null; // Remove this line when implemented
|
||||||
|
if (other.numerator == 0 )
|
||||||
|
{
|
||||||
|
throw new ArithmeticException("cannot divide ") ;
|
||||||
|
}
|
||||||
|
int NewNumerator = this.numerator*other.denominator ;
|
||||||
|
int NewDenominator = this.denominator*other.numerator ;
|
||||||
|
return new Rational(NewNumerator ,NewDenominator);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Static method - r1 / r2
|
// TODO: Static method - r1 / r2
|
||||||
public static Rational divide(Rational r1, Rational r2) {
|
public static Rational divide(Rational r1, Rational r2) {
|
||||||
// YOUR CODE HERE
|
// YOUR CODE HERE
|
||||||
return null; // Remove this line when implemented
|
if (r2.numerator == 0 )
|
||||||
|
{
|
||||||
|
throw new ArithmeticException("cannot divide ") ;
|
||||||
|
}
|
||||||
|
int NewNumerator = r1.numerator * r2.denominator ;
|
||||||
|
int NewDenominator = r1.denominator * r2.numerator ;
|
||||||
|
return new Rational(NewNumerator ,NewDenominator);
|
||||||
|
|
||||||
|
|
||||||
|
//return null; // Remove this line when implemented
|
||||||
}
|
}
|
||||||
|
|
||||||
// PROVIDED - String representation
|
// PROVIDED - String representation
|
||||||
|
|||||||
@@ -4,9 +4,11 @@ public class Genre {
|
|||||||
private Long id;
|
private Long id;
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
public Genre(Long id, String name) {
|
public Genre(Long id, String name ) {
|
||||||
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Genre() {
|
public Genre() {
|
||||||
@@ -28,6 +30,9 @@ public class Genre {
|
|||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return id + ". " + name;
|
return id + ". " + name;
|
||||||
|
|||||||
@@ -22,12 +22,19 @@ public class Main {
|
|||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
// TODO: Get genre ID and page from user, then call movieService.displayMoviesByGenre()
|
// TODO: Get genre ID and page from user, then call movieService.displayMoviesByGenre()
|
||||||
|
Long genreId = getLongInput("enter genre id") ;
|
||||||
|
Long page = getLongInput("Enter page number: ");
|
||||||
|
movieService.displayMoviesByGenre(genreId, page);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
// TODO (BONUS): Get movie ID from user, then call movieService.displayMovieDetails()
|
// TODO (BONUS): Get movie ID from user, then call movieService.displayMovieDetails()
|
||||||
|
Long movieId = getLongInput("Enter movie ID: ");
|
||||||
|
//movieService.displayMovieDetails(movieId);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -17,6 +17,76 @@ public class Movie {
|
|||||||
private String country;
|
private String country;
|
||||||
|
|
||||||
// TODO: Create a constructor with all fields
|
// TODO: Create a constructor with all fields
|
||||||
|
public Movie( Long id , String title , List<String> genres , List<String> images , String year , String imdb_rating , String country) {
|
||||||
|
this.id = id ;
|
||||||
|
this.title = title ;
|
||||||
|
this.genres = genres ;
|
||||||
|
this.images = images ;
|
||||||
|
this.year = year ;
|
||||||
|
this.imdb_rating = imdb_rating ;
|
||||||
|
this.country = country ;
|
||||||
|
}
|
||||||
|
public Movie(Long id , String title)
|
||||||
|
{
|
||||||
|
this.id = id ;
|
||||||
|
this.title = title ;
|
||||||
|
}
|
||||||
|
public Movie(){}
|
||||||
|
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 ;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// TODO: Create a simple constructor with id and title only
|
// TODO: Create a simple constructor with id and title only
|
||||||
|
|
||||||
|
|||||||
@@ -107,7 +107,23 @@ public class MovieService {
|
|||||||
// All parsing code must be inside try-catch
|
// All parsing code must be inside try-catch
|
||||||
try {
|
try {
|
||||||
// Your code here
|
// Your code here
|
||||||
|
String json_res = getMoviesByGenreList(genreId , page);
|
||||||
|
if (json_res == null)
|
||||||
|
{
|
||||||
|
System.out.println("no data ");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
JsonObject root = JsonParser.parseString(json_res).getAsJsonObject() ;
|
||||||
|
JsonArray movie_arr = root.getAsJsonArray("movies") ;
|
||||||
|
Gson gson = new Gson() ;
|
||||||
|
Type movieListType = new TypeToken<ArrayList<Movie>>(){}.getType();
|
||||||
|
List<Movie> movies = gson.fromJson(movie_arr, movieListType);
|
||||||
|
long total = root.get("total").getAsLong();
|
||||||
|
long totalPages = root.get("total_pages").getAsLong();
|
||||||
|
System.out.println("Page " + page + " of " + totalPages + " (Total movies: " + total + ")");
|
||||||
|
for (Movie m : movies) {
|
||||||
|
System.out.println("ID: " + m.getId() + " | " + m.getTitle() + " (" + m.getYear() + ")");
|
||||||
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.err.println("ERROR: " + e.getMessage());
|
System.err.println("ERROR: " + e.getMessage());
|
||||||
}
|
}
|
||||||
@@ -121,12 +137,16 @@ public class MovieService {
|
|||||||
private String getMovieById(Long movieId) {
|
private String getMovieById(Long movieId) {
|
||||||
try {
|
try {
|
||||||
// TODO: Complete this method
|
// TODO: Complete this method
|
||||||
// String url = MOVIE_BY_ID_URL + movieId;
|
String url = MOVIE_BY_ID_URL + movieId;
|
||||||
// HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).build();
|
HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).build();
|
||||||
// HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
|
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
|
||||||
// if (response.statusCode() == 200) return response.body();
|
if (response.statusCode() == 200) return response.body();
|
||||||
|
else {
|
||||||
|
throw new IOException("HTTP error code: " + response.statusCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return null;
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.out.println("!!Exception : " + e.getMessage());
|
System.out.println("!!Exception : " + e.getMessage());
|
||||||
}
|
}
|
||||||
@@ -170,10 +190,12 @@ public class MovieService {
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public void displayMovieDetails(Long movieId) {
|
/*public void displayMovieDetails(Long movieId) {
|
||||||
// Step 1: Get JSON response from API
|
// Step 1: Get JSON response from API
|
||||||
String jsonResponse = getMovieById(movieId);
|
String jsonResponse = getMovieById(movieId);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Step 2: Check if we got valid data
|
// Step 2: Check if we got valid data
|
||||||
// Step 3-5: Parse JSON and display details (PUT YOUR CODE INSIDE try-catch)
|
// Step 3-5: Parse JSON and display details (PUT YOUR CODE INSIDE try-catch)
|
||||||
if (jsonResponse == null) {
|
if (jsonResponse == null) {
|
||||||
@@ -181,12 +203,19 @@ public class MovieService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
// TODO: Parse jsonResponse to JsonObject
|
|
||||||
// HINT: Use JsonParser.parseString(jsonResponse).getAsJsonObject()
|
|
||||||
// TODO: use Gson to parse the json
|
|
||||||
// Your code here:
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.err.println("ERROR parsing movie details: " + e.getMessage());
|
System.err.println("ERROR parsing movie details: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// TODO: Parse jsonResponse to JsonObject
|
||||||
|
// HINT: Use JsonParser.parseString(jsonResponse).getAsJsonObject()
|
||||||
|
// TODO: use Gson to parse the json
|
||||||
|
// Your code here:
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.err.println("ERROR parsing movie details: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}*/
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user