Created nessesery classes, changed Objects to PECS.

src/main/java/core/mate/academy/model/Bulldozer.java

@@ -1,15 +1,26 @@
 package core.mate.academy.model;
 
-/**
- * Add some custom fields that could be only in Bulldozer
- * Do not remove no-args constructor
- */
 public class Bulldozer extends Machine {
+ private int fuelConsuptionPerHour;
+
  public Bulldozer() {
  }
 
+ public Bulldozer(String name, String color, Integer fuelConsuptionPerHour) {
+ super(name, color);
+ this.fuelConsuptionPerHour = fuelConsuptionPerHour;
+ }
+
  @Override
  public void doWork() {
  System.out.println("Bulldozer started to work");
  }
+
+ public int getFuelConsuptionPerHour() {
+ return fuelConsuptionPerHour;
+ }
+
+ public void setFuelConsuptionPerHour(int fuelConsuptionPerHour) {
+ this.fuelConsuptionPerHour = fuelConsuptionPerHour;
+ }
 }

src/main/java/core/mate/academy/model/BulldozerProducer.java

@@ -0,0 +1,19 @@
+package core.mate.academy.model;
+
+import core.mate.academy.service.MachineProducer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BulldozerProducer implements MachineProducer<Bulldozer> {
+
+ @Override
+ public List<Bulldozer> get() {
+ List<Bulldozer> bulldozer = new ArrayList<>();
+
+ bulldozer.add(new Bulldozer("TitanForce 900", "Black", 52));
+ bulldozer.add(new Bulldozer("EarthMover X5", "Red", 55));
+ bulldozer.add(new Bulldozer("TerraMaster 5000", "Orange", 70));
+
+ return bulldozer;
+ }
+}

src/main/java/core/mate/academy/model/Excavator.java

@@ -1,15 +1,27 @@
 package core.mate.academy.model;
 
-/**
- * Add some custom fields that could be only in Excavator
- * Do not remove no-args constructor
- */
 public class Excavator extends Machine {
+ private int shovelSize;
+
  public Excavator() {
+
+ }
+
+ public Excavator(String name, String color, Integer shovelSize) {
+ super(name, color);
+ this.shovelSize = shovelSize;
  }
 
  @Override
  public void doWork() {
  System.out.println("Excavator started to work");
  }
+
+ public int getShovelSize() {
+ return shovelSize;
+ }
+
+ public void setShovelSize(int shovelSize) {
+ this.shovelSize = shovelSize;
+ }
 }

src/main/java/core/mate/academy/model/ExcavatorProducer.java

@@ -0,0 +1,19 @@
+package core.mate.academy.model;
+
+import core.mate.academy.service.MachineProducer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExcavatorProducer implements MachineProducer<Excavator> {
+
+ @Override
+ public List<Excavator> get() {
+ List<Excavator> excavator = new ArrayList<>();
+
+ excavator.add(new Excavator("DigMaster 300", "Purple", 5));
+ excavator.add(new Excavator("Excavator ZX7", "Cyan", 4));
+ excavator.add(new Excavator("GroundBreaker X1", "Lime", 6));
+
+ return excavator;
+ }
+}

src/main/java/core/mate/academy/model/Machine.java

@@ -4,6 +4,15 @@ public abstract class Machine implements Workable {
  private String name;
  private String color;
 
+ public Machine() {
+
+ }
+
+ public Machine(String name, String color) {
+ this.name = name;
+ this.color = color;
+ }
+
  public String getName() {
  return name;
  }

src/main/java/core/mate/academy/model/Truck.java

@@ -1,15 +1,26 @@
 package core.mate.academy.model;
 
-/**
- * Add some custom fields that could be only in Truck
- * Do not remove no-field constructor
- */
 public class Truck extends Machine {
+ private int maxCapacity;
+
  public Truck() {
  }
 
+ public Truck(String name, String color, Integer maxCapacity) {
+ super(name, color);
+ this.maxCapacity = maxCapacity;
+ }
+
  @Override
  public void doWork() {
  System.out.println("Truck started to work");
  }
+
+ public int getMaxCapacity() {
+ return maxCapacity;
+ }
+
+ public void setMaxCapacity(int maxCapacity) {
+ this.maxCapacity = maxCapacity;
+ }
 }

src/main/java/core/mate/academy/model/TruckProducer.java

@@ -0,0 +1,19 @@
+package core.mate.academy.model;
+
+import core.mate.academy.service.MachineProducer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TruckProducer implements MachineProducer<Truck> {
+
+ @Override
+ public List<Truck> get() {
+ List<Truck> truck = new ArrayList<>();
+
+ truck.add(new Truck("HeavyHaul Pro XT", "Pink", 5000));
+ truck.add(new Truck("MaxLoad 750", "Gray", 7000));
+ truck.add(new Truck("GigaTransporter S4", "Yellow", 6500));
+
+ return truck;
+ }
+}

src/main/java/core/mate/academy/service/MachineProducer.java

@@ -1,11 +1,8 @@
 package core.mate.academy.service;
 
+import core.mate.academy.model.Machine;
 import java.util.List;
 
-public interface MachineProducer {
- /**
- * In your implementations - create 2-3 models, add them to the list and return
- * @return - the list of models
- */
- List<Object> get();
+public interface MachineProducer<T extends Machine> {
+ List<T> get();
 }

src/main/java/core/mate/academy/service/MachineService.java

@@ -1,11 +1,12 @@
 package core.mate.academy.service;
 
+import core.mate.academy.model.Machine;
 import java.util.List;
 
 /**
  * Parameterize this service and add its implementation in a separate class.
  */
-public interface MachineService {
+public interface MachineService<T extends Machine> {
 
  /**
  * Return the list of machines.
@@ -16,7 +17,7 @@ public interface MachineService {
  * @param type - any class of Machine sub class. For example: Truck.class or Bulldozer.class
  * @return the list of machines
  */
- List<Object> getAll(Class type);
+ List<Machine> getAll(Class<? extends T> type);
 
  /**
  * Fill the machines list with passed value
@@ -26,13 +27,13 @@ public interface MachineService {
  * @param machines - list of machines to be filled with value
  * @param value - any object of machine sub class
  */
- void fill(List<Object> machines, Object value);
+ void fill(List<? super T> machines, T value);
 
  /**
  * Call the method doWork() from each machine.
  * This method should be able to accept a list of bulldozers as well as list of trucks.
  *
  * @param machines - the list of machines
  */
- void startWorking(List<Object> machines);
+ void startWorking(List<? extends T> machines);
 }

src/main/java/core/mate/academy/service/MachineServiceImpl.java

@@ -1,7 +1,45 @@
 package core.mate.academy.service;
 
-/**
- * Your implementation of MachineService.
- */
-public class MachineServiceImpl {
+import core.mate.academy.model.Bulldozer;
+import core.mate.academy.model.BulldozerProducer;
+import core.mate.academy.model.Excavator;
+import core.mate.academy.model.ExcavatorProducer;
+import core.mate.academy.model.Machine;
+import core.mate.academy.model.Truck;
+import core.mate.academy.model.TruckProducer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MachineServiceImpl<T extends Machine> implements MachineService<T> {
+
+ @Override
+ public List<Machine> getAll(Class<? extends T> type) {
+ MachineProducer<? extends T> producer;
+
+ if (type == Bulldozer.class) {
+ producer = (MachineProducer<? extends T>) new BulldozerProducer();
+ } else if (type == Excavator.class) {
+ producer = (MachineProducer<? extends T>) new ExcavatorProducer();
+ } else if (type == Truck.class) {
+ producer = (MachineProducer<? extends T>) new TruckProducer();
+ } else {
+ return new ArrayList<>();
+ }
+
+ return (List<Machine>) producer.get();
+ }
+
+ @Override
+ public void fill(List<? super T> machines, T value) {
+ for (int i = 0; i < machines.size(); i++) {
+ machines.set(i, value);
+ }
+ }
+
+ @Override
+ public void startWorking(List<? extends T> machines) {
+ for (T element : machines) {
+ element.doWork();
+ }
+ }
 }