JAVA-3531 Move spring-mvc-xml module

2020-12-30 22:26:14 +01:00
parent 24ef4eaa19
commit de5f9940dd
55 changed files with 86 additions and 87 deletions
@@ -0,0 +1,21 @@
+package com.baeldung.jsp;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class ExampleOne extends HttpServlet {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("text/html");
+        PrintWriter out = response.getWriter();
+        out.println("<!DOCTYPE html><html>" + "<head>" + "<meta charset=\"UTF-8\" />" + "<title>HTML Rendered by Servlet</title>" + "</head>" + "<body>" + "<h1>HTML Rendered by Servlet</h1></br>" + "<p>This page was rendered by the ExampleOne Servlet!</p>"
+                + "</body>" + "</html>");
+    }
+}
@@ -0,0 +1,24 @@
+package com.baeldung.jsp;
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name = "ExampleThree", description = "JSP Servlet With Annotations", urlPatterns = { "/ExampleThree" })
+public class ExampleThree extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+    
+    private String instanceMessage;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String message = request.getParameter("message");
+        instanceMessage = request.getParameter("message");
+        request.setAttribute("text", message);
+        request.setAttribute("unsafeText", instanceMessage);
+        request.getRequestDispatcher("/jsp/ExampleThree.jsp").forward(request, response);
+    }
+}
@@ -0,0 +1,19 @@
+package com.baeldung.spring;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@ImportResource("classpath:webMvcConfig.xml")
+@Configuration
+@ComponentScan
+public class ClientWebConfig implements WebMvcConfigurer {
+
+    public ClientWebConfig() {
+        super();
+    }
+
+    // API
+
+}
@@ -0,0 +1,62 @@
+package com.baeldung.spring;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.support.MessageSourceResourceBundle;
+import org.springframework.context.support.ResourceBundleMessageSource;
+import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+import org.springframework.web.servlet.view.JstlView;
+
+//@EnableWebMvc
+//@Configuration
+@ComponentScan("com.baeldung.spring")
+public class ClientWebConfigJava implements WebMvcConfigurer {
+
+    public ClientWebConfigJava() {
+        super();
+    }
+
+    @Bean
+    public MessageSource messageSource() {
+
+        final ResourceBundleMessageSource ms = new ResourceBundleMessageSource();
+        ms.setBasenames("messages");
+        return ms;
+    }
+
+    @Bean
+    public ResourceBundle getBeanResourceBundle() {
+
+        final Locale locale = Locale.getDefault();
+        return new MessageSourceResourceBundle(messageSource(), locale);
+    }
+
+    @Override
+    public void addViewControllers(final ViewControllerRegistry registry) {
+        registry.addViewController("/sample.html");
+    }
+
+    @Bean
+    public ViewResolver viewResolver() {
+        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
+
+        bean.setViewClass(JstlView.class);
+        bean.setPrefix("/WEB-INF/view/");
+        bean.setSuffix(".jsp");
+
+        return bean;
+    }
+    
+    @Bean
+    public MethodValidationPostProcessor methodValidationPostProcessor() {
+        return new MethodValidationPostProcessor();
+    }
+}
@@ -0,0 +1,21 @@
+package com.baeldung.spring.controller;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+import javax.validation.ConstraintViolationException;
+
+@ControllerAdvice
+public class ConstraintViolationExceptionHandler extends ResponseEntityExceptionHandler {
+
+    @ExceptionHandler(value = {ConstraintViolationException.class})
+    protected ResponseEntity<Object> handleConstraintViolation(ConstraintViolationException e, WebRequest request) {
+        return handleExceptionInternal(e, e.getMessage(), new HttpHeaders(), HttpStatus.BAD_REQUEST, request);
+    }
+}
+
@@ -0,0 +1,51 @@
+package com.baeldung.spring.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+public class ErrorController {
+
+    @RequestMapping(value = "500Error", method = RequestMethod.GET)
+    public void throwRuntimeException() {
+        throw new NullPointerException("Throwing a null pointer exception");
+    }
+
+    @RequestMapping(value = "errors", method = RequestMethod.GET)
+    public ModelAndView renderErrorPage(HttpServletRequest httpRequest) {
+        ModelAndView errorPage = new ModelAndView("errorPage");
+        String errorMsg = "";
+        int httpErrorCode = getErrorCode(httpRequest);
+
+        switch (httpErrorCode) {
+        case 400: {
+            errorMsg = "Http Error Code : 400 . Bad Request";
+            break;
+        }
+        case 401: {
+            errorMsg = "Http Error Code : 401. Unauthorized";
+            break;
+        }
+        case 404: {
+            errorMsg = "Http Error Code : 404. Resource not found";
+            break;
+        }
+        // Handle other 4xx error codes.
+        case 500: {
+            errorMsg = "Http Error Code : 500. Internal Server Error";
+            break;
+        }
+        // Handle other 5xx error codes.
+        }
+        errorPage.addObject("errorMsg", errorMsg);
+        return errorPage;
+    }
+
+    private int getErrorCode(HttpServletRequest httpRequest) {
+        return (Integer) httpRequest.getAttribute("javax.servlet.error.status_code");
+    }
+}
@@ -0,0 +1,29 @@
+package com.baeldung.spring.controller;
+
+import java.io.IOException;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.baeldung.spring.form.GeoIP;
+import com.baeldung.spring.service.RawDBDemoGeoIPLocationService;
+
+//@Controller
+//add db file and uncomment to see the working example
+public class GeoIPTestController {
+    private RawDBDemoGeoIPLocationService locationService;
+
+    public GeoIPTestController() throws IOException {
+        locationService = new RawDBDemoGeoIPLocationService();
+    }
+
+    @RequestMapping(value = "/GeoIPTest", method = RequestMethod.POST)
+    @ResponseBody
+    public GeoIP getLocation(@RequestParam(value = "ipAddress", required = true) String ipAddress) throws Exception {
+
+        return locationService.getLocation(ipAddress);
+    }
+}
@@ -0,0 +1,16 @@
+package com.baeldung.spring.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@Controller
+public class GreetingController {
+
+    @RequestMapping(value = "/greeting", method = RequestMethod.GET)
+    public String get(ModelMap model) {
+        model.addAttribute("message", "Hello, World!");
+        return "greeting";
+    }
+}
@@ -0,0 +1,18 @@
+package com.baeldung.spring.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.AbstractController;
+
+public class HelloController extends AbstractController {
+
+    @Override
+    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ModelAndView model = new ModelAndView("helloworld");
+        model.addObject("msg", "Welcome to Baeldung's Spring Handler Mappings Guide.<br>This request was mapped" + " using SimpleUrlHandlerMapping.");
+
+        return model;
+    }
+}
@@ -0,0 +1,17 @@
+package com.baeldung.spring.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.AbstractController;
+
+public class HelloGuestController extends AbstractController {
+    @Override
+    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ModelAndView model = new ModelAndView("helloworld");
+        model.addObject("msg", "Welcome to Baeldung's Spring Handler Mappings Guide.<br>This request was mapped" + " using ControllerClassNameHandlerMapping.");
+
+        return model;
+    }
+}
@@ -0,0 +1,17 @@
+package com.baeldung.spring.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.AbstractController;
+
+public class HelloWorldController extends AbstractController {
+    @Override
+    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ModelAndView model = new ModelAndView("helloworld");
+        model.addObject("msg", "Welcome to Baeldung's Spring Handler Mappings Guide.<br>This request was mapped" + " using BeanNameUrlHandlerMapping.");
+
+        return model;
+    }
+}
@@ -0,0 +1,61 @@
+package com.baeldung.spring.controller;
+
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.http.*;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.support.ServletContextResource;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+
+@Controller
+public class ImageController {
+
+    @Autowired
+    private ServletContext servletContext;
+
+    @RequestMapping(value = "/image-view", method = RequestMethod.GET)
+    public String imageView() throws IOException {
+        return "image-download";
+    }
+
+    @RequestMapping(value = "/image-manual-response", method = RequestMethod.GET)
+    public void getImageAsByteArray(HttpServletResponse response) throws IOException {
+        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
+        response.setContentType(MediaType.IMAGE_JPEG_VALUE);
+        IOUtils.copy(in, response.getOutputStream());
+    }
+
+    @RequestMapping(value = "/image-byte-array", method = RequestMethod.GET)
+    @ResponseBody
+    public byte[] getImageAsByteArray() throws IOException {
+        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
+        return IOUtils.toByteArray(in);
+    }
+
+    @RequestMapping(value = "/image-response-entity", method = RequestMethod.GET)
+    public ResponseEntity<byte[]> getImageAsResponseEntity() throws IOException {
+        ResponseEntity<byte[]> responseEntity;
+        final HttpHeaders headers = new HttpHeaders();
+        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
+        byte[] media = IOUtils.toByteArray(in);
+        headers.setCacheControl(CacheControl.noCache().getHeaderValue());
+        responseEntity = new ResponseEntity<>(media, headers, HttpStatus.OK);
+        return responseEntity;
+    }
+
+    @RequestMapping(value = "/image-resource", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<Resource> getImageAsResource() {
+        final HttpHeaders headers = new HttpHeaders();
+        Resource resource = new ServletContextResource(servletContext, "/WEB-INF/images/image-example.jpg");
+        return new ResponseEntity<>(resource, headers, HttpStatus.OK);
+    }
+}
@@ -0,0 +1,83 @@
+package com.baeldung.spring.controller;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import com.baeldung.spring.form.Person;
+import com.baeldung.spring.validator.PersonValidator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+public class PersonController {
+
+    @Autowired
+    PersonValidator validator;
+
+    @RequestMapping(value = "/person", method = RequestMethod.GET)
+    public ModelAndView showForm(final Model model) {
+
+        initData(model);
+        return new ModelAndView("personForm", "person", new Person());
+    }
+
+    @RequestMapping(value = "/addPerson", method = RequestMethod.POST)
+    public String submit(@Valid @ModelAttribute("person") final Person person, final BindingResult result, final ModelMap modelMap, final Model model) {
+
+        validator.validate(person, result);
+
+        if (result.hasErrors()) {
+
+            initData(model);
+            return "personForm";
+        }
+
+        modelMap.addAttribute("person", person);
+
+        return "personView";
+    }
+
+    private void initData(final Model model) {
+
+        final List<String> favouriteLanguageItem = new ArrayList<String>();
+        favouriteLanguageItem.add("Java");
+        favouriteLanguageItem.add("C++");
+        favouriteLanguageItem.add("Perl");
+        model.addAttribute("favouriteLanguageItem", favouriteLanguageItem);
+
+        final List<String> jobItem = new ArrayList<String>();
+        jobItem.add("Full time");
+        jobItem.add("Part time");
+        model.addAttribute("jobItem", jobItem);
+
+        final Map<String, String> countryItems = new LinkedHashMap<String, String>();
+        countryItems.put("US", "United Stated");
+        countryItems.put("IT", "Italy");
+        countryItems.put("UK", "United Kingdom");
+        countryItems.put("FR", "Grance");
+        model.addAttribute("countryItems", countryItems);
+
+        final List<String> fruit = new ArrayList<String>();
+        fruit.add("Banana");
+        fruit.add("Mango");
+        fruit.add("Apple");
+        model.addAttribute("fruit", fruit);
+
+        final List<String> books = new ArrayList<String>();
+        books.add("The Great Gatsby");
+        books.add("Nineteen Eighty-Four");
+        books.add("The Lord of the Rings");
+        model.addAttribute("books", books);
+    }
+}
@@ -0,0 +1,31 @@
+package com.baeldung.spring.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.constraints.*;
+
+@Controller
+@RequestMapping("/public/api/1")
+@Validated
+public class RequestAndPathVariableValidationController {
+
+    @GetMapping("/name-for-day")
+    public String getNameOfDayByNumberRequestParam(@RequestParam @Min(1) @Max(7) Integer dayOfWeek) {
+        return dayOfWeek + "";
+    }
+
+    @GetMapping("/name-for-day/{dayOfWeek}")
+    public String getNameOfDayByPathVariable(@PathVariable("dayOfWeek") @Min(1) @Max(7) Integer dayOfWeek) {
+        return dayOfWeek + "";
+    }
+
+    @GetMapping("/valid-name")
+    public void validStringRequestParam(@RequestParam @NotBlank @Size(max = 10) @Pattern(regexp = "^[A-Z][a-zA-Z0-9]+$") String name) {
+
+    }
+
+}
@@ -0,0 +1,18 @@
+package com.baeldung.spring.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.AbstractController;
+
+public class WelcomeController extends AbstractController {
+    @Override
+    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        ModelAndView model = new ModelAndView("welcome");
+        model.addObject("msg", " Baeldung's Spring Handler Mappings Guide.<br>This request was mapped" + " using SimpleUrlHandlerMapping.");
+
+        return model;
+    }
+}
@@ -0,0 +1,56 @@
+package com.baeldung.spring.form;
+
+public class GeoIP {
+    private String ipAddress;
+    private String city;
+    private String latitude;
+    private String longitude;
+
+    public GeoIP() {
+
+    }
+
+    public GeoIP(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    public GeoIP(String ipAddress, String city, String latitude, String longitude) {
+        this.ipAddress = ipAddress;
+        this.city = city;
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+}
@@ -0,0 +1,153 @@
+package com.baeldung.spring.form;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public class Person {
+
+    private long id;
+
+    private String name;
+    private String email;
+    private String dateOfBirth;
+
+    @NotEmpty
+    private String password;
+    private String sex;
+    private String country;
+    private String book;
+    private String job;
+    private boolean receiveNewsletter;
+    private String[] hobbies;
+    private List<String> favouriteLanguage;
+    private List<String> fruit;
+    private String notes;
+    private MultipartFile file;
+
+    public Person() {
+        super();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(final String email) {
+        this.email = email;
+    }
+
+    public String getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    public void setDateOfBirth(final String dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(final String password) {
+        this.password = password;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(final String sex) {
+        this.sex = sex;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(final String country) {
+        this.country = country;
+    }
+
+    public String getJob() {
+        return job;
+    }
+
+    public void setJob(final String job) {
+        this.job = job;
+    }
+
+    public boolean isReceiveNewsletter() {
+        return receiveNewsletter;
+    }
+
+    public void setReceiveNewsletter(final boolean receiveNewsletter) {
+        this.receiveNewsletter = receiveNewsletter;
+    }
+
+    public String[] getHobbies() {
+        return hobbies;
+    }
+
+    public void setHobbies(final String[] hobbies) {
+        this.hobbies = hobbies;
+    }
+
+    public List<String> getFavouriteLanguage() {
+        return favouriteLanguage;
+    }
+
+    public void setFavouriteLanguage(final List<String> favouriteLanguage) {
+        this.favouriteLanguage = favouriteLanguage;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(final String notes) {
+        this.notes = notes;
+    }
+
+    public List<String> getFruit() {
+        return fruit;
+    }
+
+    public void setFruit(final List<String> fruit) {
+        this.fruit = fruit;
+    }
+
+    public String getBook() {
+        return book;
+    }
+
+    public void setBook(final String book) {
+        this.book = book;
+    }
+
+    public MultipartFile getFile() {
+        return file;
+    }
+
+    public void setFile(final MultipartFile file) {
+        this.file = file;
+    }
+}
@@ -0,0 +1,29 @@
+package com.baeldung.spring.service;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+
+import com.baeldung.spring.form.GeoIP;
+import com.maxmind.geoip2.DatabaseReader;
+import com.maxmind.geoip2.exception.GeoIp2Exception;
+import com.maxmind.geoip2.model.CityResponse;
+
+public class RawDBDemoGeoIPLocationService {
+    private DatabaseReader dbReader;
+
+    public RawDBDemoGeoIPLocationService() throws IOException {
+        File database = new File("your-path-to-db-file");
+        dbReader = new DatabaseReader.Builder(database).build();
+    }
+
+    public GeoIP getLocation(String ip) throws IOException, GeoIp2Exception {
+        InetAddress ipAddress = InetAddress.getByName(ip);
+        CityResponse response = dbReader.city(ipAddress);
+
+        String cityName = response.getCity().getName();
+        String latitude = response.getLocation().getLatitude().toString();
+        String longitude = response.getLocation().getLongitude().toString();
+        return new GeoIP(ip, cityName, latitude, longitude);
+    }
+}
@@ -0,0 +1,22 @@
+package com.baeldung.spring.validator;
+
+import com.baeldung.spring.form.Person;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import org.springframework.validation.Validator;
+
+@Component
+public class PersonValidator implements Validator {
+
+    @Override
+    public boolean supports(final Class calzz) {
+        return Person.class.isAssignableFrom(calzz);
+    }
+
+    @Override
+    public void validate(final Object obj, final Errors errors) {
+
+        ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "required.name");
+    }
+}