code smell fixes

Author: Quim

src/main/java/com/essi/Dependency/Application.java

@@ -11,27 +11,17 @@
 import com.essi.Dependency.Service.DependencyService;
 import com.essi.Dependency.Service.StorageProperties;
 
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-
 @SpringBootApplication
-// @PropertySource({"classpath:application.properties"})
 @EnableConfigurationProperties(StorageProperties.class)
 public class Application {
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
 	SpringApplication.run(Application.class, args);
     }
 
     @Bean
     CommandLineRunner init(DependencyService storageService) {
 	return (args) -> {
 	    storageService.deleteAll();
-	    //storageService.init();
 	};
     }
 

src/main/java/com/essi/Dependency/Components/Clause.java

@@ -15,11 +15,11 @@ public class Clause {
     private String subsect;
     private String parag;
     private String subparg;
-    private String clause;
+    private String clauseString;
     private int	   id;
 
     public Clause(String doc, String vol, String part, String sect, String subsect, String parag, String subparg,
-	    String clause, int id) {
+                  String clauseString, int id) {
 	super();
 	this.doc = doc;
 	this.vol = vol;
@@ -28,13 +28,13 @@ public Clause(String doc, String vol, String part, String sect, String subsect,
 	this.subsect = subsect;
 	this.parag = parag;
 	this.subparg = subparg;
-	this.clause = clause;
+	this.clauseString = clauseString;
 	this.id = id;
     }
 
     public Clause(ArrayList<String> components) {
 	this.id = Integer.parseInt(components.get(0));
-	this.clause = components.get(1);
+	this.clauseString = components.get(1);
 	this.doc = components.get(2);
 	this.vol = components.get(3);
 	this.part = components.get(4);
@@ -80,27 +80,27 @@ public String getSubparg() {
     }
 
     @ApiModelProperty(value = "Text")
-    public String getClause() {
-	return clause;
+    public String getClauseString() {
+	return clauseString;
     }
 
     @ApiModelProperty(value = "Identification number")
     public int getId() {
 	return id;
     }
 
-    public void setClause(String clause) {
-	this.clause = clause;
+    public void setClauseString(String clauseString) {
+	this.clauseString = clauseString;
     }
 
     public String printMe() {
-	return this.clause;
+	return this.clauseString;
     }
 
     @Override
     public String toString() {
 	return "Clause [id=" + id + ",\n doc=" + doc + ",\n vol=" + vol + ",\n part=" + part + ",\n sect=" + sect
-		+ ",\n subsect=" + subsect + ",\n parag=" + parag + ",\n subparg=" + subparg + ",\n clause=" + clause
+		+ ",\n subsect=" + subsect + ",\n parag=" + parag + ",\n subparg=" + subparg + ",\n clauseString=" + clauseString
 		+ "]";
     }
 

src/main/java/com/essi/Dependency/Components/ExternalDependency.java

@@ -9,23 +9,16 @@ public class ExternalDependency {
     public ExternalDependency(String externalDependency, /* int id, */ Object requirmenet) {
 	super();
 	this.externalDependency = externalDependency;
-	// this.id = id;
 	this.requirement = requirmenet;
     }
 
     public String getExternalDependency() {
 	return externalDependency;
     }
 
-    // public void setExternalDependency(String extarnelDependency) {
-    // this.extarnelDependency = extarnelDependency;
-    // }
     public int referenceId() {
 	return ((Clause) requirement).getId();
     }
-    // public void setId(int id) {
-    // this.id = id;
-    // }
 
     public Object getRequirement() {
 	return requirement;
@@ -37,7 +30,7 @@ public void setRequirement(Object requirement) {
 
     @Override
     public String toString() {
-	return ((Clause) requirement).getId() + ", External-Dependency=" + ((Clause) requirement).getClause();
+	return ((Clause) requirement).getId() + ", External-Dependency=" + ((Clause) requirement).getClauseString();
     }
 
 }

src/main/java/com/essi/Dependency/Functionalities/CallableTask.java

@@ -43,8 +43,8 @@ public class CallableTask implements Callable<ArrayList<Object>> {
 	public ArrayList<Object> call() {
 		if (expression instanceof Clause) {
 
-			((Clause) expression).setClause(((Clause) expression).getClause().toLowerCase().replaceAll(",", " ,"));
-			Matcher matcher = pattern.matcher(((Clause) expression).getClause());
+			((Clause) expression).setClauseString(((Clause) expression).getClauseString().toLowerCase().replaceAll(",", " ,"));
+			Matcher matcher = pattern.matcher(((Clause) expression).getClauseString());
 
 			dep = grammar.resolvingCrossReference(((Clause) expression), matcher, expressionList/* , outputWriter */);
 

src/main/java/com/essi/Dependency/Functionalities/JSONHandler.java

@@ -1,23 +1,13 @@
 package com.essi.Dependency.Functionalities;
 
-import java.awt.List;
-import java.io.File;
-import java.nio.file.Files;
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 
 import com.essi.Dependency.Components.Clause;
 import com.essi.Dependency.Components.Dependency;
-import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -250,7 +240,7 @@ public ObjectNode storeRequirements(ObjectNode objectNode, ArrayList<Object> cla
 			ObjectNode objN = objectMapper.createObjectNode();
 			objN.put("id", Integer.toString(((Clause) clause).getId()));
 			objN.put("name", Integer.toString(((Clause) clause).getId()));
-			objN.put("text", ((Clause) clause).getClause());
+			objN.put("text", ((Clause) clause).getClauseString());
 			objN.put("sect", ((Clause) clause).getSect());
 			objN.put("subsect", ((Clause) clause).getSubsect());
 			objN.put("parag", ((Clause) clause).getParag());