Skip to content

Commit f21eecb

Browse files
committed
Extracted ArtifactArchiveListing to separate Vertex from Artifact
1 parent 4ff9562 commit f21eecb

File tree

8 files changed

+23
-17
lines changed

8 files changed

+23
-17
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<artifactId>strongbox-db</artifactId>
1313
<packaging>pom</packaging>
14-
<version>1.0-PR-19-SNAPSHOT</version>
14+
<version>1.0-PR-20-SNAPSHOT</version>
1515

1616
<properties>
1717
<serverId />

strongbox-db-import/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.carlspring.strongbox</groupId>
1010
<artifactId>strongbox-db</artifactId>
11-
<version>1.0-PR-19-SNAPSHOT</version>
11+
<version>1.0-PR-20-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

strongbox-db-schema/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.carlspring.strongbox</groupId>
1010
<artifactId>strongbox-db</artifactId>
11-
<version>1.0-PR-19-SNAPSHOT</version>
11+
<version>1.0-PR-20-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

strongbox-db-schema/src/main/java/org/carlspring/strongbox/db/schema/Edges.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@ public interface Edges
44
{
55

66
String ARTIFACT_HAS_ARTIFACT_COORDINATES = "ArtifactHasArtifactCoordinates";
7+
78
String ARTIFACT_HAS_TAGS = "ArtifactHasTags";
9+
810
String ARTIFACT_COORDINATES_INHERIT_GENERIC_ARTIFACT_COORDINATES = "ArtifactCoordinatesInheritGenericArtifactCoordinates";
11+
912
String ARTIFACT_GROUP_HAS_ARTIFACTS = "ArtifactGroupHasArtifacts";
13+
1014
String REMOTE_ARTIFACT_INHERIT_ARTIFACT = "RemoteArtifactInheritArtifact";
1115

16+
String ARTIFACT_HAS_ARTIFACT_ARCHIVE_LISTING = "ArtifactHasArtifactArchiveListing";
17+
1218
}

strongbox-db-schema/src/main/java/org/carlspring/strongbox/db/schema/Properties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ public interface Properties
4545
String COORDINATES_PACKAGE_TYPE = "coordinates.package_type";
4646
String COORDINATES_LANGUAGE_IMPLEMENTATION_VERSION = "coordinates.languageImplementationVersion";
4747

48-
}
48+
}

strongbox-db-schema/src/main/java/org/carlspring/strongbox/db/schema/StrongboxSchema.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ public void createSchema(JanusGraph jg)
143143
try
144144
{
145145
logger.info(String.format("Schema: %n%s", jgm.printSchema()));
146-
}
147-
finally
146+
} finally
148147
{
149148
jgm.rollback();
150149
}
@@ -243,7 +242,7 @@ protected Set<String> createIndexes(JanusGraph jg,
243242
Vertex.class,
244243
jgm.getVertexLabel(USER),
245244
true,
246-
jgm.getPropertyKey(UUID)).ifPresent(result::add);
245+
jgm.getPropertyKey(UUID)).ifPresent(result::add);
247246

248247
return result;
249248
}
@@ -520,10 +519,11 @@ private Optional<String> buildIndexIfNecessary(final JanusGraphManagement jgm,
520519
final Class<? extends Element> elementType,
521520
final JanusGraphSchemaType schemaType,
522521
final boolean unique,
523-
final PropertyKey... properties){
522+
final PropertyKey... properties)
523+
{
524524
return buildIndexIfNecessary(jgm, elementType, schemaType, unique, true, properties);
525525
}
526-
526+
527527
private Optional<String> buildIndexIfNecessary(final JanusGraphManagement jgm,
528528
final Class<? extends Element> elementType,
529529
final JanusGraphSchemaType schemaType,
@@ -588,16 +588,16 @@ private void makeVertexLabelIfDoesNotExist(final JanusGraphManagement jgm,
588588
}
589589

590590
private Optional<PropertyKey> makePropertyKeyIfDoesNotExist(final JanusGraphManagement jgm,
591-
final String name,
592-
final Class<?> dataType)
591+
final String name,
592+
final Class<?> dataType)
593593
{
594594
return makePropertyKeyIfDoesNotExist(jgm, name, dataType, null);
595595
}
596596

597597
private Optional<PropertyKey> makePropertyKeyIfDoesNotExist(final JanusGraphManagement jgm,
598-
final String name,
599-
final Class<?> dataType,
600-
final Cardinality cardinality)
598+
final String name,
599+
final Class<?> dataType,
600+
final Cardinality cardinality)
601601
{
602602
if (jgm.containsPropertyKey(name))
603603
{
@@ -612,4 +612,4 @@ private Optional<PropertyKey> makePropertyKeyIfDoesNotExist(final JanusGraphMana
612612
return Optional.of(propertyKeyMaker.make());
613613
}
614614

615-
}
615+
}

strongbox-db-schema/src/main/java/org/carlspring/strongbox/db/schema/Vertices.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ public interface Vertices
1616
String ARTIFACT_TAG = "ArtifactTag";
1717
String ARTIFACT_ID_GROUP = "ArtifactIdGroup";
1818
String USER = "User";
19-
}
19+
}

strongbox-db-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.carlspring.strongbox</groupId>
1111
<artifactId>strongbox-db</artifactId>
12-
<version>1.0-PR-19-SNAPSHOT</version>
12+
<version>1.0-PR-20-SNAPSHOT</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

0 commit comments

Comments
 (0)