Fix default plot type and it's parameterisation null check code issues (

#341)

* Fix default plot type and it's parameterisation null pointer exception and pull cell plot methods from the DB to use

* Improve code

* Add null fix test coverage

* Add curly braces to else condition

* Fetch plot methods from the test DB

* Update submodule

* Refactor variable name

* Bump atlas-web-core

* Remove JDBCUtils injection and related code

* Bump atlas-web-core submodule

app/src/test/java/uk/ac/ebi/atlas/experimentpage/cellplot/CellPlotServiceTest.java

@@ -24,7 +24,7 @@
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
@@ -157,21 +157,17 @@ void returnEmptyResultIfThereIsNoDefaultPlotMethodAndParameterisation() {
     }
 
     @Test
-    void throwsNullPointerExceptionIfHardCodedTestMethodIsNotSameAsDBMethod() {
-        var tsne = randomAlphabetic(10);
-        var umap = randomAlphabetic(10);
+    void defaultResultedPlotMethodMatchesWithDBPlotMethods() {
         var experimentAccession = RandomDataTestUtils.generateRandomExperimentAccession();
+
         when(cellPlotDaoMock.fetchDefaultPlotMethodWithParameterisation(experimentAccession))
-                .thenReturn(ImmutableMap.of(umap.toUpperCase(),
+                .thenReturn(ImmutableMap.of("UMAP",
                         List.of(new Gson().fromJson("{\"n_neighbors\": 15}", JsonObject.class)),
-                        tsne,
+                        "t-SNE",
                         List.of(new Gson().fromJson("{\"perplexity\": 20}", JsonObject.class))));
 
-        assertThrows(NullPointerException.class, () -> {
-            //We are passing method 'umap' which is small letters, But DB has capilized method 'UMAP'
-            //This gives null List as MAP fetches from the DB, MAP keys are case-sensitive.
-            subject.fetchDefaultPlotMethodWithParameterisation(experimentAccession)
-                    .get(umap).getAsJsonObject();
-        });
+            assertTrue(subject.fetchDefaultPlotMethodWithParameterisation(experimentAccession)
+                    .keySet()
+                    .contains("t-SNE"));
     }
 }