Skip to content
This repository has been archived by the owner on May 4, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release/1.5.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Roeser committed Dec 27, 2018
2 parents c8e3bdf + 3428316 commit fc80afc
Show file tree
Hide file tree
Showing 37 changed files with 1,202 additions and 340 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,8 @@ gradle-app.setting
${sys:appHome}

*/logs/**

.classpath
.project
**/.settings/*
**/bin/*
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ subprojects {
apply plugin: 'maven-publish'

ext['reactor-bom.version'] = 'Californium-SR1'
ext['rsocket.version'] = '0.11.12'
ext['rsocket-rpc.version'] = '0.2.10'
ext['rsocket.version'] = '0.11.15'
ext['rsocket-rpc.version'] = '0.2.12'

ext['jackson.version'] = '2.9.7'
ext['jackson-protobuf.version'] = '0.9.10-jackson2.9-proto3'
Expand All @@ -45,7 +45,7 @@ subprojects {
ext['junit.version'] = '5.1.0'
ext['mockito.version'] = '2.23.0'
ext['hamcrest.version'] = '1.3'
ext['jmh.version'] = '1.2.0'
ext['jmh.version'] = '1.21'
ext['micrometer.version'] = '1.0.6'
ext['assertj.version'] = '3.11.1'
ext['opentracing.version'] = '0.31.0'
Expand All @@ -61,11 +61,11 @@ subprojects {
project.version += project.hasProperty('versionSuffix') ? project.property('versionSuffix') : ''

repositories {
mavenCentral()
jcenter()
maven { url 'http://repo.spring.io/libs-snapshot' }
maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
maven { url 'https://oss.jfrog.org/oss-release-local' }
mavenCentral()

}

Expand Down Expand Up @@ -145,6 +145,7 @@ subprojects {
entry 'junit-vintage-engine'
}


dependencySet(group: 'org.openjdk.jmh', version: ext['jmh.version']) {
entry 'jmh-core'
entry 'jmh-generator-annprocess'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=io.netifi.proteus
version=1.5.2
version=1.5.3
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Thu Dec 06 23:55:01 PST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,23 @@ option java_package = "io.netifi.proteus.broker.access";
option java_outer_classname = "AccessKeyInfo";
option java_multiple_files = true;

message AccessKeyName {
string name = 1;
}

message AccessKey {
int64 key = 1;
}

message AccessKeyParameters {
string name = 2;
string description = 1;
}

message AccessToken {
int64 key = 1;
bytes accessToken = 2;
string name = 4;
string description = 3;
}

Expand All @@ -28,6 +34,7 @@ message AccessTokenInfo {
bytes accessTokenHash = 2;
bytes accessTokenSalt = 3;
string accessKeyAlgo = 4;
string name = 8;
string description = 5;
bool disabled = 6;
google.protobuf.Timestamp timestamp = 7;
Expand All @@ -40,4 +47,5 @@ service AccessKeyInfoService {
rpc EnableAccessKey (AccessKey) returns (AccessTokenInfo) {}
rpc GetAccessKey (AccessKey) returns (AccessTokenInfo) {}
rpc GetAccessKeys (google.protobuf.Empty) returns (stream AccessTokenInfo) {}
rpc GetAccessKeyByName (AccessKeyName) returns (AccessTokenInfo) {}
}
1 change: 1 addition & 0 deletions proteus-auth/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
description = 'Netifi Proteus Authentication Utilities'

dependencies {
compile project (':proteus-common')
compile 'io.netty:netty-buffer'
}
5 changes: 0 additions & 5 deletions proteus-auth/src/main/java/io/netifi/proteus/auth/Clock.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.netifi.proteus.auth;

import io.netifi.proteus.common.time.Clock;
import io.netty.buffer.ByteBuf;
import java.nio.ByteBuffer;
import javax.crypto.Mac;
Expand All @@ -22,7 +23,7 @@ protected ByteBuffer initialValue() {
}

DefaultSessionUtil() {
this(new DefaultSystemClock());
this(Clock.DEFAULT);
}

@Override
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.netifi.proteus.auth;

import io.netifi.proteus.common.time.Clock;
import io.netty.buffer.Unpooled;
import java.nio.ByteBuffer;
import org.junit.Assert;
Expand Down
14 changes: 9 additions & 5 deletions proteus-broker-info-idl/src/main/proto/proteus/broker_info.proto
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@ message Destination {
}

message Broker {
string brokerId = 1;
string ipAddress = 2;
int32 port = 3;
int32 clusterPort = 4;
int32 adminPort = 5;
string brokerId = 1;
string ipAddress = 2;
int32 port = 3;
string clusterAddress = 6;
int32 clusterPort = 4;
string adminAddress = 7;
int32 adminPort = 5;
string webSocketAddress = 8;
int32 webSocketPort = 9;
}

message Event {
Expand Down
16 changes: 16 additions & 0 deletions proteus-client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
apply plugin: 'com.google.protobuf'
apply plugin: 'com.github.johnrengelman.shadow'

description = 'Netifi Proteus Client'

dependencies {
protobuf project (':proteus-broker-info-idl')

compile project (':proteus-auth')
compile project (':proteus-common')
compile project (':proteus-frames')
compile 'com.typesafe:config'
compile 'com.google.guava:guava'
Expand All @@ -25,6 +27,16 @@ dependencies {
testCompile 'org.apache.logging.log4j:log4j-slf4j-impl'
}

shadowJar {
mergeServiceFiles()
classifier = ''
dependencies {
include(dependency('com.google.guava:guava'))
}
relocate 'com.google.common', 'netifi.com.google.common'
relocate 'com.google.thirdparty', 'netifi.com.google.thirdparty'
}

protobuf {
generatedFilesBaseDir = "${projectDir}/src/generated"

Expand Down Expand Up @@ -62,3 +74,7 @@ idea {
generatedSourceDirs += file('src/generated/main/proteus')
}
}


build.finalizedBy(shadowJar)

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static boolean isSslDisabled() {
}

static boolean getKeepAlive() {
boolean keepalive = false;
boolean keepalive = true;
try {
keepalive = conf.getBoolean("proteus.client.keepalive.enable");
} catch (ConfigException.Missing m) {
Expand All @@ -35,7 +35,7 @@ static boolean getKeepAlive() {
}

static long getTickPeriodSeconds() {
long tickPeriodSeconds = 60;
long tickPeriodSeconds = 20;
try {
tickPeriodSeconds = conf.getLong("proteus.client.keepalive.tickPeriodSeconds");
} catch (ConfigException.Missing m) {
Expand All @@ -46,7 +46,7 @@ static long getTickPeriodSeconds() {
}

static long getAckTimeoutSeconds() {
long ackTimeoutSeconds = 120;
long ackTimeoutSeconds = 30;
try {
ackTimeoutSeconds = conf.getLong("proteus.client.keepalive.ackTimeoutSeconds");
} catch (ConfigException.Missing m) {
Expand Down
Loading

0 comments on commit fc80afc

Please sign in to comment.