diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b72d5104..45827afc 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -16,5 +16,5 @@ Include any relevant information about the test environment (e.g. Browser or Pla ## Checklist -- [ ] The PR follows the branch and commit styles outlined in the [CONTRIBUTING](/OctoConsulting/keip-canvas/blob/main/docs/CONTRIBUTING.md) doc +- [ ] The PR follows the branch and commit styles outlined in the [CONTRIBUTING](/codice/keip-canvas/blob/main/docs/CONTRIBUTING.md) doc - [ ] (UI changes only) Linting and formatting checks pass locally with the new changes (`npm run precommit` from the `ui` directory) diff --git a/README.md b/README.md index 6b940951..822f347e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Keip Canvas [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -[![GitHub Pages Pipeline](https://github.com/OctoConsulting/keip-canvas/actions/workflows/deploy-canvas-webapp.yaml/badge.svg)](https://github.com/OctoConsulting/keip-canvas/actions/workflows/deploy-canvas-webapp.yaml) +[![GitHub Pages Pipeline](https://github.com/codice/keip-canvas/actions/workflows/deploy-canvas-webapp.yaml/badge.svg)](https://github.com/codice/keip-canvas/actions/workflows/deploy-canvas-webapp.yaml) Intuitive drag and drop UI for creating deployable integration flow diagrams. @@ -17,13 +17,13 @@ understandability of a diagram. Consequently, Keip Canvas is designed to let you - Rapidly create data flows with full [Enterprise Integration Patterns](https://www.enterpriseintegrationpatterns.com/patterns/messaging/) support -- Easily deploy diagrams to a Kubernetes cluster powered by [keip](https://github.com/OctoConsulting/keip) +- Easily deploy diagrams to a Kubernetes cluster powered by [keip](https://github.com/codice/keip) - Focus on a flow's business logic rather than XML boilerplate - Share and collaborate on visual models rather than verbose XML ## Usage -Keip Canvas is hosted at https://octoconsulting.github.io/keip-canvas/ +Keip Canvas is hosted at https://codice.org/keip-canvas/ ## Development diff --git a/assistant/Makefile b/assistant/Makefile index 4430912a..b29e858d 100644 --- a/assistant/Makefile +++ b/assistant/Makefile @@ -40,7 +40,7 @@ clean: clean-config: - @rm ../ui/.env.development.local + @rm ../ui/.env.development.local config-ollama: @echo "Configuring for remote Ollama instance..." diff --git a/assistant/Modelfile.template b/assistant/Modelfile.template index d435100f..49967edf 100644 --- a/assistant/Modelfile.template +++ b/assistant/Modelfile.template @@ -2,13 +2,13 @@ FROM {{BASE_MODEL}} SYSTEM """ You are an expert in Enterprise Integration Patterns (EIP). You return integration flows as JSON using the keip-canvas -format. These integration flows will be implemented usin Spring Integration. The list of valid components is built from +format. These integration flows will be implemented using Spring Integration. The list of valid components is built from a subset of the available Spring Integration components. You should strive to use them in a manner that will work within the Spring Integration Framework. Violating these rules will result in an invalid response. START RULES -1. Respond only using the nodes-and-edges JSON structure shown in thexamples. Do not include explanatory text. +1. Respond only using the nodes-and-edges JSON structure shown in the examples. Do not include explanatory text. 2. Do not add any extraneous fields or properties to the response. 3. If you're unsure which namespace to use, fail silently and omit the node. Do NOT guess. 4. Ensure that all `nodes` are connected by `edges`—no node should be orphaned. diff --git a/assistant/README.md b/assistant/README.md index a1112f89..0510aa23 100644 --- a/assistant/README.md +++ b/assistant/README.md @@ -9,14 +9,14 @@ The Keip Canvas UI provides experimental support for generative AI models to aid The `keip-assistant:32b` model is designed to help users create and modify flow diagrams through natural language interactions. ### Prerequisites -- [Ollama](https://github.com/ollama/ollama) installed on your system +- [Ollama](https://github.com/ollama/ollama) installed on your system (`v0.9+`) - The Modelfile and Makefile from this repository ### Install Ollama Install [Ollama](https://github.com/ollama/ollama?tab=readme-ov-file#ollama) following the instructions for your platform. - To allow the Canvas UI to access the local Ollama server, add the following web origin: ```shell - OLLAMA_ORIGINS="https://octoconsulting.github.io" + OLLAMA_ORIGINS="https://codice.org" ``` [See here](https://github.com/ollama/ollama/blob/main/docs/faq.md#how-do-i-configure-ollama-server) for details on configuring the Ollama server. @@ -42,7 +42,7 @@ make status ``` ### Navigate to Keip Canvas -In a web browser, navigate to the [Canvas](https://octoconsulting.github.io/keip-canvas/). +In a web browser, navigate to the [Canvas](https://codice.org/keip-canvas/). The `KeipAssistant` button should be enabled in the bottom toolbar. Click it to open a chat panel. ### Example Prompts diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 73489e0c..bebbc9aa 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -10,7 +10,7 @@ pull request. ### Reporting Bugs -If you find a bug, please report it by opening a [GitHub Issue](https://github.com/OctoConsulting/keip-canvas/issues). +If you find a bug, please report it by opening a [GitHub Issue](https://github.com/codice/keip-canvas/issues). When you do so, please include: - A clear and descriptive title. diff --git a/flow-translator/flow-translator-lib/ARCHITECTURE.md b/flow-translator/flow-translator-lib/ARCHITECTURE.md index b3146f50..afce4a12 100644 --- a/flow-translator/flow-translator-lib/ARCHITECTURE.md +++ b/flow-translator/flow-translator-lib/ARCHITECTURE.md @@ -19,28 +19,28 @@ flowchart LR ``` -The [FlowTranslator](src/main/java/com/octo/keip/flow/FlowTranslator.java) class is the entrypoint to the library's main +The [FlowTranslator](src/main/java/org/codice/keip/flow/FlowTranslator.java) class is the entrypoint to the library's main translation functionality. -The translator provides a `toXml` method that accepts an [EIP Flow](src/main/java/com/octo/keip/flow/model/Flow.java) +The translator provides a `toXml` method that accepts an [EIP Flow](src/main/java/org/codice/keip/flow/model/Flow.java) object (comprised of nodes and edges) and a [Writer](https://devdocs.io/openjdk~21/java.base/java/io/writer) for storing the output. The `Flow` object is first translated to an intermediate representation, -an [EIP Graph](src/main/java/com/octo/keip/flow/model/EipGraph.java), which is then converted to the target XML. The IR +an [EIP Graph](src/main/java/org/codice/keip/flow/model/EipGraph.java), which is then converted to the target XML. The IR decouples the Flow from the target and exposes a more developer-friendly API for generating the target. ## Choosing a Target To customize the generated XML, extend -the [GraphTransformer](src/main/java/com/octo/keip/flow/xml/GraphTransformer.java) base class. It is an abstract class +the [GraphTransformer](src/main/java/org/codice/keip/flow/xml/GraphTransformer.java) base class. It is an abstract class that handles the common parts of the XML generation logic. Implementations can specify the required XML namespaces by overriding the abstract methods, in addition to controlling -individual [EIP Node](src/main/java/com/octo/keip/flow/model/EipNode.java) transformations by providing a -custom-configured [NodeTransformerFactory](src/main/java/com/octo/keip/flow/xml/NodeTransformerFactory.java). An +individual [EIP Node](src/main/java/org/codice/keip/flow/model/EipNode.java) transformations by providing a +custom-configured [NodeTransformerFactory](src/main/java/org/codice/keip/flow/xml/NodeTransformerFactory.java). An instance of the custom `GraphTransformer` can then be injected into the `FlowTranslator` constructor. For an example of a `GraphTransformer` implementation, see -the [IntegrationGraphTransformer](src/main/java/com/octo/keip/flow/xml/spring/IntegrationGraphTransformer.java) which +the [IntegrationGraphTransformer](src/main/java/org/codice/keip/flow/xml/spring/IntegrationGraphTransformer.java) which targets Spring Integration XMLs. ## The EIP Graph @@ -49,8 +49,8 @@ As mentioned above, the graph provides an intermediate representation between th is currently implemented using the [Guava Graphs](https://github.com/google/guava/wiki/GraphsExplained) library as it provides a simple, well-documented API for building immutable graphs, with built-in support for common graph algorithms (e.g. BFS, DFS). Nonetheless, all external access to the graph is through -the [EIP Graph](src/main/java/com/octo/keip/flow/model/EipGraph.java) interface (which -the [GuavaGraph](src/main/java/com/octo/keip/flow/graph/GuavaGraph.java) implements), so it should be straightforward to +the [EIP Graph](src/main/java/org/codice/keip/flow/model/EipGraph.java) interface (which +the [GuavaGraph](src/main/java/org/codice/keip/flow/graph/GuavaGraph.java) implements), so it should be straightforward to use a different library if the need arises. ## Future Work diff --git a/flow-translator/flow-translator-lib/README.md b/flow-translator/flow-translator-lib/README.md index 279b9736..04a8607f 100644 --- a/flow-translator/flow-translator-lib/README.md +++ b/flow-translator/flow-translator-lib/README.md @@ -19,7 +19,7 @@ To use, add as a dependency in `pom.xml`: ```xml - com.octo.keip + org.codice.keip flow-translator-lib 0.1.0 @@ -28,10 +28,10 @@ To use, add as a dependency in `pom.xml`: ## Usage ```java -import com.octo.keip.flow.FlowTranslator; -import com.octo.keip.flow.error.TransformationError; -import com.octo.keip.flow.xml.GraphTransformer; -import com.octo.keip.flow.xml.spring.IntegrationGraphTransformer; +import org.codice.keip.flow.FlowTranslator; +import org.codice.keip.flow.error.TransformationError; +import org.codice.keip.flow.xml.GraphTransformer; +import org.codice.keip.flow.xml.spring.IntegrationGraphTransformer; // Specify a translation target by initializing a GraphTransformer implementation // e.g. for Spring Integration XML: diff --git a/flow-translator/flow-translator-lib/pom.xml b/flow-translator/flow-translator-lib/pom.xml index 311a42e7..1b26ef91 100644 --- a/flow-translator/flow-translator-lib/pom.xml +++ b/flow-translator/flow-translator-lib/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.octo.keip + org.codice.keip flow-translator-lib 0.1.0 @@ -46,7 +46,7 @@ - com.octo.keip.schemas + org.codice.keip.schemas validation 0.1.0 test diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/FlowTranslator.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/FlowTranslator.java similarity index 76% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/FlowTranslator.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/FlowTranslator.java index d9147857..97f26b17 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/FlowTranslator.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/FlowTranslator.java @@ -1,12 +1,12 @@ -package com.octo.keip.flow; +package org.codice.keip.flow; -import com.octo.keip.flow.error.TransformationError; -import com.octo.keip.flow.graph.GuavaGraph; -import com.octo.keip.flow.model.EipGraph; -import com.octo.keip.flow.model.EipId; -import com.octo.keip.flow.model.Flow; -import com.octo.keip.flow.xml.GraphTransformer; -import com.octo.keip.flow.xml.NodeTransformer; +import org.codice.keip.flow.error.TransformationError; +import org.codice.keip.flow.graph.GuavaGraph; +import org.codice.keip.flow.model.EipGraph; +import org.codice.keip.flow.model.EipId; +import org.codice.keip.flow.model.Flow; +import org.codice.keip.flow.xml.GraphTransformer; +import org.codice.keip.flow.xml.NodeTransformer; import java.io.Writer; import java.util.List; import javax.xml.transform.TransformerException; @@ -38,7 +38,7 @@ public List toXml(Flow flow, Writer outputXml) throws Trans * * @param id EipId of the target node * @param transformer responsible for transforming the target node to an {@link - * com.octo.keip.flow.xml.XmlElement} + * org.codice.keip.flow.xml.XmlElement} */ public void registerNodeTransformer(EipId id, NodeTransformer transformer) { this.graphTransformer.registerNodeTransformer(id, transformer); diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/error/TransformationError.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/error/TransformationError.java similarity index 67% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/error/TransformationError.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/error/TransformationError.java index 32355d20..183eec0a 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/error/TransformationError.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/error/TransformationError.java @@ -1,3 +1,3 @@ -package com.octo.keip.flow.error; +package org.codice.keip.flow.error; public record TransformationError(String source, Exception exception) {} diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/graph/GuavaGraph.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/graph/GuavaGraph.java similarity index 92% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/graph/GuavaGraph.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/graph/GuavaGraph.java index 36e52c48..3308638a 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/graph/GuavaGraph.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/graph/GuavaGraph.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.graph; +package org.codice.keip.flow.graph; import com.google.common.collect.Streams; import com.google.common.graph.Graphs; @@ -6,11 +6,11 @@ import com.google.common.graph.ImmutableValueGraph.Builder; import com.google.common.graph.Traverser; import com.google.common.graph.ValueGraphBuilder; -import com.octo.keip.flow.model.Flow; -import com.octo.keip.flow.model.FlowEdge; -import com.octo.keip.flow.model.EdgeProps; -import com.octo.keip.flow.model.EipGraph; -import com.octo.keip.flow.model.EipNode; +import org.codice.keip.flow.model.Flow; +import org.codice.keip.flow.model.FlowEdge; +import org.codice.keip.flow.model.EdgeProps; +import org.codice.keip.flow.model.EipGraph; +import org.codice.keip.flow.model.EipNode; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/ConnectionType.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/ConnectionType.java similarity index 75% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/ConnectionType.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/ConnectionType.java index ac48ac39..56c30a9f 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/ConnectionType.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/ConnectionType.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; public enum ConnectionType { CONTENT_BASED_ROUTER, diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EdgeProps.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EdgeProps.java similarity index 88% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EdgeProps.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EdgeProps.java index 197ec891..ea3fa944 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EdgeProps.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EdgeProps.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; public record EdgeProps(String id, EdgeType type) { public enum EdgeType { diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipChild.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipChild.java similarity index 93% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipChild.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipChild.java index 2bf5b265..0acd1399 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipChild.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipChild.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; import java.util.Collections; import java.util.List; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipGraph.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipGraph.java similarity index 89% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipGraph.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipGraph.java index dc1a0c5f..9b418dbb 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipGraph.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipGraph.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; import java.util.Optional; import java.util.Set; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipId.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipId.java similarity index 60% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipId.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipId.java index 56b317cb..a8e65bda 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipId.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipId.java @@ -1,3 +1,3 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; public record EipId(String namespace, String name) {} diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipNode.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipNode.java similarity index 97% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipNode.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipNode.java index 22b93a49..00fdec9d 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/EipNode.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/EipNode.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; import java.util.Collections; import java.util.List; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/Flow.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/Flow.java similarity index 88% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/Flow.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/Flow.java index 08fcc36f..0ee7a99c 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/Flow.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/Flow.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; import java.util.List; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/FlowEdge.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/FlowEdge.java similarity index 75% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/FlowEdge.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/FlowEdge.java index 0e2d9b7e..21d92242 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/FlowEdge.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/FlowEdge.java @@ -1,6 +1,6 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; -import com.octo.keip.flow.model.EdgeProps.EdgeType; +import org.codice.keip.flow.model.EdgeProps.EdgeType; public record FlowEdge(String id, String source, String target, EdgeType type) { diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/Role.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/Role.java similarity index 66% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/Role.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/Role.java index 214a2a57..cbb0afcf 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/model/Role.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/model/Role.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.model; +package org.codice.keip.flow.model; public enum Role { CHANNEL, diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/GraphTransformer.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/GraphTransformer.java similarity index 97% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/GraphTransformer.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/GraphTransformer.java index e9e1e62a..32cffc40 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/GraphTransformer.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/GraphTransformer.java @@ -1,13 +1,13 @@ -package com.octo.keip.flow.xml; +package org.codice.keip.flow.xml; import static javax.xml.XMLConstants.XML_NS_PREFIX; import com.ctc.wstx.stax.WstxEventFactory; import com.ctc.wstx.stax.WstxOutputFactory; -import com.octo.keip.flow.error.TransformationError; -import com.octo.keip.flow.model.EipGraph; -import com.octo.keip.flow.model.EipId; -import com.octo.keip.flow.model.EipNode; +import org.codice.keip.flow.error.TransformationError; +import org.codice.keip.flow.model.EipGraph; +import org.codice.keip.flow.model.EipId; +import org.codice.keip.flow.model.EipNode; import java.io.Writer; import java.util.ArrayList; import java.util.Collection; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NamespaceSpec.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NamespaceSpec.java similarity index 74% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NamespaceSpec.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NamespaceSpec.java index f6e52b76..35150238 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NamespaceSpec.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NamespaceSpec.java @@ -1,3 +1,3 @@ -package com.octo.keip.flow.xml; +package org.codice.keip.flow.xml; public record NamespaceSpec(String eipNamespace, String xmlNamespace, String schemaLocation) {} diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NodeTransformer.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NodeTransformer.java similarity index 77% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NodeTransformer.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NodeTransformer.java index 0f5a0433..c631bd7e 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NodeTransformer.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NodeTransformer.java @@ -1,7 +1,7 @@ -package com.octo.keip.flow.xml; +package org.codice.keip.flow.xml; -import com.octo.keip.flow.model.EipGraph; -import com.octo.keip.flow.model.EipNode; +import org.codice.keip.flow.model.EipGraph; +import org.codice.keip.flow.model.EipNode; import java.util.List; /** diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NodeTransformerFactory.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NodeTransformerFactory.java similarity index 88% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NodeTransformerFactory.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NodeTransformerFactory.java index 8b6f9c37..26c55582 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/NodeTransformerFactory.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/NodeTransformerFactory.java @@ -1,6 +1,6 @@ -package com.octo.keip.flow.xml; +package org.codice.keip.flow.xml; -import com.octo.keip.flow.model.EipId; +import org.codice.keip.flow.model.EipId; import java.util.HashMap; import java.util.Map; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/XmlElement.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/XmlElement.java similarity index 83% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/XmlElement.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/XmlElement.java index 22c0f585..398fcfb4 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/XmlElement.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/XmlElement.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.xml; +package org.codice.keip.flow.xml; import java.util.List; import java.util.Map; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/AttributeNames.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/AttributeNames.java similarity index 91% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/AttributeNames.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/AttributeNames.java index 4fdcf274..567f14a2 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/AttributeNames.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/AttributeNames.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.xml.spring; +package org.codice.keip.flow.xml.spring; public class AttributeNames { public static final String ID = "id"; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/BaseNodeTransformation.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/BaseNodeTransformation.java similarity index 76% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/BaseNodeTransformation.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/BaseNodeTransformation.java index dec837e6..31e23bdf 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/BaseNodeTransformation.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/BaseNodeTransformation.java @@ -1,14 +1,14 @@ -package com.octo.keip.flow.xml.spring; +package org.codice.keip.flow.xml.spring; -import com.octo.keip.flow.model.EipChild; -import com.octo.keip.flow.model.EipNode; -import com.octo.keip.flow.xml.XmlElement; +import org.codice.keip.flow.model.EipChild; +import org.codice.keip.flow.model.EipNode; +import org.codice.keip.flow.xml.XmlElement; import java.util.List; /** * Handles simple conversion from an {@link EipNode} to an {@link XmlElement}. No additions or * modifications are made to the input node's attributes or children. The helper methods defined - * here are intended for use by {@link com.octo.keip.flow.xml.NodeTransformer} implementations as + * here are intended for use by {@link org.codice.keip.flow.xml.NodeTransformer} implementations as * the first step in the transformation. */ public final class BaseNodeTransformation { diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/DefaultNodeTransformer.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/DefaultNodeTransformer.java similarity index 89% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/DefaultNodeTransformer.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/DefaultNodeTransformer.java index a09e7d4c..2016b447 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/DefaultNodeTransformer.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/DefaultNodeTransformer.java @@ -1,21 +1,21 @@ -package com.octo.keip.flow.xml.spring; - -import static com.octo.keip.flow.xml.spring.AttributeNames.CHANNEL; -import static com.octo.keip.flow.xml.spring.AttributeNames.DISCARD_CHANNEL; -import static com.octo.keip.flow.xml.spring.AttributeNames.ID; -import static com.octo.keip.flow.xml.spring.AttributeNames.INPUT_CHANNEL; -import static com.octo.keip.flow.xml.spring.AttributeNames.OUTPUT_CHANNEL; -import static com.octo.keip.flow.xml.spring.AttributeNames.REPLY_CHANNEL; -import static com.octo.keip.flow.xml.spring.AttributeNames.REQUEST_CHANNEL; - -import com.octo.keip.flow.model.EdgeProps; -import com.octo.keip.flow.model.EdgeProps.EdgeType; -import com.octo.keip.flow.model.EipGraph; -import com.octo.keip.flow.model.EipId; -import com.octo.keip.flow.model.EipNode; -import com.octo.keip.flow.model.Role; -import com.octo.keip.flow.xml.NodeTransformer; -import com.octo.keip.flow.xml.XmlElement; +package org.codice.keip.flow.xml.spring; + +import static org.codice.keip.flow.xml.spring.AttributeNames.CHANNEL; +import static org.codice.keip.flow.xml.spring.AttributeNames.DISCARD_CHANNEL; +import static org.codice.keip.flow.xml.spring.AttributeNames.ID; +import static org.codice.keip.flow.xml.spring.AttributeNames.INPUT_CHANNEL; +import static org.codice.keip.flow.xml.spring.AttributeNames.OUTPUT_CHANNEL; +import static org.codice.keip.flow.xml.spring.AttributeNames.REPLY_CHANNEL; +import static org.codice.keip.flow.xml.spring.AttributeNames.REQUEST_CHANNEL; + +import org.codice.keip.flow.model.EdgeProps; +import org.codice.keip.flow.model.EdgeProps.EdgeType; +import org.codice.keip.flow.model.EipGraph; +import org.codice.keip.flow.model.EipId; +import org.codice.keip.flow.model.EipNode; +import org.codice.keip.flow.model.Role; +import org.codice.keip.flow.xml.NodeTransformer; +import org.codice.keip.flow.xml.XmlElement; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/IntegrationGraphTransformer.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/IntegrationGraphTransformer.java similarity index 80% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/IntegrationGraphTransformer.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/IntegrationGraphTransformer.java index 11244391..fea1693b 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/IntegrationGraphTransformer.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/IntegrationGraphTransformer.java @@ -1,8 +1,8 @@ -package com.octo.keip.flow.xml.spring; +package org.codice.keip.flow.xml.spring; -import com.octo.keip.flow.xml.GraphTransformer; -import com.octo.keip.flow.xml.NamespaceSpec; -import com.octo.keip.flow.xml.NodeTransformerFactory; +import org.codice.keip.flow.xml.GraphTransformer; +import org.codice.keip.flow.xml.NamespaceSpec; +import org.codice.keip.flow.xml.NodeTransformerFactory; import java.util.Collection; import java.util.Set; import javax.xml.namespace.QName; diff --git a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/Namespaces.java b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/Namespaces.java similarity index 84% rename from flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/Namespaces.java rename to flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/Namespaces.java index f8ebe36b..e5cc3f71 100644 --- a/flow-translator/flow-translator-lib/src/main/java/com/octo/keip/flow/xml/spring/Namespaces.java +++ b/flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/Namespaces.java @@ -1,6 +1,6 @@ -package com.octo.keip.flow.xml.spring; +package org.codice.keip.flow.xml.spring; -import com.octo.keip.flow.xml.NamespaceSpec; +import org.codice.keip.flow.xml.NamespaceSpec; public class Namespaces { diff --git a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/FlowToSpringIntegrationTest.groovy b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/FlowToSpringIntegrationTest.groovy similarity index 87% rename from flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/FlowToSpringIntegrationTest.groovy rename to flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/FlowToSpringIntegrationTest.groovy index dd0d2581..13755941 100644 --- a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/FlowToSpringIntegrationTest.groovy +++ b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/FlowToSpringIntegrationTest.groovy @@ -1,19 +1,19 @@ -package com.octo.keip.flow +package org.codice.keip.flow import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.MapperFeature import com.fasterxml.jackson.databind.json.JsonMapper -import com.octo.keip.flow.model.EipId -import com.octo.keip.flow.model.Flow -import com.octo.keip.flow.xml.NamespaceSpec -import com.octo.keip.flow.xml.NodeTransformer -import com.octo.keip.flow.xml.spring.IntegrationGraphTransformer +import org.codice.keip.flow.model.EipId +import org.codice.keip.flow.model.Flow +import org.codice.keip.flow.xml.NamespaceSpec +import org.codice.keip.flow.xml.NodeTransformer +import org.codice.keip.flow.xml.spring.IntegrationGraphTransformer import spock.lang.Specification import java.nio.file.Path -import static com.octo.keip.flow.xml.XmlComparisonUtil.compareXml -import static com.octo.keip.flow.xml.XmlComparisonUtil.readTestXml +import static org.codice.keip.flow.xml.XmlComparisonUtil.compareXml +import static org.codice.keip.flow.xml.XmlComparisonUtil.readTestXml // TODO: Validate against spring integration XSDs class FlowToSpringIntegrationTest extends Specification { diff --git a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/graph/GuavaGraphTest.groovy b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/graph/GuavaGraphTest.groovy similarity index 94% rename from flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/graph/GuavaGraphTest.groovy rename to flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/graph/GuavaGraphTest.groovy index a2f11f71..8e6720f8 100644 --- a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/graph/GuavaGraphTest.groovy +++ b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/graph/GuavaGraphTest.groovy @@ -1,12 +1,12 @@ -package com.octo.keip.flow.graph - -import com.octo.keip.flow.model.Flow -import com.octo.keip.flow.model.FlowEdge -import com.octo.keip.flow.model.ConnectionType -import com.octo.keip.flow.model.EdgeProps -import com.octo.keip.flow.model.EipId -import com.octo.keip.flow.model.EipNode -import com.octo.keip.flow.model.Role +package org.codice.keip.flow.graph + +import org.codice.keip.flow.model.Flow +import org.codice.keip.flow.model.FlowEdge +import org.codice.keip.flow.model.ConnectionType +import org.codice.keip.flow.model.EdgeProps +import org.codice.keip.flow.model.EipId +import org.codice.keip.flow.model.EipNode +import org.codice.keip.flow.model.Role import spock.lang.Specification import java.util.stream.Stream diff --git a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/model/FlowModelValidationTest.groovy b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/model/FlowModelValidationTest.groovy similarity index 93% rename from flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/model/FlowModelValidationTest.groovy rename to flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/model/FlowModelValidationTest.groovy index c47fa6ba..abb2aeee 100644 --- a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/model/FlowModelValidationTest.groovy +++ b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/model/FlowModelValidationTest.groovy @@ -1,15 +1,15 @@ -package com.octo.keip.flow.model +package org.codice.keip.flow.model import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.cfg.EnumFeature import com.fasterxml.jackson.databind.json.JsonMapper -import com.octo.keip.schemas.validation.EipSchema -import com.octo.keip.schemas.validation.EipSchemaValidator +import org.codice.keip.schemas.validation.EipSchema +import org.codice.keip.schemas.validation.EipSchemaValidator import spock.lang.Specification /** * Validates the {@link Flow} POJO against the externally defined EIP JSON schemas: - * https://github.com/OctoConsulting/keip-canvas/tree/main/schemas/model/json/eipFlow.schema.json + * https://github.com/codice/keip-canvas/tree/main/schemas/model/json/eipFlow.schema.json */ class FlowModelValidationTest extends Specification { diff --git a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/NodeTransformerFactoryTest.groovy b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/NodeTransformerFactoryTest.groovy similarity index 93% rename from flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/NodeTransformerFactoryTest.groovy rename to flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/NodeTransformerFactoryTest.groovy index 60e7a4ad..bb64d8a8 100644 --- a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/NodeTransformerFactoryTest.groovy +++ b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/NodeTransformerFactoryTest.groovy @@ -1,6 +1,6 @@ -package com.octo.keip.flow.xml +package org.codice.keip.flow.xml -import com.octo.keip.flow.model.EipId +import org.codice.keip.flow.model.EipId import spock.lang.Specification class NodeTransformerFactoryTest extends Specification { diff --git a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/XmlComparisonUtil.groovy b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/XmlComparisonUtil.groovy similarity index 95% rename from flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/XmlComparisonUtil.groovy rename to flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/XmlComparisonUtil.groovy index 2e4c69ea..a523d0a0 100644 --- a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/XmlComparisonUtil.groovy +++ b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/XmlComparisonUtil.groovy @@ -1,4 +1,4 @@ -package com.octo.keip.flow.xml; +package org.codice.keip.flow.xml; import org.xmlunit.builder.DiffBuilder diff --git a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/BaseNodeTransformationTest.groovy b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/BaseNodeTransformationTest.groovy similarity index 92% rename from flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/BaseNodeTransformationTest.groovy rename to flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/BaseNodeTransformationTest.groovy index 264a6d7c..38584949 100644 --- a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/BaseNodeTransformationTest.groovy +++ b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/BaseNodeTransformationTest.groovy @@ -1,10 +1,10 @@ -package com.octo.keip.flow.xml.spring +package org.codice.keip.flow.xml.spring -import com.octo.keip.flow.model.ConnectionType -import com.octo.keip.flow.model.EipChild -import com.octo.keip.flow.model.EipId -import com.octo.keip.flow.model.EipNode -import com.octo.keip.flow.model.Role +import org.codice.keip.flow.model.ConnectionType +import org.codice.keip.flow.model.EipChild +import org.codice.keip.flow.model.EipId +import org.codice.keip.flow.model.EipNode +import org.codice.keip.flow.model.Role import spock.lang.Specification class BaseNodeTransformationTest extends Specification { diff --git a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/DefaultNodeTransformerTest.groovy b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/DefaultNodeTransformerTest.groovy similarity index 94% rename from flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/DefaultNodeTransformerTest.groovy rename to flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/DefaultNodeTransformerTest.groovy index 481693a9..78f4ebcd 100644 --- a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/DefaultNodeTransformerTest.groovy +++ b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/DefaultNodeTransformerTest.groovy @@ -1,22 +1,22 @@ -package com.octo.keip.flow.xml.spring - -import com.octo.keip.flow.model.ConnectionType -import com.octo.keip.flow.model.EdgeProps -import com.octo.keip.flow.model.EipChild -import com.octo.keip.flow.model.EipGraph -import com.octo.keip.flow.model.EipId -import com.octo.keip.flow.model.EipNode -import com.octo.keip.flow.model.Role +package org.codice.keip.flow.xml.spring + +import org.codice.keip.flow.model.ConnectionType +import org.codice.keip.flow.model.EdgeProps +import org.codice.keip.flow.model.EipChild +import org.codice.keip.flow.model.EipGraph +import org.codice.keip.flow.model.EipId +import org.codice.keip.flow.model.EipNode +import org.codice.keip.flow.model.Role import spock.lang.Specification -import static com.octo.keip.flow.xml.spring.AttributeNames.CHANNEL -import static com.octo.keip.flow.xml.spring.AttributeNames.DISCARD_CHANNEL -import static com.octo.keip.flow.xml.spring.AttributeNames.ID -import static com.octo.keip.flow.xml.spring.AttributeNames.INPUT_CHANNEL -import static com.octo.keip.flow.xml.spring.AttributeNames.OUTPUT_CHANNEL -import static com.octo.keip.flow.xml.spring.AttributeNames.REPLY_CHANNEL -import static com.octo.keip.flow.xml.spring.AttributeNames.REQUEST_CHANNEL -import static com.octo.keip.flow.xml.spring.DefaultNodeTransformer.DIRECT_CHANNEL +import static org.codice.keip.flow.xml.spring.AttributeNames.CHANNEL +import static org.codice.keip.flow.xml.spring.AttributeNames.DISCARD_CHANNEL +import static org.codice.keip.flow.xml.spring.AttributeNames.ID +import static org.codice.keip.flow.xml.spring.AttributeNames.INPUT_CHANNEL +import static org.codice.keip.flow.xml.spring.AttributeNames.OUTPUT_CHANNEL +import static org.codice.keip.flow.xml.spring.AttributeNames.REPLY_CHANNEL +import static org.codice.keip.flow.xml.spring.AttributeNames.REQUEST_CHANNEL +import static org.codice.keip.flow.xml.spring.DefaultNodeTransformer.DIRECT_CHANNEL class DefaultNodeTransformerTest extends Specification { diff --git a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/IntegrationGraphTransformerTest.groovy b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/IntegrationGraphTransformerTest.groovy similarity index 93% rename from flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/IntegrationGraphTransformerTest.groovy rename to flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/IntegrationGraphTransformerTest.groovy index 07eb65a3..85821f91 100644 --- a/flow-translator/flow-translator-lib/src/test/groovy/com/octo/keip/flow/xml/spring/IntegrationGraphTransformerTest.groovy +++ b/flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/IntegrationGraphTransformerTest.groovy @@ -1,14 +1,14 @@ -package com.octo.keip.flow.xml.spring - -import com.octo.keip.flow.model.ConnectionType -import com.octo.keip.flow.model.EdgeProps -import com.octo.keip.flow.model.EipChild -import com.octo.keip.flow.model.EipGraph -import com.octo.keip.flow.model.EipId -import com.octo.keip.flow.model.EipNode -import com.octo.keip.flow.model.Role -import com.octo.keip.flow.xml.NamespaceSpec -import com.octo.keip.flow.xml.NodeTransformer +package org.codice.keip.flow.xml.spring + +import org.codice.keip.flow.model.ConnectionType +import org.codice.keip.flow.model.EdgeProps +import org.codice.keip.flow.model.EipChild +import org.codice.keip.flow.model.EipGraph +import org.codice.keip.flow.model.EipId +import org.codice.keip.flow.model.EipNode +import org.codice.keip.flow.model.Role +import org.codice.keip.flow.xml.NamespaceSpec +import org.codice.keip.flow.xml.NodeTransformer import org.w3c.dom.Node import org.xmlunit.builder.Input import org.xmlunit.xpath.JAXPXPathEngine @@ -17,8 +17,8 @@ import spock.lang.Specification import javax.xml.transform.TransformerException import java.util.stream.Stream -import static com.octo.keip.flow.xml.XmlComparisonUtil.compareXml -import static com.octo.keip.flow.xml.XmlComparisonUtil.readTestXml +import static org.codice.keip.flow.xml.XmlComparisonUtil.compareXml +import static org.codice.keip.flow.xml.XmlComparisonUtil.readTestXml class IntegrationGraphTransformerTest extends Specification { diff --git a/flow-translator/flow-translator-webapp/README.md b/flow-translator/flow-translator-webapp/README.md index f31d0bcc..d969b553 100644 --- a/flow-translator/flow-translator-webapp/README.md +++ b/flow-translator/flow-translator-webapp/README.md @@ -20,7 +20,7 @@ java -jar ./target/flow-translator-webapp-0.1.0.jar Or in a Docker container: ```shell -docker run --name flow-translator -p 8080:8080 ghcr.io/octoconsulting/keip-canvas/flow-translator-webapp +docker run --name flow-translator -p 8080:8080 ghcr.io/codice/keip-canvas/flow-translator-webapp ``` ## API Documentation diff --git a/flow-translator/flow-translator-webapp/pom.xml b/flow-translator/flow-translator-webapp/pom.xml index d91fbbed..94411aa2 100644 --- a/flow-translator/flow-translator-webapp/pom.xml +++ b/flow-translator/flow-translator-webapp/pom.xml @@ -9,7 +9,7 @@ - com.octo.keip + org.codice.keip flow-translator-webapp 0.1.0 @@ -18,9 +18,9 @@ 21 - ghcr.io/octoconsulting + ghcr.io/codice keip-canvas/${project.artifactId} - https://github.com/OctoConsulting/keip-canvas + https://github.com/codice/keip-canvas true @@ -41,7 +41,7 @@ 2.6.0 - com.octo.keip + org.codice.keip flow-translator-lib 0.1.0 diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationResponse.java b/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationResponse.java deleted file mode 100644 index 5fdad651..00000000 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.octo.keip.flow.web.translation; - -import com.octo.keip.flow.web.error.ApiError; - -record TranslationResponse(String data, ApiError error) {} diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/FlowTranslatorWebApplication.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/FlowTranslatorWebApplication.java similarity index 92% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/FlowTranslatorWebApplication.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/FlowTranslatorWebApplication.java index fcdffdd7..e3f6e66e 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/FlowTranslatorWebApplication.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/FlowTranslatorWebApplication.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.web; +package org.codice.keip.flow.web; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/config/FlowTranslatorConfig.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/config/FlowTranslatorConfig.java similarity index 74% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/config/FlowTranslatorConfig.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/config/FlowTranslatorConfig.java index 4700e744..c39b4192 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/config/FlowTranslatorConfig.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/config/FlowTranslatorConfig.java @@ -1,8 +1,8 @@ -package com.octo.keip.flow.web.config; +package org.codice.keip.flow.web.config; -import com.octo.keip.flow.FlowTranslator; -import com.octo.keip.flow.xml.GraphTransformer; -import com.octo.keip.flow.xml.spring.IntegrationGraphTransformer; +import org.codice.keip.flow.FlowTranslator; +import org.codice.keip.flow.xml.GraphTransformer; +import org.codice.keip.flow.xml.spring.IntegrationGraphTransformer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/config/NamespaceProps.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/config/NamespaceProps.java similarity index 79% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/config/NamespaceProps.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/config/NamespaceProps.java index 0d2c3953..8a16476c 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/config/NamespaceProps.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/config/NamespaceProps.java @@ -1,6 +1,6 @@ -package com.octo.keip.flow.web.config; +package org.codice.keip.flow.web.config; -import com.octo.keip.flow.xml.NamespaceSpec; +import org.codice.keip.flow.xml.NamespaceSpec; import jakarta.validation.constraints.NotEmpty; import java.util.List; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/cors/CorsConfiguration.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/cors/CorsConfiguration.java similarity index 97% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/cors/CorsConfiguration.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/cors/CorsConfiguration.java index 3f6a0b14..ec0a3114 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/cors/CorsConfiguration.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/cors/CorsConfiguration.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.web.cors; +package org.codice.keip.flow.web.cors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/cors/CorsProps.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/cors/CorsProps.java similarity index 83% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/cors/CorsProps.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/cors/CorsProps.java index e53b91db..3781fdda 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/cors/CorsProps.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/cors/CorsProps.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.web.cors; +package org.codice.keip.flow.web.cors; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/ApiError.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/ApiError.java similarity index 92% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/ApiError.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/ApiError.java index 70c0ed0a..5ff9f47b 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/ApiError.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/ApiError.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.web.error; +package org.codice.keip.flow.web.error; import java.util.Collections; import java.util.List; diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/DefaultErrorResponse.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/DefaultErrorResponse.java similarity index 61% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/DefaultErrorResponse.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/DefaultErrorResponse.java index 7ab9af00..7caa749c 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/DefaultErrorResponse.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/DefaultErrorResponse.java @@ -1,3 +1,3 @@ -package com.octo.keip.flow.web.error; +package org.codice.keip.flow.web.error; public record DefaultErrorResponse(ApiError error) {} diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/GlobalExceptionHandler.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/GlobalExceptionHandler.java similarity index 97% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/GlobalExceptionHandler.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/GlobalExceptionHandler.java index bc87e30b..26753a39 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/error/GlobalExceptionHandler.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/error/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.web.error; +package org.codice.keip.flow.web.error; import java.io.IOException; import org.slf4j.Logger; diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationController.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationController.java similarity index 94% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationController.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationController.java index 999ed6ec..6b55a4ed 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationController.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationController.java @@ -1,8 +1,8 @@ -package com.octo.keip.flow.web.translation; +package org.codice.keip.flow.web.translation; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; -import com.octo.keip.flow.model.Flow; +import org.codice.keip.flow.model.Flow; import io.swagger.v3.oas.annotations.Operation; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationErrorDetail.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationErrorDetail.java similarity index 76% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationErrorDetail.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationErrorDetail.java index 5fde7680..0b022605 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationErrorDetail.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationErrorDetail.java @@ -1,6 +1,6 @@ -package com.octo.keip.flow.web.translation; +package org.codice.keip.flow.web.translation; -import com.octo.keip.flow.error.TransformationError; +import org.codice.keip.flow.error.TransformationError; import org.springframework.core.NestedExceptionUtils; record TranslationErrorDetail(String nodeId, String message) { diff --git a/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationResponse.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationResponse.java new file mode 100644 index 00000000..cf352f67 --- /dev/null +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationResponse.java @@ -0,0 +1,5 @@ +package org.codice.keip.flow.web.translation; + +import org.codice.keip.flow.web.error.ApiError; + +record TranslationResponse(String data, ApiError error) {} diff --git a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationService.java b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationService.java similarity index 91% rename from flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationService.java rename to flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationService.java index b5ec6559..239ec122 100644 --- a/flow-translator/flow-translator-webapp/src/main/java/com/octo/keip/flow/web/translation/TranslationService.java +++ b/flow-translator/flow-translator-webapp/src/main/java/org/codice/keip/flow/web/translation/TranslationService.java @@ -1,9 +1,9 @@ -package com.octo.keip.flow.web.translation; +package org.codice.keip.flow.web.translation; -import com.octo.keip.flow.FlowTranslator; -import com.octo.keip.flow.error.TransformationError; -import com.octo.keip.flow.model.Flow; -import com.octo.keip.flow.web.error.ApiError; +import org.codice.keip.flow.FlowTranslator; +import org.codice.keip.flow.error.TransformationError; +import org.codice.keip.flow.model.Flow; +import org.codice.keip.flow.web.error.ApiError; import java.io.IOException; import java.io.Reader; import java.io.StringReader; diff --git a/flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/cors/CorsConfigurationTest.groovy b/flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/cors/CorsConfigurationTest.groovy similarity index 96% rename from flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/cors/CorsConfigurationTest.groovy rename to flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/cors/CorsConfigurationTest.groovy index d495f5c7..54c1c347 100644 --- a/flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/cors/CorsConfigurationTest.groovy +++ b/flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/cors/CorsConfigurationTest.groovy @@ -1,4 +1,4 @@ -package com.octo.keip.flow.web.cors +package org.codice.keip.flow.web.cors import org.springframework.web.servlet.config.annotation.CorsRegistration import org.springframework.web.servlet.config.annotation.CorsRegistry diff --git a/flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/translation/TranslationControllerTest.groovy b/flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/translation/TranslationControllerTest.groovy similarity index 97% rename from flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/translation/TranslationControllerTest.groovy rename to flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/translation/TranslationControllerTest.groovy index 1a0acf8c..de8ae28c 100644 --- a/flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/translation/TranslationControllerTest.groovy +++ b/flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/translation/TranslationControllerTest.groovy @@ -1,9 +1,9 @@ -package com.octo.keip.flow.web.translation +package org.codice.keip.flow.web.translation import com.fasterxml.jackson.databind.json.JsonMapper -import com.octo.keip.flow.model.Flow -import com.octo.keip.flow.web.error.ApiError -import com.octo.keip.flow.web.error.DefaultErrorResponse +import org.codice.keip.flow.model.Flow +import org.codice.keip.flow.web.error.ApiError +import org.codice.keip.flow.web.error.DefaultErrorResponse import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest import org.springframework.boot.test.context.TestConfiguration diff --git a/flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/translation/TranslationServiceTest.groovy b/flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/translation/TranslationServiceTest.groovy similarity index 93% rename from flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/translation/TranslationServiceTest.groovy rename to flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/translation/TranslationServiceTest.groovy index b0d2431f..3c8a144d 100644 --- a/flow-translator/flow-translator-webapp/src/test/groovy/com/octo/keip/flow/web/translation/TranslationServiceTest.groovy +++ b/flow-translator/flow-translator-webapp/src/test/groovy/org/codice/keip/flow/web/translation/TranslationServiceTest.groovy @@ -1,8 +1,8 @@ -package com.octo.keip.flow.web.translation +package org.codice.keip.flow.web.translation -import com.octo.keip.flow.FlowTranslator -import com.octo.keip.flow.error.TransformationError -import com.octo.keip.flow.model.Flow +import org.codice.keip.flow.FlowTranslator +import org.codice.keip.flow.error.TransformationError +import org.codice.keip.flow.model.Flow import spock.lang.Specification import javax.xml.transform.TransformerException diff --git a/flow-translator/flow-translator-webapp/src/test/java/com/octo/keip/flow/web/CorsConfigurationAppTest.java b/flow-translator/flow-translator-webapp/src/test/java/org/codice/keip/flow/web/CorsConfigurationAppTest.java similarity index 93% rename from flow-translator/flow-translator-webapp/src/test/java/com/octo/keip/flow/web/CorsConfigurationAppTest.java rename to flow-translator/flow-translator-webapp/src/test/java/org/codice/keip/flow/web/CorsConfigurationAppTest.java index 9aae6f9c..1d74aaf6 100644 --- a/flow-translator/flow-translator-webapp/src/test/java/com/octo/keip/flow/web/CorsConfigurationAppTest.java +++ b/flow-translator/flow-translator-webapp/src/test/java/org/codice/keip/flow/web/CorsConfigurationAppTest.java @@ -1,6 +1,6 @@ -package com.octo.keip.flow.web; +package org.codice.keip.flow.web; -import static com.octo.keip.flow.web.FlowTranslatorAppTest.readFlowJson; +import static org.codice.keip.flow.web.FlowTranslatorAppTest.readFlowJson; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; diff --git a/flow-translator/flow-translator-webapp/src/test/java/com/octo/keip/flow/web/FlowTranslatorAppTest.java b/flow-translator/flow-translator-webapp/src/test/java/org/codice/keip/flow/web/FlowTranslatorAppTest.java similarity index 97% rename from flow-translator/flow-translator-webapp/src/test/java/com/octo/keip/flow/web/FlowTranslatorAppTest.java rename to flow-translator/flow-translator-webapp/src/test/java/org/codice/keip/flow/web/FlowTranslatorAppTest.java index fe502b63..d02ff313 100644 --- a/flow-translator/flow-translator-webapp/src/test/java/com/octo/keip/flow/web/FlowTranslatorAppTest.java +++ b/flow-translator/flow-translator-webapp/src/test/java/org/codice/keip/flow/web/FlowTranslatorAppTest.java @@ -1,4 +1,4 @@ -package com.octo.keip.flow.web; +package org.codice.keip.flow.web; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/flow-translator/pom.xml b/flow-translator/pom.xml index d878cb39..443fcf50 100644 --- a/flow-translator/pom.xml +++ b/flow-translator/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.octo.keip + org.codice.keip flow-translator 0.1.0 pom diff --git a/schemas/README.md b/schemas/README.md index 68cbecf2..6055ac93 100644 --- a/schemas/README.md +++ b/schemas/README.md @@ -15,7 +15,7 @@ The version of the schemas are stored as part of each schema's URI set with the ``` { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/OctoConsulting/keip-canvas/schemas/v0.1.0/eipFlow.schema.json", + "$id": "https://github.com/codice/keip-canvas/schemas/v0.1.0/eipFlow.schema.json", "title": "EipFlow", . . @@ -32,7 +32,7 @@ For JVM-based services, a Maven dependency is provided to streamline validating ```xml - com.octo.keip.schemas + org.codice.keip.schemas validation 0.1.0 @@ -41,8 +41,8 @@ For JVM-based services, a Maven dependency is provided to streamline validating The `EipSchemaValidator` can then be used: ```java -import com.octo.keip.schemas.validation.EipSchema; -import com.octo.keip.schemas.validation.EipSchemaValidator; +import org.codice.keip.schemas.validation.EipSchema; +import org.codice.keip.schemas.validation.EipSchemaValidator; EipSchemaValidator validator = EipSchemaValidator.getInstance(EipSchema.FLOW); diff --git a/schemas/model/json/attributeType.schema.json b/schemas/model/json/attributeType.schema.json index 3a520261..88f66267 100644 --- a/schemas/model/json/attributeType.schema.json +++ b/schemas/model/json/attributeType.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/OctoConsulting/keip-canvas/schemas/v0.1.0/attributeType.schema.json", + "$id": "https://github.com/codice/keip-canvas/schemas/v0.1.0/attributeType.schema.json", "title": "AttributeType", "description": "The attribute's value type (attribute keys are always strings)", "oneOf": [ diff --git a/schemas/model/json/connectionType.schema.json b/schemas/model/json/connectionType.schema.json index 811929ee..70302cd0 100644 --- a/schemas/model/json/connectionType.schema.json +++ b/schemas/model/json/connectionType.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/OctoConsulting/keip-canvas/schemas/v0.1.0/connectionType.schema.json", + "$id": "https://github.com/codice/keip-canvas/schemas/v0.1.0/connectionType.schema.json", "title": "ConnectionType", "description": "Defines a connection pattern for an EIP component", "type": "string", diff --git a/schemas/model/json/eipComponentDef.schema.json b/schemas/model/json/eipComponentDef.schema.json index ff0b3c00..0d1d9e5c 100644 --- a/schemas/model/json/eipComponentDef.schema.json +++ b/schemas/model/json/eipComponentDef.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/OctoConsulting/keip-canvas/schemas/v0.1.0/eipComponentDef.schema.json", + "$id": "https://github.com/codice/keip-canvas/schemas/v0.1.0/eipComponentDef.schema.json", "title": "EipComponentDefinition", "description": "Defines the collection of EIP components available for use", "type": "object", diff --git a/schemas/model/json/eipFlow.schema.json b/schemas/model/json/eipFlow.schema.json index 466b0562..98d8021d 100644 --- a/schemas/model/json/eipFlow.schema.json +++ b/schemas/model/json/eipFlow.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/OctoConsulting/keip-canvas/schemas/v0.1.0/eipFlow.schema.json", + "$id": "https://github.com/codice/keip-canvas/schemas/v0.1.0/eipFlow.schema.json", "title": "EipFlow", "description": "A representation of an EIP flow diagram as a collection of nodes and their corresponding edges", "type": "object", diff --git a/schemas/model/json/eipNode.schema.json b/schemas/model/json/eipNode.schema.json index c4d2b423..247515e2 100644 --- a/schemas/model/json/eipNode.schema.json +++ b/schemas/model/json/eipNode.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/OctoConsulting/keip-canvas/schemas/v0.1.0/eipNode.schema.json", + "$id": "https://github.com/codice/keip-canvas/schemas/v0.1.0/eipNode.schema.json", "title": "EipNode", "description": "An instance of an 'EipComponent' as a node in the flow diagram", "type": "object", diff --git a/schemas/model/json/eipRole.schema.json b/schemas/model/json/eipRole.schema.json index c2e37a6a..bac4bc46 100644 --- a/schemas/model/json/eipRole.schema.json +++ b/schemas/model/json/eipRole.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/OctoConsulting/keip-canvas/schemas/v0.1.0/eipRole.schema.json", + "$id": "https://github.com/codice/keip-canvas/schemas/v0.1.0/eipRole.schema.json", "title": "EipRole", "description": "Describes the expected general behavior of an EIP component", "type": "string", diff --git a/schemas/model/pom.xml b/schemas/model/pom.xml index 9c118ef1..5b586ff0 100644 --- a/schemas/model/pom.xml +++ b/schemas/model/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.octo.keip.schemas + org.codice.keip.schemas schema-parent 0.1.0 diff --git a/schemas/pom.xml b/schemas/pom.xml index 9f565ec3..c7094803 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.octo.keip.schemas + org.codice.keip.schemas schema-parent 0.1.0 diff --git a/schemas/validation/pom.xml b/schemas/validation/pom.xml index 0e509cb8..1d080808 100644 --- a/schemas/validation/pom.xml +++ b/schemas/validation/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.octo.keip.schemas + org.codice.keip.schemas schema-parent 0.1.0 @@ -20,7 +20,7 @@ - com.octo.keip.schemas + org.codice.keip.schemas model 0.1.0 diff --git a/schemas/validation/src/main/java/com/octo/keip/schemas/validation/EipSchema.java b/schemas/validation/src/main/java/com/octo/keip/schemas/validation/EipSchema.java index 14d2c6e3..b8c10537 100644 --- a/schemas/validation/src/main/java/com/octo/keip/schemas/validation/EipSchema.java +++ b/schemas/validation/src/main/java/com/octo/keip/schemas/validation/EipSchema.java @@ -1,4 +1,4 @@ -package com.octo.keip.schemas.validation; +package org.codice.keip.schemas.validation; public enum EipSchema { FLOW, diff --git a/schemas/validation/src/main/java/com/octo/keip/schemas/validation/EipSchemaValidator.java b/schemas/validation/src/main/java/com/octo/keip/schemas/validation/EipSchemaValidator.java index 3380f8c4..188a7d3b 100644 --- a/schemas/validation/src/main/java/com/octo/keip/schemas/validation/EipSchemaValidator.java +++ b/schemas/validation/src/main/java/com/octo/keip/schemas/validation/EipSchemaValidator.java @@ -1,4 +1,4 @@ -package com.octo.keip.schemas.validation; +package org.codice.keip.schemas.validation; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; @@ -30,7 +30,7 @@ public final class EipSchemaValidator { .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .build(); private final JsonSchema eipSchema; - static final String SCHEMAS_PREFIX = "https://github.com/OctoConsulting/keip-canvas/schemas/"; + static final String SCHEMAS_PREFIX = "https://github.com/codice/keip-canvas/schemas/"; private EipSchemaValidator(String schemaPath) { JsonSchemaFactory jsonSchemaFactory = diff --git a/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/ComponentDefinitionValidationTest.groovy b/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/ComponentDefinitionValidationTest.groovy index 70d99bb5..5f567120 100644 --- a/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/ComponentDefinitionValidationTest.groovy +++ b/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/ComponentDefinitionValidationTest.groovy @@ -1,4 +1,4 @@ -package com.octo.keip.schemas.validation +package org.codice.keip.schemas.validation import spock.lang.Specification diff --git a/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/FlowSchemaValidationTest.groovy b/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/FlowSchemaValidationTest.groovy index 6f5e7958..8c9afa5b 100644 --- a/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/FlowSchemaValidationTest.groovy +++ b/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/FlowSchemaValidationTest.groovy @@ -1,4 +1,4 @@ -package com.octo.keip.schemas.validation +package org.codice.keip.schemas.validation import com.fasterxml.jackson.databind.ObjectMapper import spock.lang.Specification diff --git a/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/VersionlessSchemaMapperTest.groovy b/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/VersionlessSchemaMapperTest.groovy index 8749346a..12565f75 100644 --- a/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/VersionlessSchemaMapperTest.groovy +++ b/schemas/validation/src/test/groovy/com/octo/keip/schemas/validation/VersionlessSchemaMapperTest.groovy @@ -1,9 +1,9 @@ -package com.octo.keip.schemas.validation +package org.codice.keip.schemas.validation import com.networknt.schema.AbsoluteIri import spock.lang.Specification -import static com.octo.keip.schemas.validation.EipSchemaValidator.SCHEMAS_PREFIX +import static org.codice.keip.schemas.validation.EipSchemaValidator.SCHEMAS_PREFIX class VersionlessSchemaMapperTest extends Specification { diff --git a/si-xsd-parser/README.md b/si-xsd-parser/README.md index 06df910e..921b9aaa 100644 --- a/si-xsd-parser/README.md +++ b/si-xsd-parser/README.md @@ -4,7 +4,7 @@ A tool for parsing Spring Integration XSDs into an [Enterprise Integration Patterns (EIP)](https://www.enterpriseintegrationpatterns.com/patterns/messaging/) JSON model. It is mainly used to integrate Spring's library of integration components into -the [Keip Canvas UI](https://github.com/OctoConsulting/keip-canvas). +the [Keip Canvas UI](https://github.com/codice/keip-canvas). ## Getting Started diff --git a/si-xsd-parser/dependency-reduced-pom.xml b/si-xsd-parser/dependency-reduced-pom.xml index ab734314..b9ada2c5 100644 --- a/si-xsd-parser/dependency-reduced-pom.xml +++ b/si-xsd-parser/dependency-reduced-pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.octo.keip + org.codice.keip si-xml-schema-parser 0.1.0 @@ -24,7 +24,7 @@ true - com.octo.keip.schema.XsdParserApplication + org.codice.keip.schema.XsdParserApplication diff --git a/si-xsd-parser/pom.xml b/si-xsd-parser/pom.xml index af7044a0..eb45f6e3 100644 --- a/si-xsd-parser/pom.xml +++ b/si-xsd-parser/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.octo.keip + org.codice.keip si-xsd-parser 0.1.0 @@ -81,7 +81,7 @@ - com.octo.keip.schemas + org.codice.keip.schemas validation 0.1.0 test @@ -109,7 +109,7 @@ - com.octo.keip.schema.XsdParserApplication + org.codice.keip.schema.XsdParserApplication diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/EipSchemaTranslation.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/EipSchemaTranslation.java similarity index 79% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/EipSchemaTranslation.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/EipSchemaTranslation.java index 058ddc7d..8b7a5010 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/EipSchemaTranslation.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/EipSchemaTranslation.java @@ -1,11 +1,11 @@ -package com.octo.keip.schema; - -import com.octo.keip.schema.client.XmlSchemaClient; -import com.octo.keip.schema.config.XsdSourceConfiguration; -import com.octo.keip.schema.config.XsdSourceConfiguration.SchemaIdentifier; -import com.octo.keip.schema.model.eip.EipComponent; -import com.octo.keip.schema.model.eip.EipSchema; -import com.octo.keip.schema.xml.SchemaTranslator; +package org.codice.keip.schema; + +import org.codice.keip.schema.client.XmlSchemaClient; +import org.codice.keip.schema.config.XsdSourceConfiguration; +import org.codice.keip.schema.config.XsdSourceConfiguration.SchemaIdentifier; +import org.codice.keip.schema.model.eip.EipComponent; +import org.codice.keip.schema.model.eip.EipSchema; +import org.codice.keip.schema.xml.SchemaTranslator; import java.util.List; import org.apache.ws.commons.schema.XmlSchemaCollection; import org.slf4j.Logger; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/XsdParserApplication.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/XsdParserApplication.java similarity index 72% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/XsdParserApplication.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/XsdParserApplication.java index 74e87705..e6c44c4d 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/XsdParserApplication.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/XsdParserApplication.java @@ -1,6 +1,6 @@ -package com.octo.keip.schema; +package org.codice.keip.schema; -import com.octo.keip.schema.cmd.TranslateCommand; +import org.codice.keip.schema.cmd.TranslateCommand; import picocli.CommandLine; public class XsdParserApplication { diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/client/FileResolver.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/client/FileResolver.java similarity index 95% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/client/FileResolver.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/client/FileResolver.java index ae7a848d..122ccad9 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/client/FileResolver.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/client/FileResolver.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.client; +package org.codice.keip.schema.client; import java.io.BufferedInputStream; import java.io.File; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/client/HttpResolver.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/client/HttpResolver.java similarity index 97% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/client/HttpResolver.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/client/HttpResolver.java index 2e8b1d2e..5906312e 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/client/HttpResolver.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/client/HttpResolver.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.client; +package org.codice.keip.schema.client; import java.io.InputStream; import java.net.URI; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/client/UriResolver.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/client/UriResolver.java similarity index 84% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/client/UriResolver.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/client/UriResolver.java index 6b62cbd3..618fbae4 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/client/UriResolver.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/client/UriResolver.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.client; +package org.codice.keip.schema.client; import java.io.InputStream; import java.net.URI; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/client/XmlSchemaClient.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/client/XmlSchemaClient.java similarity index 98% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/client/XmlSchemaClient.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/client/XmlSchemaClient.java index c721c894..f14b2b0b 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/client/XmlSchemaClient.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/client/XmlSchemaClient.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.client; +package org.codice.keip.schema.client; import java.io.IOException; import java.io.InputStream; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/cmd/TranslateCommand.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/cmd/TranslateCommand.java similarity index 86% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/cmd/TranslateCommand.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/cmd/TranslateCommand.java index 2a2950b1..97b412dd 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/cmd/TranslateCommand.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/cmd/TranslateCommand.java @@ -1,9 +1,9 @@ -package com.octo.keip.schema.cmd; +package org.codice.keip.schema.cmd; -import com.octo.keip.schema.EipSchemaTranslation; -import com.octo.keip.schema.client.XmlSchemaClient; -import com.octo.keip.schema.config.XsdSourceConfiguration; -import com.octo.keip.schema.model.serdes.SchemaSerializer; +import org.codice.keip.schema.EipSchemaTranslation; +import org.codice.keip.schema.client.XmlSchemaClient; +import org.codice.keip.schema.config.XsdSourceConfiguration; +import org.codice.keip.schema.model.serdes.SchemaSerializer; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/config/XsdSourceConfiguration.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/config/XsdSourceConfiguration.java similarity index 98% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/config/XsdSourceConfiguration.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/config/XsdSourceConfiguration.java index d4a02b98..1725c002 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/config/XsdSourceConfiguration.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/config/XsdSourceConfiguration.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.config; +package org.codice.keip.schema.config; import java.io.InputStream; import java.net.URI; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Attribute.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Attribute.java similarity index 96% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Attribute.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Attribute.java index 1e74b88f..701ac0b0 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Attribute.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Attribute.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import com.google.gson.annotations.SerializedName; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/AttributeType.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/AttributeType.java similarity index 85% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/AttributeType.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/AttributeType.java index 648415e4..b6defcbf 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/AttributeType.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/AttributeType.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import com.google.gson.annotations.SerializedName; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ChildComposite.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ChildComposite.java similarity index 86% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ChildComposite.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ChildComposite.java index 31de80bd..818e9c20 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ChildComposite.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ChildComposite.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import java.util.List; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ChildGroup.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ChildGroup.java similarity index 95% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ChildGroup.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ChildGroup.java index 4243b1a5..81d5ec7f 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ChildGroup.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ChildGroup.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import java.util.ArrayList; import java.util.List; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ConnectionType.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ConnectionType.java similarity index 89% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ConnectionType.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ConnectionType.java index 3fee3202..1a647f54 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/ConnectionType.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/ConnectionType.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import com.google.gson.annotations.SerializedName; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipChildElement.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipChildElement.java similarity index 97% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipChildElement.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipChildElement.java index 1dbb7b7a..f47f5fd9 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipChildElement.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipChildElement.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import java.util.List; import java.util.Objects; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipComponent.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipComponent.java similarity index 96% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipComponent.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipComponent.java index 8d7c0ed7..addfe4bd 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipComponent.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipComponent.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import java.util.Objects; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipElement.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipElement.java similarity index 98% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipElement.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipElement.java index 56f03b3e..68408af6 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipElement.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipElement.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import java.util.Collections; import java.util.HashSet; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipSchema.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipSchema.java similarity index 95% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipSchema.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipSchema.java index b4db203d..78d82879 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/EipSchema.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/EipSchema.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import java.util.LinkedHashMap; import java.util.List; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Indicator.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Indicator.java similarity index 81% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Indicator.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Indicator.java index 7c42d3ff..89dec087 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Indicator.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Indicator.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import com.google.gson.annotations.SerializedName; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Occurrence.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Occurrence.java similarity index 95% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Occurrence.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Occurrence.java index c5058c34..78c2dcbf 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Occurrence.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Occurrence.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import java.util.Collections; import java.util.HashMap; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Restriction.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Restriction.java similarity index 92% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Restriction.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Restriction.java index bcf051dc..7a43de36 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Restriction.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Restriction.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import com.google.gson.annotations.SerializedName; import java.util.List; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Role.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Role.java similarity index 85% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Role.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Role.java index 9b4a06e2..cf31d129 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/eip/Role.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/eip/Role.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.model.eip; +package org.codice.keip.schema.model.eip; import com.google.gson.annotations.SerializedName; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/serdes/OccurrenceSerializer.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/serdes/OccurrenceSerializer.java similarity index 82% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/serdes/OccurrenceSerializer.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/serdes/OccurrenceSerializer.java index 13f32fd4..d46bd0c0 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/serdes/OccurrenceSerializer.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/serdes/OccurrenceSerializer.java @@ -1,9 +1,9 @@ -package com.octo.keip.schema.model.serdes; +package org.codice.keip.schema.model.serdes; import com.google.gson.JsonElement; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.octo.keip.schema.model.eip.Occurrence; +import org.codice.keip.schema.model.eip.Occurrence; import java.lang.reflect.Type; public class OccurrenceSerializer implements JsonSerializer { diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/serdes/SchemaSerializer.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/serdes/SchemaSerializer.java similarity index 78% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/model/serdes/SchemaSerializer.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/model/serdes/SchemaSerializer.java index 29585732..61c75b82 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/model/serdes/SchemaSerializer.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/model/serdes/SchemaSerializer.java @@ -1,9 +1,9 @@ -package com.octo.keip.schema.model.serdes; +package org.codice.keip.schema.model.serdes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.octo.keip.schema.model.eip.EipSchema; -import com.octo.keip.schema.model.eip.Occurrence; +import org.codice.keip.schema.model.eip.EipSchema; +import org.codice.keip.schema.model.eip.Occurrence; import java.io.File; import java.io.FileWriter; import java.io.IOException; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/ChildGroupReducer.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/ChildGroupReducer.java similarity index 96% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/xml/ChildGroupReducer.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/xml/ChildGroupReducer.java index 264a027d..b1ca523d 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/ChildGroupReducer.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/ChildGroupReducer.java @@ -1,10 +1,10 @@ -package com.octo.keip.schema.xml; +package org.codice.keip.schema.xml; -import com.octo.keip.schema.model.eip.ChildComposite; -import com.octo.keip.schema.model.eip.ChildGroup; -import com.octo.keip.schema.model.eip.EipChildElement; -import com.octo.keip.schema.model.eip.Indicator; -import com.octo.keip.schema.model.eip.Occurrence; +import org.codice.keip.schema.model.eip.ChildComposite; +import org.codice.keip.schema.model.eip.ChildGroup; +import org.codice.keip.schema.model.eip.EipChildElement; +import org.codice.keip.schema.model.eip.Indicator; +import org.codice.keip.schema.model.eip.Occurrence; import java.util.HashSet; import java.util.IdentityHashMap; import java.util.List; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/EipTranslationVisitor.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/EipTranslationVisitor.java similarity index 94% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/xml/EipTranslationVisitor.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/xml/EipTranslationVisitor.java index 11c1ff58..07ce3238 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/EipTranslationVisitor.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/EipTranslationVisitor.java @@ -1,16 +1,16 @@ -package com.octo.keip.schema.xml; - -import com.octo.keip.schema.model.eip.Attribute; -import com.octo.keip.schema.model.eip.ChildComposite; -import com.octo.keip.schema.model.eip.ChildGroup; -import com.octo.keip.schema.model.eip.ConnectionType; -import com.octo.keip.schema.model.eip.EipChildElement; -import com.octo.keip.schema.model.eip.EipComponent; -import com.octo.keip.schema.model.eip.Indicator; -import com.octo.keip.schema.model.eip.Occurrence; -import com.octo.keip.schema.model.eip.Role; -import com.octo.keip.schema.xml.attribute.AnnotationTranslator; -import com.octo.keip.schema.xml.attribute.AttributeTranslator; +package org.codice.keip.schema.xml; + +import org.codice.keip.schema.model.eip.Attribute; +import org.codice.keip.schema.model.eip.ChildComposite; +import org.codice.keip.schema.model.eip.ChildGroup; +import org.codice.keip.schema.model.eip.ConnectionType; +import org.codice.keip.schema.model.eip.EipChildElement; +import org.codice.keip.schema.model.eip.EipComponent; +import org.codice.keip.schema.model.eip.Indicator; +import org.codice.keip.schema.model.eip.Occurrence; +import org.codice.keip.schema.model.eip.Role; +import org.codice.keip.schema.xml.attribute.AnnotationTranslator; +import org.codice.keip.schema.xml.attribute.AttributeTranslator; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -37,7 +37,7 @@ /** * A custom {@link XmlSchemaVisitor} that parses an Integration XSD into the {@link - * com.octo.keip.schema.model.eip.EipSchema} model. + * org.codice.keip.schema.model.eip.EipSchema} model. * *

TODO: Consider switching to a reference-based schema (rather than inlining children). Could * potentially decrease the size of output files and enable us to better handle circular refs. diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/SchemaTranslator.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/SchemaTranslator.java similarity index 92% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/xml/SchemaTranslator.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/xml/SchemaTranslator.java index 08ab8057..06cdaf87 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/SchemaTranslator.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/SchemaTranslator.java @@ -1,8 +1,8 @@ -package com.octo.keip.schema.xml; +package org.codice.keip.schema.xml; -import com.octo.keip.schema.model.eip.ChildGroup; -import com.octo.keip.schema.model.eip.EipChildElement; -import com.octo.keip.schema.model.eip.EipComponent; +import org.codice.keip.schema.model.eip.ChildGroup; +import org.codice.keip.schema.model.eip.EipChildElement; +import org.codice.keip.schema.model.eip.EipComponent; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/attribute/AnnotationTranslator.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/attribute/AnnotationTranslator.java similarity index 98% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/xml/attribute/AnnotationTranslator.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/xml/attribute/AnnotationTranslator.java index 913ddadd..201621aa 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/attribute/AnnotationTranslator.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/attribute/AnnotationTranslator.java @@ -1,4 +1,4 @@ -package com.octo.keip.schema.xml.attribute; +package org.codice.keip.schema.xml.attribute; import java.util.Objects; import java.util.StringJoiner; diff --git a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/attribute/AttributeTranslator.java b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/attribute/AttributeTranslator.java similarity index 95% rename from si-xsd-parser/src/main/java/com/octo/keip/schema/xml/attribute/AttributeTranslator.java rename to si-xsd-parser/src/main/java/org/codice/keip/schema/xml/attribute/AttributeTranslator.java index a63b0585..10f63930 100644 --- a/si-xsd-parser/src/main/java/com/octo/keip/schema/xml/attribute/AttributeTranslator.java +++ b/si-xsd-parser/src/main/java/org/codice/keip/schema/xml/attribute/AttributeTranslator.java @@ -1,8 +1,8 @@ -package com.octo.keip.schema.xml.attribute; +package org.codice.keip.schema.xml.attribute; -import com.octo.keip.schema.model.eip.Attribute; -import com.octo.keip.schema.model.eip.AttributeType; -import com.octo.keip.schema.model.eip.Restriction; +import org.codice.keip.schema.model.eip.Attribute; +import org.codice.keip.schema.model.eip.AttributeType; +import org.codice.keip.schema.model.eip.Restriction; import java.util.Collections; import java.util.List; import org.apache.ws.commons.schema.XmlSchemaAttribute; diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/EipSchemaTranslationTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/EipSchemaTranslationTest.groovy similarity index 89% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/EipSchemaTranslationTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/EipSchemaTranslationTest.groovy index c7fd0a04..c19485dd 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/EipSchemaTranslationTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/EipSchemaTranslationTest.groovy @@ -1,14 +1,14 @@ -package com.octo.keip.schema +package org.codice.keip.schema import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.octo.keip.schema.client.XmlSchemaClient -import com.octo.keip.schema.config.XsdSourceConfiguration -import com.octo.keip.schema.model.eip.EipComponent -import com.octo.keip.schema.model.eip.EipElement -import com.octo.keip.schema.model.eip.EipSchema -import com.octo.keip.schema.test.EipComparisonUtils -import com.octo.keip.schema.test.TestIOUtils +import org.codice.keip.schema.client.XmlSchemaClient +import org.codice.keip.schema.config.XsdSourceConfiguration +import org.codice.keip.schema.model.eip.EipComponent +import org.codice.keip.schema.model.eip.EipElement +import org.codice.keip.schema.model.eip.EipSchema +import org.codice.keip.schema.test.EipComparisonUtils +import org.codice.keip.schema.test.TestIOUtils import org.apache.ws.commons.schema.XmlSchemaCollection import spock.lang.Shared import spock.lang.Specification diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/FileResolverTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/FileResolverTest.groovy similarity index 97% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/FileResolverTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/FileResolverTest.groovy index e222c4c1..ebea6c57 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/FileResolverTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/FileResolverTest.groovy @@ -1,4 +1,4 @@ -package com.octo.keip.schema.client +package org.codice.keip.schema.client import spock.lang.Shared import spock.lang.Specification diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/HttpResolverTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/HttpResolverTest.groovy similarity index 97% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/HttpResolverTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/HttpResolverTest.groovy index 07bcba48..78ee09da 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/HttpResolverTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/HttpResolverTest.groovy @@ -1,4 +1,4 @@ -package com.octo.keip.schema.client +package org.codice.keip.schema.client import spock.lang.Specification diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/XmlSchemaHttpClientTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/XmlSchemaHttpClientTest.groovy similarity index 98% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/XmlSchemaHttpClientTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/XmlSchemaHttpClientTest.groovy index b137681c..464b1700 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/client/XmlSchemaHttpClientTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/client/XmlSchemaHttpClientTest.groovy @@ -1,4 +1,4 @@ -package com.octo.keip.schema.client +package org.codice.keip.schema.client import org.apache.ws.commons.schema.XmlSchemaCollection import spock.lang.Shared diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/config/SchemaRetrievalConfigTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/config/SchemaRetrievalConfigTest.groovy similarity index 93% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/config/SchemaRetrievalConfigTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/config/SchemaRetrievalConfigTest.groovy index ffb80903..481c7848 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/config/SchemaRetrievalConfigTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/config/SchemaRetrievalConfigTest.groovy @@ -1,6 +1,6 @@ -package com.octo.keip.schema.config +package org.codice.keip.schema.config -import com.octo.keip.schema.test.TestIOUtils +import org.codice.keip.schema.test.TestIOUtils import spock.lang.Specification import java.nio.file.Path diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/model/serdes/SchemaSerializerTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/model/serdes/SchemaSerializerTest.groovy similarity index 79% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/model/serdes/SchemaSerializerTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/model/serdes/SchemaSerializerTest.groovy index 44615a39..591f3787 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/model/serdes/SchemaSerializerTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/model/serdes/SchemaSerializerTest.groovy @@ -1,24 +1,24 @@ -package com.octo.keip.schema.model.serdes +package org.codice.keip.schema.model.serdes import com.google.gson.JsonParser -import com.octo.keip.schema.model.eip.Attribute -import com.octo.keip.schema.model.eip.AttributeType -import com.octo.keip.schema.model.eip.ChildGroup -import com.octo.keip.schema.model.eip.EipChildElement -import com.octo.keip.schema.model.eip.EipComponent -import com.octo.keip.schema.model.eip.EipSchema -import com.octo.keip.schema.model.eip.ConnectionType -import com.octo.keip.schema.model.eip.Indicator -import com.octo.keip.schema.model.eip.Occurrence -import com.octo.keip.schema.model.eip.Restriction -import com.octo.keip.schema.model.eip.Role -import com.octo.keip.schemas.validation.EipSchemaValidator +import org.codice.keip.schema.model.eip.Attribute +import org.codice.keip.schema.model.eip.AttributeType +import org.codice.keip.schema.model.eip.ChildGroup +import org.codice.keip.schema.model.eip.EipChildElement +import org.codice.keip.schema.model.eip.EipComponent +import org.codice.keip.schema.model.eip.EipSchema +import org.codice.keip.schema.model.eip.ConnectionType +import org.codice.keip.schema.model.eip.Indicator +import org.codice.keip.schema.model.eip.Occurrence +import org.codice.keip.schema.model.eip.Restriction +import org.codice.keip.schema.model.eip.Role +import org.codice.keip.schemas.validation.EipSchemaValidator import spock.lang.Specification import spock.lang.TempDir import java.nio.file.Path -import static com.octo.keip.schemas.validation.EipSchema.COMPONENT_DEFINITION +import static org.codice.keip.schemas.validation.EipSchema.COMPONENT_DEFINITION class SchemaSerializerTest extends Specification { diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/test/EipComparisonUtils.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/test/EipComparisonUtils.groovy similarity index 91% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/test/EipComparisonUtils.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/test/EipComparisonUtils.groovy index 81950981..a95bc05a 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/test/EipComparisonUtils.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/test/EipComparisonUtils.groovy @@ -1,10 +1,10 @@ -package com.octo.keip.schema.test +package org.codice.keip.schema.test -import com.octo.keip.schema.model.eip.Attribute -import com.octo.keip.schema.model.eip.ChildComposite -import com.octo.keip.schema.model.eip.ChildGroup -import com.octo.keip.schema.model.eip.EipChildElement -import com.octo.keip.schema.model.eip.EipComponent +import org.codice.keip.schema.model.eip.Attribute +import org.codice.keip.schema.model.eip.ChildComposite +import org.codice.keip.schema.model.eip.ChildGroup +import org.codice.keip.schema.model.eip.EipChildElement +import org.codice.keip.schema.model.eip.EipComponent import java.util.function.BiConsumer diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/test/TestIOUtils.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/test/TestIOUtils.groovy similarity index 71% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/test/TestIOUtils.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/test/TestIOUtils.groovy index 853b8b95..c2285057 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/test/TestIOUtils.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/test/TestIOUtils.groovy @@ -1,13 +1,13 @@ -package com.octo.keip.schema.test +package org.codice.keip.schema.test import com.google.gson.Gson import com.google.gson.GsonBuilder -import com.octo.keip.schema.model.eip.ChildComposite -import com.octo.keip.schema.model.eip.Occurrence -import com.octo.keip.schema.model.eip.Restriction -import com.octo.keip.schema.serdes.ChildCompositeDeserializer -import com.octo.keip.schema.serdes.OccurrenceDeserializer -import com.octo.keip.schema.serdes.RestrictionDeserializer +import org.codice.keip.schema.model.eip.ChildComposite +import org.codice.keip.schema.model.eip.Occurrence +import org.codice.keip.schema.model.eip.Restriction +import org.codice.keip.schema.serdes.ChildCompositeDeserializer +import org.codice.keip.schema.serdes.OccurrenceDeserializer +import org.codice.keip.schema.serdes.RestrictionDeserializer import java.nio.file.Path diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/ChildGroupReducerTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/ChildGroupReducerTest.groovy similarity index 97% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/ChildGroupReducerTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/ChildGroupReducerTest.groovy index 67b87cac..caa0b5cd 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/ChildGroupReducerTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/ChildGroupReducerTest.groovy @@ -1,9 +1,9 @@ -package com.octo.keip.schema.xml +package org.codice.keip.schema.xml -import com.octo.keip.schema.model.eip.ChildGroup -import com.octo.keip.schema.model.eip.EipChildElement -import com.octo.keip.schema.model.eip.Indicator -import com.octo.keip.schema.model.eip.Occurrence +import org.codice.keip.schema.model.eip.ChildGroup +import org.codice.keip.schema.model.eip.EipChildElement +import org.codice.keip.schema.model.eip.Indicator +import org.codice.keip.schema.model.eip.Occurrence import spock.lang.Specification class ChildGroupReducerTest extends Specification { diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/EipTranslationVisitorTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/EipTranslationVisitorTest.groovy similarity index 95% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/EipTranslationVisitorTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/EipTranslationVisitorTest.groovy index 67ab13e6..8e407e03 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/EipTranslationVisitorTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/EipTranslationVisitorTest.groovy @@ -1,14 +1,14 @@ -package com.octo.keip.schema.xml - -import com.octo.keip.schema.model.eip.Attribute -import com.octo.keip.schema.model.eip.AttributeType -import com.octo.keip.schema.model.eip.ChildGroup -import com.octo.keip.schema.model.eip.ConnectionType -import com.octo.keip.schema.model.eip.EipChildElement -import com.octo.keip.schema.model.eip.Indicator -import com.octo.keip.schema.model.eip.Occurrence -import com.octo.keip.schema.model.eip.Role -import com.octo.keip.schema.test.TestIOUtils +package org.codice.keip.schema.xml + +import org.codice.keip.schema.model.eip.Attribute +import org.codice.keip.schema.model.eip.AttributeType +import org.codice.keip.schema.model.eip.ChildGroup +import org.codice.keip.schema.model.eip.ConnectionType +import org.codice.keip.schema.model.eip.EipChildElement +import org.codice.keip.schema.model.eip.Indicator +import org.codice.keip.schema.model.eip.Occurrence +import org.codice.keip.schema.model.eip.Role +import org.codice.keip.schema.test.TestIOUtils import org.apache.ws.commons.schema.XmlSchemaCollection import org.apache.ws.commons.schema.XmlSchemaElement import org.apache.ws.commons.schema.walker.XmlSchemaWalker diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/SchemaTranslatorTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/SchemaTranslatorTest.groovy similarity index 86% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/SchemaTranslatorTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/SchemaTranslatorTest.groovy index 583d94a5..d10acc52 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/SchemaTranslatorTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/SchemaTranslatorTest.groovy @@ -1,20 +1,20 @@ -package com.octo.keip.schema.xml +package org.codice.keip.schema.xml import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.octo.keip.schema.model.eip.ChildGroup -import com.octo.keip.schema.model.eip.EipComponent -import com.octo.keip.schema.model.eip.EipElement -import com.octo.keip.schema.model.eip.Indicator -import com.octo.keip.schema.model.eip.Occurrence -import com.octo.keip.schema.test.EipComparisonUtils -import com.octo.keip.schema.test.TestIOUtils +import org.codice.keip.schema.model.eip.ChildGroup +import org.codice.keip.schema.model.eip.EipComponent +import org.codice.keip.schema.model.eip.EipElement +import org.codice.keip.schema.model.eip.Indicator +import org.codice.keip.schema.model.eip.Occurrence +import org.codice.keip.schema.test.EipComparisonUtils +import org.codice.keip.schema.test.TestIOUtils import org.apache.ws.commons.schema.XmlSchemaCollection import spock.lang.Specification import java.nio.file.Path -import static com.octo.keip.schema.test.TestIOUtils.getXmlSchemaFileReader +import static org.codice.keip.schema.test.TestIOUtils.getXmlSchemaFileReader class SchemaTranslatorTest extends Specification { diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/attribute/AnnotationTranslatorTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/attribute/AnnotationTranslatorTest.groovy similarity index 99% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/attribute/AnnotationTranslatorTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/attribute/AnnotationTranslatorTest.groovy index 0699afd7..38da607c 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/attribute/AnnotationTranslatorTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/attribute/AnnotationTranslatorTest.groovy @@ -1,4 +1,4 @@ -package com.octo.keip.schema.xml.attribute +package org.codice.keip.schema.xml.attribute import org.apache.ws.commons.schema.XmlSchemaAnnotation import org.apache.ws.commons.schema.XmlSchemaAnnotationItem diff --git a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/attribute/AttributeTranslatorTest.groovy b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/attribute/AttributeTranslatorTest.groovy similarity index 98% rename from si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/attribute/AttributeTranslatorTest.groovy rename to si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/attribute/AttributeTranslatorTest.groovy index fb9c525a..c61df993 100644 --- a/si-xsd-parser/src/test/groovy/com/octo/keip/schema/xml/attribute/AttributeTranslatorTest.groovy +++ b/si-xsd-parser/src/test/groovy/org/codice/keip/schema/xml/attribute/AttributeTranslatorTest.groovy @@ -1,7 +1,7 @@ -package com.octo.keip.schema.xml.attribute +package org.codice.keip.schema.xml.attribute -import com.octo.keip.schema.model.eip.AttributeType -import com.octo.keip.schema.model.eip.Restriction +import org.codice.keip.schema.model.eip.AttributeType +import org.codice.keip.schema.model.eip.Restriction import org.apache.ws.commons.schema.XmlSchema import org.apache.ws.commons.schema.XmlSchemaAttribute import org.apache.ws.commons.schema.XmlSchemaUse diff --git a/si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/ChildCompositeDeserializer.java b/si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/ChildCompositeDeserializer.java similarity index 75% rename from si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/ChildCompositeDeserializer.java rename to si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/ChildCompositeDeserializer.java index 7e8b29c0..1b8994b0 100644 --- a/si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/ChildCompositeDeserializer.java +++ b/si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/ChildCompositeDeserializer.java @@ -1,12 +1,12 @@ -package com.octo.keip.schema.serdes; +package org.codice.keip.schema.serdes; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import com.octo.keip.schema.model.eip.ChildComposite; -import com.octo.keip.schema.model.eip.ChildGroup; -import com.octo.keip.schema.model.eip.EipChildElement; +import org.codice.keip.schema.model.eip.ChildComposite; +import org.codice.keip.schema.model.eip.ChildGroup; +import org.codice.keip.schema.model.eip.EipChildElement; import java.lang.reflect.Type; public class ChildCompositeDeserializer implements JsonDeserializer { diff --git a/si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/OccurrenceDeserializer.java b/si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/OccurrenceDeserializer.java similarity index 88% rename from si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/OccurrenceDeserializer.java rename to si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/OccurrenceDeserializer.java index d46219c4..a5d8503d 100644 --- a/si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/OccurrenceDeserializer.java +++ b/si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/OccurrenceDeserializer.java @@ -1,10 +1,10 @@ -package com.octo.keip.schema.serdes; +package org.codice.keip.schema.serdes; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import com.octo.keip.schema.model.eip.Occurrence; +import org.codice.keip.schema.model.eip.Occurrence; import java.lang.reflect.Type; public class OccurrenceDeserializer implements JsonDeserializer { diff --git a/si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/RestrictionDeserializer.java b/si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/RestrictionDeserializer.java similarity index 91% rename from si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/RestrictionDeserializer.java rename to si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/RestrictionDeserializer.java index d47e4444..665dde41 100644 --- a/si-xsd-parser/src/test/java/com/octo/keip/schema/serdes/RestrictionDeserializer.java +++ b/si-xsd-parser/src/test/java/org/codice/keip/schema/serdes/RestrictionDeserializer.java @@ -1,11 +1,11 @@ -package com.octo.keip.schema.serdes; +package org.codice.keip.schema.serdes; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import com.octo.keip.schema.model.eip.Restriction; +import org.codice.keip.schema.model.eip.Restriction; import java.lang.reflect.Type; import java.util.List; diff --git a/ui/.env b/ui/.env index 652db061..93492c75 100644 --- a/ui/.env +++ b/ui/.env @@ -1,3 +1,3 @@ VITE_FLOW_TRANSLATOR_BASE_URL=http://localhost:8080 -VITE_KEIP_ASSISTANT_DOCS_URL=https://github.com/OctoConsulting/keip-canvas/blob/main/assistant/README.md +VITE_KEIP_ASSISTANT_DOCS_URL=https://github.com/codice/keip-canvas/blob/main/assistant/README.md VITE_KEIP_ASSISTANT_OLLAMA_URL=http://localhost:11434 \ No newline at end of file diff --git a/ui/DEVELOPER.md b/ui/DEVELOPER.md index 6ad83bfb..7af4000a 100644 --- a/ui/DEVELOPER.md +++ b/ui/DEVELOPER.md @@ -19,7 +19,7 @@ For local development, the following must be installed: Clone the repository: ```shell -git clone https://github.com/OctoConsulting/keip-canvas.git && cd keip-canvas/ui +git clone https://github.com/codice/keip-canvas.git && cd keip-canvas/ui ``` Install dependencies: diff --git a/ui/genApiFromSchema.js b/ui/genApiFromSchema.js index fd8ce62b..b0656859 100644 --- a/ui/genApiFromSchema.js +++ b/ui/genApiFromSchema.js @@ -19,7 +19,7 @@ const GENERATED_SOURCE_DIR = path.resolve("src", "api", "generated") const buildUrl = (schemaFileName) => new URL( - `OctoConsulting/keip-canvas/${COMMIT_HASH}/schemas/model/json/${schemaFileName}`, + `codice/keip-canvas/${COMMIT_HASH}/schemas/model/json/${schemaFileName}`, SCHEMAS_BASE_URL ).toString() @@ -30,8 +30,12 @@ const generateSources = async (schemaFileName) => { additionalProperties: false, }) - const outputFile = `${schemaFileName.split(".")[0]}.ts` - await writeFile(path.join(GENERATED_SOURCE_DIR, outputFile), generatedCode) + const outputFileName = `${schemaFileName.split(".")[0]}.ts` + const outputPath = path.join(GENERATED_SOURCE_DIR, outputFileName) + + console.log(`generating ${outputPath}`) + + await writeFile(outputPath, generatedCode) } fs.mkdirSync(GENERATED_SOURCE_DIR, { recursive: true }) diff --git a/ui/src/components/canvas/FlowCanvas.tsx b/ui/src/components/canvas/FlowCanvas.tsx index 2a6ab85a..530130cc 100644 --- a/ui/src/components/canvas/FlowCanvas.tsx +++ b/ui/src/components/canvas/FlowCanvas.tsx @@ -71,7 +71,7 @@ const acceptDroppedFile = (file: File, importFlow: (json: string) => void) => { e.target && importFlow(e.target.result as string) } catch (e) { // TODO: Display an error pop-up on failed import - // https://github.com/OctoConsulting/keip-canvas/issues/7 + // https://github.com/codice/keip-canvas/issues/7 console.error((e as Error).message) } }