You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/02/23 04:33:27 UTC
[openmeetings] branch master updated (c8e5520 -> cce6d10)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from c8e5520 [OPENMEETINGS-2577] sonar should be more happy
new 976a75f [OPENMEETINGS-2520] sonar sould be more happy
new cce6d10 [OPENMEETINGS-2567] some indicies are added
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/openmeetings/db/entity/user/Address.java | 5 ++++-
.../main/java/org/apache/openmeetings/db/entity/user/User.java | 1 +
.../org/apache/openmeetings/util/crypt/SCryptImplementation.java | 8 ++++----
3 files changed, 9 insertions(+), 5 deletions(-)
[openmeetings] 01/02: [OPENMEETINGS-2520] sonar sould be more happy
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 976a75fd8c3def17f4600d71e467a966930f9915
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Feb 23 11:32:20 2021 +0700
[OPENMEETINGS-2520] sonar sould be more happy
---
.../org/apache/openmeetings/util/crypt/SCryptImplementation.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
index 34ba241..560d824 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
@@ -44,7 +44,7 @@ public class SCryptImplementation implements ICrypt {
}
return sr;
});
- private static int COST = 1024 * 16;
+ private static int cost = 1024 * 16;
private static final int KEY_LENGTH = 512;
private static final int SALT_LENGTH = 200;
@@ -58,14 +58,14 @@ public class SCryptImplementation implements ICrypt {
try (final InputStream is = getClass().getResourceAsStream("/openmeetings.properties")) {
Properties props = new Properties();
props.load(is);
- COST = Integer.valueOf(props.getProperty("scrypt.cost", "" + COST));
+ cost = Integer.valueOf(props.getProperty("scrypt.cost", "" + cost));
} catch (Exception e) {
- log.error("Failed to initialize the COST", e);
+ log.error("Failed to initialize the cost", e);
}
}
private static String hash(String str, byte[] salt) {
- byte[] dk = SCrypt.generate(str.getBytes(UTF_8), salt, COST, 8, 8, KEY_LENGTH);
+ byte[] dk = SCrypt.generate(str.getBytes(UTF_8), salt, cost, 8, 8, KEY_LENGTH);
return Base64.encodeBase64String(dk);
}
[openmeetings] 02/02: [OPENMEETINGS-2567] some indicies are added
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit cce6d10b50e4db2f60ce308da45cef48a630f52a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Feb 23 11:33:14 2021 +0700
[OPENMEETINGS-2567] some indicies are added
---
.../main/java/org/apache/openmeetings/db/entity/user/Address.java | 5 ++++-
.../src/main/java/org/apache/openmeetings/db/entity/user/User.java | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
index bf01604..b60cec8 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
@@ -23,6 +23,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Index;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
@@ -32,7 +33,9 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.openmeetings.db.entity.HistoricalEntity;
@Entity
-@Table(name = "address")
+@Table(name = "address", indexes = {
+ @Index(name = "email_idx", columnList = "email")
+})
@XmlRootElement(name = "address")
public class Address extends HistoricalEntity {
private static final long serialVersionUID = 1L;
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index a39b8c4..d93f90f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -121,6 +121,7 @@ import org.apache.wicket.util.string.Strings;
@Index(name = "login_idx", columnList = "login")
, @Index(name = "lastname_idx", columnList = "lastname")
, @Index(name = "firstname_idx", columnList = "firstname")
+ , @Index(name = "type_idx", columnList = "type")
})
@XmlRootElement(name = USER_NODE)
public class User extends HistoricalEntity {