LPS-83488 ResourcePermission code cleanup #6455

Preston-Crary · 2018-07-17T02:04:20Z

Have to leave out 8048868 since Wiki and Journal reset the permissions on each update with the resource prim key.

…tal-private as 53fa4d5

…ntexts easier

…he events with the right context

…e backend request is made

…ests

…'t exists

…alytics requests to the backend

…th they own context

…o get the events that are part of this informed context

… that compares the applicationId, eventId and the serializedContext of the current event and parse them for the actual context for the requestBody variable

…orage

…o it from the local storage

This reverts commit 6679fce.

…tal-private as 0b8492f

…ate from ResourceLocalService. Rename methods accordingly.

… now.

liferay-continuous-integration · 2018-07-17T02:04:22Z

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

Preston-Crary · 2018-07-17T02:05:42Z

ci:test

liferay-continuous-integration · 2018-07-17T04:20:08Z

❌ ci:test - 150 out of 161 jobs passed in 2 hours 14 minutes 399 ms

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 4a26debbd31d6f4b2cc4d44c4a0faf52d46377f2

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 0b8492f1a0afd8fedabea5735e6f7d0a9646c171

150 out of 161 jobs PASSED

11 Failed Jobs:

150 Successful Jobs:

For more details click here.

This pull contains no unique failures.

Failures in common with acceptance upstream results at 8b66fcd:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/1
Job Results:
22 Tests Passed.
1 Test Failed.
1. AXIS_VARIABLE=0,label_exp=!master #230632
  1. LocalFile.CPRolesCPWebcontent#AddWebContentSiteRoleDefaultPermission - Poshi Report - Poshi Summary - Console Output
test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/35
Job Results:
1 Test Passed.
1 Test Failed.
1. AXIS_VARIABLE=0,label_exp=!master #175386
  1. LocalFile.PGStaging#ActivateRemoteStaging - Poshi Report - Poshi Summary - Console Output

test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-oracle121-jdk8/4

Job Results:

0 Tests Passed.
1 Test Failed.

AXIS_VARIABLE=0,label_exp=!master #237840

     [java] INFO - Completed com.liferay.portal.kernel.upgrade.BaseUpgradePortletPreferences#updatePortletPreferences in 0 ms
     [java] 03:07:13,275 INFO  [main][UpgradeProcess:103] Completed upgrade process com.liferay.knowledge.base.web.internal.upgrade.v1_2_0.UpgradePortletPreferences in 1ms
     [java] INFO - Completed upgrade process com.liferay.knowledge.base.web.internal.upgrade.v1_2_0.UpgradePortletPreferences in 1ms
     [java] 
     [java] Completed Liferay core upgrade and verify processes in 99 seconds
     [java] Checking to see if all upgrades have completed... your upgrades have failed, have not started, or are still running.
     [java] You are connected to Gogo shell.
     [java] 
     [java] Type "help" to get available upgrade and verify commands.
     [java] Type "help {command}" to get additional information about the command. For example, "help upgrade:list".
     [java] Enter "exit" or "quit" to exit.
     [java] g! 
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/jps_output
     [echo] The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-batch.xml:340: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-batch.xml:994: /opt/dev/projects/github/liferay-portal/build-test-batch.xml:998: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-tomcat.xml:46: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-tomcat.xml:54: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:9673: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:10328: Timeout: killed the sub-process
     [echo] ${jstack.output}
      [get] Getting: http://test-1-14/job/test-portal-acceptance-pullrequest-batch(master)/AXIS_VARIABLE=0,label_exp=!master/237840//consoleText
      [get] To: /opt/dev/projects/github/liferay-portal/20180717032033914.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/20180717032033914.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null1272197385.properties

test-portal-acceptance-pullrequest-batch(master)/modules-integration-db2105-jdk8

Job Results:

9568 Tests Passed.
2 Tests Failed.

AXIS_VARIABLE=15,label_exp=!master #247405

TokenExpeditionTest.test

java.lang.IllegalArgumentException: The token service returned 
	at com.liferay.oauth2.provider.client.test.BaseClientTestCase.parseJSONObject(BaseClientTestCase.java:567)
	at com.liferay.oauth2.provider.client.test.BaseClientTestCase.parseJsonField(BaseClientTestCase.java:549)
	at com.liferay.oauth2.provider.client.test.BaseClientTestCase.parseError(BaseClientTestCase.java:545)
	at com.liferay.oauth2.provider.client.test.TokenExpeditionTest.test(TokenExpeditionTest.java:67)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
	at org.jboss.arquillian.junit.Arquillian$8$1.invoke(Arquillian.java:370)
	at org.jboss.arquillian.container.test.impl.execution.LocalTestExecuter.execute(LocalTestExecuter.java:60)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.jav...

PortalLogAssertorTest.testScanXMLLog

junit.framework.AssertionFailedError: 
Remote client 127.0.0.1 - 127.0.0.1 tried to use a nonexistent OAuth 2 client ID 
	at com.liferay.portal.log.assertor.PortalLogAssertorTest.scanXMLLogFile(PortalLogAssertorTest.java:174)
	at com.liferay.portal.log.assertor.PortalLogAssertorTest$1.visitFile(PortalLogAssertorTest.java:100)
	at com.liferay.portal.log.assertor.PortalLogAssertorTest$1.visitFile(PortalLogAssertorTest.java:90)
	at java.nio.file.Files.walkFileTree(Files.java:2670)
	at java.nio.file.Files.walkFileTree(Files.java:2742)
	at com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog(PortalLogAssertorTest.java:88)

test-portal-acceptance-pullrequest-batch(master)/modules-integration-hypersonic20-jdk8

Job Results:

9569 Tests Passed.
2 Tests Failed.

AXIS_VARIABLE=15,label_exp=!master #244775

TokenExpeditionTest.test

java.lang.IllegalArgumentException: The token service returned 
	at com.liferay.oauth2.provider.client.test.BaseClientTestCase.parseJSONObject(BaseClientTestCase.java:567)
	at com.liferay.oauth2.provider.client.test.BaseClientTestCase.parseJsonField(BaseClientTestCase.java:549)
	at com.liferay.oauth2.provider.client.test.BaseClientTestCase.parseError(BaseClientTestCase.java:545)
	at com.liferay.oauth2.provider.client.test.TokenExpeditionTest.test(TokenExpeditionTest.java:67)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
	at org.jboss.arquillian.junit.Arquillian$8$1.invoke(Arquillian.java:370)
	at org.jboss.arquillian.container.test.impl.execution.LocalTestExecuter.execute(LocalTestExecuter.java:60)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.jav...

PortalLogAssertorTest.testScanXMLLog

junit.framework.AssertionFailedError: 
Remote client 127.0.0.1 - 127.0.0.1 tried to use a nonexistent OAuth 2 client ID 
	at com.liferay.portal.log.assertor.PortalLogAssertorTest.scanXMLLogFile(PortalLogAssertorTest.java:174)
	at com.liferay.portal.log.assertor.PortalLogAssertorTest$1.visitFile(PortalLogAssertorTest.java:100)
	at com.liferay.portal.log.assertor.PortalLogAssertorTest$1.visitFile(PortalLogAssertorTest.java:90)
	at java.nio.file.Files.walkFileTree(Files.java:2670)
	at java.nio.file.Files.walkFileTree(Files.java:2742)
	at com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog(PortalLogAssertorTest.java:88)

...

shuyangzhou · 2018-07-17T16:24:30Z

See brianchandotcom#61402

rafaprax and others added 30 commits July 13, 2018 12:15

LPS-81340 Apply usages

7e13aaa

LPS-81340 Implement rowCheckers for formInstance and FieldSet entities

2d58473

LPS-81340 Apply usages

89bbd94

LRQA-42359 Run Documentum tests

98a1edb

APIO-139 Why do you keep commenting this out?

5d6192c

subrepo:ignore Update 'modules/apps/apio-architect/.gitrepo'.

07aff4c

LPS-74544 Add more urls

f837ebc

LPS-74544 Add suppression for test.properties

8778902

LPS-74544 Auto SF (update cdn urls)

e6128bc

LPS-74544 prep next

9ab4acc

LPS-74544 prep next

8a7e442

Record reference to liferay-portal/master-private with git-commit-por…

a2062d7

…tal-private as 53fa4d5

LPS-73711 - As a developer I want to remove old, unused build files

361c264

LPS-77329 Generated package.lock

e759537

LPS-77329 Add navigation between test pages to make testing manual co…

c649c75

…ntexts easier

LPS-77329 Save the actual user context in the local storage to send t…

224b16c

…he events with the right context

LPS-77329 Add context hash in the events object to compare it when th…

db52992

…e backend request is made

LPS-77329 declare instance.contexts to use this in the analytics requ…

b4a4bb5

…ests

LPS-77329 Import meta middleware for creating the context if it doesn…

5ecaa4d

…'t exists

LPS-77329 Import object-hash to unhash the context before sent the an…

283270c

…alytics requests to the backend

LPS-77329 Divider analytics requests by context to sent each event wi…

68fa399

…th they own context

LPS-77329 Parse the actual context for the getRequestBody to use it t…

901b30d

…o get the events that are part of this informed context

LPS-77329 Remove inline events conditions

a12b06c

LPS-77329 Get each event from their respective context by a condition…

f49d589

… that compares the applicationId, eventId and the serializedContext of the current event and parse them for the actual context for the requestBody variable

LPS-77329 Add condition to avoid duplicating the contexts in local st…

3571e90

…orage

LPS-77329 Remove each context that doesn't have any events attached t…

60d9cd7

…o it from the local storage

LPS-77329 SF

524a973

LPS-77329 Ignore some props in the objectHash method configuration

e0586ca

LPS-77329 Reorder resulution position in the plugins exports declaration

3561636

LPS-83303 SF

bc86e3a

Maria Kispal and others added 21 commits July 16, 2018 11:44

Revert "LRQA-38925 Upgrade macros and locators for staging activation"

ef87a68

This reverts commit 6679fce.

LPS-83333 Update UI tests

6b4687a

LPS-74544 Set the micro version to 0 for 'compileOnly' dependencies

b39541a

LPS-74544 Include '/modules/private/apps/'

47b715d

LPS-74544 prep next

c1bdb23

LPS-74544 prep next

549298f

LRQA-41205 Partial revert of f010061

5f6a81d

LRQA-41205 prep next

66dbc73

subrepo:ignore Update 'modules/test/poshi-runner/.gitrepo'.

b826d0c

OAUTH2-210 Log possible exceptions and errors obtaining OAuth2 data

7979327

OAUTH2-210 Wordsmith

c4a12a2

OAUTH2-210 SF

fe4b0a8

Record reference to liferay-portal/master-private with git-commit-por…

8b66fcd

…tal-private as 0b8492f

LPS-83488 Move logic over to ResourcePermissionLocalService and delig…

2d19934

…ate from ResourceLocalService. Rename methods accordingly.

LPS-83488 Clean up hasActionId usages.

83f5ab8

LPS-83488 No need to refetch the action.

8027577

LPS-83488 Remove going through the service wrappers and AOP for these.

4580b92

LPS-83488 Remove unused references.

8388878

LPS-83488 Skip AOP in ResourceLocalServiceImpl since it only delgates…

a93256c

… now.

LPS-83488 Build Service.

7731636

LPS-83488 Baseline.

773656b

Preston-Crary mentioned this pull request Jul 17, 2018

LPS-83488 Finish ResourcePermission code cleanup #6453

Closed

liferay-continuous-integration added ci:test - pending ci:test - failure and removed ci:test - pending labels Jul 17, 2018

shuyangzhou closed this Jul 17, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LPS-83488 ResourcePermission code cleanup #6455

LPS-83488 ResourcePermission code cleanup #6455

Preston-Crary commented Jul 17, 2018

liferay-continuous-integration commented Jul 17, 2018

Preston-Crary commented Jul 17, 2018

liferay-continuous-integration commented Jul 17, 2018

Base Branch:

Copied in Private Modules Branch:

11 Failed Jobs:

For more details click here.

This pull contains no unique failures.

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/1

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/35

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-oracle121-jdk8/4

Job Results:

test-portal-acceptance-pullrequest-batch(master)/modules-integration-db2105-jdk8

Job Results:

test-portal-acceptance-pullrequest-batch(master)/modules-integration-hypersonic20-jdk8

Job Results:

shuyangzhou commented Jul 17, 2018

LPS-83488 ResourcePermission code cleanup #6455

LPS-83488 ResourcePermission code cleanup #6455

Conversation

Preston-Crary commented Jul 17, 2018

liferay-continuous-integration commented Jul 17, 2018

Preston-Crary commented Jul 17, 2018

liferay-continuous-integration commented Jul 17, 2018

❌ ci:test - 150 out of 161 jobs passed in 2 hours 14 minutes 399 ms

Base Branch:

Copied in Private Modules Branch:

11 Failed Jobs:

For more details click here.

This pull contains no unique failures.

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/1

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/35

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-oracle121-jdk8/4

Job Results:

test-portal-acceptance-pullrequest-batch(master)/modules-integration-db2105-jdk8

Job Results:

test-portal-acceptance-pullrequest-batch(master)/modules-integration-hypersonic20-jdk8

Job Results:

shuyangzhou commented Jul 17, 2018