You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/09/19 20:00:37 UTC
[1/2] incubator-geode git commit: GEODE-1524: Updating swagger
annotations to 1.3.13 Removing of escape characters out of the return error
messages. JSON documents with "\" are invalid if not escaped.
Repository: incubator-geode
Updated Branches:
refs/heads/develop d0f9dc355 -> efd011750
GEODE-1524: Updating swagger annotations to 1.3.13
Removing of escape characters out of the return error messages. JSON documents
with "\" are invalid if not escaped.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/964ce837
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/964ce837
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/964ce837
Branch: refs/heads/develop
Commit: 964ce8379a2bed515fdd9f3d08b1e4d0beb4f39e
Parents: 8802404
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Sep 20 05:59:01 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Sep 20 05:59:01 2016 +1000
----------------------------------------------------------------------
.../rest/internal/web/controllers/AbstractBaseController.java | 7 +++++--
gradle/dependency-versions.properties | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/964ce837/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
index 6869f0e..e94998b 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
@@ -199,7 +199,7 @@ public abstract class AbstractBaseController {
final HttpHeaders headers = new HttpHeaders();
headers.setLocation(toUri("queries", queryId));
- return new ResponseEntity<String>(queryResultAsJson, headers, HttpStatus.OK);
+ return new ResponseEntity<>(queryResultAsJson, headers, HttpStatus.OK);
}else {
throw new GemfireRestException("Server has encountered error while generating query result into restful format(JSON)!");
}
@@ -645,7 +645,10 @@ public abstract class AbstractBaseController {
protected String convertErrorAsJson(Throwable t) {
StringWriter writer = new StringWriter();
t.printStackTrace(new PrintWriter(writer));
- return String.format("{\"message\" : \"%1$s\", \"stackTrace\" : \"%2$s\"}", t.getMessage(), writer.toString());
+ String returnString = writer.toString();
+ returnString = returnString.replace("\n"," ");
+ returnString = returnString.replace("\t"," ");
+ return String.format("{\"message\" : \"%1$s\", \"stackTrace\" : \"%2$s\"}", t.getMessage(), returnString);
}
protected Map<?,?> convertJsonToMap(final String jsonString) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/964ce837/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 0abe690..c6e99ad 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -99,7 +99,7 @@ spring-tx.version = 3.2.12.RELEASE
springframework.version = 4.2.4.RELEASE
stephenc-findbugs.version = 1.3.9-1
spymemcached.version = 2.9.0
-swagger.version = 1.3.2
+swagger.version = 1.3.13
swagger-springmvc.version = 0.8.2
system-rules.version = 1.16.0
tempus-fugit.version = 1.1
[2/2] incubator-geode git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-geode into develop
Posted by ud...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/efd01175
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/efd01175
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/efd01175
Branch: refs/heads/develop
Commit: efd011750538ac2400cef8381765b8e0ddc921a1
Parents: 964ce83 d0f9dc3
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Sep 20 05:59:12 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Sep 20 05:59:12 2016 +1000
----------------------------------------------------------------------
build.gradle | 5 +-
etc/eclipseOrganizeImports.importorder | 5 +-
etc/intellijIdeaCodeStyle.xml | 2 +
.../LauncherLifecycleCommandsJUnitTest.java | 52 +++--
.../client/internal/ConnectionFactoryImpl.java | 11 +-
.../internal/IndexTrackingQueryObserver.java | 2 +-
.../distributed/ConfigurationProperties.java | 17 --
.../internal/AbstractDistributionConfig.java | 26 ---
.../internal/DistributionConfig.java | 29 ---
.../internal/DistributionConfigImpl.java | 20 --
.../membership/gms/auth/GMSAuthenticator.java | 30 +--
.../membership/gms/fd/GMSHealthMonitor.java | 1 -
.../internal/tcpserver/TcpClient.java | 1 -
.../internal/tcpserver/TcpServer.java | 1 -
.../apache/geode/internal/admin/SSLConfig.java | 1 -
.../internal/cache/AbstractDiskRegionEntry.java | 8 +-
.../internal/cache/AbstractRegionEntry.java | 31 ++-
.../geode/internal/cache/AbstractRegionMap.java | 1 -
.../geode/internal/cache/EntryEventImpl.java | 92 +++++---
.../cache/tier/sockets/AcceptorImpl.java | 4 +-
.../cache/tier/sockets/CacheClientProxy.java | 12 +-
.../internal/cache/tier/sockets/HandShake.java | 26 ++-
.../geode/internal/logging/LogService.java | 11 +-
.../geode/internal/logging/log4j/LogMarker.java | 48 ++--
.../geode/internal/net/SocketCreator.java | 1 -
.../geode/internal/offheap/StoredObject.java | 6 +
.../security/IntegratedSecurityService.java | 148 ++-----------
.../internal/security/SecurableComponent.java | 55 -----
.../internal/security/SecurityService.java | 87 +++++++-
.../apache/geode/internal/tcp/TCPConduit.java | 9 +-
.../geode/management/GemFireProperties.java | 1 -
.../management/internal/ManagementAgent.java | 13 +-
.../apache/geode/security/AuthInitialize.java | 16 +-
.../geode/security/SecurableComponents.java | 62 ------
geode-core/src/main/resources/log4j2-cli.xml | 6 +-
geode-core/src/main/resources/log4j2.xml | 11 +-
.../internal/logging/log4j/log4j2-legacy.xml | 6 +-
.../CacheServerSSLConnectionDUnitTest.java | 7 +-
...istributedAckOverflowRegionCCEDUnitTest.java | 22 +-
.../DistributedAckRegionCCEDUnitTest.java | 4 +-
.../LocatorLauncherRemoteIntegrationTest.java | 29 ++-
.../ServerLauncherRemoteIntegrationTest.java | 34 +--
.../AbstractDistributionConfigTest.java | 78 -------
.../internal/DistributionConfigJUnitTest.java | 89 +-------
.../cache/ClientServerTransactionDUnitTest.java | 222 +++++++++++++++++--
.../internal/cache/EntryEventImplTest.java | 9 +
.../cache/SearchLoadAndWriteProcessorTest.java | 1 +
.../security/IntegratedSecurityServiceTest.java | 163 +-------------
.../security/SecurityConfigIntegrationTest.java | 57 -----
.../ConnectToLocatorSSLDUnitTest.java | 1 -
.../geode/management/JMXMBeanDUnitTest.java | 1 -
...edSecurityCacheLifecycleDistributedTest.java | 14 +-
.../PDXGfshPostProcessorOnRemoteServerTest.java | 11 +-
.../geode/codeAnalysis/excludedClasses.txt | 1 -
.../logging/log4j/custom/log4j2-custom.xml | 5 +-
.../geode/security/templates/authz5_5.dtd | 8 +-
.../geode/security/templates/authz6_0.dtd | 10 +-
.../apache/geode/test/golden/log4j2-test.xml | 7 +-
gradle/test.gradle | 18 +-
59 files changed, 631 insertions(+), 1017 deletions(-)
----------------------------------------------------------------------