fixed config for uploaded maven repository

Author: hiwayama

build.gradle

@@ -1,37 +1,84 @@
-import io.franzbecker.gradle.lombok.task.DelombokTask
-
 plugins {
     id 'java'
-    id 'io.franzbecker.gradle-lombok' version '1.14'
+    id 'maven'
+    id 'signing'
 }
 
+archivesBaseName = "jsonrpc4j-jsonSchema"
+description 'This module is jackson-module-jsonschema wrapper for the creation of api document (like JSON-Schema) from POJO of jsonrpc4j service classes.'
 group 'com.github.hiwayama'
-version '0.1-SNAPSHOT'
+version '0.2-alpha-1'
 
 sourceCompatibility = 1.8
 
-repositories {
-    mavenCentral()
+// zip sources
+task sourceJar(type : Jar) {
+    from sourceSets.main.allJava
 }
+// zip javadocs
+task javadocJar(type : Jar, dependsOn : javadoc) {
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar, sourceJar
+}
+
+signing {
+    sign configurations.archives
+}
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            def ossuname = project.hasProperty("ossrhUsername") ? project.property("ossrhUsername") : ""
+            def osspass = project.hasProperty("ossrhPassword") ? project.property("ossrhPassword") : ""
 
-task delombok(type: DelombokTask, dependsOn: compileJava) {
-    ext.outputDir = file("$buildDir/delombok")
-    outputs.dir(outputDir)
-    sourceSets.main.java.srcDirs.each {
-        inputs.dir(it)
-        args(it, "-d", outputDir)
+
+            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                authentication(userName: ossuname, password: osspass)
+            }
+
+            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+                authentication(userName: ossuname, password: osspass)
+            }
+
+            pom.project {
+                name project.name
+                packaging 'jar'
+                description project.description
+                url 'https://github.com/hiwayama/jsonrpc-jsonSchema'
+
+                scm {
+                    url 'https://github.com/hiwayama/jsonrpc-jsonSchema'
+                }
+
+                licenses {
+                    license {
+                        name 'The Apache License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+
+                developers {
+                    developer {
+                        name 'Hiromasa IWAYAMA'
+                        email 'iwayma1880@gmail.com'
+                    }
+                }
+            }
+        }
     }
 }
 
-javadoc {
-    dependsOn delombok
-    source = delombok.outputDir
-    failOnError = false
+repositories {
+    mavenCentral()
 }
 
 dependencies {
     compile "com.fasterxml.jackson.module:jackson-module-jsonSchema:2.8.5"
     compile 'com.github.briandilley.jsonrpc4j:jsonrpc4j:1.5.3'
-    compileOnly "org.projectlombok:lombok:1.16.20"
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }

src/main/java/com/github/hiwayama/jsonrpc4j/jsonSchema/JsonRpcSchema.java

@@ -2,32 +2,70 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 
 import java.io.Serializable;
 
 /**
  * JSON-RPC API schema Object
+ *
+ * request:
+ * {
+ *   "id": "xxx-xxx-xxx",
+ *   "jsonrpc": "2.0",
+ *   "method": JsonRpcSchema.method,
+ *   "params": JsonRpcSchema.request
+ * }
+ *
+ * response:
+ * {
+ *     "id": "xxx-xxx-xxx",
+ *     "method": JsonRpcSchema.method,
+ *     "jsonrpc": "2.0",
+ *     "result": JsonRpcSchema.response
+ * }
  */
-@AllArgsConstructor
-@Getter
 public class JsonRpcSchema implements Serializable {
-    /**
-     * JSON-RPC method name
-     */
     @JsonProperty("method")
     private String method;
     @JsonProperty("title")
     private String title;
-    /**
-     * JsonSchema of params object
-     */
     @JsonProperty("request")
     private JsonSchema request;
-    /**
-     * JsonSchema of result items
-     */
     @JsonProperty("response")
     private JsonSchema response;
+
+    public JsonRpcSchema(String method, String title, JsonSchema request, JsonSchema response) {
+        this.method = method;
+        this.title = title;
+        this.request = request;
+        this.response = response;
+    }
+
+    /**
+     * @return JSON-RPC method name
+     */
+    public String getMethod() {
+        return method;
+    }
+
+    /**
+     * @return title attribute of JSONSchema
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * @return JsonSchema of param object
+     */
+    public JsonSchema getRequest() {
+        return request;
+    }
+
+    /**
+     * @return JsonSchema of result items
+     */
+    public JsonSchema getResponse() {
+        return response;
+    }
 }

src/main/java/com/github/hiwayama/jsonrpc4j/jsonSchema/JsonRpcSchemaGenerator.java

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
 import com.fasterxml.jackson.module.jsonSchema.JsonSchemaGenerator;
 import com.fasterxml.jackson.module.jsonSchema.factories.SchemaFactoryWrapper;
@@ -125,8 +124,8 @@ private JsonSchema getCollectionSchema(ParameterizedType type) throws ClassNotFo
      * generate API Schemas
      * @param serviceClass Service Class of jsonrpc4j
      * @return API Schema objects
-     * @throws JsonProcessingException
-     * @throws ClassNotFoundException
+     * @throws JsonProcessingException on error
+     * @throws ClassNotFoundException on error
      */
     public List<JsonRpcSchema> generate(Class<?> serviceClass) throws JsonProcessingException, ClassNotFoundException {
         List<JsonRpcSchema> schemas = new ArrayList<>();