package ar.edu.unrc.exa.dc.dose2016.riocuartobandasderock.main;

import static spark.Spark.*;

import ar.edu.unrc.exa.dc.dose2016.riocuartobandasderock.dao.ArtistDAO;
import ar.edu.unrc.exa.dc.dose2016.riocuartobandasderock.dao.impl.ArtistDaoImpl;

public class Bootstrap {
	private static ArtistController artistController = new ArtistController(new ArtistDaoImpl());
	AlbumController albumController = AlbumController.getInstance();
	
    public static void main(String[] args) {
    	
    	get("/albums", (req, res) -> AlbumController.getAll());
    	
    	get("/albums/:album_id", (req, res) -> AlbumController.getById(req.params(":album_id")));
    	
    	post("/albums", (req, res) -> AlbumController.create(req.queryMap()));
    	
    	put("/albums", (req, res) -> AlbumController.update(req.queryMap()));
    	
    	delete("/albums/:album_id", (req, res) -> AlbumController.delete(req.params(":album_id")));
    	        
        get ("/artist", (req,res)->artistController.getAllArtists(req,res));
        
        get("/artist/:id",(req,res)->artistController.getArtistById(req,res));
        
        get("/artist/:name",(req,res)->artistController.getArtistByName(req,res));
        
        post("/artist/",(req,res)->artistController.createArtist(req,res));
        
        put("/artist/:id",(req,res)->artistController.updateArtist(req,res));
        
        delete("/artist/:id",(req,res)->artistController.deleteArtist(req,res));
        }
}
@@ -267,16 +267,17 @@
 strap %7B%0A
+%0A
 %09private
@@ -1451,11 +1451,16 @@
         
+%0A    
 %7D%0A%7D

Fix conflict