- Changed license from GNU GPL to MIT

- Updated dependencies - Added author
astuteficus · May 14, 2018 · b7b3e65 · b7b3e65
1 parent cdd4c25
commit b7b3e65
Show file tree

Hide file tree

Showing 72 changed files with 2,044 additions and 1,553 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2014-2018 BAData LLC, https://badata.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 [![Build Status](https://api.travis-ci.org/BAData/protobuf-converter.svg)](https://travis-ci.org/BAData/protobuf-converter)
 [![GitHub release](https://img.shields.io/github/release/BAData/protobuf-converter.svg)](https://github.com/BAData/protobuf-converter/releases)
-[![Slack Status](http://badata-support.herokuapp.com/badge.svg)](https://badata-support.herokuapp.com)
 [![JitPack repository](https://jitpack.io/v/BAData/protobuf-converter.svg)](https://jitpack.io/#BAData/protobuf-converter)
 # Protobuf converter
 **protobuf-converter** is library for transforming your Domain Model Objects into Google Protobuf Messages and vice versa.
@@ -137,4 +136,4 @@ java -jar example.jar
 
 # License
 
-GNU General Public License v3.0
+MIT License
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.7.6"
+        classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.5"
     }
 }
 
@@ -27,13 +27,13 @@ targetCompatibility='1.7'
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0-beta-1'
+        artifact = 'com.google.protobuf:protoc:3.5.1'
     }
     generatedFilesBaseDir = "$projectDir/src"
 }
 
 dependencies {
-    compile 'com.google.protobuf:protobuf-java:3.0.0-beta-1'
+    compile 'com.google.protobuf:protobuf-java:3.5.1'
     testCompile 'junit:junit:4.12'
 }
 
@@ -50,19 +50,4 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 artifacts {
     archives sourcesJar
     archives javadocJar
-}
-
-// To specify a license in the pom:
-install {
-    repositories.mavenInstaller {
-        pom.project {
-            licenses {
-                license {
-                    name 'GNU General Public License v3.0'
-                    url 'http://www.gnu.org/licenses/gpl-3.0.txt'
-                    distribution 'repo'
-                }
-            }
-        }
-    }
 }
diff --git a/example/build.gradle b/example/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.7.6"
+        classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.5"
     }
 }
 
@@ -40,11 +40,11 @@ jar {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0-beta-1'
+        artifact = 'com.google.protobuf:protoc:3.5.1'
     }
     plugins {
         grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:0.9.0'
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.12.0'
         }
     }
     generateProtoTasks {
@@ -58,6 +58,6 @@ protobuf {
 
 dependencies {
     compile files("libs/protobuf-converter.jar")
-    compile 'com.google.protobuf:protobuf-java:3.0.0-beta-1'
-    compile 'io.grpc:grpc-all:0.9.0'
+    compile 'com.google.protobuf:protobuf-java:3.5.1'
+    compile 'io.grpc:grpc-all:1.12.0'
 }
diff --git a/example/libs/protobuf-converter.jar b/example/libs/protobuf-converter.jar
diff --git a/example/src/main/java/net/badata/protobuf/example/Main.java b/example/src/main/java/net/badata/protobuf/example/Main.java
@@ -4,9 +4,8 @@
 import net.badata.protobuf.example.server.ProtobufServer;
 
 /**
- * Created by jsjem on 04.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class Main {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/client/ClientException.java b/example/src/main/java/net/badata/protobuf/example/client/ClientException.java
@@ -1,9 +1,8 @@
 package net.badata.protobuf.example.client;
 
 /**
- * Created by jsjem on 05.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class ClientException extends Exception {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/client/ProtobufClient.java b/example/src/main/java/net/badata/protobuf/example/client/ProtobufClient.java
@@ -20,9 +20,8 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Created by jsjem on 04.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class ProtobufClient {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/client/domain/BookMapper.java b/example/src/main/java/net/badata/protobuf/example/client/domain/BookMapper.java
@@ -8,9 +8,8 @@
 import net.badata.protobuf.example.proto.Book;
 
 /**
- * Created by jsjem on 05.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class BookMapper extends DefaultMapperImpl {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/client/domain/BooleanEnumConverter.java b/example/src/main/java/net/badata/protobuf/example/client/domain/BooleanEnumConverter.java
@@ -4,9 +4,8 @@
 import net.badata.protobuf.example.proto.BookState;
 
 /**
- * Created by jsjem on 05.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class BooleanEnumConverter implements TypeConverter<Boolean, BookState> {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/client/domain/Reader.java b/example/src/main/java/net/badata/protobuf/example/client/domain/Reader.java
@@ -5,9 +5,8 @@
 import net.badata.protobuf.example.proto.User;
 
 /**
- * Created by jsjem on 04.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 @ProtoClass(User.class)
 public class Reader {

diff --git a/example/src/main/java/net/badata/protobuf/example/client/domain/ReadingBook.java b/example/src/main/java/net/badata/protobuf/example/client/domain/ReadingBook.java
@@ -5,9 +5,8 @@
 import net.badata.protobuf.example.proto.Book;
 
 /**
- * Created by jsjem on 04.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 @ProtoClass(value = Book.class, mapper = BookMapper.class)
 public class ReadingBook {

diff --git a/example/src/main/java/net/badata/protobuf/example/client/view/AddBookView.java b/example/src/main/java/net/badata/protobuf/example/client/view/AddBookView.java
@@ -7,9 +7,8 @@
 import java.text.NumberFormat;
 
 /**
- * Created by jsjem on 06.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class AddBookView implements ActionListener {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/client/view/ClientWindow.java b/example/src/main/java/net/badata/protobuf/example/client/view/ClientWindow.java
@@ -12,9 +12,8 @@
 import java.util.List;
 
 /**
- * Created by jsjem on 05.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class ClientWindow implements LoginView.OnLoginActionListener, AddBookView.OnAddBookActionListener,
 		LibraryView.OnLibraryActionListener {

diff --git a/example/src/main/java/net/badata/protobuf/example/client/view/LibraryView.java b/example/src/main/java/net/badata/protobuf/example/client/view/LibraryView.java
@@ -12,9 +12,8 @@
 import java.util.List;
 
 /**
- * Created by jsjem on 06.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class LibraryView implements ActionListener, ListSelectionListener {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/client/view/LoginView.java b/example/src/main/java/net/badata/protobuf/example/client/view/LoginView.java
@@ -5,9 +5,8 @@
 import java.awt.event.ActionListener;
 
 /**
- * Created by jsjem on 06.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class LoginView implements ActionListener {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/server/LibraryService.java b/example/src/main/java/net/badata/protobuf/example/server/LibraryService.java
@@ -20,11 +20,10 @@
 import java.util.List;
 
 /**
- * Created by jsjem on 04.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
-public class LibraryService implements LibraryServiceGrpc.LibraryService {
+public class LibraryService extends LibraryServiceGrpc.LibraryServiceImplBase {
 
 	private final MemoryDatabase database;
 

diff --git a/example/src/main/java/net/badata/protobuf/example/server/MemoryDatabase.java b/example/src/main/java/net/badata/protobuf/example/server/MemoryDatabase.java
@@ -11,9 +11,8 @@
 import java.util.Set;
 
 /**
- * Created by jsjem on 05.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class MemoryDatabase {
 

diff --git a/example/src/main/java/net/badata/protobuf/example/server/ProtobufServer.java b/example/src/main/java/net/badata/protobuf/example/server/ProtobufServer.java
@@ -7,9 +7,8 @@
 import java.io.IOException;
 
 /**
- * Created by jsjem on 04.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 public class ProtobufServer {
 
@@ -20,7 +19,7 @@ public class ProtobufServer {
 
 	public void start() throws IOException, InterruptedException {
 		server = ServerBuilder.forPort(PORT)
-				.addService(LibraryServiceGrpc.bindService(new LibraryService(database)))
+				.addService(new LibraryService(database))
 				.build()
 				.start();
 		Runtime.getRuntime().addShutdownHook(new Thread() {

diff --git a/example/src/main/java/net/badata/protobuf/example/server/domain/LibraryBook.java b/example/src/main/java/net/badata/protobuf/example/server/domain/LibraryBook.java
@@ -8,9 +8,8 @@
 import java.util.Objects;
 
 /**
- * Created by jsjem on 04.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 @ProtoClass(Book.class)
 public class LibraryBook {

diff --git a/example/src/main/java/net/badata/protobuf/example/server/domain/Reader.java b/example/src/main/java/net/badata/protobuf/example/server/domain/Reader.java
@@ -5,9 +5,8 @@
 import net.badata.protobuf.example.proto.User;
 
 /**
- * Created by jsjem on 04.05.2016.
- *
  * @author jsjem
+ * @author Roman Gushel
  */
 @ProtoClass(value = User.class)
 public class Reader {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 06 16:25:28 EEST 2016
+#Mon May 14 12:06:50 EEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
diff --git a/src/main/java/net/badata/protobuf/converter/Configuration.java b/src/main/java/net/badata/protobuf/converter/Configuration.java
@@ -1,27 +1,11 @@
-/*
- * Copyright (C) 2016  BAData Creative Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
 package net.badata.protobuf.converter;
 
 /**
  * Contains configuration parameters that will be used by {@link net.badata.protobuf.converter.Converter
  * Converter} during performing of object conversion.
  *
  * @author jsjem
+ * @author Roman Gushel
  */
 public final class Configuration {
 

diff --git a/src/main/java/net/badata/protobuf/converter/Converter.java b/src/main/java/net/badata/protobuf/converter/Converter.java
@@ -1,20 +1,3 @@
-/*
- * Copyright (C) 2016  BAData Creative Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
 package net.badata.protobuf.converter;
 
 import com.google.protobuf.Message;
@@ -41,6 +24,7 @@
  * Converts data from Protobuf messages to domain model objects and vice versa.
  *
  * @author jsjem
+ * @author Roman Gushel
  */
 public final class Converter {
 
@@ -73,6 +57,7 @@ public static Converter create(final FieldsIgnore fieldsIgnore) {
 	 * Create configured converter.
 	 *
 	 * @param configuration Parameters for conversion.
+	 * @return Converter instance.
 	 */
 	public static Converter create(final Configuration configuration) {
 		return new Converter(configuration);
@@ -321,6 +306,7 @@ private void fillProtobufField(final FieldResolver fieldResolver, final MappingR
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	private <E extends Message> Collection<?> createProtobufValueList(final Class<E> type, final Class<?>
 			domainCollectionClass, final Collection<?> domainCollection) {
 		return createNestedConverter()