ADD: backend instance information (#32)

* Test

* Fixes

* Fixes

* Test

* Fixes

* Fixes

* ADD: raml config

* FIX: rest test

* FIX: rest test

* FIX: raml file

Author: ned29

pom.xml

@@ -17,6 +17,7 @@
         <plugin-version>0.8.6</plugin-version>
         <output-relative-path>src/main/java</output-relative-path>
         <raml-path>src/main/resources/public/raml/subscription.raml</raml-path>
+        <raml-path>src/main/resources/public/raml/instance_info.raml</raml-path>
         <base-package>com.ericsson.ei.controller</base-package>
     </properties>
 
@@ -168,7 +169,12 @@
             <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.16</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/com/ericsson/ei/controller/info/InstanceInfoController.java

@@ -0,0 +1,36 @@
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+package com.ericsson.ei.controller.info;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Provides interaction with InstanceInfo resource
+ * (Generated with springmvc-raml-parser v.0.8.6)
+ */
+@RestController
+@RequestMapping(value = "/information", produces = "application/json")
+public interface InstanceInfoController {
+
+    /**
+     * @return Instance information
+     */
+    @RequestMapping(value = "", method = RequestMethod.GET)
+    public String parseInfo();
+}

src/main/java/com/ericsson/ei/controller/info/InstanceInfoControllerImpl.java

@@ -0,0 +1,46 @@
+/*
+    Copyright 2017 Ericsson AB.
+    For a full list of individual contributors, please see the commit history.
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+package com.ericsson.ei.controller.info;
+
+import com.ericsson.ei.controller.model.ParseInstanceInfoEI;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.CrossOrigin;
+
+@Component
+@CrossOrigin
+@Api(value = "information", description = "The Information about Eiffel Intelligence Backend instance")
+public class InstanceInfoControllerImpl implements InstanceInfoController {
+    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(InstanceInfoControllerImpl.class);
+
+    @Autowired
+    private ParseInstanceInfoEI istanceInfo;
+
+    @Override
+    @CrossOrigin
+    @ApiOperation(value = "Parse information")
+    public String parseInfo() {
+        try {
+            return new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(istanceInfo);
+        } catch (Exception e) {
+            LOGGER.error("Serialization has failed " + e.getMessage());
+        }
+        return null;
+    }
+}

src/main/java/com/ericsson/ei/controller/model/ParseInstanceInfoEI.java

@@ -0,0 +1,98 @@
+/*
+   Copyright 2017 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+package com.ericsson.ei.controller.model;
+
+import com.ericsson.ei.erqueryservice.ERQueryService;
+import com.ericsson.ei.handlers.ObjectHandler;
+import com.ericsson.ei.mongodbhandler.MongoDBHandler;
+import com.ericsson.ei.rmqhandler.RmqHandler;
+import com.ericsson.ei.subscriptionhandler.InformSubscription;
+import com.ericsson.ei.subscriptionhandler.SendMail;
+import com.ericsson.ei.subscriptionhandler.SubscriptionHandler;
+import com.ericsson.ei.waitlist.WaitListStorageHandler;
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Parsing all classes which contains value annotation in eiffel-intelligence plugin.
+ * Needed for generate Json file with information about backend instance.
+ */
+@Component
+public class ParseInstanceInfoEI {
+    @Getter
+    @Value("${spring.application.name}")
+    private String applicationName;
+
+    @Getter
+    @Value("${build.version}")
+    private String version;
+
+    @Getter
+    @Autowired
+    private List<RmqHandler> rabbitmq;
+
+    @Getter
+    @Autowired
+    private List<MongoDBHandler> mongodb;
+
+    @Getter
+    @Autowired
+    private List<ThreadsValue> threads;
+
+    @Getter
+    @Autowired
+    private List<SendMail> email;
+
+    @Getter
+    @Autowired
+    private List<WaitListStorageHandler> waitList;
+
+    @Getter
+    @Autowired
+    private ObjectHandler objectHandler;
+
+    @Getter
+    @Autowired
+    private SubscriptionHandler subscriptionHandler;
+
+    @Getter
+    @Autowired
+    private InformSubscription informSubscription;
+
+    @Getter
+    @Autowired
+    private ERQueryService erUrl;
+
+    @Component
+    private class ThreadsValue {
+        @Getter
+        @Value("${threads.corePoolSize}")
+        private int corePoolSize;
+
+        @Getter
+        @Value("${threads.queueCapacity}")
+        private int queueCapacity;
+
+        @Getter
+        @Value("${threads.maxPoolSize}")
+        private int maxPoolSize;
+    }
+}

src/main/java/com/ericsson/ei/erqueryservice/ERQueryService.java

@@ -17,14 +17,12 @@
 */
 package com.ericsson.ei.erqueryservice;
 
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.annotation.PostConstruct;
 
+import lombok.Getter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,7 +37,6 @@
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -60,13 +57,10 @@ public class ERQueryService {
     public final static int UPSTREAM = 1;
     public final static int DOWNANDUPSTREAM = 2;
 
+    @Getter
     @Value("${er.url}")
     private String url;
 
-    public String getUrl() {
-        return url;
-    }
-
     public ERQueryService(RestTemplateBuilder builder) {
         rest = builder.build();
     }

src/main/java/com/ericsson/ei/handlers/ObjectHandler.java

@@ -20,6 +20,8 @@
 
 import com.ericsson.ei.subscriptionhandler.SubscriptionHandler;
 import com.mongodb.DBObject;
+import lombok.Getter;
+import lombok.Setter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,47 +40,30 @@ public class ObjectHandler {
 
        static Logger log = (Logger) LoggerFactory.getLogger(ObjectHandler.class);
 
-    @Value("${aggregated.collection.name}") private String collectionName;
-    @Value("${database.name}") private String databaseName;
+    @Getter @Setter
+    @Value("${aggregated.collection.name}")
+    private String collectionName;
 
-    public void setCollectionName(String collectionName) {
-        this.collectionName = collectionName;
-    }
-
-    public void setDatabaseName(String databaseName) {
-        this.databaseName = databaseName;
-    }
+    @Getter @Setter
+    @Value("${database.name}")
+    private String databaseName;
 
+    @Setter
     @Autowired
     private MongoDBHandler mongoDbHandler;
 
-    public void setMongoDbHandler(MongoDBHandler mongoDbHandler) {
-        this.mongoDbHandler = mongoDbHandler;
-    }
-
+    @Setter
     @Autowired
     private JmesPathInterface jmespathInterface;
 
-    public void setJmespathInterface(JmesPathInterface jmespathInterface) {
-        this.jmespathInterface = jmespathInterface;
-    }
-
+    @Setter
     @Autowired
     private EventToObjectMapHandler eventToObjectMap;
 
-
-    public void setEventToObjectMap(EventToObjectMapHandler eventToObjectMap) {
-        this.eventToObjectMap = eventToObjectMap;
-    }
-
+    @Setter
     @Autowired
     private SubscriptionHandler subscriptionHandler;
 
-    public void setSubscriptionHandler(SubscriptionHandler subscriptionHandler) {
-        this.subscriptionHandler = subscriptionHandler;
-    }
-
-
     public boolean insertObject(String aggregatedObject, RulesObject rulesObject, String event, String id) {
         if (id == null) {
             String idRules = rulesObject.getIdRule();

src/main/java/com/ericsson/ei/mongodbhandler/MongoDBHandler.java

@@ -20,6 +20,7 @@
 
 import javax.annotation.PostConstruct;
 
+import lombok.Getter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,8 +45,13 @@ public void setMongoClient(MongoClient mongoClient) {
         this.mongoClient = mongoClient;
     }
 
-    @Value("${mongodb.host}") private String host;
-    @Value("${mongodb.port}") private int port;
+    @Getter
+    @Value("${mongodb.host}")
+    private String host;
+
+    @Getter
+    @Value("${mongodb.port}")
+    private int port;
 
     //TODO establish connection automatically when Spring instantiate this
     // based on connection data in properties file
@@ -108,7 +114,7 @@ public ArrayList<String> getAllDocuments(String dataBaseName, String collectionN
     public  ArrayList<String> find(String dataBaseName, String collectionName, String condition){
         ArrayList<String> result = new ArrayList<>();
         log.debug("Find and retrieve data from database: " + dataBaseName + " Collection: " + collectionName +
-        		"\nwith Condition: " + condition);
+                "\nwith Condition: " + condition);
         try{
             DB db = mongoClient.getDB(dataBaseName);
             DBCollection table = db.getCollection(collectionName);
@@ -191,4 +197,4 @@ public void createTTLIndex(String dataBaseName, String collectionName,String fie
         db.getCollection(collectionName).createIndex(ttlField,ttlTime);
     }
 
-}
+}