Skip to content

Commit 8f4403a

Browse files
author
Rob Tjalma
authored
Merge pull request #36 from com-pas/refactoring-compas-core
Processed the refactoring of the CoMPAS core project.
2 parents c16d93c + f735ca9 commit 8f4403a

File tree

16 files changed

+38
-38
lines changed

16 files changed

+38
-38
lines changed

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasJAXBContextResolver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public JAXBContext getContext(Class<?> type) {
1919
return JAXBContext.newInstance(
2020
org.lfenergy.compas.scl.data.rest.model.ObjectFactory.class,
2121
org.lfenergy.compas.scl.data.model.ObjectFactory.class,
22-
org.lfenergy.compas.scl.ObjectFactory.class,
23-
org.lfenergy.compas.scl.extensions.ObjectFactory.class);
22+
org.lfenergy.compas.scl.model.ObjectFactory.class,
23+
org.lfenergy.compas.scl.extensions.model.ObjectFactory.class);
2424
} catch (JAXBException exp) {
2525
throw new SclDataException(exp);
2626
}

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44
package org.lfenergy.compas.scl.data.rest;
55

6-
import org.lfenergy.compas.commons.CompasExtensionsManager;
6+
import org.lfenergy.compas.scl.commons.CompasExtensionsManager;
77

88
import javax.enterprise.inject.Produces;
99

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/model/CreateRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org.lfenergy.compas.scl.data.rest.model;
66

77
import org.eclipse.microprofile.openapi.annotations.media.Schema;
8-
import org.lfenergy.compas.scl.SCL;
8+
import org.lfenergy.compas.scl.model.SCL;
99

1010
import javax.xml.bind.annotation.XmlAccessType;
1111
import javax.xml.bind.annotation.XmlAccessorType;

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/model/GetResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org.lfenergy.compas.scl.data.rest.model;
66

77
import org.eclipse.microprofile.openapi.annotations.media.Schema;
8-
import org.lfenergy.compas.scl.SCL;
8+
import org.lfenergy.compas.scl.model.SCL;
99

1010
import javax.xml.bind.annotation.XmlAccessType;
1111
import javax.xml.bind.annotation.XmlAccessorType;

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/model/UpdateRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package org.lfenergy.compas.scl.data.rest.model;
66

77
import org.eclipse.microprofile.openapi.annotations.media.Schema;
8-
import org.lfenergy.compas.scl.SCL;
98
import org.lfenergy.compas.scl.data.model.ChangeSetType;
9+
import org.lfenergy.compas.scl.model.SCL;
1010

1111
import javax.xml.bind.annotation.XmlAccessType;
1212
import javax.xml.bind.annotation.XmlAccessorType;

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// SPDX-License-Identifier: Apache-2.0
44
package org.lfenergy.compas.scl.data.rest.v1;
55

6-
import org.lfenergy.compas.scl.SCL;
76
import org.lfenergy.compas.scl.data.model.SclType;
87
import org.lfenergy.compas.scl.data.model.Version;
98
import org.lfenergy.compas.scl.data.rest.model.*;
109
import org.lfenergy.compas.scl.data.service.CompasSclDataService;
10+
import org.lfenergy.compas.scl.model.SCL;
1111

1212
import javax.inject.Inject;
1313
import javax.ws.rs.*;

‎app/src/test/java/org/lfenergy/compas/scl/data/rest/model/ObjectFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import org.junit.jupiter.api.BeforeAll;
77
import org.junit.jupiter.api.Test;
8-
import org.lfenergy.compas.scl.SCL;
98
import org.lfenergy.compas.scl.data.model.ChangeSetType;
109
import org.lfenergy.compas.scl.data.model.Item;
10+
import org.lfenergy.compas.scl.model.SCL;
1111

1212
import java.util.Collections;
1313
import java.util.UUID;

‎app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResourceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
import io.quarkus.test.junit.mockito.InjectMock;
99
import io.restassured.http.ContentType;
1010
import org.junit.jupiter.api.Test;
11-
import org.lfenergy.compas.commons.MarshallerWrapper;
12-
import org.lfenergy.compas.scl.SCL;
11+
import org.lfenergy.compas.scl.commons.MarshallerWrapper;
1312
import org.lfenergy.compas.scl.data.model.ChangeSetType;
1413
import org.lfenergy.compas.scl.data.model.Item;
1514
import org.lfenergy.compas.scl.data.model.SclType;
1615
import org.lfenergy.compas.scl.data.model.Version;
1716
import org.lfenergy.compas.scl.data.rest.model.CreateRequest;
1817
import org.lfenergy.compas.scl.data.rest.model.UpdateRequest;
1918
import org.lfenergy.compas.scl.data.service.CompasSclDataService;
19+
import org.lfenergy.compas.scl.model.SCL;
2020

2121
import java.util.Collections;
2222
import java.util.UUID;

‎repository-basex/src/main/java/org/lfenergy/compas/scl/data/repository/CompasSclDataBaseXRepository.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// SPDX-License-Identifier: Apache-2.0
44
package org.lfenergy.compas.scl.data.repository;
55

6-
import org.lfenergy.compas.commons.MarshallerWrapper;
7-
import org.lfenergy.compas.scl.SCL;
6+
import org.lfenergy.compas.scl.commons.MarshallerWrapper;
87
import org.lfenergy.compas.scl.data.basex.BaseXClient;
98
import org.lfenergy.compas.scl.data.basex.BaseXClientFactory;
109
import org.lfenergy.compas.scl.data.model.Item;
1110
import org.lfenergy.compas.scl.data.model.SclType;
1211
import org.lfenergy.compas.scl.data.model.Version;
1312
import org.lfenergy.compas.scl.data.util.JaxbMarshaller;
13+
import org.lfenergy.compas.scl.model.SCL;
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
1616

@@ -26,18 +26,18 @@
2626
import java.util.UUID;
2727

2828
import static java.lang.String.format;
29-
import static org.lfenergy.compas.commons.CommonConstants.XML_DEFAULT_NS_URI;
29+
import static org.lfenergy.compas.scl.commons.SclConstants.SCL_NS_URI;
3030
import static org.lfenergy.compas.scl.data.model.Constants.SDS_NAMESPACE;
31-
import static org.lfenergy.compas.scl.extensions.common.CompasExtensionsConstants.COMPAS_EXTENSION_NS;
32-
import static org.lfenergy.compas.scl.extensions.common.CompasExtensionsConstants.COMPAS_SCL_EXTENSION_TYPE;
33-
import static org.lfenergy.compas.scl.extensions.common.CompasExtensionsField.SCL_NAME_EXTENSION;
31+
import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsConstants.COMPAS_EXTENSION_NS_URI;
32+
import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsConstants.COMPAS_SCL_EXTENSION_TYPE;
33+
import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsField.SCL_NAME_EXTENSION;
3434

3535
@ApplicationScoped
3636
public class CompasSclDataBaseXRepository implements CompasSclDataRepository {
3737
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclDataBaseXRepository.class);
3838

39-
private static final String DECLARE_SCL_NAMESPACE = "declare namespace scl=\"" + XML_DEFAULT_NS_URI + "\";\n";
40-
private static final String DECLARE_COMPAS_NAMESPACE = "declare namespace compas=\"" + COMPAS_EXTENSION_NS + "\";\n";
39+
private static final String DECLARE_SCL_NAMESPACE = "declare namespace scl=\"" + SCL_NS_URI + "\";\n";
40+
private static final String DECLARE_COMPAS_NAMESPACE = "declare namespace compas=\"" + COMPAS_EXTENSION_NS_URI + "\";\n";
4141
private static final String DECLARE_LATEST_VERSION_FUNC =
4242
"declare function local:latest-version($db as xs:string, $id as xs:string)\n" +
4343
" as document-node() { \n" +

‎repository-basex/src/test/java/org/lfenergy/compas/scl/data/repository/CompasSclDataBaseXRepositoryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import org.junit.jupiter.api.BeforeEach;
88
import org.junit.jupiter.api.Test;
99
import org.junit.jupiter.api.extension.ExtendWith;
10-
import org.lfenergy.compas.commons.MarshallerWrapper;
11-
import org.lfenergy.compas.scl.SCL;
10+
import org.lfenergy.compas.scl.commons.MarshallerWrapper;
1211
import org.lfenergy.compas.scl.data.basex.BaseXClientFactory;
1312
import org.lfenergy.compas.scl.data.basex.BaseXServerJUnitExtension;
1413
import org.lfenergy.compas.scl.data.model.ChangeSetType;
1514
import org.lfenergy.compas.scl.data.model.SclType;
1615
import org.lfenergy.compas.scl.data.model.Version;
16+
import org.lfenergy.compas.scl.model.SCL;
1717
import org.mockito.junit.jupiter.MockitoExtension;
1818

1919
import java.util.UUID;

0 commit comments

Comments
 (0)