inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

format code.

Browse Source
This commit is contained in:
Epure Alexandru-Eusebiu
2020-11-13 18:16:00 +02:00
parent 5017b305fb
commit 53e87b347e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -1849,10 +1849,10 @@ public class NodesImpl implements Nodes
versionMajor = Boolean.valueOf(str); versionMajor = Boolean.valueOf(str);
} }
String versioningEnabledStringValue = parameters.getParameter("versioningEnabled"); String versioningEnabledStringValue = parameters.getParameter("versioningEnabled");
if(null != versioningEnabledStringValue) if (null != versioningEnabledStringValue)
{ {
boolean versioningEnabled = Boolean.parseBoolean(versioningEnabledStringValue); boolean versioningEnabled = Boolean.parseBoolean(versioningEnabledStringValue);
if(versioningEnabled) if (versioningEnabled)
{ {
versionMajor = (null != versionMajor) ? versionMajor : true; versionMajor = (null != versionMajor) ? versionMajor : true;
} }
@@ -2987,7 +2987,7 @@ public class NodesImpl implements Nodes
case "versioningenabled": case "versioningenabled":
String versioningEnabledStringValue = getStringOrNull(field.getValue()); String versioningEnabledStringValue = getStringOrNull(field.getValue());
if(null != versioningEnabledStringValue) if (null != versioningEnabledStringValue)
{ {
versioningEnabled = !versioningEnabledStringValue.equalsIgnoreCase("false"); versioningEnabled = !versioningEnabledStringValue.equalsIgnoreCase("false");
} }

8
remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -5626,7 +5626,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// 6: majorVersion true - versioningEnabled true Expect: MAJOR version // 6: majorVersion true - versioningEnabled true Expect: MAJOR version
// 7: majorVersion false - versioningEnabled true Expect: Minor version // 7: majorVersion false - versioningEnabled true Expect: Minor version
// 8: majorVersion not set - versioningEnabled False Expect: versioning disabled // 8: majorVersion not set - versioningEnabled False Expect: versioning disabled
// 9: majorVersion not set - versioningEnabled False1 Expect: MAJOR version // 9: majorVersion not set - versioningEnabled invalid Expect: MAJOR version
// Scenario 1: // Scenario 1:
String fileName = "myfile" + UUID.randomUUID() + ".txt"; String fileName = "myfile" + UUID.randomUUID() + ".txt";
@@ -5740,7 +5740,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// Scenario 9: // Scenario 9:
fileName = "myfile" + UUID.randomUUID() + ".txt"; fileName = "myfile" + UUID.randomUUID() + ".txt";
multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file)); multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
multiPartBuilder.setVersioningEnabled("False1"); multiPartBuilder.setVersioningEnabled("invalid");
reqBody = multiPartBuilder.build(); reqBody = multiPartBuilder.build();
response = post(getNodeChildrenUrl(myNodeId), reqBody.getBody(), null, reqBody.getContentType(), 201); response = post(getNodeChildrenUrl(myNodeId), reqBody.getBody(), null, reqBody.getContentType(), 201);
@@ -5766,7 +5766,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// 6: majorVersion true - versioningEnabled true Expect: MAJOR version // 6: majorVersion true - versioningEnabled true Expect: MAJOR version
// 7: majorVersion false - versioningEnabled true Expect: Minor version // 7: majorVersion false - versioningEnabled true Expect: Minor version
// 8: majorVersion not set - versioningEnabled False Expect: versioning disabled // 8: majorVersion not set - versioningEnabled False Expect: versioning disabled
// 9: majorVersion not set - versioningEnabled False1 Expect: versioning disabled // 9: majorVersion not set - versioningEnabled invalid Expect: versioning disabled
// 10 majorVersion not set - versioningenabled true Expect: versioning disabled // 10 majorVersion not set - versioningenabled true Expect: versioning disabled
Document d1 = new Document(); Document d1 = new Document();
@@ -5869,7 +5869,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
//Scenario 9: //Scenario 9:
d1.setName("testDoc" + UUID.randomUUID()); d1.setName("testDoc" + UUID.randomUUID());
requestHeaders = new HashMap<>(); requestHeaders = new HashMap<>();
requestHeaders.put("versioningEnabled","False1"); requestHeaders.put("versioningEnabled","invalid");
response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(d1),requestHeaders, null, null, 201); response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(d1),requestHeaders, null, null, 201);
documentResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); documentResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);