Fix format and style

itesla · Jan 18, 2017 · 7b11797 · 7b11797
1 parent 43b7358
commit 7b11797
Show file tree

Hide file tree

Showing 37 changed files with 1,280 additions and 1,211 deletions.
diff --git a/online-server/src/main/java/eu/itesla_project/online/server/OnlineApplicationBean.java b/online-server/src/main/java/eu/itesla_project/online/server/OnlineApplicationBean.java
@@ -259,7 +259,6 @@ public int getAvailableCores() {
 
     public WorkflowStatusEnum getWorkflowStatus(String workflowId) {
         return workflows.get(workflowId).getStatus();
-
     }
 
     public Collection<String> getWorkFlowIds() {

diff --git a/online-server/src/main/java/eu/itesla_project/online/server/OnlineApplicationEndPoint.java b/online-server/src/main/java/eu/itesla_project/online/server/OnlineApplicationEndPoint.java
@@ -28,23 +28,20 @@
 import eu.itesla_project.online.server.message.encoder.WorkStatusMessageEncoder;
 import eu.itesla_project.online.server.message.encoder.WorkflowListMessageEncoder;
 
-
-@ServerEndpoint(value="/messages/online/workflow", encoders={StatusMessageEncoder.class,RunningMessageEncoder.class,WcaRunningMessageEncoder.class,
-															 BusyCoresMessageEncoder.class,StatesWithActionsSynthesisMessageEncoder.class,
-															 StatesWithIndexesSynthesisMessageEncoder.class, WorkStatusMessageEncoder.class, 
-															 //StableContingenciesMessageEncoder.class, 
-															 WorkflowListMessageEncoder.class,ConnectionMessageEncoder.class, 
-															 StatesWithSecurityRulesResultSynthesisMessageEncoder.class ,
-															 //unstableContingenciesMessageEncoder.class
-															 WcaContingenciesMessageEncoder.class})
+@ServerEndpoint(value = "/messages/online/workflow", encoders = { StatusMessageEncoder.class,
+        RunningMessageEncoder.class, WcaRunningMessageEncoder.class, BusyCoresMessageEncoder.class,
+        StatesWithActionsSynthesisMessageEncoder.class, StatesWithIndexesSynthesisMessageEncoder.class,
+        WorkStatusMessageEncoder.class,
+        WorkflowListMessageEncoder.class, ConnectionMessageEncoder.class,
+        StatesWithSecurityRulesResultSynthesisMessageEncoder.class,
+        WcaContingenciesMessageEncoder.class })
 /**
  *
  * @author Quinary <itesla@quinary.com>
  */
 public class OnlineApplicationEndPoint {
 
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(OnlineApplicationEndPoint.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OnlineApplicationEndPoint.class);
 
     @Inject
     private OnlineApplicationBean bean;

diff --git a/...ne-server/src/main/java/eu/itesla_project/online/server/OnlinePostProcessInterceptor.java b/...ne-server/src/main/java/eu/itesla_project/online/server/OnlinePostProcessInterceptor.java
@@ -21,14 +21,11 @@
  * @author Quinary <itesla@quinary.com>
  */
 @Provider
-public class OnlinePostProcessInterceptor implements ContainerResponseFilter{
+public class OnlinePostProcessInterceptor implements ContainerResponseFilter {
 
-
+    @Override
+    public void filter(ContainerRequestContext request, ContainerResponseContext response) throws IOException {
 
-	@Override
-	public void filter(ContainerRequestContext request,
-			ContainerResponseContext response) throws IOException {
-
-	}
+    }
 
 }
diff --git a/online-server/src/main/java/eu/itesla_project/online/server/OnlinePreProcessInterceptor.java b/online-server/src/main/java/eu/itesla_project/online/server/OnlinePreProcessInterceptor.java
@@ -29,41 +29,11 @@
  * @author Quinary <itesla@quinary.com>
  */
 @Provider
-public class OnlinePreProcessInterceptor implements ContainerRequestFilter{
+public class OnlinePreProcessInterceptor implements ContainerRequestFilter {
 
-	@Override
-	public void filter(ContainerRequestContext req) throws IOException {
-		/*
-		SecurityContext securityContext=req.getSecurityContext();
-		Principal principal=securityContext.getUserPrincipal();
-		
-		if(principal==null || (!securityContext.isUserInRole("user" )&& !securityContext.isUserInRole("admin" )))
-		{
-			System.out.println("PReProcess NOT AUTHORIZED");
-			ResponseBuilder rb=new ResponseBuilderImpl();
-			rb.status(Status.UNAUTHORIZED);
-			
-			
-			req.abortWith(rb.build());
-		}
-		if(req.getUriInfo().getPath().equals("/online/j_security_check")){
-			System.out.println("PReProcess redirect j_security_check to index");
-			ResponseBuilder rb=new ResponseBuilderImpl();
-			rb.status(Status.TEMPORARY_REDIRECT);
-			try {
-				rb.location(new URI("/online/index.html"));
-			} catch (URISyntaxException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			req.abortWith(rb.build());
-		}
-		*/
-
-	}
+    @Override
+    public void filter(ContainerRequestContext req) throws IOException {
 
-
-
-
+    }
 
 }
diff --git a/online-server/src/main/java/eu/itesla_project/online/server/RMIContextFactory.java b/online-server/src/main/java/eu/itesla_project/online/server/RMIContextFactory.java
@@ -16,14 +16,17 @@
  *
  * @author Quinary <itesla@quinary.com>
  */
-public class RMIContextFactory implements InitialContextFactory{
+public class RMIContextFactory implements InitialContextFactory {
 
-    /* (non-Javadoc)
-     * @see javax.naming.spi.InitialContextFactory#getInitialContext(java.util.Hashtable)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.naming.spi.InitialContextFactory#getInitialContext(java.util.
+     * Hashtable)
      */
     @Override
     public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
         return new rmiURLContext(environment);
     }
 
-}
+}
diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/ConnectionMessage.java b/online-server/src/main/java/eu/itesla_project/online/server/message/ConnectionMessage.java
@@ -15,29 +15,27 @@
  * @author Quinary <itesla@quinary.com>
  */
 public class ConnectionMessage extends Message<Boolean> {
-
-	private String type="connection";
-
-	public ConnectionMessage(Boolean body) {
-		super(body);
-	}
-
-	 @Override
-	    protected String getType() {
-	        return type;
-	    }
-
-	 @Override
-		public String toJson(){
-			Gson gson = new Gson();
-			return gson.toJson(this);  
-
-
-		}
-
-		@Override
-		protected void toJson(JsonGenerator generator) {
-
-
-		}
+
+    private String type = "connection";
+
+    public ConnectionMessage(Boolean body) {
+        super(body);
+    }
+
+    @Override
+    protected String getType() {
+        return type;
+    }
+
+    @Override
+    public String toJson() {
+        Gson gson = new Gson();
+        return gson.toJson(this);
+
+    }
+
+    @Override
+    protected void toJson(JsonGenerator generator) {
+
+    }
 }
diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/Message.java b/online-server/src/main/java/eu/itesla_project/online/server/message/Message.java
@@ -11,46 +11,42 @@
 import javax.json.Json;
 import javax.json.stream.JsonGenerator;
 
-
 /**
  *
  * @author Quinary <itesla@quinary.com>
  */
 public abstract class Message<T> {
-	 protected final T body;
-
-	    protected Message(T body) {
-	        this.body = body;
-	    }
-
-	    protected abstract String getType();
-
-	    protected abstract void toJson(JsonGenerator generator);
-
-	    public String toJson() {
-	        StringWriter writer = new StringWriter();
-	        try (JsonGenerator generator = Json.createGenerator(writer)) {
-	            generator.writeStartObject()
-	                    .write("type", getType())
-	                    .writeStartObject("body");
-	            toJson(generator);
-	            generator.writeEnd()
-	                    .writeEnd();
-	        }
-	        return writer.toString();
-	    }
-
-	    public static <U extends Message<?>> String toJson(Iterable<U> messages) {
-	        StringWriter writer = new StringWriter();
-	        try (JsonGenerator generator = Json.createGenerator(writer)) {
-	            generator.writeStartArray();
-	            for (U message : messages) {
-	                generator.writeStartObject();
-	                message.toJson(generator);
-	                generator.writeEnd();
-	            }
-	            generator.writeEnd();
-	        }
-	        return writer.toString();
-	    }
+    protected final T body;
+
+    protected Message(T body) {
+        this.body = body;
+    }
+
+    protected abstract String getType();
+
+    protected abstract void toJson(JsonGenerator generator);
+
+    public String toJson() {
+        StringWriter writer = new StringWriter();
+        try (JsonGenerator generator = Json.createGenerator(writer)) {
+            generator.writeStartObject().write("type", getType()).writeStartObject("body");
+            toJson(generator);
+            generator.writeEnd().writeEnd();
+        }
+        return writer.toString();
+    }
+
+    public static <U extends Message<?>> String toJson(Iterable<U> messages) {
+        StringWriter writer = new StringWriter();
+        try (JsonGenerator generator = Json.createGenerator(writer)) {
+            generator.writeStartArray();
+            for (U message : messages) {
+                generator.writeStartObject();
+                message.toJson(generator);
+                generator.writeEnd();
+            }
+            generator.writeEnd();
+        }
+        return writer.toString();
+    }
 }
diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/RunningMessage.java b/online-server/src/main/java/eu/itesla_project/online/server/message/RunningMessage.java
@@ -15,29 +15,27 @@
  * @author Quinary <itesla@quinary.com>
  */
 public class RunningMessage extends Message<Boolean> {
-
-	private String type="running";
-
-	public RunningMessage(Boolean body) {
-		super(body);
-	}
-
-	 @Override
-	    protected String getType() {
-	        return type;
-	    }
-
-	 @Override
-		public String toJson(){
-			Gson gson = new Gson();
-			return gson.toJson(this);  
-
-
-		}
-
-		@Override
-		protected void toJson(JsonGenerator generator) {
-
-
-		}
+
+    private String type = "running";
+
+    public RunningMessage(Boolean body) {
+        super(body);
+    }
+
+    @Override
+    protected String getType() {
+        return type;
+    }
+
+    @Override
+    public String toJson() {
+        Gson gson = new Gson();
+        return gson.toJson(this);
+
+    }
+
+    @Override
+    protected void toJson(JsonGenerator generator) {
+
+    }
 }
diff --git a/...er/src/main/java/eu/itesla_project/online/server/message/SelectedWorkFlowInfoMessage.java b/...er/src/main/java/eu/itesla_project/online/server/message/SelectedWorkFlowInfoMessage.java
@@ -6,49 +6,41 @@
  */
 package eu.itesla_project.online.server.message;
 
-
 import java.util.HashMap;
 
-
 import javax.json.stream.JsonGenerator;
 
 import com.google.gson.Gson;
 
 import eu.itesla_project.online.server.OnlineWorkflowInfo;
 
-
 /**
  *
  * @author Quinary <itesla@quinary.com>
  */
-public class SelectedWorkFlowInfoMessage extends Message<OnlineWorkflowInfo>  {
+public class SelectedWorkFlowInfoMessage extends Message<OnlineWorkflowInfo> {
 
-
-	private String type="selectedWorkFlowInfo";
-
+    private String type = "selectedWorkFlowInfo";
 
     public SelectedWorkFlowInfoMessage(OnlineWorkflowInfo workflow) {
-    	super(workflow);
-
+        super(workflow);
+
+    }
+
+    @Override
+    protected String getType() {
+        return type;
+    }
+
+    @Override
+    public String toJson() {
+        Gson gson = new Gson();
+        return gson.toJson(this);
     }
-
-
-	@Override
-	protected String getType() {
-		return type;
-	}
-
-	@Override
-	public String toJson(){
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-
-
-	@Override
-	protected void toJson(JsonGenerator generator) {
-
-	}
 
+    @Override
+    protected void toJson(JsonGenerator generator) {
+
+    }
 
 }