Additions are JOOQ async classic, generated DB objects

Author: spectralcodex

.idea/jarRepositories.xml

@@ -20,22 +20,20 @@
  <artifactId>common-microservice</artifactId>
  <version>${project.version}</version>
  </dependency>
-
- <!--<dependency>
+ <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-jdbc-client</artifactId>
  <optional>true</optional>
  </dependency>
  <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.conn.version}</version>
+ <groupId>io.vertx</groupId>
+ <artifactId>vertx-sql-common</artifactId>
  <optional>true</optional>
- </dependency>-->
+ </dependency>
  <dependency>
- <groupId>io.vertx</groupId>
- <artifactId>vertx-pg-client</artifactId>
- <scope>provided</scope>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${pgsql.driver.version}</version>
  </dependency>
  </dependencies>
 

administration-microservice/pom.xml

@@ -8,9 +8,14 @@
 [frame="topbot"]
 |===
 ^|Name | Type ^| Description
-|[[age]]`@age`|`String`|-
+|[[companyCode]]`@companyCode`|`String`|-
+|[[createdBy]]`@createdBy`|`String`|-
+|[[email]]`@email`|`String`|-
 |[[firstName]]`@firstName`|`String`|-
 |[[id]]`@id`|`Number (Long)`|-
 |[[lastName]]`@lastName`|`String`|-
+|[[mobile]]`@mobile`|`String`|-
+|[[salt]]`@salt`|`String`|-
+|[[secret]]`@secret`|`String`|-
 |===
 

administration-microservice/src/main/asciidoc/dataobjects.adoc

@@ -14,9 +14,19 @@ public class UserConverter {
  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, User obj) {
  for (java.util.Map.Entry<String, Object> member : json) {
  switch (member.getKey()) {
- case "age":
+ case "companyCode":
  if (member.getValue() instanceof String) {
- obj.setAge((String)member.getValue());
+ obj.setCompanyCode((String)member.getValue());
+ }
+ break;
+ case "createdBy":
+ if (member.getValue() instanceof String) {
+ obj.setCreatedBy((String)member.getValue());
+ }
+ break;
+ case "email":
+ if (member.getValue() instanceof String) {
+ obj.setEmail((String)member.getValue());
  }
  break;
  case "firstName":
@@ -34,6 +44,21 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
  obj.setLastName((String)member.getValue());
  }
  break;
+ case "mobile":
+ if (member.getValue() instanceof String) {
+ obj.setMobile((String)member.getValue());
+ }
+ break;
+ case "salt":
+ if (member.getValue() instanceof String) {
+ obj.setSalt((String)member.getValue());
+ }
+ break;
+ case "secret":
+ if (member.getValue() instanceof String) {
+ obj.setSecret((String)member.getValue());
+ }
+ break;
  }
  }
  }
@@ -43,8 +68,14 @@ public static void toJson(User obj, JsonObject json) {
  }
 
  public static void toJson(User obj, java.util.Map<String, Object> json) {
- if (obj.getAge() != null) {
- json.put("age", obj.getAge());
+ if (obj.getCompanyCode() != null) {
+ json.put("companyCode", obj.getCompanyCode());
+ }
+ if (obj.getCreatedBy() != null) {
+ json.put("createdBy", obj.getCreatedBy());
+ }
+ if (obj.getEmail() != null) {
+ json.put("email", obj.getEmail());
  }
  if (obj.getFirstName() != null) {
  json.put("firstName", obj.getFirstName());
@@ -55,5 +86,14 @@ public static void toJson(User obj, java.util.Map<String, Object> json) {
  if (obj.getLastName() != null) {
  json.put("lastName", obj.getLastName());
  }
+ if (obj.getMobile() != null) {
+ json.put("mobile", obj.getMobile());
+ }
+ if (obj.getSalt() != null) {
+ json.put("salt", obj.getSalt());
+ }
+ if (obj.getSecret() != null) {
+ json.put("secret", obj.getSecret());
+ }
  }
 }

administration-microservice/src/main/generated/io/vertx/easyerp/microservice/administration/jpojo/UserConverter.java

@@ -4,7 +4,10 @@
 import io.vertx.core.Promise;
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.JsonObject;
+import io.vertx.core.logging.Logger;
+import io.vertx.core.logging.LoggerFactory;
 import io.vertx.easyerp.microservice.administration.AdministrationService;
+import io.vertx.easyerp.microservice.administration.impl.AdministrationImpl;
 import io.vertx.easyerp.microservice.administration.jpojo.User;
 import io.vertx.easyerp.microservice.common.RestAPIVerticle;
 import io.vertx.ext.web.Router;
@@ -20,6 +23,7 @@ public class AdministrationRestAPIVerticle extends RestAPIVerticle {
  private static final String API_UPDATE_USER = "/:userId";
  private static final String API_DELETE_USER = "/:userId";
  private static final String API_DELETE_ALL_USER = "/all";
+ protected final static Logger logger = LoggerFactory.getLogger(AdministrationRestAPIVerticle.class);
 
  private final AdministrationService service;
 
@@ -37,8 +41,8 @@ public void start(Promise<Void> startPromise) throws Exception {
  router.post(API_ADD_USER).handler(this::apiAddUser);
  router.post(API_RETRIEVE_USER).handler(this::apiRetrieveUser);
 
- String host = config().getString("user.http.address", "0.0.0.0");
- int port = config().getInteger("user.http.port", 8082);
+ String host = config().getString("administration.http.address", "0.0.0.0");
+ int port = config().getInteger("administration.http.port", 8082);
 
  createHttpServer(router, host, port)
  .compose(serverCreated -> publishHttpEndpoint(SERVICE_NAME, host, port))
@@ -47,11 +51,12 @@ public void start(Promise<Void> startPromise) throws Exception {
 
  private void apiAddUser(RoutingContext context) {
  try {
- User user = new User(new JsonObject(context.getBodyAsString()));
+ logger.info(context.getBodyAsJson());
+
+ User user = new User(context.getBodyAsJson());
  service.addUser(user, resultHandler(context, r -> {
- String result = new JsonObject().put("message", "user_added")
- .put("userId", user.getId())
- .encodePrettily();
+ String result = new JsonObject()
+ .put("message", "user_added").encodePrettily();
  context.response().setStatusCode(201)
  .putHeader("content-type", "application/json")
  .end(result);

administration-microservice/src/main/java/io/vertx/easyerp/microservice/administration/api/AdministrationRestAPIVerticle.java

@@ -3,18 +3,17 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
-import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.logging.Logger;
 import io.vertx.core.logging.LoggerFactory;
 import io.vertx.easyerp.microservice.administration.AdministrationService;
 import io.vertx.easyerp.microservice.administration.jpojo.User;
-import io.vertx.easyerp.microservice.common.service.JdbcRepositoryWrapper;
+import io.vertx.easyerp.microservice.common.service.JooqRepositoryWrapper;
 
 import java.util.UUID;
 
 
-public class AdministrationImpl extends JdbcRepositoryWrapper implements AdministrationService {
+public class AdministrationImpl extends JooqRepositoryWrapper implements AdministrationService {
 
  protected final static Logger logger = LoggerFactory.getLogger(AdministrationImpl.class);
 
@@ -25,33 +24,21 @@ public AdministrationImpl(Vertx vertx, JsonObject config) {
  @Override
  public AdministrationService initializePersistence(Handler<AsyncResult<Void>> handler) {
  final String uuid = UUID.randomUUID().toString();
- logger.info("Initializing service..Administration->" + uuid);
- this.retrieveNone(uuid, "{ call time_stamp() }")
+ //logger.info("Initializing service..Administration->" + uuid);
+ this.retrieveNone(uuid, "select fn_get_now()")
  .onComplete(handler);
  return this;
  }
 
-
  @Override
  public AdministrationService addUser(User user, Handler<AsyncResult<Void>> resultHandler) {
- JsonArray param = new JsonArray();
- String func = "{ call add_user() }";
- param.add(user.getId());
- param.add(user.getFirstName());
- param.add(user.getLastName());
- param.add(user.getAge());
- this.executeNoResult(param, func, resultHandler);
- return this;
+ return null;
  }
 
-
  @Override
  public AdministrationService retrieveUser(String userId, Handler<AsyncResult<User>> resultHandler) {
- String func = "{ call get_user(?) }";
- this.retrieveOne(userId, func)
- .map(option -> option.map(User::new).orElse(null))
- .onComplete(resultHandler);
-
- return this;
+ return null;
  }
+
+
 }

administration-microservice/src/main/java/io/vertx/easyerp/microservice/administration/impl/AdministrationImpl.java

@@ -11,7 +11,12 @@ public class User {
  private Long Id;
  private String firstName;
  private String lastName;
- private String age;
+ private String email;
+ private String mobile;
+ private String secret;
+ private String salt;
+ private String companyCode;
+ private String createdBy;
 
  public User(JsonObject json) {
  UserConverter.fromJson(json, this);
@@ -27,7 +32,12 @@ public User(User other) {
  this.Id = other.Id;
  this.firstName = other.firstName;
  this.lastName = other.lastName;
- this.age = other.age;
+ this.email = other.email;
+ this.mobile = other.mobile;
+ this.secret = other.secret;
+ this.salt = other.salt;
+ this.companyCode = other.companyCode;
+ this.createdBy = other.createdBy;
  }
 
  public Long getId() {
@@ -57,15 +67,66 @@ public User setLastName(String lastName) {
  return this;
  }
 
- public String getAge() {
- return age;
+
+ public String getEmail() {
+ return email;
+ }
+
+ public User setEmail(String email) {
+ this.email = email;
+ return this;
+ }
+
+ public String getMobile() {
+ return mobile;
+ }
+
+ public User setMobile(String mobile) {
+ this.mobile = mobile;
+ return this;
+ }
+
+ public String getSecret() {
+ return secret;
+ }
+
+ public User setSecret(String secret) {
+ this.secret = secret;
+ return this;
+ }
+
+ public String getSalt() {
+ return salt;
+ }
+
+ public User setSalt(String salt) {
+ this.salt = salt;
+ return this;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
  }
 
- public User setAge(String age) {
- this.age = age;
+ public User setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
  return this;
  }
 
+ public String getCreatedBy() {
+ return createdBy;
+ }
+
+ public User setCreatedBy(String createdBy) {
+ this.createdBy = createdBy;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return this.toJson().encodePrettily();
+ }
+
  @Override
  public boolean equals(Object o) {
  if (this == o) return true;
@@ -74,16 +135,16 @@ public boolean equals(Object o) {
  return Objects.equals(Id, user.Id) &&
  Objects.equals(firstName, user.firstName) &&
  Objects.equals(lastName, user.lastName) &&
- Objects.equals(age, user.age);
+ Objects.equals(email, user.email) &&
+ Objects.equals(mobile, user.mobile) &&
+ Objects.equals(secret, user.secret) &&
+ Objects.equals(salt, user.salt) &&
+ Objects.equals(companyCode, user.companyCode) &&
+ Objects.equals(createdBy, user.createdBy);
  }
 
  @Override
  public int hashCode() {
- return Objects.hash(Id, firstName, lastName, age);
- }
-
- @Override
- public String toString() {
- return this.toJson().encodePrettily();
+ return Objects.hash(Id, firstName, lastName, email, mobile, secret, salt, companyCode, createdBy);
  }
 }

administration-microservice/src/main/java/io/vertx/easyerp/microservice/administration/jpojo/User.java

@@ -1,12 +1,14 @@
 {
  "api.name": "administration",
- "product.http.address": "administration-microservice",
- "product.http.port": 8082,
- "host" : "localhost",
- "port" : 5432,
- "maxPoolSize" : 30,
- "username" : "postgres",
- "password" : "secr3t",
- "database" : "easyerp",
- "charset" : "UTF8"
+ "administration.http.address": "0.0.0.0",
+ "administration.http.port": 8082,
+ "port": 5432,
+ "maxPoolSize": 30,
+ "username": "postgres",
+ "host": "localhost",
+ "database": "impala",
+ "password": "secr3t",
+ "charset": "UTF8",
+ "driver_class": "org.postgresql.Driver",
+ "jooq.dialect": "POSTGRES"
 }