Mongodb uplift #510

shubhamkumarguptaTCS · 2021-10-22T14:37:12Z

Applicable Issues

Since mongodb and spring boot parent has introduced their latest versions with major updates, we also updated to the latest version. Updating to the latest versions will help to fix existing issues with APIs along with more enhancements.
git issue#509

Description of the Change

Updated mongodb and spring boot related APIs versions to the latest, further changes include removing deprecated methods by replacing with latest ones.

Alternate Designs

Application is modified in a way that it is also compatible with older mongodb versions(i.e. 3.4.10). The latest mongodb versions is 4.4.9.

Benefits

Will able to leverage latest features of mongodb and spring-boot APIs.

Possible Drawbacks

Sign-off

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

Signed-off-by: SHUBHAM KUMAR GUPTA shubhamkumar.gupta1@tcs.com, Dhruvin K dhruvin.kalavadia@tcs.com, Vishal Kumar P vr.panchal@tcs.com

SantoshNC68 · 2021-10-25T04:25:15Z

pom.xml

                    <artifactId>android-json</artifactId>
                </exclusion>
+                <exclusion>
+					<groupId>org.junit.jupiter</groupId>


proper format.

SantoshNC68 · 2021-10-25T04:25:55Z

pom.xml

            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-mail</artifactId>
-            <version>${springBootVersion}</version>
+            <!-- <version>${springBootVersion}</version> -->


keep the original one. we have added the version in properties and this is not a change.

same in all the places where we have commented out this line.

SantoshNC68 · 2021-10-25T04:28:52Z

src/functionaltests/java/com/ericsson/ei/utils/TestConfigs.java

-            MongodForTestsFactory testsFactory = MongodForTestsFactory.with(Version.V3_4_1);
-            mongoClient = testsFactory.newMongo();
-            String port = "" + mongoClient.getAddress().getPort();
+        	ListDatabasesIterable<Document> list = mongoClient.listDatabases();


check the format in this block.
Also make these variables final

SantoshNC68 · 2021-10-25T04:29:08Z

src/integrationtests/java/com/ericsson/ei/integrationtests/flow/FlowStepsIT.java

    private void setupMailhogMongoDBHandler() {
-        MongoClientURI uri = new MongoClientURI(mailHogUri);
-        MongoClient mongoClient = new MongoClient(uri);
+    	MongoClient mongoClient = MongoClients.create(mailHogUri);


SantoshNC68 · 2021-10-25T04:29:39Z

...ationtests/java/com/ericsson/ei/integrationtests/notification/FailedNotificationStepsIT.java

    public String aggregatedEvent;
-
    private SubscriptionObject subscriptionObject;



There is no change in this file, keep the original one.

SantoshNC68 · 2021-10-25T04:30:37Z

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

-    public void runIdRules(RulesObject rulesObject, String event)
-            throws MongoDBConnectionException {
+    public void runIdRules(RulesObject rulesObject, String event) 
+            throws MongoDBConnectionException, Exception {


Why are we throwing Exception here?

SantoshNC68 · 2021-10-25T04:31:43Z

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

                    LOGGER.debug("DB locked by {} thread", Thread.currentThread().getId());
                    documentLocked = false;
-                    return JSON.serialize(result);
+                    BasicDBObject basicDBObject=new BasicDBObject(result);


this can be final,
or do it like
return new BasicDBObject(result).toString();

SantoshNC68 · 2021-10-25T04:32:16Z

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

            }

-            rabbitTemplate.setQueue(rmqProperties.getWaitlistQueueName());
+            rabbitTemplate.setDefaultReceiveQueue(rmqProperties.getWaitlistQueueName());


check the format properly

SantoshNC68 · 2021-10-25T04:32:42Z

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

        LOGGER.debug("%%%% Response time for upstream query for id: {}: {} ", aggregatedObjectId, stop-start);
        LOGGER.debug("ResponseEntity: " + responseEntity);
-
        if (responseEntity == null) {


no change in this file. keep the original file.

SantoshNC68 · 2021-10-25T04:34:29Z

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

    public boolean isMongoDBServerUp() {
        try {
-            mongoClient.getAddress();
+            ListDatabasesIterable<Document> list = mongoClient.listDatabases();


declare this variable final. Same for the BasicDBObject added above (line 157)

RajuBeemreddy1 · 2021-10-25T04:47:34Z

pom.xml

+		    <version>4.3.2</version><!--$NO-MVN-MAN-VER$-->
+		</dependency>
+
+		<dependency>


No need of mongodb-driver-core dependency explicitly. sync will download the same.

RajuBeemreddy1 · 2021-10-25T04:54:39Z

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

            // all " later on, All get sometihng in mongoDB shoult redurn a JSON object and not a
            // String.
-            result.add(JSON.serialize(document));
+        	BasicDBObject basicDBObject=new BasicDBObject(document);


Format the code.

RajuBeemreddy1 · 2021-10-25T05:01:45Z

src/test/java/com/ericsson/ei/mongo/MongoDBHandlerTest.java

-
-        // Need to set a working client to enable cleanup
-        mongoDBHandler.setMongoClient(TestConfigs.getMongoClient());
+        //doThrow(Exception.class).when(cursor.getServerAddress());


Can you verify other way what the commented lines are doing here.

RajuBeemreddy1 · 2021-10-25T05:02:15Z

src/test/java/com/ericsson/ei/notifications/HttpRequestTest.java

-        mongoClient = testsFactory.newMongo();
-        String port = "" + mongoClient.getAddress().getPort();
+    	ListDatabasesIterable<Document> list = mongoClient.listDatabases();
+        MongoCursor<Document> iter = list.iterator(); 


Not properly formatted.

RajuBeemreddy1 · 2021-10-25T05:03:47Z

src/test/java/com/ericsson/ei/notifications/HttpRequestTest.java


    @BeforeClass
    public static void init() throws Exception {
+    	//new AnnotationConfigApplicationContext(HttpRequest.class);


Why these lines are commented. If the client has already created in other places, why dont you move the logic from there to here.

RajuBeemreddy1 · 2021-10-25T05:04:34Z

src/test/java/com/ericsson/ei/services/SubscriptionRestAPITest.java


    @MockBean
    private SecurityContext securityContext;
+


Remove unnecessary new lines.

RajuBeemreddy1

Some environmental issues found for the test cases. Need to fix those after this changes.

Shubham Gupta C added 4 commits October 22, 2021 15:56

dummy commit

8ae442d

implementation mongo uplift in EI

4812921

mongodb uplift changes

f2b59ad

code refactor

4fe4b0a

SantoshNC68 marked this pull request as ready for review October 25, 2021 04:21

SantoshNC68 reviewed Oct 25, 2021

View reviewed changes

RajuBeemreddy1 suggested changes Oct 25, 2021

View reviewed changes

Shubham Gupta C added 5 commits October 25, 2021 14:39

code refactoring

2e7ed53

code refactor

42d310c

refactor code

6db865a

resolved review comments

7fc5f32

code changes as per review

eb38a0f

RajuBeemreddy1 approved these changes Oct 25, 2021

View reviewed changes

SantoshNC68 approved these changes Oct 25, 2021

View reviewed changes

SantoshNC68 merged commit 548cf8b into eiffel-community:master Oct 25, 2021

		public String aggregatedEvent;

		private SubscriptionObject subscriptionObject;

Mongodb uplift #510

Mongodb uplift #510

Uh oh!

Conversation

shubhamkumarguptaTCS commented Oct 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Applicable Issues

Description of the Change

Alternate Designs

Benefits

Possible Drawbacks

Sign-off

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RajuBeemreddy1 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

shubhamkumarguptaTCS commented Oct 22, 2021 •

edited

Loading