Apifix

pom.xml

@@ -146,6 +146,49 @@
 			<scope>runtime</scope>
 		</dependency>
 
+ 	<!-- add ons that may work -->
+		<dependency>
+		  <groupId>io.cucumber</groupId>
+		  <artifactId>cucumber-java8</artifactId>
+		  <version>4.2.0</version>
+		  <scope>test</scope>
+		</dependency>
+
+		<dependency>
+		  <groupId>io.cucumber</groupId>
+		  <artifactId>cucumber-spring</artifactId>
+		  <version>4.2.0</version>
+		  <scope>test</scope>
+		</dependency>
+
+		<dependency>
+		  <groupId>io.cucumber</groupId>
+		  <artifactId>cucumber-junit</artifactId>
+		  <version>4.2.0</version>
+		  <scope>test</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
+	<dependency>
+	    <groupId>org.seleniumhq.selenium</groupId>
+	    <artifactId>selenium-java</artifactId>
+	    <version>3.141.59</version>
+	</dependency>
+
+  	<dependency>
+	            <groupId>info.cukes</groupId>
+	            <artifactId>cucumber-java</artifactId>
+	            <version>1.2.4</version>
+	            <scope>test</scope>
+	        </dependency>
+	        <dependency>
+	            <groupId>info.cukes</groupId>
+	            <artifactId>cucumber-junit</artifactId>
+	            <version>1.2.4</version>
+	            <scope>test</scope>
+	        </dependency>
+
+
 	</dependencies>
 
 </project>

resources/login.feature

@@ -0,0 +1,7 @@
+Feature:
+	Background: On homepage
+		Given: The user is on the Rideshare homepage
+	Scenario: User Logins in
+		When: The user clicks on Login Button
+		Then: 
+

src/main/java/com/revature/controllers/AdminController.java

@@ -41,67 +41,34 @@ public class AdminController {
 	@Autowired
 	private AdminService as;
 
-	/**
-	 * HTTP GET method (/users)
-	 * 
-	 * @return A list of all the admins.
-	 */
-
 	@ApiOperation(value="Returns all admins", tags= {"Admin"})
 	@GetMapping
 	public List<Admin> getAdmins() {
 
 		return as.getAdmins();
 	}
 
-	/**
-	 * HTTP GET method (/users/{id})
-	 * 
-	 * @param id represents the admin's id.
-	 * @return An admin that matches the id.
-	 */
-
 	@ApiOperation(value="Returns admin by id", tags= {"Admin"})
 	@GetMapping("/{id}")
 	public Admin getAdminById(@PathVariable("id")int id) {
 
 		return as.getAdminById(id);
 	}
-
-	/**
-	 * HTTP POST method (/users)
-	 * 
-	 * @param admin represents the new Admin object being sent.
-	 * @return The newly created object with a 201 code.
-	 */
-
+
 	@ApiOperation(value="Adds a new admin", tags= {"Admin"})
 	@PostMapping
 	public ResponseEntity<Admin> createAdmin(@Valid @RequestBody Admin admin) {
 
 		return new ResponseEntity<>(as.createAdmin(admin), HttpStatus.CREATED);
 	}
 
-	/**
-	 * HTTP PUT method (/users)
-	 * 
-	 * @param admin represents the updated Admin object being sent.
-	 * @return The newly updated object.
-	 */
-
 	@ApiOperation(value="Updates admin by id", tags= {"Admin"})
 	@PutMapping("/{id}")
 	public Admin updateAdmin(@Valid @RequestBody Admin admin) {
 
 		return as.updateAdmin(admin);
 	}
 
-	/**
-	 * HTTP DELETE method (/users/{id})
-	 * 
-	 * @param id represents the admin's id.
-	 * @return A string that says which admin was deleted.
-	 */
 
 	@ApiOperation(value="Deletes an admin by id", tags= {"Admin"})
 	@DeleteMapping("/{id}")

src/main/java/com/revature/controllers/BatchController.java

@@ -42,13 +42,6 @@ public class BatchController {
 	@Autowired
 	private BatchService bs;
 
-	/**
-	 * HTTP GET method (/batches)
-	 * 
-	 * @param location represents the batch location.
-	 * @return A list of all the batches or batches by the location.
-	 */
-
 	@ApiOperation(value="Returns all batches", tags= {"Batch"}, notes="Can also filter by location")
 	@GetMapping
 	public List<Batch> getBatches(@RequestParam(name="location",required=false)String location) {
@@ -61,55 +54,27 @@ public List<Batch> getBatches(@RequestParam(name="location",required=false)Strin
 		return bs.getBatches();
 	}
 
-	/**
-	 * HTTP GET method (/batches/{number})
-	 * 
-	 * @param number represents the batch number.
-	 * @return A batch that matches the number.
-	 */
-
 	@ApiOperation(value="Returns batch by number", tags= {"Batch"})
 	@GetMapping("/{number}")
 	public Batch getBatchByNumber(@PathVariable("number")int number) {
 
 		return bs.getBatchByNumber(number);
 	}
 
-	/**
-	 * HTTP POST method (/batches)
-	 * 
-	 * @param batch represents the new Batch object being sent.
-	 * @return The newly created object with a 201 code.
-	 */
-
 	@ApiOperation(value="Adds a new batch", tags= {"Batch"})
 	@PostMapping
 	public ResponseEntity<Batch> addBatch(@Valid @RequestBody Batch batch) {
 
 		return new ResponseEntity<>(bs.addBatch(batch), HttpStatus.CREATED);
 	}
 
-	/**
-	 * HTTP PUT method (/batches)
-	 * 
-	 * @param batch represents the updated Batch object being sent.
-	 * @return The newly updated object.
-	 */
-
 	@ApiOperation(value="Updates batch by number", tags= {"Batch"})
 	@PutMapping("/{number}")
 	public Batch updateBatch(@Valid @RequestBody Batch batch) {
 
 		return bs.updateBatch(batch);
 	}
 
-	/**
-	 * HTTP DELETE method (/batches/{id})
-	 * 
-	 * @param number represents the batch number.
-	 * @return A string that says which batch was deleted.
-	 */
-
 	@ApiOperation(value="Deletes batch by number", tags= {"Batch"})
 	@DeleteMapping("/{number}")
 	public String deleteBatchByNumber(@PathVariable("number")int number) {

src/main/java/com/revature/controllers/CarController.java

@@ -41,39 +41,20 @@ public class CarController {
 	@Autowired
 	private CarService cs;
 
-	/**
-	 * HTTP GET method (/cars)
-	 * 
-	 * @return A list of all the cars.
-	 */
-
 	@ApiOperation(value="Returns all cars", tags= {"Car"})
 	@GetMapping
 	public List<Car> getCars() {
 
 		return cs.getCars();
 	}
 
-	/**
-	 * HTTP GET method (/cars/{number})
-	 * 
-	 * @param id represents the car's id.
-	 * @return A car that matches the id.
-	 */
-
 	@ApiOperation(value="Returns car by id", tags= {"Car"})
 	@GetMapping("/{id}")
 	public Car getCarById(@PathVariable("id")int id) {
 
 		return cs.getCarById(id);
 	}
 
-	/**
-	 * HTTP GET method (/cars/users/{userId})
-	 * 
-	 * @param userId represents the user's id.
-	 * @return A car that matches the user's id.
-	 */
 
 	@ApiOperation(value="Returns car by user id", tags= {"Car"})
 	@GetMapping("/users/{userId}")
@@ -82,12 +63,6 @@ public Car getCarByUserId(@PathVariable("userId")int userId) {
 		return cs.getCarByUserId(userId);
 	}
 
-	/**
-	 * HTTP POST method (/cars)
-	 * 
-	 * @param car represents the new Car object being sent.
-	 * @return The newly created object with a 201 code.
-	 */
 
 	@ApiOperation(value="Adds a new car", tags= {"Car"})
 	@PostMapping
@@ -96,12 +71,6 @@ public ResponseEntity<Car> addCar(@Valid @RequestBody Car car) {
 		return new ResponseEntity<>(cs.addCar(car), HttpStatus.CREATED);
 	}
 
-	/**
-	 * HTTP PUT method (/cars)
-	 * 
-	 * @param car represents the updated Car object being sent.
-	 * @return The newly updated object.
-	 */
 
 	@ApiOperation(value="Updates car by id", tags= {"Car"})
 	@PutMapping("/{id}")
@@ -110,13 +79,6 @@ public Car updateCar(@Valid @RequestBody Car car) {
 		return cs.updateCar(car);
 	}
 
-	/**
-	 * HTTP DELETE method (/cars/{id})
-	 * 
-	 * @param id represents the car's id.
-	 * @return A string that says which car was deleted.
-	 */
-
 	@ApiOperation(value="Deletes car by id", tags= {"Car"})
 	@DeleteMapping("/{id}")
 	public String deleteCarById(@PathVariable("id")int id) {

src/main/java/com/revature/controllers/UserController.java

@@ -60,15 +60,6 @@ public class UserController {
 	@Autowired
 	private DistanceService ds;
 
-	/**
-	 * HTTP GET method (/users)
-	 * 
-	 * @param isDriver represents if the user is a driver or rider.
-	 * @param username represents the user's username.
-	 * @param location represents the batch's location.
-	 * @return A list of all the users, users by is-driver, user by username and users by is-driver and location.
-	 */
-
 
 	/*@ApiOperation(value="Returns user drivers", tags= {"User"})
 	@GetMapping
@@ -114,15 +105,6 @@ public List <User> getTopFiveDrivers(@PathVariable("address")String address) thr
 
 	}
 
-	/**
-	 * HTTP GET method (/users)
-	 * 
-	 * @param isDriver represents if the user is a driver or rider.
-	 * @param username represents the user's username.
-	 * @param location represents the batch's location.
-	 * @return A list of all the users, users by is-driver, user by username and users by is-driver and location.
-	 */
-
 	@ApiOperation(value="Returns all users", tags= {"User"}, notes="Can also filter by is-driver, location and username")
 	@GetMapping
 	public List<User> getUsers(@RequestParam(name="is-driver",required=false)Boolean isDriver,
@@ -140,29 +122,13 @@ public List<User> getUsers(@RequestParam(name="is-driver",required=false)Boolean
 		return us.getUsers();
 	}
 
-	/**
-	 * HTTP GET (users/{id})
-	 * 
-	 * @param id represents the user's id.
-	 * @return A user that matches the id.
-	 */
-
 	@ApiOperation(value="Returns user by id", tags= {"User"})
 	@GetMapping("/{id}")
 	public User getUserById(@PathVariable("id")int id) {
 
 		return us.getUserById(id);
 	}
 
-	/**
-	 * HTTP POST method (/users)
-	 * 
-	 * @param user represents the new User object being sent.
-	 * @return The newly created object with a 201 code.
-	 * 
-	 * Sends custom error messages when incorrect input is used
-	 */
-
 	@ApiOperation(value="Adds a new user", tags= {"User"})
 	@PostMapping
 	public Map<String, Set<String>> addUser(@Valid @RequestBody User user, BindingResult result) {
@@ -264,27 +230,13 @@ else if (code.equals("Pattern") && field.equals("phoneNumber")) {
 
 	}
 
-	/**
-	 * HTTP PUT method (/users)
-	 * 
-	 * @param user represents the updated User object being sent.
-	 * @return The newly updated object.
-	 */
-
 	@ApiOperation(value="Updates user by id", tags= {"User"})
 	@PutMapping
 	public User updateUser(@Valid @RequestBody User user) {
 		//System.out.println(user);
 		return us.updateUser(user);
 	}
 
-	/**
-	 * HTTP DELETE method (/users)
-	 * 
-	 * @param id represents the user's id.
-	 * @return A string that says which user was deleted.
-	 */
-
 	@ApiOperation(value="Deletes user by id", tags= {"User"})
 	@DeleteMapping("/{id}")
 	public String deleteUserById(@PathVariable("id")int id) {

src/main/java/com/revature/services/impl/DistanceServiceImpl.java

@@ -149,7 +149,7 @@ public String getGoogleMAPKey() {
                 return entry.getValue();
             }
         }
-        return null;
+        return "AIzaSyBC1Ufex-AFP9O0IZGX3iHB1P_DKfaIqV0";
     }