Spring migration - Spring Data Gremlin

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -492,6 +492,10 @@
   <suppress checks="ConstantName" files="com.azure.spring.data.cosmos.repository|common.*\.java" />
   <suppress checks="ConstantName|MemberName" files="com.azure.cosmos.UserRepositoryConfiguration|AppConfiguration|MyDocument.java" />
 
+  <!-- Checkstyle suppressions for spring-data-gremlin package  -->
+  <suppress checks="PackageName" files="com.microsoft.spring.data.gremlin.*" />
+  <suppress checks="MethodName" files="com.microsoft.spring.data.gremlin.common.GremlinConfig.java" />
+
   <!-- These suppressions were added due to limitations in our custom Checkstyle rules and should be addressed in the future. -->
   <!-- API naming is too restrictive -->
   <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck" files="com.azure.search.documents.indexes.SearchIndexerAsyncClient.java"

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -2077,6 +2077,13 @@
                   RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"/>
   </Match>
 
+  <Match>
+    <Or>
+      <Class name="com.microsoft.azure.telemetry.TelemetryEventData$EventData$CustomData"/> <!-- false positive -->
+    </Or>
+    <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
+  </Match>
+
 
   <!-- These fields are designed to be not written. They are for deserializing. -->
   <Match>

eng/jacoco-test-coverage/pom.xml

@@ -282,6 +282,11 @@
       <artifactId>azure-spring-data-cosmos</artifactId>
       <version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
     </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-data-gremlin</artifactId>
+      <version>2.3.1-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-gremlin;current} -->
+    </dependency>
   </dependencies>
   <build>
     <plugins>

eng/versioning/external_dependencies.txt

@@ -25,8 +25,8 @@ com.microsoft.azure:azure-servicebus-jms;0.0.2
 com.microsoft.azure:qpid-proton-j-extensions;1.2.3
 com.microsoft.rest:client-runtime;1.7.4
 com.microsoft.rest.v2:client-runtime;2.1.1
-com.microsoft.spring.data.gremlin:spring-data-gremlin;2.2.3
 com.microsoft.azure:spring-data-cosmosdb;2.3.0
+com.microsoft.spring.data.gremlin:spring-data-gremlin;2.3.0
 com.squareup.okhttp3:okhttp;4.2.2
 commons-codec:commons-codec;1.13
 io.micrometer:micrometer-core;1.2.0
@@ -52,11 +52,13 @@ net.minidev:json-smart;2.3
 org.apache.ant:ant;1.9.4
 org.apache.avro:avro;1.9.2
 org.apache.avro:avro-maven-plugin;1.9.2
+org.apache.commons:commons-lang3;3.8.1
 org.apache.httpcomponents:httpclient;4.3.6
 org.apache.logging.log4j:log4j-api;2.11.1
 org.apache.logging.log4j:log4j-core;2.11.1
 org.apache.logging.log4j:log4j-slf4j-impl;2.13.0
 org.apache.qpid:proton-j;0.33.4
+org.apache.tinkerpop:gremlin-driver;3.2.4
 org.asynchttpclient:async-http-client;2.10.5
 org.codehaus.groovy:groovy-eclipse-batch;2.5.8-01
 org.codehaus.groovy:groovy-eclipse-compiler;3.4.0-01
@@ -82,19 +84,20 @@ org.springframework.boot:spring-boot-starter-web;2.3.0.RELEASE
 org.springframework.boot:spring-boot-starter;2.3.0.RELEASE
 org.springframework.boot:spring-boot;2.3.0.RELEASE
 org.springframework.boot:spring-boot-starter-parent;2.3.0.RELEASE
+org.springframework.data:spring-data-commons;2.3.0.RELEASE
 org.springframework.security:spring-security-config;5.3.2.RELEASE
 org.springframework.security:spring-security-core;5.3.2.RELEASE
 org.springframework.security:spring-security-web;5.3.2.RELEASE
 org.springframework.security:spring-security-oauth2-client;5.3.2.RELEASE
 org.springframework.security:spring-security-oauth2-core;5.3.2.RELEASE
 org.springframework.security:spring-security-oauth2-jose;5.3.2.RELEASE
-org.springframework:spring-web;5.2.6.RELEASE
-org.springframework:spring-jms;5.2.6.RELEASE
-org.springframework.data:spring-data-commons;2.3.0.RELEASE
 org.springframework:spring-beans;5.2.6.RELEASE
+org.springframework:spring-context;5.2.6.RELEASE
 org.springframework:spring-core;5.2.6.RELEASE
 org.springframework:spring-expression;5.2.6.RELEASE
+org.springframework:spring-jms;5.2.6.RELEASE
 org.springframework:spring-tx;5.2.6.RELEASE
+org.springframework:spring-web;5.2.6.RELEASE
 pl.pragmatists:JUnitParams;1.1.1
 
 ## Test dependency versions
@@ -152,7 +155,6 @@ org.junit.platform:junit-platform-testkit;1.6.2
 org.junit.vintage:junit-vintage-engine;5.6.2
 org.openjdk.jmh:jmh-core;1.22
 org.openjdk.jmh:jmh-generator-annprocess;1.22
-org.springframework:spring-context;5.2.6.RELEASE
 org.spockframework:spock-core;1.3-groovy-2.5
 org.testng:testng;6.14.3
 uk.org.lidalia:slf4j-test;1.2.0
@@ -174,7 +176,6 @@ net.java.dev.jna:jna-platform;5.4.0
 net.jonathangiles.tools:dependencyChecker-maven-plugin;1.0.4
 net.jonathangiles.tools:whitelistgenerator-maven-plugin;1.0.1
 org.apache.commons:commons-collections4;4.2
-org.apache.commons:commons-lang3;3.8.1
 org.apache.commons:commons-text;1.6
 org.apache.maven.plugins:maven-antrun-plugin;1.8
 org.apache.maven.plugins:maven-assembly-plugin;3.2.0

eng/versioning/version_client.txt

@@ -54,6 +54,7 @@ com.azure:azure-spring-boot-test-aad;1.0.0;1.0.0
 com.azure:azure-spring-boot-test-core;1.0.0;1.0.0
 com.azure:azure-spring-boot-test-cosmosdb;1.0.0;1.0.0
 com.azure:azure-spring-boot-test-keyvault;1.0.0;1.0.0
+com.azure:azure-spring-data-gremlin;2.3.1-beta.1;2.3.1-beta.1
 com.microsoft.azure:azure-spring-boot;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-active-directory-spring-boot-starter;2.3.2;2.3.3-beta.1
@@ -63,7 +64,6 @@ com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1
 com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1
-com.microsoft.azure:spring-data-cosmosdb;3.0.0-beta.1;3.0.0-beta.1
 
 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current
 # version. Unreleased dependencies are only valid for dependency versions.

sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/pom.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
+  </parent>
+
+  <groupId>com.azure</groupId>
+  <artifactId>azure-spring-data-sample-gremlin-web-service</artifactId>
+  <name>Spring Data gremlin - Web Service</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.jayway.jsonpath</groupId>
+      <artifactId>json-path</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-spring-data-gremlin</artifactId>
+      <version>2.3.1-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-gremlin;current} -->
+    </dependency>
+
+  </dependencies>
+
+</project>

sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/src/main/java/com/microsoft/spring/data/gremlin/web/service/Application.java

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.spring.data.gremlin.web.service;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}

sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/src/main/java/com/microsoft/spring/data/gremlin/web/service/config/GremlinProperties.java

@@ -0,0 +1,105 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.spring.data.gremlin.web.service.config;
+
+import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("gremlin")
+public class GremlinProperties {
+    private String endpoint;
+
+    private int port;
+
+    private String username;
+
+    private String password;
+
+    private boolean sslEnabled;
+
+    private boolean telemetryAllowed = true;
+
+    private String serializer = Serializers.GRAPHSON.toString();
+
+    private int maxContentLength;
+
+    public GremlinProperties() {
+    }
+
+    public GremlinProperties(String endpoint, int port, String username, String password, boolean sslEnabled,
+                             boolean telemetryAllowed, String serializer, int maxContentLength) {
+        this.endpoint = endpoint;
+        this.port = port;
+        this.username = username;
+        this.password = password;
+        this.sslEnabled = sslEnabled;
+        this.telemetryAllowed = telemetryAllowed;
+        this.serializer = serializer;
+        this.maxContentLength = maxContentLength;
+    }
+
+    public String getEndpoint() {
+        return endpoint;
+    }
+
+    public void setEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public boolean isSslEnabled() {
+        return sslEnabled;
+    }
+
+    public void setSslEnabled(boolean sslEnabled) {
+        this.sslEnabled = sslEnabled;
+    }
+
+    public boolean isTelemetryAllowed() {
+        return telemetryAllowed;
+    }
+
+    public void setTelemetryAllowed(boolean telemetryAllowed) {
+        this.telemetryAllowed = telemetryAllowed;
+    }
+
+    public String getSerializer() {
+        return serializer;
+    }
+
+    public void setSerializer(String serializer) {
+        this.serializer = serializer;
+    }
+
+    public int getMaxContentLength() {
+        return maxContentLength;
+    }
+
+    public void setMaxContentLength(int maxContentLength) {
+        this.maxContentLength = maxContentLength;
+    }
+}

sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/src/main/java/com/microsoft/spring/data/gremlin/web/service/config/UserRepositoryConfiguration.java

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.spring.data.gremlin.web.service.config;
+
+import com.microsoft.spring.data.gremlin.common.GremlinConfig;
+import com.microsoft.spring.data.gremlin.config.AbstractGremlinConfiguration;
+import com.microsoft.spring.data.gremlin.repository.config.EnableGremlinRepositories;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@EnableGremlinRepositories(basePackages = "com.microsoft.azure.spring.data.gremlin.web.service.repository")
+@EnableConfigurationProperties(GremlinProperties.class)
+@PropertySource("classpath:application.properties")
+public class UserRepositoryConfiguration extends AbstractGremlinConfiguration {
+
+    @Autowired
+    private GremlinProperties gremlinProps;
+
+    @Override
+    public GremlinConfig getGremlinConfig() {
+        return GremlinConfig.defaultBuilder()
+            .endpoint(gremlinProps.getEndpoint())
+            .port(gremlinProps.getPort())
+            .username(gremlinProps.getUsername())
+            .password(gremlinProps.getPassword())
+            .sslEnabled(gremlinProps.isSslEnabled())
+            .telemetryAllowed(gremlinProps.isTelemetryAllowed())
+            .serializer(gremlinProps.getSerializer())
+            .maxContentLength(gremlinProps.getMaxContentLength())
+            .build();
+    }
+}

sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/src/main/java/com/microsoft/spring/data/gremlin/web/service/domain/MicroService.java

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.spring.data.gremlin.web.service.domain;
+
+import com.microsoft.spring.data.gremlin.annotation.Vertex;
+import org.springframework.data.annotation.Id;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Vertex
+public class MicroService {
+
+    @Id
+    private String id;
+
+    private Map<String, String> properties = new HashMap<>();
+
+    public MicroService() {
+    }
+
+    public MicroService(String id, Map<String, String> properties) {
+        this.id = id;
+        this.properties = properties;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+    }
+}
+