Use 4.0.1 version of the swim backend

ajay-gov · ajay-gov · commit cae8b47a3d2b · 2022-07-26T01:10:07.000-07:00
Update Copyright
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ ext.swimVersion = project.property('swim.version')
 // Build with `gradle -Pno-modules` to force compatibility with legacy JVMs.
 def javaVersion = System.getProperty('java.version').split('\\.')
 ext.jvmVersion = (javaVersion[0] as Integer) > 1 ? javaVersion[0] as Integer : javaVersion[1] as Integer
-ext.useModules = jvmVersion >= 9 && !hasProperty('no-modules')
+ext.useModules = !hasProperty('no-modules')
 ext.moduleArgs = ['--add-modules', 'swim.meta']
 
 repositories {
@@ -43,8 +43,8 @@ dependencies {
 afterEvaluate {
   configurations {
     apiElements {
-      sourceCompatibility = JavaVersion.VERSION_1_9
-      targetCompatibility = JavaVersion.VERSION_1_9
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
     }
   }
 
@@ -60,9 +60,9 @@ afterEvaluate {
       options.encoding = 'UTF-8'
       classpath = files()
       source = sourceSets.main.allJava
-      sourceCompatibility = JavaVersion.VERSION_1_9
-      targetCompatibility = JavaVersion.VERSION_1_9
-      destinationDir = compileJava.destinationDir
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
+      destinationDirectory = compileJava.destinationDirectory
       include '*module-info*'
     }
     classes.dependsOn compileModuleInfoJava
@@ -76,8 +76,8 @@ afterEvaluate {
   compileJava {
     options.compilerArgs += compilerArgs
     options.encoding = 'UTF-8'
-    sourceCompatibility = JavaVersion.VERSION_1_9
-    targetCompatibility = JavaVersion.VERSION_1_9
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
     exclude '*module-info*'
   }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-application.version=0.1.0
-swim.version=3.11.0
+application.version=1.0.0
+swim.version=4.0.1
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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.
+
 open module swim.cellular {
   requires transitive swim.api;
   requires transitive swim.server;
diff --git a/src/main/java/swim/cellular/CellularAuthenticator.java b/src/main/java/swim/cellular/CellularAuthenticator.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular;
 
 import swim.api.auth.AbstractAuthenticator;
diff --git a/src/main/java/swim/cellular/CellularPlane.java b/src/main/java/swim/cellular/CellularPlane.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular;
 
 import swim.api.auth.Authenticator;
diff --git a/src/main/java/swim/cellular/CellularPolicy.java b/src/main/java/swim/cellular/CellularPolicy.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular;
 
 import swim.api.auth.Identity;
diff --git a/src/main/java/swim/cellular/CellularResources.java b/src/main/java/swim/cellular/CellularResources.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular;
 
 import java.io.IOException;
@@ -23,7 +37,7 @@ public static Value loadJsonResource(String jsonResource) {
     try {
       jsonInput = CellularPlane.class.getClassLoader().getResourceAsStream(jsonResource);
       if (jsonInput != null) {
-        jsonValue = Utf8.read(Json.structureParser().valueParser(), jsonInput);
+        jsonValue = Utf8.read(jsonInput, Json.structureParser().valueParser());
       }
     } catch (IOException cause) {
       throw new ParserException(cause);
@@ -44,7 +58,7 @@ public static Value loadReconResource(String reconResource) {
     try {
       reconInput = CellularPlane.class.getClassLoader().getResourceAsStream(reconResource);
       if (reconInput != null) {
-        reconValue = Utf8.read(Recon.structureParser().blockParser(), reconInput);
+        reconValue = Utf8.read(reconInput, Recon.structureParser().blockParser());
       }
     } catch (IOException cause) {
       throw new ParserException(cause);
diff --git a/src/main/java/swim/cellular/CellularUiRouter.java b/src/main/java/swim/cellular/CellularUiRouter.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular;
 
 import swim.kernel.KernelProxy;
diff --git a/src/main/java/swim/cellular/agent/ENodeBAgent.java b/src/main/java/swim/cellular/agent/ENodeBAgent.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular.agent;
 
 import swim.api.SwimLane;
@@ -7,7 +21,6 @@
 import swim.api.lane.ValueLane;
 import swim.codec.Output;
 import swim.http.HttpChunked;
-import swim.http.HttpEntity;
 import swim.http.HttpRequest;
 import swim.http.HttpResponse;
 import swim.http.HttpStatus;
@@ -69,10 +82,10 @@ HttpResponse<?> onRequestSummary(HttpRequest<Value> request) {
     final Value payload = this.status.get().concat(this.kpis.get());
     // Construct the response entity by incrementally serializing and encoding
     // the response payload as JSON.
-    final HttpEntity<?> entity = HttpChunked.from(Json.write(payload, Output.full()),
+    final HttpChunked<?> entity = HttpChunked.create(Json.write(Output.full(), payload),
                                                   MediaType.applicationJson());
     // Return the HTTP response.
-    return HttpResponse.from(HttpStatus.OK).content(entity);
+    return HttpResponse.create(HttpStatus.OK).content(entity);
   }
 
   /**
diff --git a/src/main/java/swim/cellular/agent/ENodeBConnectorAgent.java b/src/main/java/swim/cellular/agent/ENodeBConnectorAgent.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular.agent;
 
 import swim.api.SwimLane;
diff --git a/src/main/java/swim/cellular/agent/ENodeBSimAgent.java b/src/main/java/swim/cellular/agent/ENodeBSimAgent.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular.agent;
 
 import swim.api.SwimLane;
diff --git a/src/main/java/swim/cellular/agent/RanAgent.java b/src/main/java/swim/cellular/agent/RanAgent.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular.agent;
 
 import java.util.Iterator;
diff --git a/src/main/java/swim/cellular/agent/RegionAgent.java b/src/main/java/swim/cellular/agent/RegionAgent.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular.agent;
 
 import swim.api.SwimLane;
diff --git a/src/main/java/swim/cellular/agent/SectorAgent.java b/src/main/java/swim/cellular/agent/SectorAgent.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular.agent;
 
 import swim.api.SwimLane;
diff --git a/src/main/java/swim/cellular/agent/SiteAgent.java b/src/main/java/swim/cellular/agent/SiteAgent.java
@@ -1,3 +1,17 @@
+// Copyright 2015-2022 Swim.inc
+//
+// Licensed 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 swim.cellular.agent;
 
 import swim.api.SwimLane;
@@ -70,7 +84,7 @@ void seed() {
       final int sectorAzimuth = baseAngle + 2 * sectorSweep * i;
 
       for (int j = 0; j < carrierCount; j += 1) {
-        final Uri nodeUri = Uri.from(sitePath.appended("sector", String.valueOf(sectorId)));
+        final Uri nodeUri = Uri.create(sitePath.appended("sector", String.valueOf(sectorId)));
         final Value key = Uri.form().mold(nodeUri).toValue();
         final Uri laneUri = Uri.parse("status");
         final String band = Character.toString('A' + (char) Math.round(26 * Math.random()));
diff --git a/src/main/resources/ui/swim-cellular.js b/src/main/resources/ui/swim-cellular.js
diff --git a/src/main/resources/ui/swim-core.min.js b/src/main/resources/ui/swim-core.min.js
diff --git a/src/main/resources/ui/swim-maps.min.js b/src/main/resources/ui/swim-maps.min.js
diff --git a/src/main/resources/ui/swim-mesh.min.js b/src/main/resources/ui/swim-mesh.min.js
diff --git a/src/main/resources/ui/swim-ui.min.js b/src/main/resources/ui/swim-ui.min.js
diff --git a/src/main/resources/ui/swim-ux.min.js b/src/main/resources/ui/swim-ux.min.js
diff --git a/src/main/resources/ui/swim-vis.min.js b/src/main/resources/ui/swim-vis.min.js
