Pull_request_1

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

@@ -5,11 +5,39 @@
  * Do not remove no-args constructor
  */
 public class Bulldozer extends Machine {
+ private int bladeWidth;
+ private int operatingWeight;
+ private String engineType;
+
  public Bulldozer() {
  }
 
  @Override
  public void doWork() {
  System.out.println("Bulldozer started to work");
  }
+
+ public int getBladeWidth() {
+ return bladeWidth;
+ }
+
+ public void setBladeWidth(int bladeWidth) {
+ this.bladeWidth = bladeWidth;
+ }
+
+ public int getOperatingWeight() {
+ return operatingWeight;
+ }
+
+ public void setOperatingWeight(int operatingWeight) {
+ this.operatingWeight = operatingWeight;
+ }
+
+ public String getEngineType() {
+ return engineType;
+ }
+
+ public void setEngineType(String engineType) {
+ this.engineType = engineType;
+ }
 }

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

@@ -5,11 +5,39 @@
  * Do not remove no-args constructor
  */
 public class Excavator extends Machine {
+ private double bucketCapacity;
+ private int maxReach;
+ private String armType;
+
  public Excavator() {
  }
 
  @Override
  public void doWork() {
  System.out.println("Excavator started to work");
  }
+
+ public double getBucketCapacity() {
+ return bucketCapacity;
+ }
+
+ public void setBucketCapacity(double bucketCapacity) {
+ this.bucketCapacity = bucketCapacity;
+ }
+
+ public int getMaxReach() {
+ return maxReach;
+ }
+
+ public void setMaxReach(int maxReach) {
+ this.maxReach = maxReach;
+ }
+
+ public String getArmType() {
+ return armType;
+ }
+
+ public void setArmType(String armType) {
+ this.armType = armType;
+ }
 }

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

@@ -5,11 +5,39 @@
  * Do not remove no-field constructor
  */
 public class Truck extends Machine {
+ private int cargoCapacity;
+ private int numberOfAxles;
+ private String fuelType;
+
  public Truck() {
  }
 
  @Override
  public void doWork() {
  System.out.println("Truck started to work");
  }
+
+ public int getCargoCapacity() {
+ return cargoCapacity;
+ }
+
+ public void setCargoCapacity(int cargoCapacity) {
+ this.cargoCapacity = cargoCapacity;
+ }
+
+ public int getNumberOfAxles() {
+ return numberOfAxles;
+ }
+
+ public void setNumberOfAxles(int numberOfAxles) {
+ this.numberOfAxles = numberOfAxles;
+ }
+
+ public String getFuelType() {
+ return fuelType;
+ }
+
+ public void setFuelType(String fuelType) {
+ this.fuelType = fuelType;
+ }
 }

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

@@ -0,0 +1,12 @@
+package core.mate.academy.service;
+
+import core.mate.academy.model.Bulldozer;
+import java.util.List;
+
+public class BulldozerProducer implements MachineProducer<Bulldozer> {
+
+ @Override
+ public List<Bulldozer> get() {
+ return List.of(new Bulldozer(), new Bulldozer(), new Bulldozer());
+ }
+}

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

@@ -0,0 +1,12 @@
+package core.mate.academy.service;
+
+import core.mate.academy.model.Excavator;
+import java.util.List;
+
+public class ExcavatorProducer implements MachineProducer<Excavator> {
+
+ @Override
+ public List<Excavator> get() {
+ return List.of(new Excavator(), new Excavator(), new Excavator());
+ }
+}

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

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

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

@@ -5,7 +5,7 @@
 /**
  * Parameterize this service and add its implementation in a separate class.
  */
-public interface MachineService {
+public interface MachineService<T> {
 
  /**
  * Return the list of machines.
@@ -16,7 +16,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<T> getAll(Class<? extends T> type);
 
  /**
  * Fill the machines list with passed value
@@ -26,13 +26,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,46 @@
 package core.mate.academy.service;
 
+import core.mate.academy.model.Bulldozer;
+import core.mate.academy.model.Excavator;
+import core.mate.academy.model.Machine;
+import core.mate.academy.model.Truck;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Your implementation of MachineService.
  */
-public class MachineServiceImpl {
+public class MachineServiceImpl implements MachineService<Machine> {
+ @Override
+ public List<Machine> getAll(Class<? extends Machine> type) {
+ List<Machine> machineList = new ArrayList<>();
+
+ if (type == Bulldozer.class) {
+ BulldozerProducer bulldozerProducer = new BulldozerProducer();
+ machineList.addAll(bulldozerProducer.get());
+ }
+
+ if (type == Excavator.class) {
+ ExcavatorProducer excavatorProducer = new ExcavatorProducer();
+ machineList.addAll(excavatorProducer.get());
+ }
+
+ if (type == Truck.class) {
+ TruckProducer truckProducer = new TruckProducer();
+ machineList.addAll(truckProducer.get());
+ }
+ return machineList;
+ }
+
+ @Override
+ public void fill(List<? super Machine> machines, Machine value) {
+ Collections.fill(machines, value);
+ }
+
+ @Override
+ public void startWorking(List<? extends Machine> machines) {
+ machines.forEach(Machine::doWork);
+
+ }
 }

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

@@ -0,0 +1,12 @@
+package core.mate.academy.service;
+
+import core.mate.academy.model.Truck;
+import java.util.List;
+
+public class TruckProducer implements MachineProducer<Truck> {
+
+ @Override
+ public List<Truck> get() {
+ return List.of(new Truck(), new Truck(), new Truck());
+ }
+}