Merge pull request #16 from mendrika261/sprint13

sprint13: capability to return Json with ModelView

Author: mendrika261

.framework/dev_files/etu2024/framework/annotation/Session.java

@@ -0,0 +1,11 @@
+package etu2024.framework.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Session {
+}

.framework/dev_files/etu2024/framework/core/ModelView.java

@@ -11,6 +11,7 @@ public class ModelView {
     String view;
     HashMap<String, Object> data = new HashMap<>();
     HashMap<String, Object> session = new HashMap<>();
+    boolean isJson = false;
 
     // Constructor
     public ModelView() {}
@@ -88,4 +89,12 @@ public void addSessionItem(String key, Object value) {
     public void removeSessionItem(String key) {
         getSession().put(key, null);
     }
+
+    public boolean isJson() {
+        return isJson;
+    }
+
+    public void setJson(boolean isJson) {
+        this.isJson = isJson;
+    }
 }

.framework/dev_files/etu2024/framework/servlet/FrontServlet.java

@@ -1,5 +1,8 @@
 package etu2024.framework.servlet;
 
+import com.google.gson.Gson;
+import etu2024.framework.annotation.Auth;
+import etu2024.framework.annotation.Session;
 import etu2024.framework.annotation.Singleton;
 import etu2024.framework.core.File;
 import etu2024.framework.core.ModelView;
@@ -79,26 +82,39 @@ private void processRequest(HttpServletRequest request, HttpServletResponse resp
 
             ModelView modelView = (ModelView) method.invoke(object, parameters.toArray());
 
-            // Set session attributes from the modelView to the request
-            for (String key: modelView.getSession().keySet()) {
-                // If the value is null, remove the attribute from the session
-                if(modelView.getSession().get(key) == null)
-                    session.removeAttribute(key);
-                else
-                    session.setAttribute(key, modelView.getSession().get(key));
-            }
-
-            // Set session from the request to the modelView
-            for (Enumeration<String> e = session.getAttributeNames(); e.hasMoreElements(); ) {
-                String key = e.nextElement();
-                modelView.addSessionItem(key, session.getAttribute(key));
+            if(method.isAnnotationPresent(Session.class) || objectClass.isAnnotationPresent(Session.class) ||
+                method.isAnnotationPresent(Auth.class)) {
+                // Set session attributes from the modelView to the request
+                for (String key : modelView.getSession().keySet()) {
+                    // If the value is null, remove the attribute from the session
+                    if (modelView.getSession().get(key) == null)
+                        session.removeAttribute(key);
+                    else
+                        session.setAttribute(key, modelView.getSession().get(key));
+                }
+
+                // Set session from the request to the modelView
+                for (Enumeration<String> e = session.getAttributeNames(); e.hasMoreElements(); ) {
+                    String key = e.nextElement();
+                    modelView.addSessionItem(key, session.getAttribute(key));
+                }
+            } else {
+                if(!modelView.getSession().isEmpty())
+                    throw new RuntimeException("FRAMEWORK ERROR - You can't set or get session attributes if the method" +
+                            " or the class is not annotated with @Session");
             }
 
             // Set the attributes from the modelView to the request
             for (String key : modelView.getData().keySet())
                 request.setAttribute(key, modelView.getData().get(key));
 
-            // Forward the request to the view
+            // Return JSON if isJson is true in the modelView
+            if(modelView.isJson()) {
+                printJson(modelView.getData(), response);
+                return;
+            }
+
+            // Forward the request if view is set in the modelView
             if (modelView.getView() != null)
                 request.getRequestDispatcher(modelView.getView()).forward(request, response);
 
@@ -172,6 +188,13 @@ public Object constructObject(Class<?> objectClass) throws NoSuchMethodException
         return objectClass.getDeclaredConstructor().newInstance();
     }
 
+    public void printJson(Object object, HttpServletResponse response) throws IOException {
+        response.setContentType("application/json");
+        response.setCharacterEncoding("UTF-8");
+        Gson gson = new Gson();
+        gson.toJson(object, response.getWriter());
+    }
+
     // Getters and setters
     public HashMap<String, Mapping> getMappingUrls() {
         return mappingUrls;

.framework/framework.jar

@@ -41,6 +41,9 @@ if [[ "$1" == "-i" || "$1" == "--init" ]]; then
     # Move framework.jar to $PROJECT_JAVA_LIB
     cp .framework/framework.jar "$PROJECT_JAVA_LIB"
 
+    # Copy lib files from .framework
+    cp -r .framework/lib/* "$PROJECT_JAVA_LIB"
+
     # Project creation test
     error=0
 
@@ -139,7 +142,7 @@ function compile {
     fi
     reminding_files=${#source_files[@]}
   done
-  rm -rf compilation.temp
+  rm -rf compilation.log
 }