Merge pull request #18 from MicroFocus/dmoldoveanu_story_1234009

user story #1234009: changed the 'View in Octane' link based on octane server version

Author: pikachugb

src/main/java/com/microfocus/octane/plugins/configuration/OctaneRestManager.java

@@ -44,13 +44,13 @@ public class OctaneRestManager {
 
     private static final Logger log = LoggerFactory.getLogger(OctaneRestManager.class);
 
-    private static LoadingCache<String, VersionEntity> versionCache = CacheBuilder
+    private static LoadingCache<SpaceConfiguration, VersionEntity> versionCache = CacheBuilder
             .newBuilder()
             .expireAfterWrite(30, TimeUnit.MINUTES)
-            .build((new CacheLoader<String, VersionEntity>() {
+            .build((new CacheLoader<SpaceConfiguration, VersionEntity>() {
                 @Override
-                public VersionEntity load(@NotNull String spaceConfigId) {
-                    return getOctaneServerVersion(spaceConfigId);
+                public VersionEntity load(@NotNull SpaceConfiguration sc) {
+                    return getOctaneServerVersion(sc);
                 }
             }));
 
@@ -71,7 +71,7 @@ private static String getQueryParamBasedOnTypeAndVersion(SpaceConfiguration sc,
         if (hasSubtype) {
             VersionEntity versionEntity;
             try {
-                versionEntity = versionCache.get(sc.getId());
+                versionEntity = versionCache.get(sc);
             } catch (ExecutionException e) {
                 throw new RuntimeException(e.getMessage());
             }
@@ -88,9 +88,7 @@ private static String getQueryParamBasedOnTypeAndVersion(SpaceConfiguration sc,
         return  getQueryParam(octaneEntity, typeDescriptor);
     }
 
-    private static VersionEntity getOctaneServerVersion(String spaceConfigId) {
-        SpaceConfiguration sc = ConfigurationManager.getInstance().getSpaceConfigurationById(spaceConfigId, true).get();
-
+    public static VersionEntity getOctaneServerVersion(SpaceConfiguration sc) {
         String url = "/admin/server/version";
         Map<String, String> headers = createHeaderMapWithOctaneClientType();
         headers.put(RestConnector.HEADER_ACCEPT, RestConnector.HEADER_APPLICATION_JSON);

src/main/java/com/microfocus/octane/plugins/configuration/PluginConstants.java

@@ -19,4 +19,5 @@ public class PluginConstants {
     public static final String DEFAULT_BUILD = "9999";
     public static final String SEPARATOR = ".";
     public static final String FUGEES_VERSION = "15.1.90";
+    public static final String GUNSNROSES_PUSH2 = "16.0.16";
 }

src/main/java/com/microfocus/octane/plugins/configuration/SpaceConfiguration.java

@@ -20,6 +20,8 @@
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
+import java.util.Objects;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class SpaceConfiguration {
 
@@ -98,4 +100,17 @@ public RestConnector getRestConnector() {
     public void clearRestConnector() {
         restConnector = null;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SpaceConfiguration that = (SpaceConfiguration) o;
+        return location.equals(that.location) && locationParts.equals(that.locationParts) && id.equals(that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(location, locationParts, id);
+    }
 }

src/main/java/com/microfocus/octane/plugins/descriptors/OctaneEntityTypeDescriptor.java

@@ -15,6 +15,8 @@
 
 package com.microfocus.octane.plugins.descriptors;
 
+import com.microfocus.octane.plugins.configuration.*;
+
 public class OctaneEntityTypeDescriptor {
 
     /***
@@ -62,7 +64,7 @@ public class OctaneEntityTypeDescriptor {
      */
     private String indirectCoveringTestsField;
 
-    private static final String TESTS_URL_FOR_DEFECTS = "&configuration={\"tabName\":\"%s\",\"relation_name\":\"test_to_work_items-gherkin_test-scenario_test-test_automated-test_manual-test_suite-target\"}";
+    private static final String TESTS_URL_FOR_DEFECTS = "&configuration={\"tabName\":\"relationships\",\"relation_name\":\"test_to_work_items-gherkin_test-scenario_test-test_automated-test_manual-test_suite-target\"}";
 
     public OctaneEntityTypeDescriptor(String typeName, String alias, String typeAbbreviation, String label, String typeColor, String nameForNavigation, String testTabName, String testReferenceField, String indirectCoveringTestsField) {
         this.typeName = typeName;
@@ -103,13 +105,14 @@ public String buildEntityUrl(String baseUrl, long spaceId, long workspaceId, Str
         return octaneEntityUrl;
     }
 
-    public String buildTestTabEntityUrl(String baseUrl, long spaceId, long workspaceId, String entityId, String subtype) {
-        if (("defect").equals(subtype)) {
-            String defectTestsUrl = String.format(TESTS_URL_FOR_DEFECTS, getTestTabName());
+    public String buildTestTabEntityUrl(SpaceConfiguration sc, long workspaceId, String entityId, String subtype) {
+        VersionEntity versionEntity = OctaneRestManager.getOctaneServerVersion(sc);
+        OctaneServerVersion octaneServerVersion = new OctaneServerVersion(versionEntity.getVersion());
 
-            return buildEntityUrl(baseUrl, spaceId, workspaceId, entityId) + defectTestsUrl;
+        if (("defect").equals(subtype) && octaneServerVersion.isLessThan(new OctaneServerVersion(PluginConstants.GUNSNROSES_PUSH2))) {
+            return buildEntityUrl(sc.getLocationParts().getBaseUrl(), sc.getLocationParts().getSpaceId(), workspaceId, entityId) + TESTS_URL_FOR_DEFECTS;
         } else {
-            return buildEntityUrl(baseUrl, spaceId, workspaceId, entityId) + "&tabName=" + getTestTabName();
+            return buildEntityUrl(sc.getLocationParts().getBaseUrl(), sc.getLocationParts().getSpaceId(), workspaceId, entityId) + "&tabName=" + getTestTabName();
         }
     }
 

src/main/java/com/microfocus/octane/plugins/descriptors/OctaneEntityTypeManager.java

@@ -28,7 +28,7 @@ public class OctaneEntityTypeManager {
         //TYPE
         OctaneEntityTypeDescriptor featureType = new OctaneEntityTypeDescriptor("feature", null, "F", "Feature", "#e57828", "work_item", "tests_in_backlog", "covered_content", "work_items_of_last_run");
         OctaneEntityTypeDescriptor storyType = new OctaneEntityTypeDescriptor("story", null, "US", "User Story", "#ffb000", "work_item", "tests_in_backlog", "covered_content", "work_items_of_last_run");
-        OctaneEntityTypeDescriptor defectType = new OctaneEntityTypeDescriptor("defect", null, "D", "Defect", "#b21646", "work_item", "relationships", "covered_content", "work_items_of_last_run");
+        OctaneEntityTypeDescriptor defectType = new OctaneEntityTypeDescriptor("defect", null, "D", "Defect", "#b21646", "work_item", "tests_in_backlog", "covered_content", "work_items_of_last_run");
 
         OctaneEntityTypeDescriptor requirementType = new OctaneEntityTypeDescriptor("requirement_document", null, "RD", "Requirement", "#0b8eac", "requirement", "tests_in_requirement", "covered_requirement", null);
         OctaneEntityTypeDescriptor applicationModuleType = new OctaneEntityTypeDescriptor("product_area", "application_module", "AM", "Application Module", "#43e4ff", "product_area", "tests-in-pa", "product_areas", null);

src/main/java/com/microfocus/octane/plugins/views/CoverageUiHelper.java

@@ -241,9 +241,8 @@ public static Map<String, Object> buildCoverageContextMap(String projectKey, Str
                         //fill context map
                         octaneEntity.put("url", typeDescriptor.buildEntityUrl(spaceConfiguration.getLocationParts().getBaseUrl(),
                                 spaceConfiguration.getLocationParts().getSpaceId(), workspaceConfig.getWorkspaceId(), octaneEntity.getId()));
-                        octaneEntity.put("testTabUrl", typeDescriptor.buildTestTabEntityUrl(spaceConfiguration.getLocationParts().getBaseUrl(),
-                                spaceConfiguration.getLocationParts().getSpaceId(), workspaceConfig.getWorkspaceId(), octaneEntity.getId(),
-                                (String) octaneEntity.getFields().get("subtype")));
+                        octaneEntity.put("testTabUrl", typeDescriptor.buildTestTabEntityUrl(spaceConfiguration, workspaceConfig.getWorkspaceId(),
+                                octaneEntity.getId(), (String) octaneEntity.getFields().get("subtype")));
                         octaneEntity.put("typeAbbreviation", typeDescriptor.getTypeAbbreviation());
                         octaneEntity.put("typeColor", typeDescriptor.getTypeColor());
                         contextMap.put("octaneEntity", octaneEntity);