Fix bug in jwt correction and molecular data service

cBioPortal · Dec 14, 2023 · ec2c1ad · ec2c1ad
1 parent 97b5677
commit ec2c1ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/main/java/org/cbioportal/service/impl/MolecularDataServiceImpl.java b/src/main/java/org/cbioportal/service/impl/MolecularDataServiceImpl.java
@@ -126,7 +126,7 @@ public Iterable<GeneMolecularAlteration> getMolecularAlterations(String molecula
         throws MolecularProfileNotFoundException {
 
         validateMolecularProfile(molecularProfileId);
-        if ((entrezGeneIds == null || entrezGeneIds.isEmpty()) && projection == "SUMMARY") {
+        if ((entrezGeneIds == null || entrezGeneIds.isEmpty()) && projection.equals("SUMMARY")) {
             return molecularDataRepository.getGeneMolecularAlterationsIterableFast(molecularProfileId);
         }
         return molecularDataRepository.getGeneMolecularAlterationsIterable(molecularProfileId, entrezGeneIds, projection);

diff --git a/src/main/java/org/cbioportal/service/util/JwtUtils.java b/src/main/java/org/cbioportal/service/util/JwtUtils.java
@@ -144,17 +144,11 @@ public static String createNewSecretKey() {
     }
 
     public static void main(String[] args) {
-        if (args.length < 1 || args.length > 1) {
-            usage();
-        }
-        if (args[0].equals("--make-key")) {
+    	if (args.length == 1 && args[0].equals("--make-key")) {
             System.out.println("Creating new secret key for JWTS token signing:");
             System.out.println(createNewSecretKey());
+        } else {
+        	System.out.println("usage: JwtUtils --make-key");
         }
     }
-
-    public static void usage() {
-        System.out.println("usage: JwtUtils --make-key");
-    }
-
 }