Issue #000 feat: Remove unused dependencies

Sunbird-RC · Jun 21, 2018 · 6505961 · 6505961
1 parent c63d8a8
commit 6505961
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 303 deletions.
diff --git a/java/cukes/src/test/java/io/opensaber/registry/test/RegistryIntegrationSteps.java b/java/cukes/src/test/java/io/opensaber/registry/test/RegistryIntegrationSteps.java
@@ -5,25 +5,19 @@
 import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.io.StringReader;
-import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.riot.RDFDataMgr;
 import org.json.JSONObject;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import cucumber.api.java.Before;

diff --git a/java/cukes/src/test/java/io/opensaber/registry/test/UpdateIntegrationTestSteps.java b/java/cukes/src/test/java/io/opensaber/registry/test/UpdateIntegrationTestSteps.java
@@ -12,37 +12,20 @@
 import io.opensaber.pojos.Response.Status;
 
 import org.apache.jena.rdf.model.StmtIterator;
-import org.json.JSONObject;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.jsonldjava.core.JsonLdProcessor;
-import com.github.jsonldjava.core.JsonLdTripleCallback;
-import com.github.jsonldjava.utils.JsonUtils;
 
 import org.springframework.http.ResponseEntity;
-import org.apache.jena.ext.com.google.common.collect.Maps;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.Statement;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 import java.io.InputStreamReader;
 import java.io.StringReader;
-import java.io.StringWriter;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.List;
 
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 
 public class UpdateIntegrationTestSteps extends RegistryTestBase implements En {
 

diff --git a/java/middleware-commons/pom.xml b/java/middleware-commons/pom.xml
@@ -23,12 +23,6 @@
 			<artifactId>spring-context</artifactId>
 			<version>5.0.2.RELEASE</version>
 		</dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-common</artifactId>
-            <version>4.0.0.Beta1</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
 			<groupId>io.opensaber</groupId>
 			<artifactId>jenardf4j</artifactId>

diff --git a/java/middleware-commons/src/main/java/io/opensaber/registry/middleware/Middleware.java b/java/middleware-commons/src/main/java/io/opensaber/registry/middleware/Middleware.java
@@ -3,28 +3,23 @@
 import java.io.IOException;
 import java.util.Map;
 
-/**
- * 
- * @author jyotsna
- *
- */
 public interface Middleware {
-	
+
 	/**
 	 * This method executes the middleware logic
-	 * @param request
-	 * @param response
+	 * @param mapData
+	 * @return
 	 * @throws IOException
-	 * @throws MiddlewareHaltException 
+	 * @throws MiddlewareHaltException
 	 */
-	public Map<String,Object> execute(Map<String,Object> mapData) throws IOException, MiddlewareHaltException;
-	
+	Map<String,Object> execute(Map<String,Object> mapData) throws IOException, MiddlewareHaltException;
+
 	/**
 	 * This method chains the flow to the next middleware that needs to be executed
-	 * @param request
-	 * @param response
+	 * @param mapData
+	 * @return
 	 * @throws IOException
 	 */
-	public Map<String,Object> next(Map<String,Object> mapData) throws IOException;
+	Map<String,Object> next(Map<String,Object> mapData) throws IOException;
 
 }
diff --git a/java/middleware-commons/src/main/java/io/opensaber/registry/middleware/Validator.java b/java/middleware-commons/src/main/java/io/opensaber/registry/middleware/Validator.java
@@ -3,15 +3,15 @@
 import io.opensaber.pojos.ValidationResponse;
 
 public interface Validator {
-	
+
 	/**
 	 * This method can be implemented to
 	 * custom validate data
+	 *
 	 * @return ValidationResponse object which contains
 	 * the validation status and information on the errors
 	 * if present during validation
 	 */
-	public ValidationResponse validate();
-
+	ValidationResponse validate();
 
 }
diff --git a/java/middleware-commons/src/main/java/io/opensaber/registry/middleware/util/Constants.java b/java/middleware-commons/src/main/java/io/opensaber/registry/middleware/util/Constants.java
@@ -73,11 +73,11 @@ public String getName() {
 	}
 
 	public enum AuditProperties {
-	    createdOn, lastUpdatedOn, createdBy, lastUpdatedBy;
+		createdAt, lastUpdatedAt, createdBy, lastUpdatedBy
 	}
 
 	public enum GraphParams {
-		properties, userId, operationType, label, requestId, nodeId, removedRelations, addedRelations, ets, createdOn, transactionData, CREATE, UPDATE, DELETE
+		properties, userId, operationType, label, requestId, nodeId, removedRelations, addedRelations, ets, createdAt, transactionData, CREATE, UPDATE, DELETE
 	}
 
 }
diff --git a/java/middleware-commons/src/main/java/io/opensaber/registry/middleware/util/RDFUtil.java b/java/middleware-commons/src/main/java/io/opensaber/registry/middleware/util/RDFUtil.java
@@ -17,7 +17,6 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,82 +28,13 @@
 public class RDFUtil {
 
     private static Logger logger = LoggerFactory.getLogger(RDFUtil.class);
-
-    @Value("${registry.context.base}")
-    private static String registryContext;
-
 
     public static Model getRdfModelBasedOnFormat(String jsonldData, String format){
     	Model m = ModelFactory.createDefaultModel();
     	StringReader reader = new StringReader(jsonldData);
     	return m.read(reader, null, format);
     }
 
-    /**
-     * This method returns a List of RDFNodes which are blank nodes from a Jena Model
-     * @param model
-     * @return
-     */
-    public static List<RDFNode> getBlankNodes(Model model) {
-        StmtIterator it = model.listStatements();
-        List<RDFNode> blankNodes = new ArrayList<>();
-        int blankNodeCount=0;
-        while (it.hasNext()) {
-            Statement stmt = it.next();
-            if (stmt.getSubject().isAnon() && !stmt.getObject().isLiteral() && stmt.getSubject().getURI() == null) {
-                 logger.debug("blank node %s : %s", blankNodeCount++,stmt.getObject());
-                blankNodes.add(stmt.getObject());
-            }
-        }
-        return blankNodes;
-    }
-
-    /**
-     * This method updates the Blank node's URI with a random generated UUID. Also, the
-     * Subject of the children nodes of the blank node will be updated with the same URI.
-     * @param model
-     */
-    public static void updateIdForBlankNode(Model model) {
-        StmtIterator stmtIterator = model.listStatements();
-
-        ArrayList<Statement> updatedStatements = new ArrayList<>();
-        while (stmtIterator.hasNext()) {
-            Statement node = stmtIterator.next();
-
-            if (node.getSubject().isAnon() && !node.getObject().isLiteral() && node.getSubject().getURI() == null) {
-
-                StmtIterator parent = model.listStatements(null, null, node.getSubject());
-
-                String label = UUID.randomUUID().toString();
-                StmtIterator nodeProperties = node.getSubject().listProperties();
-                int updatedBlankNodeCount =0;
-                // String namespace = node.getObject().asResource().getNameSpace();
-
-                /*
-                 * Update the child node labels
-                 */
-                while (nodeProperties.hasNext()) {
-                    Statement childNode = nodeProperties.next();
-                    Statement updated = updateSubjectLabel(childNode, label);
-                    nodeProperties.remove();
-                    updatedStatements.add(updated);
-                    logger.debug("Updated blank node statement %s : %s",updatedBlankNodeCount++,updated.toString());
-                }
-
-                // Update the parent node label
-                // updateSubjectLabel(node, label, namespace);
-                while(parent.hasNext()) {
-                    Statement parentSt = parent.next();
-                    Statement updatedParent = updateResource(parentSt, label);
-                    parent.remove();
-                    updatedStatements.add(updatedParent);
-                    logger.debug("Updated corresponding parent statement(s) for blank node(s) : %s",updatedParent.toString());
-                }
-            }
-        }
-        model.add(updatedStatements.toArray(new Statement[0]));
-    }
-
     public static Statement updateSubjectLabel(Statement statement, String label) {
         Resource subject = statement.getSubject();
         Property predicate = statement.getPredicate();

diff --git a/java/middleware/registry-middleware/authorization/pom.xml b/java/middleware/registry-middleware/authorization/pom.xml
@@ -27,11 +27,6 @@
 			<artifactId>spring-security-core</artifactId>
 			<version>5.0.3.RELEASE</version>
 		</dependency>
-		<dependency>
-			<groupId>io.opensaber</groupId>
-			<artifactId>pojos</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt</artifactId>

diff --git a/java/opensaber-client/pom.xml b/java/opensaber-client/pom.xml
@@ -41,11 +41,6 @@
             <artifactId>config</artifactId>
             <version>1.2.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.json4s</groupId>
-            <artifactId>json4s-jackson_2.12</artifactId>
-            <version>3.6.0-M3</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -76,19 +71,6 @@
             <artifactId>commons-lang</artifactId>
             <version>2.6</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs</artifactId>
-            <version>4.0.0.Beta3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-client</artifactId>
-            <version>4.0.0.Beta3</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/java/pojos/pom.xml b/java/pojos/pom.xml
@@ -24,11 +24,6 @@
             <version>2.8.2</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>5.0.5.RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>org.perf4j</groupId>
             <artifactId>perf4j</artifactId>

diff --git a/java/pojos/src/main/java/io/opensaber/pojos/OpenSaberInstrumentation.java b/java/pojos/src/main/java/io/opensaber/pojos/OpenSaberInstrumentation.java
@@ -3,58 +3,22 @@
 import org.perf4j.slf4j.Slf4JStopWatch;
 
 public class OpenSaberInstrumentation {
-    // private StopWatch sw = new StopWatch();
     private org.perf4j.StopWatch perf4jStopWatch = new Slf4JStopWatch();
     private boolean performanceMonitoingEnabled;
-    // private static Logger perfLogger = LoggerFactory.getLogger("PERFORMANCE_INSTRUMENTATION");
 
     public OpenSaberInstrumentation(boolean performanceMonitoringEnabled) {
         this.performanceMonitoingEnabled = performanceMonitoringEnabled;
     }
 
-    // public OpenSaberInstrumentation(){}
-
     public void start(String tag) {
         if (performanceMonitoingEnabled) {
-            /*
-            if (!sw.isRunning()) {
-                sw.start(tag);
-            }
-            */
             perf4jStopWatch.start(tag);
         }
     }
 
     public void stop(String tag) {
         if (performanceMonitoingEnabled) {
-            /*
-            if (sw.isRunning()) {
-                sw.stop();
-                perfLogger.info(sw.prettyPrint());
-            }
-            */
             perf4jStopWatch.stop(tag);
         }
     }
-
-    /*
-    public void prettyPrint() {
-        if (performanceMonitoingEnabled) {
-            perfLogger.info(sw.prettyPrint());
-        }
-    }
-
-    public void shortSummary() {
-        if (performanceMonitoingEnabled) {
-            perfLogger.info(sw.shortSummary());
-        }
-    }
-
-    public String getTotalTimeMillis(){
-        if (performanceMonitoingEnabled) {
-            perfLogger.info(Long.toString(sw.getTotalTimeMillis()));
-        }
-        return Long.toString(sw.getTotalTimeMillis());
-    }
-    */
 }