<singularClass>org.onap.aaiclient.client.aai.AAIObjectType</singularClass>
<pluralClass>org.onap.aaiclient.client.aai.AAIObjectPlurals</pluralClass>
<nameClass>org.onap.aaiclient.client.aai.AAIObjectName</nameClass>
+ <singleFragmentClass>org.onap.aaiclient.client.aai.entities.uri.AAISingleFragment</singleFragmentClass>
+ <pluralFragmentClass>org.onap.aaiclient.client.aai.entities.uri.AAIPluralFragment</pluralFragmentClass>
</configuration>
</execution>
</executions>
--- /dev/null
+package org.onap.aaiclient.client.aai.entities.uri;
+
+import java.io.Serializable;
+import org.onap.aaiclient.client.graphinventory.GraphInventoryPluralFragment;
+
+public class AAIPluralFragment implements Serializable, GraphInventoryPluralFragment<AAIFluentPluralType> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final AAIFluentPluralType type;
+
+ public AAIPluralFragment(AAIFluentPluralType type) {
+ this.type = type;
+ }
+
+ public AAIFluentPluralType get() {
+ return type;
+ }
+
+}
import org.onap.aaiclient.client.graphinventory.entities.uri.GraphInventorySingleResourceUri;
public interface AAIResourceUri extends AAIBaseResourceUri<AAIResourceUri, AAIObjectType>,
- GraphInventorySingleResourceUri<AAIResourceUri, AAIPluralResourceUri, AAIObjectType, AAIObjectPlurals> {
+ GraphInventorySingleResourceUri<AAIResourceUri, AAIPluralResourceUri, AAIObjectType, AAIObjectPlurals, AAISingleFragment, AAIPluralFragment> {
}
import org.onap.aaiclient.client.aai.AAIObjectType;
import org.onap.aaiclient.client.graphinventory.entities.uri.SimpleUri;
-public class AAISimpleUri extends SimpleUri<AAIResourceUri, AAIPluralResourceUri, AAIObjectType, AAIObjectPlurals>
+public class AAISimpleUri extends
+ SimpleUri<AAIResourceUri, AAIPluralResourceUri, AAIObjectType, AAIObjectPlurals, AAISingleFragment, AAIPluralFragment>
implements AAIResourceUri {
private static final long serialVersionUID = -6397024057188453229L;
return new AAISimplePluralUri(this, plural);
}
+ @Override
+ public AAISimpleUri relatedTo(AAISingleFragment fragment) {
+ this.internalURI.path(relatedTo);
+ return new AAISimpleUri(this, fragment.get().build(), fragment.get().values());
+ }
+
+ @Override
+ public AAISimplePluralUri relatedTo(AAIPluralFragment fragment) {
+ this.internalURI.path(relatedTo);
+ return new AAISimplePluralUri(this, fragment.get().build());
+ }
+
}
--- /dev/null
+package org.onap.aaiclient.client.aai.entities.uri;
+
+import java.io.Serializable;
+import org.onap.aaiclient.client.graphinventory.GraphInventorySingleFragment;
+
+public class AAISingleFragment implements Serializable, GraphInventorySingleFragment<AAIFluentSingleType> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final AAIFluentSingleType type;
+
+ public AAISingleFragment(AAIFluentSingleType type) {
+ this.type = type;
+ }
+
+ public AAIFluentSingleType get() {
+ return type;
+ }
+}
package org.onap.aaiclient.client.graphinventory;
+import java.util.Collections;
import java.util.List;
public interface GraphInventoryFluentTypeBase {
public interface Info {
- String getPartialUri();
+ default String getPartialUri() {
+ return "";
+ }
- List<String> getPaths();
+ default List<String> getPaths() {
+ return Collections.emptyList();
+ }
}
- Object[] values();
+ default Object[] values() {
+ return new Object[] {};
+ }
- String uriTemplate();
+ default String uriTemplate() {
+ return "";
+ }
}
--- /dev/null
+package org.onap.aaiclient.client.graphinventory;
+
+public interface GraphInventoryFragmentBase<T> {
+
+ T get();
+}
--- /dev/null
+package org.onap.aaiclient.client.graphinventory;
+
+
+
+public interface GraphInventoryPluralFragment<T extends GraphInventoryFluentType<? extends GraphInventoryObjectPlurals>>
+ extends GraphInventoryFragmentBase<T> {
+
+
+}
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.onap.aai.domain.yang.Relationship;
-import org.onap.so.client.RestClient;
-import org.onap.so.client.RestProperties;
import org.onap.aaiclient.client.graphinventory.entities.GraphInventoryEdgeLabel;
import org.onap.aaiclient.client.graphinventory.entities.GraphInventoryResultWrapper;
import org.onap.aaiclient.client.graphinventory.entities.uri.GraphInventoryPluralResourceUri;
import org.onap.aaiclient.client.graphinventory.entities.uri.GraphInventorySingleResourceUri;
import org.onap.aaiclient.client.graphinventory.entities.uri.HttpAwareUri;
import org.onap.aaiclient.client.graphinventory.exceptions.GraphInventoryMultipleItemsException;
+import org.onap.so.client.RestClient;
+import org.onap.so.client.RestProperties;
-public abstract class GraphInventoryResourcesClient<Self, Uri extends GraphInventoryResourceUri<?, ?>, SingleUri extends GraphInventorySingleResourceUri<?, ?, ?, ?>, PluralUri extends GraphInventoryPluralResourceUri<?, ?>, EdgeLabel extends GraphInventoryEdgeLabel, Wrapper extends GraphInventoryResultWrapper, TransactionalClient, SingleTransactionClient> {
+public abstract class GraphInventoryResourcesClient<Self, Uri extends GraphInventoryResourceUri<?, ?>, SingleUri extends GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?>, PluralUri extends GraphInventoryPluralResourceUri<?, ?>, EdgeLabel extends GraphInventoryEdgeLabel, Wrapper extends GraphInventoryResultWrapper, TransactionalClient, SingleTransactionClient> {
protected GraphInventoryClient client;
* @return
*/
public void connect(SingleUri uriA, SingleUri uriB) {
- GraphInventorySingleResourceUri<?, ?, ?, ?> uriAClone = (SingleUri) uriA.clone();
+ GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?> uriAClone = (SingleUri) uriA.clone();
RestClient giRC = client.createClient(uriAClone.relationshipAPI());
giRC.put(this.buildRelationship(uriB));
}
* @return
*/
public void connect(SingleUri uriA, SingleUri uriB, EdgeLabel label) {
- GraphInventorySingleResourceUri<?, ?, ?, ?> uriAClone = (SingleUri) uriA.clone();
+ GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?> uriAClone = (SingleUri) uriA.clone();
RestClient giRC = client.createClient(uriAClone.relationshipAPI());
giRC.put(this.buildRelationship(uriB, label));
}
* @return
*/
public void disconnect(SingleUri uriA, SingleUri uriB) {
- GraphInventorySingleResourceUri<?, ?, ?, ?> uriAClone = (SingleUri) uriA.clone();
+ GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?> uriAClone = (SingleUri) uriA.clone();
RestClient giRC = client.createClient(uriAClone.relationshipAPI());
giRC.delete(this.buildRelationship(uriB));
}
* @return
*/
public void delete(SingleUri uri) {
- GraphInventorySingleResourceUri<?, ?, ?, ?> clone = (SingleUri) uri.clone();
+ GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?> clone = (SingleUri) uri.clone();
RestClient giRC = client.createClient(clone);
Map<String, Object> result = giRC.get(new GenericType<Map<String, Object>>() {}).orElseThrow(
() -> new NotFoundException(clone.build() + " does not exist in " + client.getGraphDBName()));
--- /dev/null
+package org.onap.aaiclient.client.graphinventory;
+
+public interface GraphInventorySingleFragment<T extends GraphInventoryFluentType<? extends GraphInventoryObjectType>>
+ extends GraphInventoryFragmentBase<T> {
+
+
+}
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class GraphInventoryTransactionClient<Self, Uri extends GraphInventoryResourceUri<?, ?>, SingleUri extends GraphInventorySingleResourceUri<?, ?, ?, ?>, EdgeLabel extends GraphInventoryEdgeLabel> {
+public abstract class GraphInventoryTransactionClient<Self, Uri extends GraphInventoryResourceUri<?, ?>, SingleUri extends GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?>, EdgeLabel extends GraphInventoryEdgeLabel> {
protected static Logger logger = LoggerFactory.getLogger(GraphInventoryTransactionClient.class);
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-public abstract class GraphInventoryRelationships<Wrapper extends GraphInventoryResultWrapper<?>, Uri extends GraphInventorySingleResourceUri<?, ?, ?, ?>, Type extends GraphInventoryObjectType> {
+public abstract class GraphInventoryRelationships<Wrapper extends GraphInventoryResultWrapper<?>, Uri extends GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?>, Type extends GraphInventoryObjectType> {
protected final ObjectMapper mapper;
protected Map<String, Object> map;
import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectPlurals;
import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectType;
+import org.onap.aaiclient.client.graphinventory.GraphInventoryPluralFragment;
+import org.onap.aaiclient.client.graphinventory.GraphInventorySingleFragment;
-public interface GraphInventorySingleResourceUri<T extends GraphInventorySingleResourceUri<?, ?, ?, ?>, P extends GraphInventoryPluralResourceUri<?, ?>, SingleObject extends GraphInventoryObjectType, PluralObject extends GraphInventoryObjectPlurals>
+public interface GraphInventorySingleResourceUri<T extends GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?>, P extends GraphInventoryPluralResourceUri<?, ?>, SingleObject extends GraphInventoryObjectType, PluralObject extends GraphInventoryObjectPlurals, SingleFragment extends GraphInventorySingleFragment, PluralFragment extends GraphInventoryPluralFragment>
extends GraphInventoryResourceUri<T, SingleObject> {
public T resourceVersion(String version);
public P relatedTo(PluralObject plural);
public T relatedTo(SingleObject type, String... values);
+
+ public P relatedTo(PluralFragment fragment);
+
+ public T relatedTo(SingleFragment fragment);
}
import org.onap.aaiclient.client.graphinventory.exceptions.IncorrectNumberOfUriKeys;
import org.springframework.web.util.UriUtils;
-public abstract class SimpleBaseUri<T extends GraphInventoryResourceUri<?, ?>, Parent extends GraphInventorySingleResourceUri<?, ?, ?, ?>, S extends GraphInventoryObjectBase>
+public abstract class SimpleBaseUri<T extends GraphInventoryResourceUri<?, ?>, Parent extends GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?>, S extends GraphInventoryObjectBase>
implements GraphInventoryResourceUri<T, S> {
private static final long serialVersionUID = -1011069933894179423L;
import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectPlurals;
import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectType;
-public abstract class SimplePluralUri<T extends GraphInventoryPluralResourceUri<?, ?>, Parent extends GraphInventorySingleResourceUri<?, ?, ?, ?>, PT extends GraphInventoryObjectPlurals, OT extends GraphInventoryObjectType>
+public abstract class SimplePluralUri<T extends GraphInventoryPluralResourceUri<?, ?>, Parent extends GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?>, PT extends GraphInventoryObjectPlurals, OT extends GraphInventoryObjectType>
extends SimpleBaseUri<T, Parent, PT> implements GraphInventoryPluralResourceUri<T, PT>, Serializable {
private static final long serialVersionUID = -337701171277616439L;
import javax.ws.rs.core.UriBuilder;
import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectPlurals;
import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectType;
+import org.onap.aaiclient.client.graphinventory.GraphInventoryPluralFragment;
+import org.onap.aaiclient.client.graphinventory.GraphInventorySingleFragment;
-public abstract class SimpleUri<T extends GraphInventorySingleResourceUri<?, ?, ?, ?>, PT extends GraphInventoryPluralResourceUri<?, ?>, S extends GraphInventoryObjectType, P extends GraphInventoryObjectPlurals>
- extends SimpleBaseUri<T, T, S> implements GraphInventorySingleResourceUri<T, PT, S, P> {
+public abstract class SimpleUri<T extends GraphInventorySingleResourceUri<?, ?, ?, ?, ?, ?>, PT extends GraphInventoryPluralResourceUri<?, ?>, S extends GraphInventoryObjectType, P extends GraphInventoryObjectPlurals, SF extends GraphInventorySingleFragment<?>, PF extends GraphInventoryPluralFragment<?>>
+ extends SimpleBaseUri<T, T, S> implements GraphInventorySingleResourceUri<T, PT, S, P, SF, PF> {
private static final long serialVersionUID = -337701171277616439L;
protected static final String relationshipAPI = "/relationship-list/relationship";
import org.onap.aaiclient.client.aai.AAIObjectPlurals;
import org.onap.aaiclient.client.aai.AAIObjectType;
import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder;
+import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder.Types;
import org.onap.aaiclient.client.graphinventory.entities.uri.Depth;
public class AAISimpleUriTest {
AAIPluralResourceUri uri =
AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test1").relatedTo(AAIObjectPlurals.PSERVER);
String uriOutput = uri.build().toString();
- assertEquals("/network/generic-vnfs/generic-vnf/test1/related-to/pservers", uriOutput);
+
+ String expected = "/network/generic-vnfs/generic-vnf/test1/related-to/pservers";
+ assertEquals(expected, uriOutput);
+
+ uri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test1")
+ .relatedTo(Types.PSERVERS.getFragment());
+ uriOutput = uri.build().toString();
+ assertEquals(expected, uriOutput);
}
@Test
AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test1")
.relatedTo(AAIObjectType.PSERVER, "test2");
String uriOutput = uri.build().toString();
- assertEquals("/network/generic-vnfs/generic-vnf/test1/related-to/pservers/pserver/test2", uriOutput);
+
+ String expected = "/network/generic-vnfs/generic-vnf/test1/related-to/pservers/pserver/test2";
+ assertEquals(expected, uriOutput);
+
+ uri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test1")
+ .relatedTo(Types.PSERVER.getFragment("test2"));
+
+ uriOutput = uri.build().toString();
+
+ assertEquals(expected, uriOutput);
+
}
@Test
private final String pluralClass;
private final String builderName;
private final String nameClass;
+ private final String singleFragmentClass;
+ private final String pluralFragmentClass;
public FluentGenerator(Log log, String location, String destinationClasspath, String swaggerLocation,
String builderName, String singularBuilderClass, String pluralBuilderClass, String topLevelBuilderClass,
- String baseBuilderClass, String singularClass, String pluralClass, String nameClass)
- throws JsonProcessingException {
+ String baseBuilderClass, String singularClass, String pluralClass, String nameClass,
+ String singleFragmentClass, String pluralFragmentClass) throws JsonProcessingException {
this.location = location;
this.CLASSPATH = destinationClasspath;
this.singularClass = singularClass;
this.pluralClass = pluralClass;
this.nameClass = nameClass;
+ this.singleFragmentClass = singleFragmentClass;
+ this.pluralFragmentClass = pluralFragmentClass;
doc = new SwaggerConverter(log).getDoc(swaggerLocation);
}
}
protected TypeSpec createTypes() {
- List<FieldSpec> params = doc.values().stream().filter(item -> item.getType().equals("singular"))
+ List<FieldSpec> params = doc.values().stream()
+ .filter(item -> item.getType().equals("singular") || item.getType().equals("plural"))
.sorted(Comparator.comparing(item -> item.getName())).map(item -> {
ClassName nameType =
ClassName.get(CLASSPATH, CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, item.getName()))
"\"" + oType.getPaths().stream().collect(Collectors.joining("\", \"")) + "\"")
.build());
+ if (oType.getType().equals("plural")) {
+ Pair<String, String> path = splitClasspath(this.pluralFragmentClass);
+ ClassName fragmentClass = ClassName.get(path.getLeft(), path.getRight());
+ path = splitClasspath(this.baseBuilderClass);
+ ClassName baseClass = ClassName.get(path.getLeft(), path.getRight());
+
+ classFields.add(FieldSpec.builder(fragmentClass, "fragment")
+ .addModifiers(Modifier.PRIVATE, Modifier.FINAL, Modifier.STATIC)
+ .initializer("new $T(new $L(new $T(){}))", fragmentClass, upperCamel(oType.getName()), baseClass)
+ .build());
+ }
+
ClassName superInterface;
String name;
if (oType.getType().equals("plural")) {
.addModifiers(Modifier.PUBLIC).addAnnotation(Override.class).addStatement("return Info.paths").build());
methods.add(MethodSpec.methodBuilder("getPartialUri").returns(String.class).addModifiers(Modifier.PUBLIC)
.addAnnotation(Override.class).addStatement("return Info.partialUri").build());
+
+ if (oType.getType().equals("plural")) {
+ Pair<String, String> path = splitClasspath(this.pluralFragmentClass);
+ ClassName fragmentClass = ClassName.get(path.getLeft(), path.getRight());
+ methods.add(MethodSpec.methodBuilder("getFragment").returns(fragmentClass).addModifiers(Modifier.PUBLIC)
+ .addStatement("return fragment").build());
+ } else if (oType.getType().equals("singular")) {
+ Pair<String, String> path = splitClasspath(this.singleFragmentClass);
+ ClassName fragmentClass = ClassName.get(path.getLeft(), path.getRight());
+ path = splitClasspath(this.baseBuilderClass);
+ ClassName baseClass = ClassName.get(path.getLeft(), path.getRight());
+ List<ParameterSpec> typeParams = new ArrayList<>();
+
+ for (ObjectField oF : oType.getFields()) {
+ if (oF.getType().equals("string")) {
+ typeParams.add(ParameterSpec.builder(String.class, lowerCamel(makeValidJavaVariable(oF.getName())))
+ .build());
+ } else if (oF.getType().equals("integer")) {
+ typeParams.add(
+ ParameterSpec.builder(int.class, lowerCamel(makeValidJavaVariable(oF.getName()))).build());
+ }
+ }
+ methods.add(MethodSpec.methodBuilder("getFragment").returns(fragmentClass).addParameters(typeParams)
+ .addModifiers(Modifier.PUBLIC)
+ .addStatement("return new $T(new $L(new $T(){}, $L))", fragmentClass, upperCamel(oType.getName()),
+ baseClass, typeParams.stream().map(item -> item.name).collect(Collectors.joining(", ")))
+ .build());
+ }
if (!oType.getType().equals("top level")) {
classFields.add(FieldSpec.builder(String.class, "name")
.addModifiers(Modifier.PRIVATE, Modifier.FINAL, Modifier.STATIC).initializer("$S", name).build());
private String pluralClass;
@Parameter
private String nameClass;
+ @Parameter
+ private String singleFragmentClass;
+ @Parameter
+ private String pluralFragmentClass;
public void execute() throws MojoExecutionException, MojoFailureException {
try {
new FluentGenerator(getLog(), destination, destinationClasspath, swaggerLocation, builderName,
singularBuilderClass, pluralBuilderClass, topLevelBuilderClass, baseBuilderClass, singularClass,
- pluralClass, nameClass).run();
+ pluralClass, nameClass, singleFragmentClass, pluralFragmentClass).run();
} catch (JsonProcessingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Code Review / so.git / commitdiff