style - code formatting

pom.xml

@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.gcube.tools</groupId>

src/main/java/org/gcube/service/helloworld/HelloWorld.java

@@ -6,11 +6,14 @@ import java.util.Set;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.gcube.service.helloworld.services.AuthorizedMethods;
+import org.gcube.service.helloworld.services.AuthenticatedService;
-import org.gcube.service.helloworld.services.ExcludeAuthorization;
+import org.gcube.service.helloworld.services.ExcludeAuthorizationService;
 import org.gcube.service.helloworld.services.HelloService;
-import org.gcube.service.helloworld.services.TestAuthorizationService;
 
+/**
+ * 
+ * @author Lucio Lelii (ISTI-CNR)
+ */
 
 @ApplicationPath("")
 public class HelloWorld extends Application {
@@ -19,9 +22,8 @@ public class HelloWorld extends Application {
 		final Set<Class<?>> classes = new HashSet<Class<?>>();
 		// register resources classes implementing Servlets
 		classes.add(HelloService.class);
-		classes.add(ExcludeAuthorization.class);
+		classes.add(ExcludeAuthorizationService.class);
-		classes.add(TestAuthorizationService.class);
+		classes.add(AuthenticatedService.class);
-
 		return classes;
 	}
 }

src/main/java/org/gcube/service/helloworld/manager/HelloWorldManager.java

@@ -16,9 +16,7 @@ import org.slf4j.LoggerFactory;
  * to the app declaring it via the @ManagedBy annotation. (@see HelloWorld
  * class)
  * 
- * 
+ * @author Lucio Lelii (ISTI-CNR)
- * @author lucio
- *
  */
 
 public class HelloWorldManager implements ApplicationManager {

src/main/java/org/gcube/service/helloworld/serializers/ContainerConfigurationSerializer.java

@@ -8,6 +8,13 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
+/**
+ * Jackson serializer for ContainerConfiguration
+ * 
+ * @author Alfredo Oliviero (ISTI-CNR)
+ * 
+ */
+
 public class ContainerConfigurationSerializer extends StdSerializer<ContainerConfiguration> {
     protected ContainerConfigurationSerializer(Class<ContainerConfiguration> t) {
         super(t);
@@ -17,9 +24,9 @@ public class ContainerConfigurationSerializer extends StdSerializer<ContainerCon
         super(ContainerConfiguration.class, true);
     }
 
-
     @Override
-    public void serialize(ContainerConfiguration configuration, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+    public void serialize(ContainerConfiguration configuration, JsonGenerator jgen, SerializerProvider provider)
+            throws IOException {
         jgen.writeStartObject();
         jgen.writeObjectField("mode", configuration.mode());
         jgen.writeObjectField("app", configuration.apps());
@@ -33,8 +40,6 @@ public class ContainerConfigurationSerializer extends StdSerializer<ContainerCon
 
         jgen.writeObjectField("desc", configuration.toString());
 
-
-
         jgen.writeEndObject();
     }
 }

src/main/java/org/gcube/service/helloworld/serializers/ContainerContextSerializer.java

@@ -8,6 +8,13 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
+/**
+ * Jackson serializer for ContainerContext
+ * 
+ * @author Alfredo Oliviero (ISTI-CNR)
+ * 
+ */
+
 public class ContainerContextSerializer extends StdSerializer<ContainerContext> {
     protected ContainerContextSerializer(Class<ContainerContext> t) {
         super(t);
@@ -17,9 +24,9 @@ public class ContainerContextSerializer extends StdSerializer<ContainerContext>
         super(ContainerContext.class, true);
     }
 
-
     @Override
-    public void serialize(ContainerContext ccontext, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+    public void serialize(ContainerContext ccontext, JsonGenerator jgen, SerializerProvider provider)
+            throws IOException {
         jgen.writeStartObject();
         jgen.writeStringField("id", ccontext.id());
         // jgen.writeObjectField("configuration.site", ccontext.configuration().site());

src/main/java/org/gcube/service/helloworld/serializers/ContextSerializator.java

@@ -7,7 +7,14 @@ import org.gcube.smartgears.security.SimpleCredentials;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
-public class SmartGearSerializator {
+/**
+ * Jackson Serialization utils for Smartgear Context classes
+ * 
+ * @author Alfredo Oliviero (ISTI-CNR)
+ * 
+ */
+
+public class ContextSerializator {
     private static ObjectMapper serializer = null;
 
     public static ObjectMapper getSerializer() {
@@ -20,7 +27,6 @@ public class SmartGearSerializator {
             module.addSerializer(ContainerContext.class, new ContainerContextSerializer());
             module.addSerializer(SimpleCredentials.class, new SimpleCredentialsSerializer());
 
-            
             om.registerModule(module);
             serializer = om;
         }

src/main/java/org/gcube/service/helloworld/serializers/OwnerSerializer.java

@@ -8,6 +8,13 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
+/**
+ * Jackson serializer for Owner
+ * 
+ * @author Alfredo Oliviero (ISTI-CNR)
+ * 
+ */
+
 public class OwnerSerializer extends StdSerializer<Owner> {
 
     protected OwnerSerializer(Class<Owner> t) {
@@ -18,7 +25,6 @@ public class OwnerSerializer extends StdSerializer<Owner> {
         super(Owner.class, true);
     }
 
-
     @Override
     public void serialize(Owner owner, JsonGenerator jgen, SerializerProvider provider) throws IOException {
         jgen.writeStartObject();

src/main/java/org/gcube/service/helloworld/serializers/SimpleCredentialsSerializer.java

@@ -8,6 +8,13 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
+/**
+ * Jackson serializer for SimpleCredentials
+ * 
+ * @author Alfredo Oliviero (ISTI-CNR)
+ * 
+ */
+
 public class SimpleCredentialsSerializer extends StdSerializer<SimpleCredentials> {
 
     protected SimpleCredentialsSerializer(Class<SimpleCredentials> t) {
@@ -18,9 +25,9 @@ public class SimpleCredentialsSerializer extends StdSerializer<SimpleCredentials
         super(SimpleCredentials.class, true);
     }
 
-
     @Override
-    public void serialize(SimpleCredentials credentials, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+    public void serialize(SimpleCredentials credentials, JsonGenerator jgen, SerializerProvider provider)
+            throws IOException {
         jgen.writeStartObject();
         jgen.writeStringField("clientId", credentials.getClientID());
         jgen.writeStringField("secret", "[*****]");

src/main/java/org/gcube/service/helloworld/services/AuthenticatedService.java

@@ -10,8 +10,13 @@ import org.gcube.common.security.providers.SecretManagerProvider;
 import org.gcube.common.security.secrets.Secret;
 import org.gcube.smartgears.utils.InnerMethodName;
 
+/**
+ * @author Lucio Le (ISTI - CNR)
+ * @author Alfredo Oliviero (ISTI - CNR)
+ */
+
 @Path("auth")
-public class TestAuthorizationService {
+public class AuthenticatedService {
 
 	private static final String ALLOWED_ROLE = "myRole";
 	private static final String ALLOWED_ROLE_ORG = "OrganizationMember";
@@ -25,7 +30,9 @@ public class TestAuthorizationService {
 		Secret secret = SecretManagerProvider.get();
 		String userId = secret.getOwner().getId();
 		String context = secret.getContext();
-		return String.format("User %s in context %s is authorized to execute this method because he has the correct role", userId,context);
+		return String.format(
+				"User %s in context %s is authorized to execute this method because he has the correct role", userId,
+				context);
 	}
 
 	@AuthorizationControl(allowedRoles = { ALLOWED_ROLE })
@@ -37,7 +44,9 @@ public class TestAuthorizationService {
 		Secret secret = SecretManagerProvider.get();
 		String userId = secret.getOwner().getId();
 		String context = secret.getContext();
-		return String.format("User %s in context %s is authorized to execute this method because he has the correct role", userId,context);
+		return String.format(
+				"User %s in context %s is authorized to execute this method because he has the correct role", userId,
+				context);
 	}
 
 }

src/main/java/org/gcube/service/helloworld/services/HelloService.java

@@ -13,7 +13,7 @@ import org.gcube.common.security.Owner;
 import org.gcube.common.security.providers.SecretManagerProvider;
 import org.gcube.common.security.secrets.Secret;
 import org.gcube.service.helloworld.manager.HelloWorldManager;
-import org.gcube.service.helloworld.serializers.SmartGearSerializator;
+import org.gcube.service.helloworld.serializers.ContextSerializator;
 import org.gcube.smartgears.ContextProvider;
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.gcube.smartgears.context.container.ContainerContext;
@@ -24,6 +24,12 @@ import org.slf4j.LoggerFactory;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+/**
+ * 
+ * @author Lucio Lelii (ISTI-CNR)
+ * @author Alfredo Oliviero (ISTI-CNR)
+ */
+
 @ManagedBy(HelloWorldManager.class)
 @Path("")
 public class HelloService {
@@ -41,7 +47,8 @@ public class HelloService {
 
 		String infrastructureName = ContextProvider.get().container().configuration().infrastructure();
 		logger.info("caller id is {}", userId);
-		return String.format("Hello %s in context %s in infastructure %s -roles %s", userId,context, infrastructureName, secret.getOwner().getRoles());
+		return String.format("Hello %s in context %s in infastructure %s -roles %s", userId, context,
+				infrastructureName, secret.getOwner().getRoles());
 	}
 
 	@GET
@@ -54,7 +61,6 @@ public class HelloService {
 
 		Secret secret = SecretManagerProvider.get();
 
-	
 		String context = secret.getContext();
 		data.put("context", context);
 
@@ -64,7 +70,7 @@ public class HelloService {
 		ContainerContext container = ContextProvider.get().container();
 		data.put("container", container);
 
-		ObjectMapper objectMapper = SmartGearSerializator.getSerializer();
+		ObjectMapper objectMapper = ContextSerializator.getSerializer();
 
 		try {
 			String jsonData = objectMapper.writeValueAsString(data);

src/main/java/org/gcube/service/helloworld/utils/RestUtils.java

@@ -5,15 +5,12 @@ import java.util.List;
 import java.util.Map;
 
 import org.gcube.common.security.Owner;
-import org.gcube.service.helloworld.serializers.ContainerConfigurationSerializer;
-import org.gcube.service.helloworld.serializers.ContainerContextSerializer;
-import org.gcube.service.helloworld.serializers.SimpleCredentialsSerializer;
-import org.gcube.smartgears.configuration.container.ContainerConfiguration;
 import org.gcube.smartgears.context.container.ContainerContext;
-import org.gcube.smartgears.security.SimpleCredentials;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+/**
-import com.fasterxml.jackson.databind.module.SimpleModule;
+ * 
+ * @author Lucio Lelii (ISTI-CNR)
+ */
 
 public class RestUtils {