From 98e71d8a8f8f3ba5a5130177c1848d6d0cf0b5fd Mon Sep 17 00:00:00 2001
From: redmitry <redmitry@list.ru>
Date: Wed, 6 Mar 2024 16:22:29 +0100
Subject: [PATCH] 'granularity' -> 'requestedGranularity' (model fix)

---
 pom.xml                                                         | 2 +-
 .../beacon/network/engine/BeaconNetworkResponseBuilder.java     | 2 +-
 .../ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b3d9a8..8acef24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
         <dependency>        
             <groupId>es.bsc.inb.ga4gh</groupId>
             <artifactId>beacon-framework</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.7</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkResponseBuilder.java b/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkResponseBuilder.java
index 984e0c8..166ae84 100644
--- a/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkResponseBuilder.java
+++ b/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkResponseBuilder.java
@@ -310,7 +310,7 @@ protected BeaconResponseMeta getMeta(
                         .collect(Collectors.toList()));
             }
 
-            request_summary.setRequestedGranularity(request_query.getGranularity());
+            request_summary.setRequestedGranularity(request_query.getRequestedGranularity());
             request_summary.setTestMode(request_query.getTestMode());
         }
         
diff --git a/src/main/java/es/bsc/inb/ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java b/src/main/java/es/bsc/inb/ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java
index 3193228..c5a4096 100644
--- a/src/main/java/es/bsc/inb/ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java
+++ b/src/main/java/es/bsc/inb/ga4gh/beacon/network/info/BeaconFilteringTermsProducer.java
@@ -186,7 +186,7 @@ private BeaconFilteringTermsResponse aggregateFilteringTerms(String scope,
                                 if (scopes == null) {
                                     filtering_term.setScopes(scopes = new ArrayList());
                                 }
-                                if (!scopes.contains(scope)) {
+                                if (scope != null && !scopes.contains(scope)) {
                                     scopes.add(scope);
                                 }
                                 terms.put(id, filtering_term);