Merge branch 'master' into AUTHORING-2206-repl-activity-improvements-2

Author: ThinkThoughtThunk

.github/workflows/CI.yml

@@ -0,0 +1,25 @@
+name: Java CI
+
+on:
+  push:
+    branches:
+      - master
+      - 'SPRINT-*'
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11.0.x
+    - name: Copy env settings
+      run: cp service.example.envs service.envs
+    - name: Build with Maven
+      run: mvn clean test

src/main/java/edu/cmu/oli/content/boundary/managers/ContentResourceManager.java

@@ -32,6 +32,7 @@
 import org.apache.commons.text.StringEscapeUtils;
 import org.jdom2.DocType;
 import org.jdom2.Document;
+import org.jdom2.Element;
 import org.jdom2.JDOMException;
 import org.jdom2.input.SAXBuilder;
 import org.jdom2.input.sax.XMLReaders;
@@ -58,8 +59,7 @@
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static edu.cmu.oli.content.AppUtils.generateUID;
 import static edu.cmu.oli.content.security.Roles.ADMIN;
@@ -537,6 +537,17 @@ public Resource doCreate(String packageIdOrGuid, String resourceTypeId, JsonElem
             JsonObject organization = (JsonObject) ((JsonObject) resourceContent).get("organization");
             organization.remove("@id");
             organization.addProperty("@id", id);
+            JsonArray meta = organization.getAsJsonArray("#array");
+            if(meta!= null){
+                JsonElement icon = null;
+                for (JsonElement elem : meta) {
+                    if (elem.isJsonObject() && elem.getAsJsonObject().has("icon")) {
+                        icon = elem;
+                        break;
+                    }
+                }
+                meta.remove(icon);
+            }
             resource.setId(id);
             JsonObject metadata = new JsonObject();
             metadata.addProperty("version", "1.0");
@@ -593,7 +604,6 @@ public Resource doCreate(String packageIdOrGuid, String resourceTypeId, JsonElem
 
         // Parse update payload into final xml and json documents
         Map<String, String> contentValues = contentValues(resourceContent, resource, jsonCapable);
-
         validateXmlContent(contentPackage.getGuid(), resource, contentValues.get("xmlContent"), throwErrors);
 
         RevisionBlob revisionBlob = jsonCapable

src/main/java/edu/cmu/oli/content/boundary/managers/WebResourceManager.java

@@ -186,9 +186,13 @@ public JsonElement uploadWebcontent(AppSecurityContext session, List<InputPart>
                 }
                 String fileName = fileNameOption.get();
                 fileName = fileName.replaceAll(" ", "_");
-                String substring = fileName.substring(0, fileName.lastIndexOf('.'));
+                int extensionIndex = fileName.lastIndexOf('.');
+                if (extensionIndex == -1) {
+                    extensionIndex = fileName.length() - 1;
+                }
+                String substring = fileName.substring(0, extensionIndex);
                 substring = substring.replaceAll("\\.", "");
-                fileName = substring + fileName.substring(fileName.lastIndexOf('.'));
+                fileName = substring + fileName.substring(extensionIndex);
 
                 // Force upload into webcontent directory
                 if (!fileName.contains("webcontent")) {