Skip to content

Commit f0d887f

Browse files
david-waltermiredavid-waltermire
committed
Package reorganization to align all item related classes in the same package hierarchy. Similar with XML and JSON related classes.
1 parent e7e52dc commit f0d887f

File tree

664 files changed

+1983
-2007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

664 files changed

+1983
-2007
lines changed

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package gov.nist.secauto.metaschema.core.datatype;
77

8-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
9-
import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType;
8+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAnyAtomicItem;
9+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAtomicOrUnionType;
1010

1111
import edu.umd.cs.findbugs.annotations.NonNull;
1212

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeAdapter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import com.fasterxml.jackson.core.JsonGenerator;
99
import com.fasterxml.jackson.core.JsonParser;
1010

11-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
12-
import gov.nist.secauto.metaschema.core.metapath.type.AbstractAtomicOrUnionType;
13-
import gov.nist.secauto.metaschema.core.metapath.type.DataTypeItemType;
14-
import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType;
15-
import gov.nist.secauto.metaschema.core.model.util.JsonUtil;
16-
import gov.nist.secauto.metaschema.core.model.util.XmlEventUtil;
11+
import gov.nist.secauto.metaschema.core.metapath.atomic.AbstractAtomicOrUnionType;
12+
import gov.nist.secauto.metaschema.core.metapath.atomic.DataTypeItemType;
13+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAnyAtomicItem;
14+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAtomicOrUnionType;
15+
import gov.nist.secauto.metaschema.core.model.json.JsonUtil;
16+
import gov.nist.secauto.metaschema.core.model.xml.XmlEventUtil;
1717
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
1818
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
1919

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractDataTypeProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
package gov.nist.secauto.metaschema.core.datatype;
77

8-
import gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider;
9-
import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType;
8+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAtomicOrUnionType;
109
import gov.nist.secauto.metaschema.core.util.CollectionUtil;
1110

1211
import java.util.ArrayList;

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java renamed to ‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractIntegerAdapter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.metaschema.core.datatype.adapter;
6+
package gov.nist.secauto.metaschema.core.datatype;
77

88
import com.fasterxml.jackson.core.JsonGenerator;
99
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
1010

11-
import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
12-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IIntegerItem;
13-
import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType;
11+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAtomicOrUnionType;
12+
import gov.nist.secauto.metaschema.core.metapath.atomic.IIntegerItem;
1413

1514
import java.io.IOException;
1615
import java.math.BigInteger;

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/AbstractStringAdapter.java renamed to ‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/AbstractStringAdapter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.metaschema.core.datatype.adapter;
6+
package gov.nist.secauto.metaschema.core.datatype;
77

88
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
99

10-
import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
11-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
12-
import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType;
10+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAtomicOrUnionType;
11+
import gov.nist.secauto.metaschema.core.metapath.atomic.IStringItem;
1312

1413
import edu.umd.cs.findbugs.annotations.NonNull;
1514

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/Base64Adapter.java renamed to ‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/Base64Adapter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.metaschema.core.datatype.adapter;
6+
package gov.nist.secauto.metaschema.core.datatype;
77

88
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
99

10-
import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
1110
import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
12-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBase64BinaryItem;
11+
import gov.nist.secauto.metaschema.core.metapath.atomic.IBase64BinaryItem;
1312
import gov.nist.secauto.metaschema.core.qname.EQNameFactory;
1413
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
1514
import gov.nist.secauto.metaschema.core.util.ObjectUtils;

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/BooleanAdapter.java renamed to ‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/BooleanAdapter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.metaschema.core.datatype.adapter;
6+
package gov.nist.secauto.metaschema.core.datatype;
77

88
import com.fasterxml.jackson.core.JsonGenerator;
99
import com.fasterxml.jackson.core.JsonParser;
1010
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
1111

12-
import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeAdapter;
1312
import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
14-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
13+
import gov.nist.secauto.metaschema.core.metapath.atomic.IBooleanItem;
1514
import gov.nist.secauto.metaschema.core.qname.EQNameFactory;
1615
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
1716
import gov.nist.secauto.metaschema.core.util.ObjectUtils;

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DataTypeService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
package gov.nist.secauto.metaschema.core.datatype;
77

8-
import gov.nist.secauto.metaschema.core.metapath.item.IItem;
9-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyAtomicItem;
10-
import gov.nist.secauto.metaschema.core.metapath.type.IAtomicOrUnionType;
11-
import gov.nist.secauto.metaschema.core.metapath.type.IItemType;
8+
import gov.nist.secauto.metaschema.core.metapath.IItem;
9+
import gov.nist.secauto.metaschema.core.metapath.IItemType;
10+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAnyAtomicItem;
11+
import gov.nist.secauto.metaschema.core.metapath.atomic.IAtomicOrUnionType;
1212
import gov.nist.secauto.metaschema.core.qname.EQNameFactory;
1313
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
1414
import gov.nist.secauto.metaschema.core.util.CollectionUtil;

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateAdapter.java renamed to ‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DateAdapter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.metaschema.core.datatype.adapter;
6+
package gov.nist.secauto.metaschema.core.datatype;
77

88
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
99

10-
import gov.nist.secauto.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter;
1110
import gov.nist.secauto.metaschema.core.datatype.object.AmbiguousDate;
1211
import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
13-
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
12+
import gov.nist.secauto.metaschema.core.metapath.atomic.IDateItem;
1413
import gov.nist.secauto.metaschema.core.qname.EQNameFactory;
1514
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
1615
import gov.nist.secauto.metaschema.core.util.ObjectUtils;

‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/DateFormats.java renamed to ‎core/src/main/java/gov/nist/secauto/metaschema/core/datatype/DateFormats.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
package gov.nist.secauto.metaschema.core.datatype.adapter;
6+
package gov.nist.secauto.metaschema.core.datatype;
77

88
import java.time.format.DateTimeFormatter;
99
import java.time.format.DateTimeFormatterBuilder;

0 commit comments

Comments
 (0)