From 7fd63f1cf224f38672d76b7a56ce82409e8b99eb Mon Sep 17 00:00:00 2001 From: Jared Stewart Date: Thu, 5 Jan 2017 14:44:58 -0800 Subject: [PATCH 1/3] GEODE-1114: RemoveGemfireXD references from Pulse --- .../pulse/internal/PulseAppListener.java | 15 -- .../internal/controllers/PulseController.java | 14 -- .../pulse/internal/data/JMXDataUpdater.java | 168 +----------------- .../service/ClusterMemberService.java | 8 +- .../service/ClusterRegionService.java | 10 +- .../service/ClusterRegionsService.java | 13 +- .../service/ClusterSelectedRegionService.java | 18 +- .../service/MemberDetailsService.java | 7 +- .../service/MemberRegionsService.java | 9 +- .../main/webapp/WEB-INF/spring-security.xml | 1 - .../scripts/pulsescript/MemberDetails.js | 27 +-- .../scripts/pulsescript/clusterDetail.js | 46 +---- .../main/webapp/scripts/pulsescript/common.js | 5 +- .../scripts/pulsescript/pages/DataBrowser.js | 16 +- .../webapp/scripts/pulsescript/pages/Login.js | 24 --- .../scripts/pulsescript/queryStatistics.js | 7 +- .../webapp/scripts/pulsescript/regionView.js | 11 +- .../controllers/PulseControllerJUnitTest.java | 9 +- .../pulse/tests/ui/PulseAutomatedTest.java | 6 +- 19 files changed, 44 insertions(+), 370 deletions(-) diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java index 87402884d8f2..5408a5651774 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java @@ -114,12 +114,6 @@ public void contextInitialized(ServletContextEvent event) { // in present deployment String pulseProduct = pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_PRODUCTSUPPORT); - // default is gemfire - - if ((pulseProduct != null) - && (pulseProduct.trim().equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE))) { - PulseController.setPulseProductSupport(PulseConstants.PRODUCT_NAME_SQLFIRE); - } } pulseSecurityProperties = loadProperties(PulseConstants.PULSE_SECURITY_PROPERTIES_FILE); @@ -164,15 +158,6 @@ public void contextInitialized(ServletContextEvent event) { } sysPulsePort = PulseConstants.GEMFIRE_DEFAULT_PORT; - boolean pulseEmbededSqlf = - Boolean.getBoolean(PulseConstants.SYSTEM_PROPERTY_PULSE_EMBEDDED_SQLF); - if (pulseEmbededSqlf) { - PulseController.setPulseProductSupport(PulseConstants.PRODUCT_NAME_SQLFIRE); - if (LOGGER.infoEnabled()) { - LOGGER.info(resourceBundle.getString("LOG_MSG_APP_RUNNING_EMBEDDED_SQLF_MODE")); - } - } - } else { // Application Pulse is running in Non-Embedded Mode if (LOGGER.infoEnabled()) { diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java index 4bf107f3dfba..1fd2361020c0 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java @@ -501,18 +501,4 @@ public void getQueryStatisticsGridModel(HttpServletRequest request, HttpServletR } } } - - /** - * @return the pulseProductSupport - */ - public static String getPulseProductSupport() { - return pulseProductSupport; - } - - /** - * @param pulseProductSupport the pulseProductSupport to set - */ - public static void setPulseProductSupport(String pulseProductSupport) { - PulseController.pulseProductSupport = pulseProductSupport; - } } diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java index 5b9e4466feec..5c30501a2c07 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java @@ -120,13 +120,6 @@ public JMXDataUpdater(String server, String port, Cluster cluster) { this.MBEAN_OBJECT_NAME_STATEMENT_DISTRIBUTED = new ObjectName(PulseConstants.OBJECT_NAME_STATEMENT_DISTRIBUTED); - // For SQLFire - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - this.MBEAN_OBJECT_NAME_TABLE_AGGREGATE = - new ObjectName(PulseConstants.OBJECT_NAME_TABLE_AGGREGATE); - } - } catch (MalformedObjectNameException e) { if (LOGGER.severeEnabled()) { LOGGER.severe(e.getMessage(), e); @@ -439,27 +432,9 @@ public boolean updateData() { Set tableMBeans = this.mbs.queryNames(this.MBEAN_OBJECT_NAME_TABLE_AGGREGATE, null); - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - // For SQLfire - for (ObjectName tableMBean : tableMBeans) { - String regNameFromTable = - StringUtils.getRegionNameFromTableName(tableMBean.getKeyProperty("table")); - for (ObjectName regionMBean : regionMBeans) { - String regionName = regionMBean.getKeyProperty("name"); - if (regNameFromTable.equals(regionName)) { - updateClusterRegion(regionMBean); - // Increment cluster region count - cluster.setTotalRegionCount(cluster.getTotalRegionCount() + 1); - break; - } - } - } - } else { - // For Gemfire - for (ObjectName regMBean : regionMBeans) { - updateClusterRegion(regMBean); - } + // For Gemfire + for (ObjectName regMBean : regionMBeans) { + updateClusterRegion(regMBean); } // Remove deleted regions from cluster's regions list @@ -477,22 +452,7 @@ public boolean updateData() { } else { switch (service) { case PulseConstants.MBEAN_KEY_PROPERTY_SERVICE_VALUE_REGION: - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - // For SQLfire - for (ObjectName tableMBean : tableMBeans) { - String regNameFromTable = - StringUtils.getRegionNameFromTableName(tableMBean.getKeyProperty("table")); - String regionName = memMBean.getKeyProperty("name"); - if (regNameFromTable.equals(regionName)) { - updateMemberRegion(memMBean); - break; - } - } - } else { - // For Gemfire - updateMemberRegion(memMBean); - } + updateMemberRegion(memMBean); break; case PulseConstants.MBEAN_KEY_PROPERTY_SERVICE_VALUE_CACHESERVER: updateMemberClient(memMBean); @@ -578,16 +538,9 @@ private void updateClusterSystem(ObjectName mbeanName) throws IOException { this.isAddedNotiListner = true; } - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - // Reset to zero - cluster.setServerCount(0); - cluster.setTotalRegionCount(0); - } else { - String[] serverCnt = (String[]) (this.mbs.invoke(mbeanName, - PulseConstants.MBEAN_OPERATION_LISTSERVERS, null, null)); - cluster.setServerCount(serverCnt.length); - } + String[] serverCnt = (String[]) (this.mbs.invoke(mbeanName, + PulseConstants.MBEAN_OPERATION_LISTSERVERS, null, null)); + cluster.setServerCount(serverCnt.length); TabularData table = (TabularData) (this.mbs.invoke(mbeanName, PulseConstants.MBEAN_OPERATION_VIEWREMOTECLUSTERSTATUS, null, null)); @@ -714,64 +667,10 @@ private void updateClusterSystem(ObjectName mbeanName) throws IOException { cluster.getGarbageCollectionTrend().add(cluster.getGarbageCollectionCount()); break; case PulseConstants.MBEAN_ATTRIBUTE_TOTALREGIONCOUNT: - if (!PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - // for Gemfire - cluster.setTotalRegionCount( - getIntegerAttribute(attribute.getValue(), attribute.getName())); - } - break; - } - } - - // SQLFIRE attributes - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - - try { // get sqlfire cluster mbean - - ObjectName sfMemberMbeansObjectName = - new ObjectName(PulseConstants.OBJECT_NAME_SF_CLUSTER); - - Set sfCluserMBeans = this.mbs.queryNames(sfMemberMbeansObjectName, null); - - for (ObjectName sfCluserMBean : sfCluserMBeans) { - - AttributeList attrList = - this.mbs.getAttributes(sfCluserMBean, PulseConstants.SF_CLUSTER_MBEAN_ATTRIBUTES); - - for (int i = 0; i < attrList.size(); i++) { - - Attribute attribute = (Attribute) attrList.get(i); - - if (attribute.getName() - .equals(PulseConstants.MBEAN_ATTRIBUTE_PROCEDURECALLSINPROGRESS)) { - try { - cluster.setRunningFunctionCount( - getIntegerAttribute(attribute.getValue(), attribute.getName())); - } catch (Exception e) { - cluster.setRunningFunctionCount(0); - continue; - } - } else if (attribute.getName() - .equals(PulseConstants.MBEAN_ATTRIBUTE_NETWORKSERVERCLIENTCONNECTIONSTATS)) { - // set number of cluster's clients - CompositeData nscConnStats = (CompositeData) attribute.getValue(); - - cluster.setClientConnectionCount(getLongAttribute( - nscConnStats.get(PulseConstants.COMPOSITE_DATA_KEY_CONNECTIONSACTIVE), - PulseConstants.COMPOSITE_DATA_KEY_CONNECTIONSACTIVE)); - } - } + cluster.setTotalRegionCount( + getIntegerAttribute(attribute.getValue(), attribute.getName())); break; - } - - } catch (MalformedObjectNameException e) { - LOGGER.warning(e); - } catch (NullPointerException e) { - LOGGER.warning(e); } - } } catch (InstanceNotFoundException infe) { @@ -1684,55 +1583,6 @@ private Cluster.Member initializeMember(ObjectName mbeanName, Cluster.Member mem } } - // SQLFire specific attributes - if (PulseController.getPulseProductSupport() - .equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)) { - - try { - // get sqlfire mbeans - String memberName = mbeanName.getKeyProperty(PulseConstants.MBEAN_KEY_PROPERTY_MEMBER); - - ObjectName sfMemberMbeansObjectName = - new ObjectName(PulseConstants.OBJECT_NAME_SF_MEMBER_PATTERN + memberName); - - Set sfMemberMBeans = this.mbs.queryNames(sfMemberMbeansObjectName, null); - for (ObjectName sfMemberMBean : sfMemberMBeans) { - - AttributeList attrList = - this.mbs.getAttributes(sfMemberMBean, PulseConstants.SF_MEMBER_MBEAN_ATTRIBUTES); - for (int i = 0; i < attrList.size(); i++) { - - Attribute attribute = (Attribute) attrList.get(i); - - if (attribute.getName().equals(PulseConstants.MBEAN_ATTRIBUTE_DATASTORE)) { - member.setServer(getBooleanAttribute(attribute.getValue(), attribute.getName())); - - // Update Server count - if (member.isServer()) { - cluster.setServerCount(cluster.getServerCount() + 1); - } - } else if (attribute.getName() - .equals(PulseConstants.MBEAN_ATTRIBUTE_NETWORKSERVERCLIENTCONNECTIONSTATS)) { - - CompositeData nscConnStats = (CompositeData) attribute.getValue(); - - // Update sqlfire client count - member.setNumSqlfireClients(getLongAttribute( - nscConnStats.get(PulseConstants.COMPOSITE_DATA_KEY_CONNECTIONSACTIVE), - PulseConstants.COMPOSITE_DATA_KEY_CONNECTIONSACTIVE)); - } - } - break; - } - - } catch (MalformedObjectNameException e) { - LOGGER.warning(e); - } catch (NullPointerException e) { - LOGGER.warning(e); - } - - } - return member; } diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java index 3cd617cee560..b6a129d05126 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java @@ -108,12 +108,8 @@ public ObjectNode execute(final HttpServletRequest request) throws Exception { memberJSON.put("threads", clusterMember.getNumThreads()); // Number of member clients - if (PulseController.getPulseProductSupport() - .equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)) { - memberJSON.put("clients", clusterMember.getNumSqlfireClients()); - } else { - memberJSON.put("clients", clusterMember.getMemberClientsHMap().size()); - } + memberJSON.put("clients", clusterMember.getMemberClientsHMap().size()); + memberJSON.put("queues", clusterMember.getQueueBacklog()); memberListJson.add(memberJSON); diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java index e862615e9ad6..2e0a6f4b40c7 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java @@ -166,13 +166,9 @@ private ArrayNode getRegionJson(Cluster cluster) { regionJSON.put("compressionCodec", VALUE_NA); } - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - // Convert region path to dot separated region path - regionJSON.put("regionPath", StringUtils.getTableNameFromRegionName(reg.getFullPath())); - } else { - regionJSON.put("regionPath", reg.getFullPath()); - } + + regionJSON.put("regionPath", reg.getFullPath()); + regionJSON.put("memoryReadsTrend", mapper .valueToTree(reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_GETS_PER_SEC_TREND))); diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java index 0579ccb16daa..79937425fa9a 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java @@ -160,15 +160,10 @@ private ArrayNode getRegionJson(Cluster cluster) { regionJSON.put("compressionCodec", this.VALUE_NA); } - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - // Convert region path to dot separated region path - regionJSON.put("regionPath", StringUtils.getTableNameFromRegionName(reg.getFullPath())); - regionJSON.put("id", StringUtils.getTableNameFromRegionName(reg.getFullPath())); - } else { - regionJSON.put("regionPath", reg.getFullPath()); - regionJSON.put("id", reg.getFullPath()); - } + + regionJSON.put("regionPath", reg.getFullPath()); + regionJSON.put("id", reg.getFullPath()); + regionJSON.put("memoryReadsTrend", mapper .valueToTree(reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_GETS_PER_SEC_TREND))); diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java index 2b72e610ebf8..e94ef631724b 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java @@ -170,12 +170,8 @@ private ObjectNode getSelectedRegionJson(Cluster cluster, String selectedRegionF regionMember.put("sockets", member.getTotalFileDescriptorOpen()); regionMember.put("threads", member.getNumThreads()); - if (PulseController.getPulseProductSupport() - .equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)) { - regionMember.put("clients", member.getNumSqlfireClients()); - } else { - regionMember.put("clients", member.getMemberClientsHMap().size()); - } + regionMember.put("clients", member.getMemberClientsHMap().size()); + regionMember.put("queues", member.getQueueBacklog()); memberArray.add(regionMember); } @@ -196,13 +192,9 @@ private ObjectNode getSelectedRegionJson(Cluster cluster, String selectedRegionF regionJSON.put("compressionCodec", PulseService.VALUE_NA); } - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - // Convert region path to dot separated region path - regionJSON.put("regionPath", StringUtils.getTableNameFromRegionName(reg.getFullPath())); - } else { - regionJSON.put("regionPath", reg.getFullPath()); - } + + regionJSON.put("regionPath", reg.getFullPath()); + regionJSON.put("memoryReadsTrend", mapper.valueToTree( reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_GETS_PER_SEC_TREND))); diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java index e69bfa560fca..c311c67413eb 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java @@ -77,12 +77,7 @@ public ObjectNode execute(final HttpServletRequest request) throws Exception { responseJSON.put("regionsCount", clusterMember.getMemberRegionsList().length); // Number of member clients - if (PulseController.getPulseProductSupport() - .equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)) { - responseJSON.put("numClients", clusterMember.getNumSqlfireClients()); - } else { - responseJSON.put("numClients", clusterMember.getMemberClientsHMap().size()); - } + responseJSON.put("numClients", clusterMember.getMemberClientsHMap().size()); Long diskUsageVal = clusterMember.getTotalDiskUsage(); Double diskUsage = diskUsageVal.doubleValue() / 1024; diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java index d7e56b103080..c8addd979d72 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java @@ -79,14 +79,7 @@ public ObjectNode execute(final HttpServletRequest request) throws Exception { ObjectNode regionJSON = mapper.createObjectNode(); regionJSON.put(this.NAME, memberRegion.getName()); - if (PulseConstants.PRODUCT_NAME_SQLFIRE - .equalsIgnoreCase(PulseController.getPulseProductSupport())) { - // Convert region path to dot separated region path - regionJSON.put("fullPath", - StringUtils.getTableNameFromRegionName(memberRegion.getFullPath())); - } else { - regionJSON.put("fullPath", memberRegion.getFullPath()); - } + regionJSON.put("fullPath", memberRegion.getFullPath()); regionJSON.put("type", memberRegion.getRegionType()); regionJSON.put("entryCount", memberRegion.getSystemRegionEntryCount()); diff --git a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml index 2842f64e5232..47d181141c4b 100644 --- a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml +++ b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml @@ -29,7 +29,6 @@ - diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js b/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js index b41b2897802f..650f30d2b26e 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js @@ -35,11 +35,9 @@ $(document).ready(function() { // modify UI text as per requirement customizeUI(); - if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) { - alterHtmlContainer(CONST_BACKEND_PRODUCT_SQLFIRE); - } else { - alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE); - } + + alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE); + scanPageForWidgets(); createMemberRegionsTreeMap(); @@ -193,19 +191,8 @@ function hideAsyncEventQueuePopup() { * is sqlfire or gemfire */ function alterHtmlContainer(prodname) { - if (CONST_BACKEND_PRODUCT_SQLFIRE == prodname.toLowerCase()) { - // Hide HTML for following - - // Show HTML for following - $('#subTabQueryStatistics').show(); - } else { // Hide HTML for following $('#subTabQueryStatistics').hide(); - - // Show HTML for following - - } - } // Function to generate HTML for Members list drop down @@ -1009,14 +996,6 @@ function createMemberRegionsGrid() { mRLC.css("position", "relative"); mRLC.css('right', scrollPositionX); }); - - // change col names depend on product - if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) { - jQuery("#memberRegionsList").jqGrid('setLabel', 'entryCount', - jQuery.i18n.prop('pulse-entrycount-custom')); - jQuery("#memberRegionsList").jqGrid('setLabel', 'entrySize', - jQuery.i18n.prop('pulse-entrysize-custom')); - } } }); } diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js index 78c9cda5f169..f4bdddec343b 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js @@ -42,24 +42,14 @@ $(document).ready(function() { // modify UI text as per requirement customizeUI(); - if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) { - alterHtmlContainer(CONST_BACKEND_PRODUCT_SQLFIRE); + alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE); - // "ClusterDetails" service callback handler - getClusterDetailsBack = getClusterDetailsSQLfireBack; + // "ClusterDetails" service callback handler + getClusterDetailsBack = getClusterDetailsGemfireBack; - // "ClusterKeyStatistics" service callback handler - getClusterKeyStatisticsBack = getClusterKeyStatisticsSQLfireBack; + // "ClusterKeyStatistics" service callback handler + getClusterKeyStatisticsBack = getClusterKeyStatisticsGemfireBack; - } else { - alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE); - - // "ClusterDetails" service callback handler - getClusterDetailsBack = getClusterDetailsGemfireBack; - - // "ClusterKeyStatistics" service callback handler - getClusterKeyStatisticsBack = getClusterKeyStatisticsGemfireBack; - } // Add hostspot attributes hotspotAttributes = new Array(); @@ -106,17 +96,6 @@ $(document).ready(function() { * is sqlfire or gemfire */ function alterHtmlContainer(prodname){ - if(CONST_BACKEND_PRODUCT_SQLFIRE == prodname.toLowerCase()){ - // Hide HTML for following - $('#clusterUniqueCQsContainer').hide(); - $('#SubscriptionsContainer').hide(); - $('#queriesPerSecContainer').hide(); - - // Show HTML for following - $('#subTabQueryStatistics').show(); - $('#TxnCommittedContainer').show(); - $('#TxnRollbackContainer').show(); - }else{ // Hide HTML for following $('#subTabQueryStatistics').hide(); $('#TxnCommittedContainer').hide(); @@ -126,8 +105,6 @@ function alterHtmlContainer(prodname){ $('#clusterUniqueCQsContainer').show(); $('#SubscriptionsContainer').show(); $('#queriesPerSecContainer').show(); - } - } // Function called when Hotspot is changed @@ -1481,18 +1458,7 @@ function createRegionsGridDefault() { mRLC.css("position", "relative"); mRLC.css('right', scrollPositionX); }); - - // change col names depend on product - if(CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()){ - jQuery("#regionsList").jqGrid('setLabel', 'name', jQuery.i18n.prop('pulse-regiontableName-custom')); - jQuery("#regionsList").jqGrid('setLabel', 'regionPath', jQuery.i18n.prop('pulse-regiontablePathColName-custom')); - jQuery("#regionsList").jqGrid('setLabel', 'getsRate', jQuery.i18n.prop('pulse-readsRate-custom')); - jQuery("#regionsList").jqGrid('setLabel', 'putsRate', jQuery.i18n.prop('pulse-writesRate-custom')); - jQuery("#regionsList").jqGrid('setLabel', 'writes', jQuery.i18n.prop('pulse-writes-custom')); - jQuery("#regionsList").jqGrid('setLabel', 'reads', jQuery.i18n.prop('pulse-reads-custom')); - jQuery("#regionsList").jqGrid('setLabel', 'systemRegionEntryCount', jQuery.i18n.prop('pulse-entrycount-custom')); - jQuery("#regionsList").jqGrid('setLabel', 'entrySize', jQuery.i18n.prop('pulse-entrysize-custom')); - } + } }); } diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js index 15b18d12994e..3d0d994f96f0 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js @@ -19,7 +19,6 @@ // CONSTANTS var CONST_BACKEND_PRODUCT_GEMFIRE = "gemfire"; -var CONST_BACKEND_PRODUCT_SQLFIRE = "gemfirexd"; // "sqlfire"; var host = ''; var port = ''; @@ -71,8 +70,6 @@ function changeLocale(language, pagename) { function customizeUI() { - productname = getCookie("productname"); - // common call back function for default and selected languages var propertiesFileLoadedCallBackFunction = function() { // $.holdReady(false); @@ -95,7 +92,7 @@ function customizeUI() { // TODO : retrieve locale from VM and use it later i.e. returned from server var locale_language = 'en'; jQuery.i18n.properties({ - name : [ productname, 'default' ], + name : [ "gemfire", 'default' ], path : 'properties/', mode : 'map', cache : true, diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js index 19ac9afc07b7..9995337d5f33 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js @@ -45,11 +45,7 @@ $(document).ready(function() { // Load Notification HTML generateNotificationsPanel(); - if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) { - alterHtmlContainer(CONST_BACKEND_PRODUCT_SQLFIRE); - } else { - alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE); - } + alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE); scanPageForWidgets(); $.ajaxSetup({ cache: false }); @@ -133,14 +129,8 @@ var queryHistoryIconOnClick = function(event) { * is sqlfire or gemfire */ function alterHtmlContainer(prodname){ - if(CONST_BACKEND_PRODUCT_SQLFIRE == prodname.toLowerCase()){ - // Show HTML for following - $('#subTabQueryStatistics').show(); - }else{ - // Hide HTML for following - $('#subTabQueryStatistics').hide(); - } - + // Hide HTML for following + $('#subTabQueryStatistics').hide(); } diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js index 57fa39bb8e6d..7b483cd09334 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js @@ -18,31 +18,7 @@ */ $(document).ready(function() { - - // determine pulse back end product - $.ajax({ - url : 'pulse/pulseProductSupport', - type : 'GET', - dataType : 'json', - async : true, - success : function(data) { - // Set product name in cookie - setCookie('productname', data.product, 1); - - // modify UI text as per requirement customizeUI(); - - }, - error: function(jqXHR, textStatus, errorThrown){ - - $('#user_name').prop('disabled', true); - $('#user_password').prop('disabled', true); - $('input[type="submit"]').prop('disabled', true); - $("#errorText").html("Unable to determine backend product [Gemfire / SQLfire]
"+textStatus); - $("#errorMasterBlock").show(); - } - }); - }); // this function is called when login page loads diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js b/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js index 9a4b12e536b5..7dee29baab1f 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js @@ -32,12 +32,7 @@ $(document).ready(function() { // modify UI text as per requirement customizeUI(); - if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) { - // Do nothing - } else { - // Redirect to Cluster details page - openClusterDetail(); - } + openClusterDetail(); scanPageForWidgets(); // creating blank query statistics grid diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js b/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js index ce64c428a2f4..5ce63007b3be 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js @@ -43,11 +43,7 @@ $(document).ready(function() { // Load Notification HTML generateNotificationsPanel(); - if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) { - alterHtmlContainer(CONST_BACKEND_PRODUCT_SQLFIRE); - } else { - alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE); - } + alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE); createMemberTreeMap(); @@ -66,13 +62,8 @@ $(document).ready(function() { * is sqlfire or gemfire */ function alterHtmlContainer(prodname){ - if(CONST_BACKEND_PRODUCT_SQLFIRE == prodname.toLowerCase()){ - // Show HTML for following - $('#subTabQueryStatistics').show(); - }else{ // Hide HTML for following $('#subTabQueryStatistics').hide(); - } } //function used for applying filter of member names in data view screen diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java index a4e9903c081f..ddd799f5158e 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java @@ -122,6 +122,7 @@ public void setup() throws Exception { add(MEMBER_NAME); } }); + region.setPutsRate(12.31D); region.setGetsRate(27.99D); Cluster.RegionOnMember regionOnMember = new Cluster.RegionOnMember(); @@ -829,14 +830,6 @@ public void dataBrowserQueryHistory() throws Exception { jsonPath("$.queryHistory[0].queryText").value("\"SELECT * FROM " + REGION_PATH + "\"")); } - @Test - public void pulseProductSupport() throws Exception { - this.mockMvc - .perform(get("/pulseProductSupport") - .accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE))) - .andExpect(status().isOk()).andExpect(jsonPath("$.product").value("gemfire")); - } - @Test public void getQueryStatisticsGridModel() throws Exception { this.mockMvc diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java index 7c42e44569f3..72bd6a75402b 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java @@ -208,11 +208,11 @@ public void regionDiskWrites() { @Test public void clickHostShowsMemberTest() { clickElementUsingXpath(PulseTestLocators.TopNavigation.clusterViewLinkXpath); - clickElementUsingId(PulseTestLocators.TopologyView.nodeH1Id); + PulseTestUtils.waitForElementWithId(PulseTestLocators.TopologyView.nodeH1Id).click(); verifyElementPresentById(PulseTestLocators.TopologyView.memberM1Id); - clickElementUsingId(PulseTestLocators.TopologyView.nodeH2Id); + PulseTestUtils.waitForElementWithId(PulseTestLocators.TopologyView.nodeH2Id).click(); verifyElementPresentById(PulseTestLocators.TopologyView.memberM2Id); - clickElementUsingId(PulseTestLocators.TopologyView.nodeH3Id); + PulseTestUtils.waitForElementWithId(PulseTestLocators.TopologyView.nodeH3Id).click(); verifyElementPresentById(PulseTestLocators.TopologyView.memberM3Id); } From ac26441851039dca6db64cfc446bbde4369a2b0c Mon Sep 17 00:00:00 2001 From: Jared Stewart Date: Tue, 10 Jan 2017 10:53:49 -0800 Subject: [PATCH 2/3] GEODE-2194: Fix Pulse webapp context * Pulse no longer has redundant URLs like http://localhost/pulse/pulse/pulseVersion --- geode-pulse/src/main/webapp/DataBrowser.html | 2 +- geode-pulse/src/main/webapp/MemberDetails.html | 2 +- .../src/main/webapp/QueryStatistics.html | 2 +- .../webapp/WEB-INF/mvc-dispatcher-servlet.xml | 2 +- .../main/webapp/WEB-INF/spring-security.xml | 16 ++++++++-------- geode-pulse/src/main/webapp/WEB-INF/web.xml | 2 +- geode-pulse/src/main/webapp/clusterDetail.html | 2 +- geode-pulse/src/main/webapp/regionDetail.html | 2 +- .../scripts/pulsescript/PulseFunctions.js | 2 +- .../scripts/pulsescript/clusterDetail.js | 18 +++++++++--------- .../main/webapp/scripts/pulsescript/common.js | 18 +++++++++--------- .../scripts/pulsescript/pages/DataBrowser.js | 6 +++--- .../pulsescript/pages/DataBrowserQuery.js | 4 ++-- .../pages/DataBrowserQueryHistory.js | 2 +- .../webapp/scripts/pulsescript/pages/Login.js | 2 +- .../scripts/pulsescript/queryStatistics.js | 2 +- .../tools/pulse/tests/rules/ServerRule.java | 4 ++-- .../tools/pulse/tests/rules/WebDriverRule.java | 4 ++-- .../pulse/tests/ui/PulseAnonymousUserTest.java | 6 +++--- .../pulse/tests/ui/PulseAutomatedTest.java | 1 + .../geode/tools/pulse/tests/ui/PulseBase.java | 4 ++-- 21 files changed, 52 insertions(+), 51 deletions(-) diff --git a/geode-pulse/src/main/webapp/DataBrowser.html b/geode-pulse/src/main/webapp/DataBrowser.html index a01df6b280de..dac5a4df7b8f 100644 --- a/geode-pulse/src/main/webapp/DataBrowser.html +++ b/geode-pulse/src/main/webapp/DataBrowser.html @@ -142,7 +142,7 @@
Welcome
-
Sign Out
+
Sign Out
diff --git a/geode-pulse/src/main/webapp/MemberDetails.html b/geode-pulse/src/main/webapp/MemberDetails.html index bc946da8b175..18a5eac72efd 100644 --- a/geode-pulse/src/main/webapp/MemberDetails.html +++ b/geode-pulse/src/main/webapp/MemberDetails.html @@ -133,7 +133,7 @@
Welcome
-
Sign Out
+
Sign Out
diff --git a/geode-pulse/src/main/webapp/QueryStatistics.html b/geode-pulse/src/main/webapp/QueryStatistics.html index 543e003a0b0c..0b0e3e101488 100644 --- a/geode-pulse/src/main/webapp/QueryStatistics.html +++ b/geode-pulse/src/main/webapp/QueryStatistics.html @@ -158,7 +158,7 @@
- Sign + Sign Out
diff --git a/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml index 8cdbac9f5101..95e09db2909b 100644 --- a/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml +++ b/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml @@ -31,5 +31,5 @@ - + diff --git a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml index 47d181141c4b..cac6caffe500 100644 --- a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml +++ b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml @@ -28,31 +28,31 @@ - + - + + - - - + - + diff --git a/geode-pulse/src/main/webapp/WEB-INF/web.xml b/geode-pulse/src/main/webapp/WEB-INF/web.xml index d0b10c0dee71..1d0b261c89f9 100644 --- a/geode-pulse/src/main/webapp/WEB-INF/web.xml +++ b/geode-pulse/src/main/webapp/WEB-INF/web.xml @@ -32,7 +32,7 @@ mvc-dispatcher - /pulse/* + / org.springframework.web.context.ContextLoaderListener diff --git a/geode-pulse/src/main/webapp/clusterDetail.html b/geode-pulse/src/main/webapp/clusterDetail.html index b1fc1e0a2482..26ae3d147e40 100644 --- a/geode-pulse/src/main/webapp/clusterDetail.html +++ b/geode-pulse/src/main/webapp/clusterDetail.html @@ -123,7 +123,7 @@
Welcome
-
Sign Out
+
Sign Out
diff --git a/geode-pulse/src/main/webapp/regionDetail.html b/geode-pulse/src/main/webapp/regionDetail.html index 711ef31bd6f2..94d3b88e28be 100644 --- a/geode-pulse/src/main/webapp/regionDetail.html +++ b/geode-pulse/src/main/webapp/regionDetail.html @@ -215,7 +215,7 @@

M1

Welcome
-
Sign Out
+
Sign Out
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js b/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js index fd1e8de27e3b..53fbce06f4b2 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js @@ -43,7 +43,7 @@ function PulseFunctions() { PulseFunctions.prototype.pulseVersion = function(responseBack) { var po = new Object(); po.traceNo = UUIDv4(); - ajaxPost("pulse/pulseVersion", po, responseBack); + ajaxPost("pulseVersion", po, responseBack); }; PulseFunctions.prototype.CluserAlertNotificationFunc = function (funcName, postData) { diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js index f4bdddec343b..3fe49eb57c79 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js @@ -1953,7 +1953,7 @@ function showMembersDefaultRgraphPanel() { // populateMemberRGraph using pulseUpdate var pulseData = new Object(); pulseData.ClusterMembersRGraph = ""; - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberRGraphBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberRGraphBack); } @@ -1965,7 +1965,7 @@ function showMembersDefaultTreemapPanel() { // populate Member TreeMap using pulseUpdate var pulseData = new Object(); pulseData.ClusterMembers = ""; - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack); } @@ -1978,7 +1978,7 @@ function showMembersDefaultGridPanel() { // populate Member Grid using pulseUpdate var pulseData = new Object(); pulseData.ClusterMembers = ""; // getClusterMembersBack - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack); $('#default_grid_block').hide(); destroyScrollPane('gview_memberList'); @@ -2003,7 +2003,7 @@ function showMembersSGTreemapPanel() { // populate Member TreeMap using pulseUpdate var pulseData = new Object(); pulseData.ClusterMembers = ""; - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack); } @@ -2015,7 +2015,7 @@ function showMembersSGGridPanel() { // populate Member Grid using pulseUpdate var pulseData = new Object(); pulseData.ClusterMembers = ""; // getClusterMembersBack - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack); $('#servergroups_grid_block').hide(); destroyScrollPane('gview_memberListSG'); @@ -2040,7 +2040,7 @@ function showMembersRZTreemapPanel() { // populate Member TreeMap using pulseUpdate var pulseData = new Object(); pulseData.ClusterMembers = ""; - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack); } //Show Members Redundancy Zones Grid View and hide rest @@ -2051,7 +2051,7 @@ function showMembersRZGridPanel() { // populate Member Grid using pulseUpdate var pulseData = new Object(); pulseData.ClusterMembers = ""; - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack); $('#redundancyzones_grid_block').hide(); destroyScrollPane('gview_memberListRZ'); @@ -2076,7 +2076,7 @@ function showDataTreemapPanel() { // populate Region TreeMap using pulseUpdate var pulseData = new Object(); pulseData.ClusterRegions = ""; - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterRegionsBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterRegionsBack); } @@ -2088,7 +2088,7 @@ function showDataGridPanel() { // populate Regions Grid using pulseUpdate var pulseData = new Object(); pulseData.ClusterRegions = ""; - ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterRegionsBack); + ajaxPost("pulseUpdate", pulseData, translateGetClusterRegionsBack); $('#data_grid_block').hide(); destroyScrollPane('gview_regionsList'); diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js index 3d0d994f96f0..550af7c9ab49 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js @@ -174,7 +174,7 @@ function clearAlerts(alertType, flagClearAll) { requestData.alertType = -1; } - $.getJSON("pulse/clearAlerts", requestData, function(data) { + $.getJSON("clearAlerts", requestData, function(data) { // call system alerts callback handler getSystemAlertsBack(data); @@ -259,7 +259,7 @@ function displayClusterStatus() { var data = { "pulseData" : this.toJSONObj(postData) }; - $.post("pulse/pulseUpdate", data, function(data) { + $.post("pulseUpdate", data, function(data) { updateRGraphFlags(); clusteRGraph.loadJSON(data.clustor); clusteRGraph.compute('end'); @@ -277,7 +277,7 @@ function displayClusterStatus() { "pulseData" : this.toJSONObj(postData) }; - $.post("pulse/pulseUpdate", data, function(data) { + $.post("pulseUpdate", data, function(data) { var members = data.members; memberCount = members.length; var childerensVal = []; @@ -1174,7 +1174,7 @@ function acknowledgeAlert(divId) { "alertId" : divId }; $.getJSON( - "pulse/acknowledgeAlert", + "acknowledgeAlert", requestData, function(data) { // Change color of alert title @@ -1419,7 +1419,7 @@ function prepareDataAndPost(functionTimingList) { + "var funcCall = 'pf.'+functionName + \"('\" +functionName+\"',postData);\";\n" + "eval(funcCall);\n" + "}\n" - + "ajaxPost(\"pulse/pulseUpdate\", postData, responseCallbackHandler);\n" + + "ajaxPost(\"pulseUpdate\", postData, responseCallbackHandler);\n" + "postData = null;\n" + "postData = new Object();\n" + "}," + timing + ");"; var loadOnStart = "setTimeout(function() {\n" @@ -1432,7 +1432,7 @@ function prepareDataAndPost(functionTimingList) { + "var funcCall = 'pf.'+functionName + \"('\" +functionName+\"',postData);\";\n" + "eval(funcCall);\n" + "}\n" - + "ajaxPost(\"pulse/pulseUpdate\", postData, responseCallbackHandler);\n" + + "ajaxPost(\"pulseUpdate\", postData, responseCallbackHandler);\n" + "postData = null;\n" + "postData = new Object();\n" + "},0);"; functionArray[i] = func; functionStartArray[i] = loadOnStart; @@ -1456,7 +1456,7 @@ function prepareDataAndPost(functionTimingList) { * j++) { var functionName = listOfPulseFunction[j]; //Create the function call * from function name and parameter. var funcCall = 'pf.'+functionName + "('" + * functionName + "',postData);"; //Call the function eval(funcCall); } - * ajaxPost("pulse/pulseUpdate", postData, responseCallbackHandler); postData = + * ajaxPost("pulseUpdate", postData, responseCallbackHandler); postData = * null; postData = new Object(); }, timing); } } */ @@ -1476,13 +1476,13 @@ var responseCallbackHandler = function(data) { * Use this function to force periodic update of pulse data. */ function forcePulseDataUpdate(postData){ - ajaxPost("pulse/pulseUpdate", postData, responseCallbackHandler); + ajaxPost("pulseUpdate", postData, responseCallbackHandler); } // function used for getting pulse version function getPulseVersion() { - $.getJSON("pulse/pulseVersion", function(data) { + $.getJSON("pulseVersion", function(data) { var pulseVersion = data.pulseVersion; $('#pulseVersion').html(pulseVersion); diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js index 9995337d5f33..5bbcd7534864 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js @@ -52,7 +52,7 @@ $(document).ready(function() { var requestData = {}; getRequestParams(); - $.getJSON("pulse/authenticateUser", requestData, function(data) { + $.getJSON("authenticateUser", requestData, function(data) { // return isUserLoggedIn if(!data.isUserLoggedIn){ @@ -172,7 +172,7 @@ function initClusterRegions(){ function updateDataBrowserRegionsData(){ requestData = {}; - $.getJSON("pulse/dataBrowserRegions", requestData, function(data) { + $.getJSON("dataBrowserRegions", requestData, function(data) { // set cluster name on tab link to cluster page if(data.clusterName != undefined && data.clusterName != null){ @@ -593,7 +593,7 @@ function dynamicSort(property, passedSortOrder) { * Function to get basic details on Data Browser Page */ function getClusterBasicDetails(){ - $.getJSON("pulse/dataBrowserBasicDetails", function(data) { + $.getJSON("dataBrowserBasicDetails", function(data) { $('#userName').html(data.userName); diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js index df78be2f6bdb..39aae572837b 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js @@ -101,7 +101,7 @@ function executeDBQuery(){ $('#memberAccordion').html(''); } - $.getJSON("pulse/dataBrowserQuery", requestData, function(data) { + $.getJSON("dataBrowserQuery", requestData, function(data) { if(data != undefined && data != null){ if(data.error != undefined && data.error != null){ @@ -958,7 +958,7 @@ function exportResult() { $.generateFile({ filename : 'export.json', content : JSON.stringify(responseResult), - script : 'pulse/dataBrowserExport' + script : 'dataBrowserExport' }); } } diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js index 8da6fe8f5b3d..77f939e82f95 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js @@ -26,7 +26,7 @@ function updateQueryHistory(action,queryId) { queryId:queryId }; - $.getJSON("pulse/dataBrowserQueryHistory", requestData, function(data) { + $.getJSON("dataBrowserQueryHistory", requestData, function(data) { var queries = new Array(); if(data.queryHistory != undefined && data.queryHistory != null){ diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js index 7b483cd09334..b26e91917ca0 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js @@ -26,7 +26,7 @@ function pageOnLoad(){ // get Pulse Version Details getPulseVersion(); - $.getJSON("pulse/authenticateUser", function(data) { + $.getJSON("authenticateUser", function(data) { // return isUserLoggedIn if(data.isUserLoggedIn){ diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js b/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js index 7dee29baab1f..d3b32c44031c 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js @@ -61,7 +61,7 @@ var customSortFunction = function(cell, rowObject) { function createQueryStatisticsGrid() { $.ajax({ - url : 'pulse/getQueryStatisticsGridModel', + url : 'getQueryStatisticsGridModel', type : 'GET', dataType : 'json', async : false, diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java index 308489cc23b2..7822caa9b973 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java @@ -30,8 +30,8 @@ import java.util.Properties; public class ServerRule extends ExternalResource { - public static final String LOCALHOST = "localhost"; - public static final String PULSE_CONTEXT = "/pulse"; + private static final String LOCALHOST = "localhost"; + private static final String PULSE_CONTEXT = "/pulse/"; private org.eclipse.jetty.server.Server jetty; private Server server; diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java index 8a4e7f4e0432..4215615f8ca1 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java @@ -59,7 +59,7 @@ public String getPulseURL() { @Override protected void before() throws Throwable { setUpWebDriver(); - driver.get(getPulseURL()); + driver.get(getPulseURL() + "Login.html"); if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) { login(); } @@ -78,7 +78,7 @@ private void login() { passwordElement.sendKeys(password); passwordElement.submit(); - driver.get(getPulseURL() + "/clusterDetail.html"); + driver.get(getPulseURL() + "clusterDetail.html"); WebElement userNameOnPulsePage = (new WebDriverWait(driver, 10)).until(new ExpectedCondition() { @Override diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java index 680b11f143ca..b37551b565da 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java @@ -48,12 +48,12 @@ public class PulseAnonymousUserTest { @Before public void setup() { - webDriverRule.getDriver().get(serverRule.getPulseURL() + "/clusterDetail.html"); + webDriverRule.getDriver().get(serverRule.getPulseURL() + "clusterDetail.html"); } @Test public void userCanGetToPulseLoginPage() { - webDriverRule.getDriver().get(serverRule.getPulseURL() + "/Login.html"); + webDriverRule.getDriver().get(serverRule.getPulseURL() + "Login.html"); WebElement userNameElement = webDriverRule.getDriver().findElement(By.id("user_name")); WebElement passwordElement = webDriverRule.getDriver().findElement(By.id("user_password")); @@ -64,7 +64,7 @@ public void userCanGetToPulseLoginPage() { @Test public void userCannotGetToPulseDetails() { - webDriverRule.getDriver().get(serverRule.getPulseURL() + "/pulse/pulseVersion"); + webDriverRule.getDriver().get(serverRule.getPulseURL() + "pulseVersion"); assertThat(webDriverRule.getDriver().getPageSource()).doesNotContain("sourceRevision"); } diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java index 72bd6a75402b..b19416c3b2e9 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java @@ -74,6 +74,7 @@ public String getPulseURL() { @Before public void setupPulseTestUtils() { PulseTestUtils.setDriverProvider(() -> webDriverRule.getDriver()); + getWebDriver().get(getPulseURL() + "clusterDetail.html"); } @Test diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java index 25bdef004916..9754839704bc 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java @@ -876,8 +876,8 @@ public void testDataBrowser() { } @Test - public void userCannotGetToPulseDetails() { - getWebDriver().get(getPulseURL() + "/pulse/pulseVersion"); + public void userCanGetToPulseDetails() { + getWebDriver().get(getPulseURL() + "pulseVersion"); assertTrue(getWebDriver().getPageSource().contains("sourceRevision")); } From 89958e604daaf066782aba90e40110d83ff9dc04 Mon Sep 17 00:00:00 2001 From: Jared Stewart Date: Wed, 4 Jan 2017 17:08:59 -0800 Subject: [PATCH 3/3] GEODE-2272: Fix Pulse data browser export --- .../dunit/rules/LocatorServerStartupRule.java | 26 ++++ .../internal/controllers/PulseController.java | 61 ++++---- .../pulsescript/pages/DataBrowserQuery.js | 26 +++- .../pulse/tests/PulseDataExportTest.java | 137 ++++++++++++++++++ .../pulse/tests/rules/WebDriverRule.java | 25 ++-- .../geode/tools/pulse/tests/ui/PulseBase.java | 38 +---- 6 files changed, 235 insertions(+), 78 deletions(-) create mode 100644 geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseDataExportTest.java diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java index 300d75a4eba7..211a8c6ca085 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java @@ -30,6 +30,7 @@ import java.io.File; import java.io.IOException; import java.io.Serializable; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -97,6 +98,31 @@ public Locator startLocatorVM(int index, Properties locatorProperties) throws IO return locator; } + public Locator startLocatorVMWithPulse(int index, Properties locatorProperties) + throws IOException { + String name = "locator-" + index; + locatorProperties.setProperty(NAME, name); + File workingDir = createWorkingDirForMember(name); + + // Setting gemfire.home to this value allows locators started by the rule to run Pulse + String geodeInstallDir = new File(".").getAbsoluteFile().getParentFile().getParentFile() + .toPath().resolve("geode-assembly").resolve("build").resolve("install") + .resolve("apache-geode").toString(); + + VM locatorVM = getHost(0).getVM(index); + int locatorPort = locatorVM.invoke(() -> { + System.setProperty("user.dir", workingDir.getCanonicalPath()); + System.setProperty("gemfire.home", geodeInstallDir); + locatorStarter = new LocatorStarterRule(locatorProperties); + locatorStarter.startLocator(); + return locatorStarter.locator.getPort(); + }); + Locator locator = new Locator(locatorVM, locatorPort, workingDir); + members.add(index, locator); + return locator; + } + + public Locator startLocatorVM(int index) throws IOException { return startLocatorVM(index, new Properties()); } diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java index 1fd2361020c0..9b24393792cc 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java @@ -28,6 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.sun.net.httpserver.Headers; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.PulseConstants; import org.apache.geode.tools.pulse.internal.data.PulseVersion; @@ -91,6 +92,7 @@ public void getPulseUpdate(HttpServletRequest request, HttpServletResponse respo JsonNode requestMap = null; + try { requestMap = mapper.readTree(pulseData); Iterator keys = requestMap.fieldNames(); @@ -416,46 +418,55 @@ public void dataBrowserQueryHistory(HttpServletRequest request, HttpServletRespo } } response.getOutputStream().write(responseJSON.toString().getBytes()); + + } - @RequestMapping(value = "/dataBrowserExport", method = RequestMethod.POST) + + @RequestMapping(value = "/dataBrowserExport", method = RequestMethod.GET) public void dataBrowserExport(HttpServletRequest request, HttpServletResponse response) throws IOException { - // get query string - String filename = request.getParameter("filename"); - String resultContent = request.getParameter("content"); - - response.setHeader("Cache-Control", ""); - response.setHeader("Content-type", "text/plain"); - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(filename)) { - response.setHeader("Content-Disposition", "attachment; filename=" + filename); - } else { - response.setHeader("Content-Disposition", "attachment; filename=" + DEFAULT_EXPORT_FILENAME); - } + String query = request.getParameter("query"); + String members = request.getParameter("members"); + int limit = 0; - if (!StringUtils.isNotNullNotEmptyNotWhiteSpace(resultContent)) { - resultContent = ""; + try { + limit = Integer.valueOf(request.getParameter("limit")); + } catch (NumberFormatException e) { + limit = 0; + if (LOGGER.finerEnabled()) { + LOGGER.finer(e.getMessage()); + } } - response.getOutputStream().write(resultContent.getBytes()); - } + ObjectNode queryResult = mapper.createObjectNode(); + try { - @RequestMapping(value = "/pulseProductSupport", method = RequestMethod.GET) - public void getConfiguredPulseProduct(HttpServletRequest request, HttpServletResponse response) - throws IOException { - ObjectNode responseJSON = mapper.createObjectNode(); + if (StringUtils.isNotNullNotEmptyNotWhiteSpace(query)) { + // get cluster object + Cluster cluster = Repository.get().getCluster(); + String userName = request.getUserPrincipal().getName(); - try { - responseJSON.put("product", pulseProductSupport); + // Call execute query method + queryResult = cluster.executeQuery(query, members, limit); - // Send json response - response.getOutputStream().write(responseJSON.toString().getBytes()); + // Add query in history if query is executed successfully + if (!queryResult.has("error")) { + // Add html escaped query to history + String escapedQuery = StringEscapeUtils.escapeHtml(query); + cluster.addQueryInHistory(escapedQuery, userName); + } + } } catch (Exception e) { if (LOGGER.fineEnabled()) { - LOGGER.fine("Exception Occurred : " + e.getMessage()); + LOGGER.fine("Exception Occured : " + e.getMessage()); } } + + response.setContentType("application/json"); + response.setHeader("Content-Disposition", "attachment; filename=results.json"); + response.getOutputStream().write(queryResult.toString().getBytes()); } @RequestMapping(value = "/getQueryStatisticsGridModel", method = RequestMethod.GET) diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js index 39aae572837b..534f5c87baa6 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js @@ -954,11 +954,25 @@ function generateEntryUID(prefixForId, type, len) { // Function that posts the query result response received to backend in order // export it into file function exportResult() { - if(responseResult != undefined && responseResult !== null){ - $.generateFile({ - filename : 'export.json', - content : JSON.stringify(responseResult), - script : 'dataBrowserExport' - }); + var queryText = $('#dataBrowserQueryText').val(); + var selectedMemberNames = ""; + + if(isEmpty(queryText)){ + alert("Please enter query to execute.."); + return; } + + // Determine selected members query to be execute on + if($("#membersList").html() != ""){ + var selectedMembers = $( "input[type=checkbox][name=Member]:checked" ); + for(var i=0; i< selectedMembers.length; i++){ + if(selectedMemberNames == ""){ + selectedMemberNames = selectedMembers[i].value; + }else{ + selectedMemberNames += ","+selectedMembers[i].value; + } + } + } + + window.open("dataBrowserExport?query=" + encodeURIComponent(queryText) + "&members=" + encodeURIComponent(selectedMemberNames), "_blank"); } diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseDataExportTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseDataExportTest.java new file mode 100644 index 000000000000..c44c83740c6b --- /dev/null +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseDataExportTest.java @@ -0,0 +1,137 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You 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 org.apache.geode.tools.pulse.tests; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.test.dunit.IgnoredException; +import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; +import org.apache.geode.test.dunit.rules.GfshShellConnectionRule; +import org.apache.geode.test.dunit.rules.Locator; +import org.apache.geode.test.dunit.rules.LocatorServerStartupRule; +import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.tools.pulse.tests.rules.WebDriverRule; +import org.apache.http.HttpResponse; +import org.apache.http.client.CookieStore; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.client.utils.URIBuilder; +import org.apache.http.cookie.ClientCookie; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.HttpContext; +import org.apache.http.util.EntityUtils; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.openqa.selenium.Cookie; + +import java.net.URISyntaxException; +import java.util.Properties; + +@Category(DistributedTest.class) +public class PulseDataExportTest extends JUnit4DistributedTestCase { + + @Rule + public LocatorServerStartupRule lsRule = new LocatorServerStartupRule(); + + private Locator locator; + private org.apache.geode.test.dunit.rules.Server server; + private GfshShellConnectionRule gfshConnector; + private HttpClient httpClient; + + + @Before + public void before() throws Throwable { + IgnoredException + .addIgnoredException("Failed to properly release resources held by the HTTP service:"); + IgnoredException.addIgnoredException("!STOPPED"); + + locator = lsRule.startLocatorVMWithPulse(0, new Properties()); + + gfshConnector = new GfshShellConnectionRule(locator); + gfshConnector.connect(); + assertThat(gfshConnector.isConnected()).isTrue(); + + server = lsRule.startServerVM(1, locator.getPort()); + + gfshConnector.executeAndVerifyCommand("create region --name=regionA --type=REPLICATE"); + org.apache.geode.cache.Region region = new ClientCacheFactory() + .addPoolLocator("localhost", locator.getPort()).create() + .createClientRegionFactory(ClientRegionShortcut.PROXY).create("regionA"); + + region.put("key1", "value1"); + region.put("key2", "value2"); + region.put("key3", "value3"); + + httpClient = HttpClientBuilder.create().build(); + } + + + @Test + public void dataBrowserExportWorksAsExpected() throws Throwable { + HttpGet dataExportGET = buildDataExportRequest(); + HttpContext authenticatedHttpContext = buildAuthenticatedHttpContext(); + + HttpResponse response = httpClient.execute(dataExportGET, authenticatedHttpContext); + assertThat(response.getStatusLine().getStatusCode()).describedAs(response.toString()) + .isEqualTo(200); + + String responseBody = EntityUtils.toString(response.getEntity(), "UTF-8"); + assertThat(responseBody).isEqualTo( + "{\"result\":[[\"java.lang.String\",\"value1\"],[\"java.lang.String\",\"value2\"],[\"java.lang.String\",\"value3\"]]}"); + } + + private HttpGet buildDataExportRequest() throws URISyntaxException { + URIBuilder builder = new URIBuilder(); + builder.setScheme("http").setHost("localhost").setPort(7070).setPath("/pulse/dataBrowserExport") + .setParameter("query", "select * from /regionA a order by a"); + return new HttpGet(builder.build()); + } + + private HttpContext buildAuthenticatedHttpContext() throws Throwable { + HttpContext localContext = new BasicHttpContext(); + CookieStore cookieStore = new BasicCookieStore(); + BasicClientCookie cookie = new BasicClientCookie("JSESSIONID", getAuthenticatedJSESSIONID()); + cookie.setDomain("localhost"); + cookie.setAttribute(ClientCookie.DOMAIN_ATTR, "true"); + cookie.setPath("/"); + cookieStore.addCookie(cookie); + localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore); + + return localContext; + } + + public String getAuthenticatedJSESSIONID() throws Throwable { + WebDriverRule webDriverRule = + new WebDriverRule("admin", "admin", "http://localhost:7070/pulse/"); + webDriverRule.before(); + + Cookie loginCookie = webDriverRule.getDriver().manage().getCookieNamed("JSESSIONID"); + webDriverRule.after(); + + assertThat(loginCookie.getValue()).isNotEmpty(); + return loginCookie.getValue(); + } + +} diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java index 4215615f8ca1..ca4646bc4192 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java @@ -57,7 +57,7 @@ public String getPulseURL() { } @Override - protected void before() throws Throwable { + public void before() throws Throwable { setUpWebDriver(); driver.get(getPulseURL() + "Login.html"); if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) { @@ -67,12 +67,12 @@ protected void before() throws Throwable { } @Override - protected void after() { + public void after() { driver.quit(); } private void login() { - WebElement userNameElement = waitForElementById("user_name"); + WebElement userNameElement = waitForElementById("user_name", 60); WebElement passwordElement = waitForElementById("user_password"); userNameElement.sendKeys(username); passwordElement.sendKeys(password); @@ -80,7 +80,7 @@ private void login() { driver.get(getPulseURL() + "clusterDetail.html"); WebElement userNameOnPulsePage = - (new WebDriverWait(driver, 10)).until(new ExpectedCondition() { + (new WebDriverWait(driver, 30)).until(new ExpectedCondition() { @Override public WebElement apply(WebDriver d) { return d.findElement(By.id("userName")); @@ -103,12 +103,17 @@ private void setUpWebDriver() { } public WebElement waitForElementById(final String id) { - WebElement element = (new WebDriverWait(driver, 10)).until(new ExpectedCondition() { - @Override - public WebElement apply(WebDriver d) { - return d.findElement(By.id(id)); - } - }); + return waitForElementById(id, 10); + } + + public WebElement waitForElementById(final String id, int timeoutInSeconds) { + WebElement element = + (new WebDriverWait(driver, timeoutInSeconds)).until(new ExpectedCondition() { + @Override + public WebElement apply(WebDriver d) { + return d.findElement(By.id(id)); + } + }); assertNotNull(element); return element; } diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java index 9754839704bc..90c56ce1bfde 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java @@ -838,47 +838,11 @@ public void testNumberOfRegions() throws InterruptedException { } } - @Ignore("WIP") - @Test - public void testDataBrowser() { - - getWebDriver().findElement(By.linkText("Data Browser")).click(); - // WebElement dataBrowserLabel = getWebDriver().findElement(By.xpath("")); - WebDriverWait wait = new WebDriverWait(getWebDriver(), 20); - wait.until(ExpectedConditions - .visibilityOf(getWebDriver().findElement(By.xpath("//label[text()='Data Browser']")))); - - // Verify all elements must be displayed on data browser screen - assertTrue(getWebDriver().findElement(By.xpath("//a[text()='Data Regions']")).isDisplayed()); - assertTrue(getWebDriver().findElement(By.id("linkColocatedRegions")).isDisplayed()); - assertTrue(getWebDriver().findElement(By.linkText("All Regions")).isDisplayed()); - - assertTrue(getWebDriver().findElement(By.xpath("//a[text()='Region Members']")).isDisplayed()); - - assertTrue(getWebDriver().findElement(By.xpath("//a[text()='Queries']")).isDisplayed()); - assertTrue( - getWebDriver().findElement(By.xpath("//label[text()='Query Editor']")).isDisplayed()); - assertTrue(getWebDriver().findElement(By.xpath("//label[text()='Result']")).isDisplayed()); - assertTrue( - getWebDriver().findElement(By.xpath("//input[@value='Export Result']")).isDisplayed()); - assertTrue(getWebDriver().findElement(By.id("btnExecuteQuery")).isDisplayed()); - assertTrue(getWebDriver().findElement(By.xpath("//input[@value='Clear']")).isDisplayed()); - assertTrue(getWebDriver().findElement(By.id("dataBrowserQueryText")).isDisplayed()); - - assertTrue(getWebDriver().findElement(By.id("historyIcon")).isDisplayed()); - - // Actual query execution - - getWebDriver().findElement(By.id("dataBrowserQueryText")).sendKeys("Query1"); - - // Assert data regions are displayed - assertTrue(getWebDriver().findElement(By.id("treeDemo_1")).isDisplayed()); - } - @Test public void userCanGetToPulseDetails() { getWebDriver().get(getPulseURL() + "pulseVersion"); assertTrue(getWebDriver().getPageSource().contains("sourceRevision")); } + }